diff options
1919 files changed, 38727 insertions, 22023 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000000..4a581f9dcea --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,32 @@ +# This file contains a list of commits that are not likely what you +# are looking for in a blame, such as mass reformatting or renaming. +# You can set this file as a default ignore file for blame by running +# the following command. +# +# $ git config blame.ignoreRevsFile .git-blame-ignore-revs +# +# To temporarily not use this file add +# --ignore-revs-file="" +# to your blame command. +# +# The ignoreRevsFile can't be set globally due to blame failing if the file isn't present. +# To not have to set the option in every repository it is needed in, +# save the following script in your path with the name "git-bblame" +# now you can run +# $ git bblame $FILE +# to use the .git-blame-ignore-revs file if it is present. +# +# #!/usr/bin/env bash +# repo_root=$(git rev-parse --show-toplevel) +# if [[ -e $repo_root/.git-blame-ignore-revs ]]; then +# git blame --ignore-revs-file="$repo_root/.git-blame-ignore-revs" $@ +# else +# git blame $@ +# fi + + +# nixos/modules/rename: Sort alphabetically +1f71224fe86605ef4cd23ed327b3da7882dad382 + +# nixos: fix module paths in rename.nix +d08ede042b74b8199dc748323768227b88efcf7c diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 44007ca4828..c4662b044aa 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -104,9 +104,9 @@ /pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 # Perl -/pkgs/development/interpreters/perl @volth @stigtsp @zakame -/pkgs/top-level/perl-packages.nix @volth @stigtsp @zakame -/pkgs/development/perl-modules @volth @stigtsp @zakame +/pkgs/development/interpreters/perl @stigtsp @zakame +/pkgs/top-level/perl-packages.nix @stigtsp @zakame +/pkgs/development/perl-modules @stigtsp @zakame # R /pkgs/applications/science/math/R @jbedo @bcdarwin diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 268b1594de7..397e5ff5d17 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,16 +1,10 @@ +###### Description of changes + <!-- -To help with the large amounts of pull requests, we would appreciate your -reviews of other pull requests, especially simple package updates. Just leave a -comment describing what you have tested in the relevant package/service. -Reviewing helps to reduce the average time-to-merge for everyone. -Thanks a lot if you do! -List of open PRs: https://github.com/NixOS/nixpkgs/pulls -Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions +For package updates please link to a changelog or describe changes, this helps your fellow maintainers discover breaking updates. +For new packages please briefly describe the package or provide a link to its homepage. --> -###### Motivation for this change - - ###### Things done <!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. --> @@ -34,3 +28,14 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing- - [ ] (Module addition) Added a release notes entry if adding a new NixOS module - [ ] (Release notes changes) Ran `nixos/doc/manual/md-to-db.sh` to update generated release notes - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). + +<!-- +To help with the large amounts of pull requests, we would appreciate your +reviews of other pull requests, especially simple package updates. Just leave a +comment describing what you have tested in the relevant package/service. +Reviewing helps to reduce the average time-to-merge for everyone. +Thanks a lot if you do! + +List of open PRs: https://github.com/NixOS/nixpkgs/pulls +Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions +--> diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 0e3f315bb0d..bcb164a04ee 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -8,7 +8,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # required to find all branches fetch-depth: 0 diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 67634af51f6..51429ae40be 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -14,7 +14,12 @@ jobs: runs-on: ubuntu-latest # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v16 + - uses: cachix/cachix-action@v10 + with: + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. + name: nixpkgs-ci + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 28e20d6c945..de49e55ef2a 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -24,7 +24,7 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 4d1e2a2a0f9..c464f8bf58a 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/labeler@v3 + - uses: actions/labeler@v4 with: repo-token: ${{ secrets.GITHUB_TOKEN }} sync-labels: true diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index b9181c5f3bb..61a8a217651 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge @@ -24,7 +24,7 @@ jobs: extra_nix_config: sandbox = true - uses: cachix/cachix-action@v10 with: - # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - name: Building NixOS manual diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 3bdbd7f78fc..70d9aab6982 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge @@ -24,7 +24,7 @@ jobs: extra_nix_config: sandbox = true - uses: cachix/cachix-action@v10 with: - # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - name: Building Nixpkgs manual diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml index e1c5b4dc93b..bd70f228d46 100644 --- a/.github/workflows/nixos-manual.yml +++ b/.github/workflows/nixos-manual.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index b8535fdf952..5ad0db1db51 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -38,7 +38,7 @@ jobs: into: staging-21.11 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@1.4.0 diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index daa9b6d3c84..a8af04b78bc 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -32,7 +32,7 @@ jobs: into: staging name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@1.4.0 diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 9de57d6e3d1..09d208a6216 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -10,7 +10,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v16 - name: setup id: setup diff --git a/README.md b/README.md index 082469876b7..ff66ef0d85e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ <p align="center"> - <a href="https://nixos.org/nixos"><img src="https://nixos.org/logo/nixos-hires.png" width="500px" alt="NixOS logo" /></a> + <a href="https://nixos.org#gh-light-mode-only"> + <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/master/logo/nixos-hires.png" width="500px" alt="NixOS logo"/> + </a> + <a href="https://nixos.org#gh-dark-mode-only"> + <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png" width="500px" alt="NixOS logo"/> + </a> </p> <p align="center"> diff --git a/doc/builders/packages/steam.section.md b/doc/builders/packages/steam.section.md index 0cfc1a2c245..3ce33c9b60e 100644 --- a/doc/builders/packages/steam.section.md +++ b/doc/builders/packages/steam.section.md @@ -56,7 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a ## steam-run {#sec-steam-run} -The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run-native` package and run the game with +The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run` package and run the game with ``` steam-run ./foo diff --git a/doc/builders/special/fhs-environments.section.md b/doc/builders/special/fhs-environments.section.md index 43dc99b7c18..cacad261e28 100644 --- a/doc/builders/special/fhs-environments.section.md +++ b/doc/builders/special/fhs-environments.section.md @@ -45,3 +45,5 @@ One can create a simple environment using a `shell.nix` like that: ``` Running `nix-shell` would then drop you into a shell with these libraries and binaries available. You can use this to run closed-source applications which expect FHS structure without hassles: simply change `runScript` to the application path, e.g. `./bin/start.sh` -- relative paths are supported. + +Additionally, the FHS builder links all relocated gsettings-schemas (the glib setup-hook moves them to `share/gsettings-schemas/${name}/glib-2.0/schemas`) to their standard FHS location. This means you don't need to wrap binaries with `wrapGAppsHook`. diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index a30f4edf4c1..052bfa1f6ae 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1474,7 +1474,7 @@ lib.attrsets.zipAttrsWith <section xml:id="function-library-lib.attrsets.zipAttrs"> <title><function>lib.attrsets.zipAttrs</function></title> - <subtitle><literal>zipAttrsWith :: [ AttrSet ] -> AttrSet</literal> + <subtitle><literal>zipAttrs :: [ AttrSet ] -> AttrSet</literal> </subtitle> <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" /> diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 47035551d41..e4813d7dd2d 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -38,8 +38,8 @@ Here is a simple package example. - It uses the `fetchFromGitHub` fetcher to get its source. -- `useDune2 = true` ensures that the latest version of Dune is used for the - build (this may become the default value in a future release). +- `useDune2 = true` ensures that Dune version 2 is used for the + build (this is the default; set to `false` to use Dune version 1). - It sets the optional `doCheck` attribute such that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md index df152bc14e7..a51aa9ee8fc 100644 --- a/doc/using/overlays.chapter.md +++ b/doc/using/overlays.chapter.md @@ -77,7 +77,7 @@ In Nixpkgs, we have multiple implementations of the BLAS/LAPACK numerical linear The Nixpkgs attribute is `openblas` for ILP64 (integer width = 64 bits) and `openblasCompat` for LP64 (integer width = 32 bits). `openblasCompat` is the default. -- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS) +- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS and CBLAS) The Nixpkgs attribute is `lapack-reference`. @@ -117,7 +117,23 @@ $ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH n Intel MKL requires an `openmp` implementation when running with multiple processors. By default, `mkl` will use Intel's `iomp` implementation if no other is specified, but this is a runtime-only dependency and binary compatible with the LLVM implementation. To use that one instead, Intel recommends users set it with `LD_PRELOAD`. Note that `mkl` is only available on `x86_64-linux` and `x86_64-darwin`. Moreover, Hydra is not building and distributing pre-compiled binaries using it. -For BLAS/LAPACK switching to work correctly, all packages must depend on `blas` or `lapack`. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, `LP64` (integer size = 32 bits) and `ILP64` (integer size = 64 bits). Some software needs special flags or patches to work with `ILP64`. You can check if `ILP64` is used in Nixpkgs with `blas.isILP64` and `lapack.isILP64`. Some software does NOT work with `ILP64`, and derivations need to specify an assertion to prevent this. You can prevent `ILP64` from being used with the following: +To override `blas` and `lapack` with its reference implementations (i.e. for development purposes), one can use the following overlay: + +```nix +self: super: + +{ + blas = super.blas.override { + blasProvider = self.lapack-reference; + }; + + lapack = super.lapack.override { + lapackProvider = self.lapack-reference; + }; +} +``` + +For BLAS/LAPACK switching to work correctly, all packages must depend on `blas` or `lapack`. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, `LP64` (integer size = 32 bits) and `ILP64` (integer size = 64 bits). The attributes `blas` and `lapack` are `LP64` by default. Their `ILP64` version are provided through the attributes `blas-ilp64` and `lapack-ilp64`. Some software needs special flags or patches to work with `ILP64`. You can check if `ILP64` is used in Nixpkgs with `blas.isILP64` and `lapack.isILP64`. Some software does NOT work with `ILP64`, and derivations need to specify an assertion to prevent this. You can prevent `ILP64` from being used with the following: ```nix { stdenv, blas, lapack, ... }: diff --git a/lib/attrsets.nix b/lib/attrsets.nix index a88947b4585..c0d3ede73d0 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -327,7 +327,7 @@ rec { isDerivation "foobar" => false */ - isDerivation = x: isAttrs x && x ? type && x.type == "derivation"; + isDerivation = x: x.type or null == "derivation"; /* Converts a store path to a fake derivation. */ toDerivation = path: diff --git a/lib/default.nix b/lib/default.nix index 3e43733ad20..3fead03a463 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -126,7 +126,7 @@ let getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' scrubOptionValue literalExpression literalExample literalDocBook - showOption showFiles unknownModule mkOption; + showOption showFiles unknownModule mkOption mkPackageOption; inherit (self.types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; inherit (self.asserts) diff --git a/lib/modules.nix b/lib/modules.nix index e9fc1007fc2..01ba914ca80 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -9,7 +9,7 @@ let catAttrs concatLists concatMap - count + concatStringsSep elem filter findFirst @@ -47,6 +47,20 @@ let showOption unknownModule ; + + showDeclPrefix = loc: decl: prefix: + " - option(s) with prefix `${showOption (loc ++ [prefix])}' in module `${decl._file}'"; + showRawDecls = loc: decls: + concatStringsSep "\n" + (sort (a: b: a < b) + (concatMap + (decl: map + (showDeclPrefix loc decl) + (attrNames decl.options) + ) + decls + )); + in rec { @@ -151,8 +165,7 @@ rec { }; _module.freeformType = mkOption { - # Disallow merging for now, but could be implemented nicely with a `types.optionType` - type = types.nullOr (types.uniq types.attrs); + type = types.nullOr types.optionType; internal = true; default = null; description = '' @@ -475,26 +488,61 @@ rec { [{ inherit (module) file; inherit value; }] ) configs; + # Convert an option tree decl to a submodule option decl + optionTreeToOption = decl: + if isOption decl.options + then decl + else decl // { + options = mkOption { + type = types.submoduleWith { + modules = [ { options = decl.options; } ]; + # `null` is not intended for use by modules. It is an internal + # value that means "whatever the user has declared elsewhere". + # This might become obsolete with https://github.com/NixOS/nixpkgs/issues/162398 + shorthandOnlyDefinesConfig = null; + }; + }; + }; + resultsByName = mapAttrs (name: decls: # We're descending into attribute ‘name’. let loc = prefix ++ [name]; defns = defnsByName.${name} or []; defns' = defnsByName'.${name} or []; - nrOptions = count (m: isOption m.options) decls; + optionDecls = filter (m: isOption m.options) decls; in - if nrOptions == length decls then + if length optionDecls == length decls then let opt = fixupOptionType loc (mergeOptionDecls loc decls); in { matchedOptions = evalOptionValue loc opt defns'; unmatchedDefns = []; } - else if nrOptions != 0 then - let - firstOption = findFirst (m: isOption m.options) "" decls; - firstNonOption = findFirst (m: !isOption m.options) "" decls; - in - throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'." + else if optionDecls != [] then + if all (x: x.options.type.name == "submodule") optionDecls + # Raw options can only be merged into submodules. Merging into + # attrsets might be nice, but ambiguous. Suppose we have + # attrset as a `attrsOf submodule`. User declares option + # attrset.foo.bar, this could mean: + # a. option `bar` is only available in `attrset.foo` + # b. option `foo.bar` is available in all `attrset.*` + # c. reject and require "<name>" as a reminder that it behaves like (b). + # d. magically combine (a) and (c). + # All of the above are merely syntax sugar though. + then + let opt = fixupOptionType loc (mergeOptionDecls loc (map optionTreeToOption decls)); + in { + matchedOptions = evalOptionValue loc opt defns'; + unmatchedDefns = []; + } + else + let + firstNonOption = findFirst (m: !isOption m.options) "" decls; + nonOptions = filter (m: !isOption m.options) decls; + in + throw "The option `${showOption loc}' in module `${(lib.head optionDecls)._file}' would be a parent of the following options, but its type `${(lib.head optionDecls).options.type.description or "<no description>"}' does not support nested options.\n${ + showRawDecls loc nonOptions + }" else mergeModules' loc decls defns) declsByName; @@ -754,21 +802,22 @@ rec { compare = a: b: (a.priority or 1000) < (b.priority or 1000); in sort compare defs'; - /* Hack for backward compatibility: convert options of type - optionSet to options of type submodule. FIXME: remove - eventually. */ fixupOptionType = loc: opt: let options = opt.options or (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); + + # Hack for backward compatibility: convert options of type + # optionSet to options of type submodule. FIXME: remove + # eventually. f = tp: - let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet"); - in if tp.name == "option set" || tp.name == "submodule" then throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." - else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options) - else if optionSetIn "listOf" then types.listOf (types.submodule options) - else if optionSetIn "nullOr" then types.nullOr (types.submodule options) + else if (tp.functor.wrapped.name or null) == "optionSet" then + if tp.name == "attrsOf" then types.attrsOf (types.submodule options) + else if tp.name == "listOf" then types.listOf (types.submodule options) + else if tp.name == "nullOr" then types.nullOr (types.submodule options) + else tp else tp; in if opt.type.getSubModules or null == null diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 8a88d8cfbe8..f0e87c30e47 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -364,8 +364,8 @@ rec { musleabihf = { float = "hard"; }; musl = {}; - uclibceabihf = { float = "soft"; }; - uclibceabi = { float = "hard"; }; + uclibceabi = { float = "soft"; }; + uclibceabihf = { float = "hard"; }; uclibc = {}; unknown = {}; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index a1c592cf4ef..8050c6539fc 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -62,6 +62,13 @@ checkConfigError() { checkConfigOutput '^false$' config.enable ./declare-enable.nix checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix +checkConfigOutput '^1$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix +checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix +checkConfigOutput '^42$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix ./declare-bare-submodule-deep-option.nix ./define-bare-submodule-values.nix +checkConfigOutput '^420$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix ./declare-bare-submodule-deep-option.nix ./define-bare-submodule-values.nix +checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix ./define-shorthandOnlyDefinesConfig-true.nix +checkConfigError 'The option .bare-submodule.deep. in .*/declare-bare-submodule-deep-option.nix. is already declared in .*/declare-bare-submodule-deep-option-duplicate.nix' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix ./declare-bare-submodule-deep-option-duplicate.nix + # Check integer types. # unsigned checkConfigOutput '^42$' config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix @@ -240,6 +247,11 @@ checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep- checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix +# submodules in freeformTypes should have their locations annotated +checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freeform-submodules.nix +# freeformTypes can get merged using `types.type`, including submodules +checkConfigOutput '^10$' config.free.xxx.foo ./freeform-submodules.nix +checkConfigOutput '^10$' config.free.yyy.bar ./freeform-submodules.nix ## types.anything # Check that attribute sets are merged recursively @@ -299,6 +311,22 @@ checkConfigOutput "10" config.processedToplevel ./raw.nix checkConfigError "The option .multiple. is defined multiple times" config.multiple ./raw.nix checkConfigOutput "bar" config.priorities ./raw.nix +## Option collision +checkConfigError \ + 'The option .set. in module .*/declare-set.nix. would be a parent of the following options, but its type .attribute set of signed integers. does not support nested options.\n\s*- option[(]s[)] with prefix .set.enable. in module .*/declare-enable-nested.nix.' \ + config.set \ + ./declare-set.nix ./declare-enable-nested.nix + +# Test that types.optionType merges types correctly +checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix +checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix + +# Test that types.optionType correctly annotates option locations +checkConfigError 'The option .theOption.nested. in .other.nix. is already declared in .optionTypeFile.nix.' config.theOption.nested ./optionTypeFile.nix + +# Test that types.optionType leaves types untouched as long as they don't need to be merged +checkConfigOutput 'ok' config.freeformItems.foo.bar ./adhoc-freeformType-survives-type-merge.nix + cat <<EOF ====== module tests ====== $pass Pass diff --git a/lib/tests/modules/adhoc-freeformType-survives-type-merge.nix b/lib/tests/modules/adhoc-freeformType-survives-type-merge.nix new file mode 100644 index 00000000000..3cefb543c25 --- /dev/null +++ b/lib/tests/modules/adhoc-freeformType-survives-type-merge.nix @@ -0,0 +1,14 @@ +{ lib, ... }: { + options.dummy = lib.mkOption { type = lib.types.anything; default = {}; }; + freeformType = + let + a = lib.types.attrsOf (lib.types.submodule { options.bar = lib.mkOption { }; }); + in + # modifying types like this breaks type merging. + # This test makes sure that type merging is not performed when only a single declaration exists. + # Don't modify types in practice! + a // { + merge = loc: defs: { freeformItems = a.merge loc defs; }; + }; + config.foo.bar = "ok"; +} diff --git a/lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nix b/lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nix new file mode 100644 index 00000000000..06ad1f6e0a5 --- /dev/null +++ b/lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nix @@ -0,0 +1,10 @@ +{ lib, ... }: +let + inherit (lib) mkOption types; +in +{ + options.bare-submodule.deep = mkOption { + type = types.int; + default = 2; + }; +} diff --git a/lib/tests/modules/declare-bare-submodule-deep-option.nix b/lib/tests/modules/declare-bare-submodule-deep-option.nix new file mode 100644 index 00000000000..06ad1f6e0a5 --- /dev/null +++ b/lib/tests/modules/declare-bare-submodule-deep-option.nix @@ -0,0 +1,10 @@ +{ lib, ... }: +let + inherit (lib) mkOption types; +in +{ + options.bare-submodule.deep = mkOption { + type = types.int; + default = 2; + }; +} diff --git a/lib/tests/modules/declare-bare-submodule-nested-option.nix b/lib/tests/modules/declare-bare-submodule-nested-option.nix new file mode 100644 index 00000000000..da125c84b25 --- /dev/null +++ b/lib/tests/modules/declare-bare-submodule-nested-option.nix @@ -0,0 +1,19 @@ +{ config, lib, ... }: +let + inherit (lib) mkOption types; +in +{ + options.bare-submodule = mkOption { + type = types.submoduleWith { + shorthandOnlyDefinesConfig = config.shorthandOnlyDefinesConfig; + modules = [ + { + options.nested = mkOption { + type = types.int; + default = 1; + }; + } + ]; + }; + }; +} diff --git a/lib/tests/modules/declare-bare-submodule.nix b/lib/tests/modules/declare-bare-submodule.nix new file mode 100644 index 00000000000..5402f4ff5a5 --- /dev/null +++ b/lib/tests/modules/declare-bare-submodule.nix @@ -0,0 +1,18 @@ +{ config, lib, ... }: +let + inherit (lib) mkOption types; +in +{ + options.bare-submodule = mkOption { + type = types.submoduleWith { + modules = [ ]; + shorthandOnlyDefinesConfig = config.shorthandOnlyDefinesConfig; + }; + default = {}; + }; + + # config-dependent options: won't recommend, but useful for making this test parameterized + options.shorthandOnlyDefinesConfig = mkOption { + default = false; + }; +} diff --git a/lib/tests/modules/declare-set.nix b/lib/tests/modules/declare-set.nix new file mode 100644 index 00000000000..853418531a8 --- /dev/null +++ b/lib/tests/modules/declare-set.nix @@ -0,0 +1,12 @@ +{ lib, ... }: + +{ + options.set = lib.mkOption { + default = { }; + example = { a = 1; }; + type = lib.types.attrsOf lib.types.int; + description = '' + Some descriptive text + ''; + }; +} diff --git a/lib/tests/modules/define-bare-submodule-values.nix b/lib/tests/modules/define-bare-submodule-values.nix new file mode 100644 index 00000000000..00ede929ee6 --- /dev/null +++ b/lib/tests/modules/define-bare-submodule-values.nix @@ -0,0 +1,4 @@ +{ + bare-submodule.nested = 42; + bare-submodule.deep = 420; +} diff --git a/lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nix b/lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nix new file mode 100644 index 00000000000..bd3a73dce34 --- /dev/null +++ b/lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nix @@ -0,0 +1 @@ +{ shorthandOnlyDefinesConfig = true; } diff --git a/lib/tests/modules/freeform-submodules.nix b/lib/tests/modules/freeform-submodules.nix new file mode 100644 index 00000000000..3910435a7b5 --- /dev/null +++ b/lib/tests/modules/freeform-submodules.nix @@ -0,0 +1,22 @@ +{ lib, options, ... }: with lib.types; { + + options.fooDeclarations = lib.mkOption { + default = (options.free.type.getSubOptions [])._freeformOptions.foo.declarations; + }; + + options.free = lib.mkOption { + type = submodule { + config._module.freeformType = lib.mkMerge [ + (attrsOf (submodule { + options.foo = lib.mkOption {}; + })) + (attrsOf (submodule { + options.bar = lib.mkOption {}; + })) + ]; + }; + }; + + config.free.xxx.foo = 10; + config.free.yyy.bar = 10; +} diff --git a/lib/tests/modules/optionTypeFile.nix b/lib/tests/modules/optionTypeFile.nix new file mode 100644 index 00000000000..6015d59a72c --- /dev/null +++ b/lib/tests/modules/optionTypeFile.nix @@ -0,0 +1,28 @@ +{ config, lib, ... }: { + + _file = "optionTypeFile.nix"; + + options.theType = lib.mkOption { + type = lib.types.optionType; + }; + + options.theOption = lib.mkOption { + type = config.theType; + default = {}; + }; + + config.theType = lib.mkMerge [ + (lib.types.submodule { + options.nested = lib.mkOption { + type = lib.types.int; + }; + }) + (lib.types.submodule { + _file = "other.nix"; + options.nested = lib.mkOption { + type = lib.types.str; + }; + }) + ]; + +} diff --git a/lib/tests/modules/optionTypeMerging.nix b/lib/tests/modules/optionTypeMerging.nix new file mode 100644 index 00000000000..74a620c4620 --- /dev/null +++ b/lib/tests/modules/optionTypeMerging.nix @@ -0,0 +1,27 @@ +{ config, lib, ... }: { + + options.theType = lib.mkOption { + type = lib.types.optionType; + }; + + options.theOption = lib.mkOption { + type = config.theType; + }; + + config.theType = lib.mkMerge [ + (lib.types.submodule { + options.int = lib.mkOption { + type = lib.types.int; + default = 10; + }; + }) + (lib.types.submodule { + options.str = lib.mkOption { + type = lib.types.str; + }; + }) + ]; + + config.theOption.str = "hello"; + +} diff --git a/lib/types.nix b/lib/types.nix index c47a35cd0d6..00d97bf5723 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -61,7 +61,11 @@ let boolToString ; - inherit (lib.modules) mergeDefinitions; + inherit (lib.modules) + mergeDefinitions + fixupOptionType + mergeOptionDecls + ; outer_types = rec { isType = type: x: (x._type or "") == type; @@ -364,13 +368,21 @@ rec { emptyValue = { value = {}; }; }; - # derivation is a reserved keyword. + # A package is a top-level store path (/nix/store/hash-name). This includes: + # - derivations + # - more generally, attribute sets with an `outPath` or `__toString` attribute + # pointing to a store path, e.g. flake inputs + # - strings with context, e.g. "${pkgs.foo}" or (toString pkgs.foo) + # - hardcoded store path literals (/nix/store/hash-foo) or strings without context + # ("/nix/store/hash-foo"). These get a context added to them using builtins.storePath. package = mkOptionType { name = "package"; check = x: isDerivation x || isStorePath x; merge = loc: defs: let res = mergeOneOption loc defs; - in if isDerivation res then res else toDerivation res; + in if builtins.isPath res || (builtins.isString res && ! builtins.hasContext res) + then toDerivation res + else res; }; shellPackage = package // { @@ -510,7 +522,7 @@ rec { functionTo = elemType: mkOptionType { name = "functionTo"; - description = "function that evaluates to a(n) ${elemType.name}"; + description = "function that evaluates to a(n) ${elemType.description}"; check = isFunction; merge = loc: defs: fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue; @@ -525,6 +537,33 @@ rec { modules = toList modules; }; + # The type of a type! + optionType = mkOptionType { + name = "optionType"; + description = "optionType"; + check = value: value._type or null == "option-type"; + merge = loc: defs: + if length defs == 1 + then (head defs).value + else let + # Prepares the type definitions for mergeOptionDecls, which + # annotates submodules types with file locations + optionModules = map ({ value, file }: + { + _file = file; + # There's no way to merge types directly from the module system, + # but we can cheat a bit by just declaring an option with the type + options = lib.mkOption { + type = value; + }; + } + ) defs; + # Merges all the types into a single one, including submodule merging. + # This also propagates file information to all submodules + mergedOption = fixupOptionType loc (mergeOptionDecls loc optionModules); + in mergedOption.type; + }; + submoduleWith = { modules , specialArgs ? {} @@ -533,14 +572,18 @@ rec { let inherit (lib.modules) evalModules; - coerce = unify: value: if isFunction value - then setFunctionArgs (args: unify (value args)) (functionArgs value) - else unify (if shorthandOnlyDefinesConfig then { config = value; } else value); + shorthandToModule = if shorthandOnlyDefinesConfig == false + then value: value + else value: { config = value; }; allModules = defs: imap1 (n: { value, file }: - if isAttrs value || isFunction value then - # Annotate the value with the location of its definition for better error messages - coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value + if isFunction value + then setFunctionArgs + (args: lib.modules.unifyModuleSyntax file "${toString file}-${toString n}" (value args)) + (functionArgs value) + else if isAttrs value + then + lib.modules.unifyModuleSyntax file "${toString file}-${toString n}" (shorthandToModule value) else value ) defs; @@ -608,7 +651,11 @@ rec { then lhs.specialArgs // rhs.specialArgs else throw "A submoduleWith option is declared multiple times with the same specialArgs \"${toString (attrNames intersecting)}\""; shorthandOnlyDefinesConfig = - if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig + if lhs.shorthandOnlyDefinesConfig == null + then rhs.shorthandOnlyDefinesConfig + else if rhs.shorthandOnlyDefinesConfig == null + then lhs.shorthandOnlyDefinesConfig + else if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig then lhs.shorthandOnlyDefinesConfig else throw "A submoduleWith option is declared multiple times with conflicting shorthandOnlyDefinesConfig values"; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 435e272765e..e26d693c39c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1301,6 +1301,12 @@ githubId = 75235; name = "Michael Walker"; }; + bartsch = { + email = "consume.noise@gmail.com"; + github = "bartsch"; + githubId = 3390885; + name = "Daniel Martin"; + }; bartuka = { email = "wand@hey.com"; github = "wandersoncferreira"; @@ -1682,6 +1688,12 @@ githubId = 355401; name = "Brian Hicks"; }; + brianmcgee = { + name = "Brian McGee"; + email = "brian@41north.dev"; + github = "brianmcgee"; + githubId = 1173648; + }; Br1ght0ne = { email = "brightone@protonmail.com"; github = "Br1ght0ne"; @@ -1889,6 +1901,12 @@ githubId = 82591; name = "Carl Sverre"; }; + carpinchomug = { + email = "aki.suda@protonmail.com"; + github = "carpinchomug"; + githubId = 101536256; + name = "Akiyoshi Suda"; + }; cartr = { email = "carter.sande@duodecima.technology"; github = "cartr"; @@ -2175,6 +2193,12 @@ githubId = 42220376; name = "Charlotte Van Petegem"; }; + cigrainger = { + name = "Christopher Grainger"; + email = "chris@amplified.ai"; + github = "cigrainger"; + githubId = 3984794; + }; ciil = { email = "simon@lackerbauer.com"; github = "ciil"; @@ -2218,7 +2242,7 @@ ckie = { email = "nixpkgs-0efe364@ckie.dev"; github = "ckiee"; - githubId = 2526321; + githubId = 25263210; keys = [{ longkeyid = "rsa4096/0x13E79449C0525215"; fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; @@ -2418,6 +2442,23 @@ githubId = 5510514; name = "Conrad Mearns"; }; + corbanr = { + email = "corban@raunco.co"; + github = "CorbanR"; + githubId = 1918683; + matrix = "@corbansolo:matrix.org"; + name = "Corban Raun"; + keys = [ + { + longkeyid = "rsa4096/0xA697A56F1F151189"; + fingerprint = "6607 0B24 8CE5 64ED 22CE 0950 A697 A56F 1F15 1189"; + } + { + longkeyid = "ed25519/0x230F4AC153F90F29"; + fingerprint = "D8CB 816A B678 A4E6 1EC7 5325 230F 4AC1 53F9 0F29"; + } + ]; + }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; @@ -5602,6 +5643,12 @@ github = "jduan"; githubId = 452450; }; + jdupak = { + name = "Jakub Dupak"; + email = "dev@jakubdupak.com"; + github = "jdupak"; + githubId = 22683640; + }; jecaro = { email = "jeancharles.quillet@gmail.com"; github = "jecaro"; @@ -6333,6 +6380,12 @@ githubId = 37185887; name = "Calvin Kim"; }; + keldu = { + email = "mail@keldu.de"; + github = "keldu"; + githubId = 15373888; + name = "Claudius Holeksa"; + }; kennyballou = { email = "kb@devnulllabs.io"; github = "kennyballou"; @@ -7188,6 +7241,18 @@ githubId = 1267527; name = "Daniel Firth"; }; + lodi = { + email = "anthony.lodi@gmail.com"; + github = "lodi"; + githubId = 918448; + name = "Anthony Lodi"; + }; + loicreynier = { + email = "loic@loireynier.fr"; + github = "loicreynier"; + githubId = 88983487; + name = "Loïc Reynier"; + }; lopsided98 = { email = "benwolsieffer@gmail.com"; github = "lopsided98"; @@ -7678,6 +7743,16 @@ githubId = 279868; name = "Matti Kariluoma"; }; + matthewpi = { + email = "me+nix@matthewp.io"; + github = "matthewpi"; + githubId = 26559841; + name = "Matthew Penner"; + keys = [{ + longkeyid = "ed25519/0x31311906AD4CF6D6"; + fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6"; + }]; + }; maurer = { email = "matthew.r.maurer+nix@gmail.com"; github = "maurer"; @@ -7724,6 +7799,12 @@ githubId = 1187050; name = "Maximilian Huber"; }; + maximsmol = { + email = "maximsmol@gmail.com"; + github = "maximsmol"; + githubId = 1472826; + name = "Max Smolin"; + }; maxxk = { email = "maxim.krivchikov@gmail.com"; github = "maxxk"; @@ -7946,6 +8027,12 @@ githubId = 668926; name = "Maximilian Güntner"; }; + mh = { + email = "68288772+markus-heinrich@users.noreply.github.com"; + github = "markus-heinrich"; + githubId = 68288772; + name = "Markus Heinrich"; + }; mhaselsteiner = { email = "magdalena.haselsteiner@gmx.at"; github = "mhaselsteiner"; @@ -8371,6 +8458,17 @@ githubId = 3073833; name = "Massimo Redaelli"; }; + mrhedgehog = { + name = "Mr Hedgehog"; + email = "hedgehog@mrhedgehog.xyz"; + matrix = "@mrhedgehog:jupiterbroadcasting.com"; + github = "ModdedGamers"; + githubId = 35778371; + keys = [{ + longkeyid = "rsa4096/0x7D5107866B1C6752"; + fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752"; + }]; + }; mrkkrp = { email = "markkarpov92@gmail.com"; github = "mrkkrp"; @@ -8515,6 +8613,17 @@ githubId = 25388474; name = "Matej Urbas"; }; + mvisonneau = { + name = "Maxime VISONNEAU"; + email = "maxime@visonneau.fr"; + matrix = "@maxime:visonneau.fr"; + github = "mvisonneau"; + githubId = 1761583; + keys = [{ + longkeyid = "rsa4096/0x150D6F0AE9198D24"; + fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24"; + }]; + }; mvnetbiz = { email = "mvnetbiz@gmail.com"; matrix = "@mvtva:matrix.org"; @@ -8776,6 +8885,12 @@ githubId = 8214542; name = "Nicolò Balzarotti"; }; + nidabdella = { + name = "Mohamed Nidabdella"; + email = "nidabdella.mohamed@gmail.com"; + github = "nidabdella"; + githubId = 8083813; + }; NieDzejkob = { email = "kuba@kadziolka.net"; github = "NieDzejkob"; @@ -9081,6 +9196,12 @@ githubId = 158758; name = "Oliver Dunkl"; }; + ofek = { + email = "oss@ofek.dev"; + github = "ofek"; + githubId = 9677399; + name = "Ofek Lev"; + }; offline = { email = "jaka@x-truder.net"; github = "offlinehacker"; @@ -9175,6 +9296,12 @@ githubId = 23431373; name = "Christoph Neidahl"; }; + opeik = { + email = "sandro@stikic.com"; + github = "opeik"; + githubId = 11566773; + name = "Sandro Stikić"; + }; orbekk = { email = "kjetil.orbekk@gmail.com"; github = "orbekk"; @@ -9333,6 +9460,13 @@ githubId = 71795; name = "Mica Semrick"; }; + papojari = { + email = "papojari-git.ovoid@aleeas.com"; + matrix = "@papojari:artemislena.eu"; + github = "papojari"; + githubId = 81317317; + name = "papojari"; + }; paraseba = { email = "paraseba@gmail.com"; github = "paraseba"; @@ -10276,6 +10410,13 @@ githubId = 6047658; name = "Ryan Horiguchi"; }; + rhysmdnz = { + email = "rhys@memes.nz"; + matrix = "@rhys:memes.nz"; + github = "rhysmdnz"; + githubId = 2162021; + name = "Rhys Davies"; + }; ribose-jeffreylau = { name = "Jeffrey Lau"; email = "jeffrey.lau@ribose.com"; @@ -10952,6 +11093,12 @@ githubId = 19472270; name = "Sebastian"; }; + sebastianblunt = { + name = "Sebastian Blunt"; + email = "nix@sebastianblunt.com"; + github = "sebastianblunt"; + githubId = 47431204; + }; sebbadk = { email = "sebastian@sebba.dk"; github = "SEbbaDK"; @@ -11565,6 +11712,17 @@ githubId = 55607356; name = "Stephan Heßelmann"; }; + steinybot = { + name = "Jason Pickens"; + email = "jasonpickensnz@gmail.com"; + matrix = "@steinybot:matrix.org"; + github = "steinybot"; + githubId = 4659562; + keys = [{ + longkeyid = "ed25519/0x21DE1CAE59762A0F"; + fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; + }]; + }; stelcodes = { email = "stel@stel.codes"; github = "stelcodes"; @@ -12810,9 +12968,9 @@ githubId = 5837359; name = "Adrian Pistol"; }; - vika_nezrimaya = { + vikanezrimaya = { email = "vika@fireburn.ru"; - github = "kisik21"; + github = "vikanezrimaya"; githubId = 7953163; name = "Vika Shleina"; keys = [{ @@ -12836,6 +12994,12 @@ githubId = 118959; name = "VinyMeuh"; }; + viraptor = { + email = "nix@viraptor.info"; + github = "viraptor"; + githubId = 188063; + name = "Stanisław Pitucha"; + }; viric = { email = "viric@viric.name"; github = "viric"; @@ -13954,6 +14118,12 @@ github = "jpagex"; githubId = 635768; }; + vbrandl = { + name = "Valentin Brandl"; + email = "mail+nixpkgs@vbrandl.net"; + github = "vbrandl"; + githubId = 20639051; + }; portothree = { name = "Gustavo Porto"; email = "gustavoporto@ya.ru"; diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 285f6ed7cf9..9d51eb4ca4a 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -20,7 +20,7 @@ HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" # See: https://github.com/NixOS/nixpkgs/pull/122023 export LC_ALL=C.UTF-8 -extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' +extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" config_dir=pkgs/development/haskell-modules/configuration-hackage2nix diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 23303d22c47..d69546cdf07 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -68,7 +68,7 @@ luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn luuid,,,,,, -luv,,,,1.42.0-0,, +luv,,,,1.43.0-0,, lyaml,,,,,,lblasc markdown,,,,,, mediator_lua,,,,,, diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index c559d5699df..73a233c5f10 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -25,8 +25,8 @@ from pathlib import Path log = logging.getLogger() log.addHandler(logging.StreamHandler()) -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent -from pluginupdate import Editor, update_plugins, PluginDesc, CleanEnvironment, LOG_LEVELS, Cache +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore +from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment PKG_LIST="maintainers/scripts/luarocks-packages.csv" TMP_FILE="$(mktemp)" @@ -118,7 +118,7 @@ class LuaEditor(Editor): def attr_path(self): return "luaPackages" - def get_update(self, input_file: str, outfile: str, proc: int): + def get_update(self, input_file: str, outfile: str, config: FetchConfig): _prefetch = generate_pkg_nix def update() -> dict: @@ -126,14 +126,14 @@ class LuaEditor(Editor): sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower()) try: - pool = Pool(processes=proc) + pool = Pool(processes=config.proc) results = pool.map(_prefetch, sorted_plugin_specs) finally: pass self.generate_nix(results, outfile) - redirects = [] + redirects = {} return redirects return update @@ -181,11 +181,9 @@ def generate_pkg_nix(plug: LuaPlugin): cmd.append(plug.version) - # if plug.server != "src" and plug.server: cmd.append(f"--only-server={plug.server}") - if plug.luaversion: with CleanEnvironment(): local_pkgs = str(ROOT.resolve()) @@ -209,7 +207,6 @@ def main(): parser = editor.create_parser() args = parser.parse_args() - log.setLevel(LOG_LEVELS[args.debug]) update_plugins(editor, args) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 4e410b5914e..bf4fcc6a4a7 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -65,7 +65,6 @@ with lib.maintainers; { chia = { members = [ - atemu lourkeur ]; scope = "Maintain the Chia blockchain and its dependencies"; diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index cb5043b528f..53ecb9b3a62 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -146,26 +146,26 @@ As an example, we will take the case of display managers. There is a central display manager module for generic display manager options and a module file per display manager backend (sddm, gdm \...). -There are two approach to this module structure: +There are two approaches we could take with this module structure: -- Managing the display managers independently by adding an enable +- Configuring the display managers independently by adding an enable option to every display manager module backend. (NixOS) -- Managing the display managers in the central module by adding an - option to select which display manager backend to use. +- Configuring the display managers in the central module by adding + an option to select which display manager backend to use. Both approaches have problems. Making backends independent can quickly become hard to manage. For -display managers, there can be only one enabled at a time, but the type -system can not enforce this restriction as there is no relation between -each backend `enable` option. As a result, this restriction has to be -done explicitely by adding assertions in each display manager backend -module. +display managers, there can only be one enabled at a time, but the +type system cannot enforce this restriction as there is no relation +between each backend's `enable` option. As a result, this restriction +has to be done explicitly by adding assertions in each display manager +backend module. -On the other hand, managing the display managers backends in the central -module will require to change the central module option every time a new -backend is added or removed. +On the other hand, managing the display manager backends in the +central module will require changing the central module option every +time a new backend is added or removed. By using extensible option types, it is possible to create a placeholder option in the central module @@ -176,7 +176,7 @@ and to extend it in each backend module As a result, `displayManager.enable` option values can be added without changing the main service module file and the type system automatically -enforce that there can only be a single display manager enabled. +enforces that there can only be a single display manager enabled. ::: {#ex-option-declaration-eot-service .example} ::: {.title} diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index 78ace62e8f1..00f1d85bdb6 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -16,13 +16,14 @@ merging is handled. `types.path` -: A filesystem path, defined as anything that when coerced to a string - starts with a slash. Even if derivations can be considered as path, - the more specific `types.package` should be preferred. +: A filesystem path is anything that starts with a slash when + coerced to a string. Even if derivations can be considered as + paths, the more specific `types.package` should be preferred. `types.package` -: A derivation or a store path. +: A top-level store path. This can be an attribute set pointing + to a store path, like a derivation or a flake input. `types.anything` @@ -74,6 +75,13 @@ merging is handled. should only be used when checking, merging and nested evaluation are not desirable. +`types.optionType` + +: The type of an option's type. Its merging operation ensures that nested + options have the correct file location annotated, and that if possible, + multiple option definitions are correctly merged together. The main use + case is as the type of the `_module.freeformType` option. + `types.attrs` : A free-form attribute set. diff --git a/nixos/doc/manual/development/unit-handling.section.md b/nixos/doc/manual/development/unit-handling.section.md index d477f2c860f..a7ccb3dbd04 100644 --- a/nixos/doc/manual/development/unit-handling.section.md +++ b/nixos/doc/manual/development/unit-handling.section.md @@ -17,7 +17,8 @@ checks: them and comparing their contents. If they are different but only `X-Reload-Triggers` in the `[Unit]` section is changed, **reload** the unit. The NixOS module system allows setting these triggers with the option - [systemd.services.\<name\>.reloadTriggers](#opt-systemd.services). If the + [systemd.services.\<name\>.reloadTriggers](#opt-systemd.services). There are + some additional keys in the `[Unit]` section that are ignored as well. If the unit files differ in any way, the following actions are performed: - `.path` and `.slice` units are ignored. There is no need to restart them @@ -33,6 +34,9 @@ checks: - The rest of the units (mostly `.service` units) are then **reload**ed if `X-ReloadIfChanged` in the `[Service]` section is set to `true` (exposed via [systemd.services.\<name\>.reloadIfChanged](#opt-systemd.services)). + A little exception is done for units that were deactivated in the meantime, + for example because they require a unit that got stopped before. These + are **start**ed instead of reloaded. - If the reload flag is not set, some more flags decide if the unit is skipped. These flags are `X-RestartIfChanged` in the `[Service]` section @@ -41,17 +45,18 @@ checks: `RefuseManualStop` in the `[Unit]` section, and `X-OnlyManualStart` in the `[Unit]` section. - - The rest of the behavior is decided whether the unit has `X-StopIfChanged` - in the `[Service]` section set (exposed via + - Further behavior depends on the unit having `X-StopIfChanged` in the + `[Service]` section set to `true` (exposed via [systemd.services.\<name\>.stopIfChanged](#opt-systemd.services)). This is set to `true` by default and must be explicitly turned off if not wanted. If the flag is enabled, the unit is **stop**ped and then **start**ed. If not, the unit is **restart**ed. The goal of the flag is to make sure that the new unit never runs in the old environment which is still in place - before the activation script is run. + before the activation script is run. This behavior is different when the + service is socket-activated, as outlined in the following steps. - The last thing that is taken into account is whether the unit is a service - and socket-activated. Due to a bug, this is currently only done when - `X-StopIfChanged` is set. If the unit is socket-activated, the socket is - stopped and started, and the service is stopped and to be started by socket - activation. + and socket-activated. If `X-StopIfChanged` is **not** set, the service + is **restart**ed with the others. If it is set, both the service and the + socket are **stop**ped and the socket is **start**ed, leaving socket + activation to start the service when it's needed. diff --git a/nixos/doc/manual/development/writing-modules.chapter.md b/nixos/doc/manual/development/writing-modules.chapter.md index 2e3c6b34f1f..0c41cbd3cb7 100644 --- a/nixos/doc/manual/development/writing-modules.chapter.md +++ b/nixos/doc/manual/development/writing-modules.chapter.md @@ -90,6 +90,17 @@ modules: `systemd.services` (the set of all systemd services) and `systemd.timers` (the list of commands to be executed periodically by `systemd`). +Care must be taken when writing systemd services using `Exec*` directives. By +default systemd performs substitution on `%<char>` specifiers in these +directives, expands environment variables from `$FOO` and `${FOO}`, splits +arguments on whitespace, and splits commands on `;`. All of these must be escaped +to avoid unexpected substitution or splitting when interpolating into an `Exec*` +directive, e.g. when using an `extraArgs` option to pass additional arguments to +the service. The functions `utils.escapeSystemdExecArg` and +`utils.escapeSystemdExecArgs` are provided for this, see [Example: Escaping in +Exec directives](#exec-escaping-example) for an example. When using these +functions system environment substitution should *not* be disabled explicitly. + ::: {#locate-example .example} ::: {.title} **Example: NixOS Module for the "locate" Service** @@ -153,6 +164,37 @@ in { ``` ::: +::: {#exec-escaping-example .example} +::: {.title} +**Example: Escaping in Exec directives** +::: +```nix +{ config, lib, pkgs, utils, ... }: + +with lib; + +let + cfg = config.services.echo; + echoAll = pkgs.writeScript "echo-all" '' + #! ${pkgs.runtimeShell} + for s in "$@"; do + printf '%s\n' "$s" + done + ''; + args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ]; +in { + systemd.services.echo = + { description = "Echo to the journal"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + ${echoAll} ${utils.escapeSystemdExecArgs args} + ''; + }; +} +``` +::: + ```{=docbook} <xi:include href="option-declarations.section.xml" /> <xi:include href="option-types.section.xml" /> diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml index c7b62192158..0ac5e0eeca2 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -217,21 +217,22 @@ lib.mkOption { manager backend (sddm, gdm ...). </para> <para> - There are two approach to this module structure: + There are two approaches we could take with this module + structure: </para> <itemizedlist> <listitem> <para> - Managing the display managers independently by adding an - enable option to every display manager module backend. - (NixOS) + Configuring the display managers independently by adding + an enable option to every display manager module + backend. (NixOS) </para> </listitem> <listitem> <para> - Managing the display managers in the central module by - adding an option to select which display manager backend - to use. + Configuring the display managers in the central module + by adding an option to select which display manager + backend to use. </para> </listitem> </itemizedlist> @@ -240,16 +241,16 @@ lib.mkOption { </para> <para> Making backends independent can quickly become hard to - manage. For display managers, there can be only one enabled - at a time, but the type system can not enforce this - restriction as there is no relation between each backend + manage. For display managers, there can only be one enabled + at a time, but the type system cannot enforce this + restriction as there is no relation between each backend’s <literal>enable</literal> option. As a result, this - restriction has to be done explicitely by adding assertions + restriction has to be done explicitly by adding assertions in each display manager backend module. </para> <para> - On the other hand, managing the display managers backends in - the central module will require to change the central module + On the other hand, managing the display manager backends in + the central module will require changing the central module option every time a new backend is added or removed. </para> <para> @@ -270,7 +271,7 @@ lib.mkOption { <para> As a result, <literal>displayManager.enable</literal> option values can be added without changing the main service module - file and the type system automatically enforce that there + file and the type system automatically enforces that there can only be a single display manager enabled. </para> <anchor xml:id="ex-option-declaration-eot-service" /> diff --git a/nixos/doc/manual/from_md/development/option-types.section.xml b/nixos/doc/manual/from_md/development/option-types.section.xml index 90ef05a24e7..44472929270 100644 --- a/nixos/doc/manual/from_md/development/option-types.section.xml +++ b/nixos/doc/manual/from_md/development/option-types.section.xml @@ -30,10 +30,10 @@ </term> <listitem> <para> - A filesystem path, defined as anything that when coerced to - a string starts with a slash. Even if derivations can be - considered as path, the more specific - <literal>types.package</literal> should be preferred. + A filesystem path is anything that starts with a slash when + coerced to a string. Even if derivations can be considered + as paths, the more specific <literal>types.package</literal> + should be preferred. </para> </listitem> </varlistentry> @@ -43,7 +43,9 @@ </term> <listitem> <para> - A derivation or a store path. + A top-level store path. This can be an attribute set + pointing to a store path, like a derivation or a flake + input. </para> </listitem> </varlistentry> @@ -113,6 +115,20 @@ </varlistentry> <varlistentry> <term> + <literal>types.optionType</literal> + </term> + <listitem> + <para> + The type of an option’s type. Its merging operation ensures + that nested options have the correct file location + annotated, and that if possible, multiple option definitions + are correctly merged together. The main use case is as the + type of the <literal>_module.freeformType</literal> option. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> <literal>types.attrs</literal> </term> <listitem> diff --git a/nixos/doc/manual/from_md/development/unit-handling.section.xml b/nixos/doc/manual/from_md/development/unit-handling.section.xml index a6a654042f6..4c980e1213a 100644 --- a/nixos/doc/manual/from_md/development/unit-handling.section.xml +++ b/nixos/doc/manual/from_md/development/unit-handling.section.xml @@ -38,8 +38,9 @@ <emphasis role="strong">reload</emphasis> the unit. The NixOS module system allows setting these triggers with the option <link linkend="opt-systemd.services">systemd.services.<name>.reloadTriggers</link>. - If the unit files differ in any way, the following actions are - performed: + There are some additional keys in the <literal>[Unit]</literal> + section that are ignored as well. If the unit files differ in + any way, the following actions are performed: </para> <itemizedlist> <listitem> @@ -71,6 +72,11 @@ <literal>[Service]</literal> section is set to <literal>true</literal> (exposed via <link linkend="opt-systemd.services">systemd.services.<name>.reloadIfChanged</link>). + A little exception is done for units that were deactivated + in the meantime, for example because they require a unit + that got stopped before. These are + <emphasis role="strong">start</emphasis>ed instead of + reloaded. </para> </listitem> <listitem> @@ -88,9 +94,10 @@ </listitem> <listitem> <para> - The rest of the behavior is decided whether the unit has + Further behavior depends on the unit having <literal>X-StopIfChanged</literal> in the - <literal>[Service]</literal> section set (exposed via + <literal>[Service]</literal> section set to + <literal>true</literal> (exposed via <link linkend="opt-systemd.services">systemd.services.<name>.stopIfChanged</link>). This is set to <literal>true</literal> by default and must be explicitly turned off if not wanted. If the flag is @@ -100,17 +107,22 @@ is <emphasis role="strong">restart</emphasis>ed. The goal of the flag is to make sure that the new unit never runs in the old environment which is still in place before the - activation script is run. + activation script is run. This behavior is different when + the service is socket-activated, as outlined in the + following steps. </para> </listitem> <listitem> <para> The last thing that is taken into account is whether the - unit is a service and socket-activated. Due to a bug, this - is currently only done when - <literal>X-StopIfChanged</literal> is set. If the unit is - socket-activated, the socket is stopped and started, and the - service is stopped and to be started by socket activation. + unit is a service and socket-activated. If + <literal>X-StopIfChanged</literal> is + <emphasis role="strong">not</emphasis> set, the service is + <emphasis role="strong">restart</emphasis>ed with the + others. If it is set, both the service and the socket are + <emphasis role="strong">stop</emphasis>ped and the socket is + <emphasis role="strong">start</emphasis>ed, leaving socket + activation to start the service when it’s needed. </para> </listitem> </itemizedlist> diff --git a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml index e33c24f4f12..367731eda09 100644 --- a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml +++ b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml @@ -122,6 +122,25 @@ services) and <literal>systemd.timers</literal> (the list of commands to be executed periodically by <literal>systemd</literal>). </para> + <para> + Care must be taken when writing systemd services using + <literal>Exec*</literal> directives. By default systemd performs + substitution on <literal>%<char></literal> specifiers in these + directives, expands environment variables from + <literal>$FOO</literal> and <literal>${FOO}</literal>, splits + arguments on whitespace, and splits commands on + <literal>;</literal>. All of these must be escaped to avoid + unexpected substitution or splitting when interpolating into an + <literal>Exec*</literal> directive, e.g. when using an + <literal>extraArgs</literal> option to pass additional arguments to + the service. The functions + <literal>utils.escapeSystemdExecArg</literal> and + <literal>utils.escapeSystemdExecArgs</literal> are provided for + this, see <link linkend="exec-escaping-example">Example: Escaping in + Exec directives</link> for an example. When using these functions + system environment substitution should <emphasis>not</emphasis> be + disabled explicitly. + </para> <anchor xml:id="locate-example" /> <para> <emphasis role="strong">Example: NixOS Module for the @@ -184,6 +203,36 @@ in { }; } </programlisting> + <anchor xml:id="exec-escaping-example" /> + <para> + <emphasis role="strong">Example: Escaping in Exec + directives</emphasis> + </para> + <programlisting language="bash"> +{ config, lib, pkgs, utils, ... }: + +with lib; + +let + cfg = config.services.echo; + echoAll = pkgs.writeScript "echo-all" '' + #! ${pkgs.runtimeShell} + for s in "$@"; do + printf '%s\n' "$s" + done + ''; + args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ]; +in { + systemd.services.echo = + { description = "Echo to the journal"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + ${echoAll} ${utils.escapeSystemdExecArgs args} + ''; + }; +} +</programlisting> <xi:include href="option-declarations.section.xml" /> <xi:include href="option-types.section.xml" /> <xi:include href="option-def.section.xml" /> diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a11baa91dea..b61a0268dee 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -35,7 +35,17 @@ This means, <literal>ip[6]tables</literal>, <literal>arptables</literal> and <literal>ebtables</literal> commands will actually show rules from some specific tables in - the <literal>nf_tables</literal> kernel subsystem. + the <literal>nf_tables</literal> kernel subsystem. In case + you’re migrating from an older release without rebooting, + there might be cases where you end up with iptable rules + configured both in the legacy <literal>iptables</literal> + kernel backend, as well as in the <literal>nf_tables</literal> + backend. This can lead to confusing firewall behaviour. An + <literal>iptables-save</literal> after switching will complain + about <quote>iptables-legacy tables present</quote>. It’s + probably best to reboot after the upgrade, or manually + removing all legacy iptables rules (via the + <literal>iptables-legacy</literal> package). </para> </listitem> <listitem> diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index a6bd453b35d..d91bad8042d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -50,6 +50,18 @@ granular distinction between reloads and restarts. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://kops.sigs.k8s.io"><literal>kops</literal></link> + defaults to 1.22.4, which will enable + <link xlink:href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html">Instance + Metadata Service Version 2</link> and require tokens on new + clusters with Kubernetes 1.22. This will increase security by + default, but may break some types of workloads. See the + <link xlink:href="https://kops.sigs.k8s.io/releases/1.22-notes/">release + notes</link> for details. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-22.05-new-services"> @@ -110,6 +122,13 @@ </listitem> <listitem> <para> + <link xlink:href="https://snowflake.torproject.org/">snowflake-proxy</link>, + a system to defeat internet censorship. Available as + <link xlink:href="options.html#opt-services.snowflake-proxy.enable">services.snowflake-proxy</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://ergo.chat">ergochat</link>, a modern IRC with IRCv3 features. Available as <link xlink:href="options.html#opt-services.ergochat.enable">services.ergochat</link>. @@ -170,6 +189,14 @@ </listitem> <listitem> <para> + <link xlink:href="https://github.com/prometheus-pve/prometheus-pve-exporter">prometheus-pve-exporter</link>, + a tool that exposes information from the Proxmox VE API for + use by Prometheus. Available as + <link xlink:href="options.html#opt-services.prometheus.exporters.pve">services.prometheus.exporters.pve</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://tetrd.app">tetrd</link>, share your internet connection from your device to your PC and vice versa through a USB cable. Available at @@ -224,6 +251,17 @@ </listitem> <listitem> <para> + <link xlink:href="https://github.com/rfjakob/systembus-notify">systembus-notify</link>, + allow system level notifications to reach the users. Available + as + <link xlink:href="opt-services.systembus-notify.enable">services.systembus-notify</link>. + Please keep in mind that this service should only be enabled + on machines with fully trusted users, as any local user is + able to DoS user sessions by spamming notifications. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://github.com/audreyt/ethercalc">ethercalc</link>, an online collaborative spreadsheet. Available as <link xlink:href="options.html#opt-services.ethercalc.enable">services.ethercalc</link>. @@ -231,6 +269,13 @@ </listitem> <listitem> <para> + <link xlink:href="https://nbd.sourceforge.io/">nbd</link>, a + Network Block Device server. Available as + <link xlink:href="options.html#opt-services.nbd.server.enable">services.nbd</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://timetagger.app">timetagger</link>, an open source time-tracker with an intuitive user experience and powerful reporting. @@ -261,6 +306,12 @@ with many features. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://clusterlabs.org/pacemaker/">pacemaker</link> + cluster resource manager + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-22.05-incompatibilities"> @@ -347,6 +398,38 @@ </listitem> <listitem> <para> + <literal>services.k3s.enable</literal> no longer implies + <literal>systemd.enableUnifiedCgroupHierarchy = false</literal>, + and will default to the <quote>systemd</quote> cgroup driver + when using <literal>services.k3s.docker = true</literal>. This + change may require a reboot to take effect, and k3s may not be + able to run if the boot cgroup hierarchy does not match its + configuration. The previous behavior may be retained by + explicitly setting + <literal>systemd.enableUnifiedCgroupHierarchy = false</literal> + in your configuration. + </para> + </listitem> + <listitem> + <para> + <literal>fonts.fonts</literal> no longer includes ancient + bitmap fonts when both + <literal>config.services.xserver.enable</literal> and + <literal>config.nixpkgs.config.allowUnfree</literal> are + enabled. If you still want these fonts, use: + </para> + <programlisting language="bash"> +{ + fonts.fonts = [ + pkgs.xorg.fontbhlucidatypewriter100dpi + pkgs.xorg.fontbhlucidatypewriter75dpi + pkgs.xorg.fontbh100dpi + ]; +} +</programlisting> + </listitem> + <listitem> + <para> The DHCP server (<literal>services.dhcpd4</literal>, <literal>services.dhcpd6</literal>) has been hardened. The service is now using the systemd’s @@ -371,6 +454,116 @@ </listitem> <listitem> <para> + The <literal>matrix-synapse</literal> service + (<literal>services.matrix-synapse</literal>) has been + converted to use the <literal>settings</literal> option + defined in RFC42. This means that options that are part of + your <literal>homeserver.yaml</literal> configuration, and + that were specified at the top-level of the module + (<literal>services.matrix-synapse</literal>) now need to be + moved into + <literal>services.matrix-synapse.settings</literal>. And while + not all options you may use are defined in there, they are + still supported, because you can set arbitrary values in this + freeform type. + </para> + <para> + An example to make the required migration clearer: + </para> + <para> + Before: + </para> + <programlisting language="bash"> +{ + services.matrix-synapse = { + enable = true; + + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + registration_shared_secret = "xohshaeyui8jic7uutuDogahkee3aehuaf6ei3Xouz4iicie5thie6nohNahceut"; + macaroon_secret_key = "xoo8eder9seivukaiPh1cheikohquuw8Yooreid0The4aifahth3Ou0aiShaiz4l"; + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_address = ""; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + + }; +} +</programlisting> + <para> + After: + </para> + <programlisting language="bash"> +{ + services.matrix-synapse = { + enable = true; + + # this attribute set holds all values that go into your homeserver.yaml configuration + # See https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml for + # possible values. + settings = { + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + # pass `registration_shared_secret` and `macaroon_secret_key` via `extraConfigFiles` instead + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_address = [ + "::" + "0.0.0.0" + ]; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + }; + + extraConfigFiles = [ + /run/keys/matrix-synapse/secrets.yaml + ]; + }; +} +</programlisting> + <para> + The secrets in your original config should be migrated into a + YAML file that is included via + <literal>extraConfigFiles</literal>. + </para> + <para> + Additionally a few option defaults have been synced up with + upstream default values, for example the + <literal>max_upload_size</literal> grew from + <literal>10M</literal> to <literal>50M</literal>. + </para> + </listitem> + <listitem> + <para> The MoinMoin wiki engine (<literal>services.moinmoin</literal>) has been removed, because Python 2 is being retired from nixpkgs. @@ -378,6 +571,25 @@ </listitem> <listitem> <para> + Services in the <literal>hadoop</literal> module previously + set <literal>openFirewall</literal> to true by default. This + has now been changed to false. Node definitions for multi-node + clusters would need <literal>openFirewall = true;</literal> to + be added to to hadoop services when upgrading from NixOS + 21.11. + </para> + </listitem> + <listitem> + <para> + <literal>services.hadoop.yarn.nodemanager</literal> now uses + cgroup-based CPU limit enforcement by default. Additionally, + the option <literal>useCGroups</literal> was added to + nodemanagers as an easy way to switch back to the old + behavior. + </para> + </listitem> + <listitem> + <para> The <literal>wafHook</literal> hook now honors <literal>NIX_BUILD_CORES</literal> when <literal>enableParallelBuilding</literal> is not set @@ -555,6 +767,13 @@ </listitem> <listitem> <para> + The F-PROT antivirus (<literal>fprot</literal> package) and + its service module were removed because it reached + <link xlink:href="https://kb.cyren.com/av-support/index.php?/Knowledgebase/Article/View/434/0/end-of-sale--end-of-life-for-f-prot-and-csam">end-of-life</link>. + </para> + </listitem> + <listitem> + <para> <literal>bird1</literal> and its modules <literal>services.bird</literal> as well as <literal>services.bird6</literal> have been removed. Upgrade @@ -618,6 +837,18 @@ </listitem> <listitem> <para> + The <literal>dendrite</literal> package has been upgraded from + 0.5.1 to + <link xlink:href="https://github.com/matrix-org/dendrite/releases/tag/v0.6.5">0.6.5</link>. + Instances configured with split sqlite databases, which has + been the default in NixOS, require merging of the federation + sender and signing key databases. See upstream + <link xlink:href="https://github.com/matrix-org/dendrite/releases/tag/v0.6.0">release + notes</link> on version 0.6.0 for details on database changes. + </para> + </listitem> + <listitem> + <para> The existing <literal>pkgs.opentelemetry-collector</literal> has been moved to <literal>pkgs.opentelemetry-collector-contrib</literal> to @@ -651,6 +882,58 @@ </listitem> <listitem> <para> + <literal>pkgs.epgstation</literal> has been upgraded from v1 + to v2, resulting in incompatible changes in the database + scheme and configuration format. + </para> + </listitem> + <listitem> + <para> + Some top-level settings under + <link linkend="opt-services.epgstation.enable">services.epgstation</link> + is now deprecated because it was redudant due to the same + options being present in + <link linkend="opt-services.epgstation.settings">services.epgstation.settings</link>. + </para> + </listitem> + <listitem> + <para> + The option <literal>services.epgstation.basicAuth</literal> + was removed because basic authentication support was dropped + by upstream. + </para> + </listitem> + <listitem> + <para> + The option + <link linkend="opt-services.epgstation.database.passwordFile">services.epgstation.database.passwordFile</link> + no longer has a default value. Make sure to set this option + explicitly before upgrading. Change the database password if + necessary. + </para> + </listitem> + <listitem> + <para> + The + <link linkend="opt-services.epgstation.settings">services.epgstation.settings</link> + option now expects options for <literal>config.yml</literal> + in EPGStation v2. + </para> + </listitem> + <listitem> + <para> + Existing data for the + <link linkend="opt-services.epgstation.enable">services.epgstation</link> + module would have to be backed up prior to the upgrade. To + back up exising data to + <literal>/tmp/epgstation.bak</literal>, run + <literal>sudo -u epgstation epgstation run backup /tmp/epgstation.bak</literal>. + To import that data after to the upgrade, run + <literal>sudo -u epgstation epgstation run v1migrate /tmp/epgstation.bak</literal> + </para> + </listitem> + <listitem> + <para> <literal>switch-to-configuration</literal> (the script that is run when running <literal>nixos-rebuild switch</literal> for example) has been reworked @@ -911,6 +1194,33 @@ </listitem> <listitem> <para> + Some improvements have been made to the + <literal>hadoop</literal> module: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + A <literal>gatewayRole</literal> option has been added, + for deploying hadoop cluster configuration files to a node + that does not have any active services + </para> + </listitem> + <listitem> + <para> + Support for older versions of hadoop have been added to + the module + </para> + </listitem> + <listitem> + <para> + Overriding and extending site XML files has been made + easier + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> If you are using Wayland you can choose to use the Ozone Wayland support in Chrome and several Electron apps by setting the environment variable <literal>NIXOS_OZONE_WL=1</literal> @@ -934,6 +1244,12 @@ </listitem> <listitem> <para> + <literal>programs.zsh.autosuggestions.strategy</literal> now + takes a list of strings instead of a string. + </para> + </listitem> + <listitem> + <para> The <literal>services.unifi.openPorts</literal> option default value of <literal>true</literal> is now deprecated and will be changed to <literal>false</literal> in 22.11. Configurations @@ -1018,6 +1334,52 @@ </listitem> <listitem> <para> + ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which + introduces some breaking changes: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + If you are relying on the SQLite images, update your + Docker Pull commands as follows: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + <literal>docker pull oryd/kratos:{version}</literal> + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + Additionally, all passwords now have to be at least 8 + characters long. + </para> + </listitem> + <listitem> + <para> + For more details, see: + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.8.1-alpha.1">Release + Notes for v0.8.1-alpha-1</link> + </para> + </listitem> + <listitem> + <para> + <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.8.2-alpha.1">Release + Notes for v0.8.2-alpha-1</link> + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> <literal>fetchFromSourcehut</literal> now allows fetching repositories recursively using <literal>fetchgit</literal> or <literal>fetchhg</literal> if the argument @@ -1046,6 +1408,15 @@ </listitem> <listitem> <para> + The option + <literal>services.xserver.videoDriver = [ "nvidia" ];</literal> + will now also install + <link xlink:href="https://github.com/elFarto/nvidia-vaapi-driver">nvidia + VA-API drivers</link> by default. + </para> + </listitem> + <listitem> + <para> The <literal>firmwareLinuxNonfree</literal> package has been renamed to <literal>linux-firmware</literal>. </para> @@ -1141,6 +1512,16 @@ </listitem> <listitem> <para> + The <literal>pomerium-cli</literal> command has been moved out + of the <literal>pomerium</literal> package into the + <literal>pomerium-cli</literal> package, following upstream’s + repository split. If you are using the + <literal>pomerium-cli</literal> command, you should now + install the <literal>pomerium-cli</literal> package. + </para> + </listitem> + <listitem> + <para> The option <link linkend="opt-networking.networkmanager.enableFccUnlock">services.networking.networkmanager.enableFccUnlock</link> was added to support FCC unlock procedures. Since release @@ -1159,6 +1540,54 @@ <literal>tmux</literal>. </para> </listitem> + <listitem> + <para> + The polkit service, available at + <literal>security.polkit.enable</literal>, is now disabled by + default. It will automatically be enabled through services and + desktop environments as needed. + </para> + </listitem> + <listitem> + <para> + The <literal>hadoop</literal> package has added support for + <literal>aarch64-linux</literal> and + <literal>aarch64-darwin</literal> as of 3.3.1 + (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link>). + </para> + </listitem> + <listitem> + <para> + The <literal>R</literal> package now builds again on + <literal>aarch64-darwin</literal> + (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>). + </para> + </listitem> + <listitem> + <para> + The <literal>spark3</literal> package has been updated from + 3.1.2 to 3.2.1 + (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/160075">#160075</link>): + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Testing has been enabled for + <literal>aarch64-linux</literal> in addition to + <literal>x86_64-linux</literal>. + </para> + </listitem> + <listitem> + <para> + The <literal>spark3</literal> package is now usable on + <literal>aarch64-darwin</literal> as a result of + <link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link> + and + <link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>. + </para> + </listitem> + </itemizedlist> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index f3644c32832..310d32cfdd7 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -13,6 +13,13 @@ In addition to numerous new and upgraded packages, this release has the followin [Fedora](https://fedoraproject.org/wiki/Changes/iptables-nft-default). This means, `ip[6]tables`, `arptables` and `ebtables` commands will actually show rules from some specific tables in the `nf_tables` kernel subsystem. + In case you're migrating from an older release without rebooting, there might + be cases where you end up with iptable rules configured both in the legacy + `iptables` kernel backend, as well as in the `nf_tables` backend. + This can lead to confusing firewall behaviour. An `iptables-save` after + switching will complain about "iptables-legacy tables present". + It's probably best to reboot after the upgrade, or manually removing all + legacy iptables rules (via the `iptables-legacy` package). - systemd got an `nftables` backend, and configures (networkd) rules in their own `io.systemd.*` tables. Check `nft list ruleset` to see these rules, not diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 8f5b4789a42..2e01297f15f 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -19,6 +19,8 @@ In addition to numerous new and upgraded packages, this release has the followin - systemd services can now set [systemd.services.\<name\>.reloadTriggers](#opt-systemd.services) instead of `reloadIfChanged` for a more granular distinction between reloads and restarts. +- [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details. + ## New Services {#sec-release-22.05-new-services} - [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable). @@ -35,6 +37,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable). +- [snowflake-proxy](https://snowflake.torproject.org/), a system to defeat internet censorship. Available as [services.snowflake-proxy](options.html#opt-services.snowflake-proxy.enable). + - [ergochat](https://ergo.chat), a modern IRC with IRCv3 features. Available as [services.ergochat](options.html#opt-services.ergochat.enable). - [PowerDNS-Admin](https://github.com/ngoduykhanh/PowerDNS-Admin), a web interface for the PowerDNS server. Available at [services.powerdns-admin](options.html#opt-services.powerdns-admin.enable). @@ -51,6 +55,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [mtr-exporter](https://github.com/mgumz/mtr-exporter), a Prometheus exporter for mtr metrics. Available as [services.mtr-exporter](options.html#opt-services.mtr-exporter.enable). +- [prometheus-pve-exporter](https://github.com/prometheus-pve/prometheus-pve-exporter), a tool that exposes information from the Proxmox VE API for use by Prometheus. Available as [services.prometheus.exporters.pve](options.html#opt-services.prometheus.exporters.pve). + - [tetrd](https://tetrd.app), share your internet connection from your device to your PC and vice versa through a USB cable. Available at [services.tetrd](#opt-services.tetrd.enable). - [agate](https://github.com/mbrubeck/agate), a very simple server for the Gemini hypertext protocol. Available as [services.agate](options.html#opt-services.agate.enable). @@ -66,9 +72,13 @@ In addition to numerous new and upgraded packages, this release has the followin - [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable). +- [systembus-notify](https://github.com/rfjakob/systembus-notify), allow system level notifications to reach the users. Available as [services.systembus-notify](opt-services.systembus-notify.enable). Please keep in mind that this service should only be enabled on machines with fully trusted users, as any local user is able to DoS user sessions by spamming notifications. + - [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative spreadsheet. Available as [services.ethercalc](options.html#opt-services.ethercalc.enable). +- [nbd](https://nbd.sourceforge.io/), a Network Block Device server. Available as [services.nbd](options.html#opt-services.nbd.server.enable). + - [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable). - [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable). @@ -77,6 +87,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [blocky](https://0xerr0r.github.io/blocky/), fast and lightweight DNS proxy as ad-blocker for local network with many features. +- [pacemaker](https://clusterlabs.org/pacemaker/) cluster resource manager + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} @@ -117,6 +129,23 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading. +- `services.k3s.enable` no longer implies `systemd.enableUnifiedCgroupHierarchy = false`, and will default to the 'systemd' cgroup driver when using `services.k3s.docker = true`. + This change may require a reboot to take effect, and k3s may not be able to run if the boot cgroup hierarchy does not match its configuration. + The previous behavior may be retained by explicitly setting `systemd.enableUnifiedCgroupHierarchy = false` in your configuration. + +- `fonts.fonts` no longer includes ancient bitmap fonts when both `config.services.xserver.enable` and `config.nixpkgs.config.allowUnfree` are enabled. + If you still want these fonts, use: + + ```nix + { + fonts.fonts = [ + pkgs.xorg.fontbhlucidatypewriter100dpi + pkgs.xorg.fontbhlucidatypewriter75dpi + pkgs.xorg.fontbh100dpi + ]; + } + ``` + - The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened. The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities. The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed. @@ -124,8 +153,105 @@ In addition to numerous new and upgraded packages, this release has the followin - The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2. +- The `matrix-synapse` service (`services.matrix-synapse`) has been converted to use the `settings` option defined in RFC42. + This means that options that are part of your `homeserver.yaml` configuration, and that were specified at the top-level of the + module (`services.matrix-synapse`) now need to be moved into `services.matrix-synapse.settings`. And while not all options you + may use are defined in there, they are still supported, because you can set arbitrary values in this freeform type. + + An example to make the required migration clearer: + + Before: + ```nix + { + services.matrix-synapse = { + enable = true; + + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + registration_shared_secret = "xohshaeyui8jic7uutuDogahkee3aehuaf6ei3Xouz4iicie5thie6nohNahceut"; + macaroon_secret_key = "xoo8eder9seivukaiPh1cheikohquuw8Yooreid0The4aifahth3Ou0aiShaiz4l"; + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_address = ""; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + + }; + } + ``` + + After: + ```nix + { + services.matrix-synapse = { + enable = true; + + # this attribute set holds all values that go into your homeserver.yaml configuration + # See https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml for + # possible values. + settings = { + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + # pass `registration_shared_secret` and `macaroon_secret_key` via `extraConfigFiles` instead + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_address = [ + "::" + "0.0.0.0" + ]; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + }; + + extraConfigFiles = [ + /run/keys/matrix-synapse/secrets.yaml + ]; + }; + } + ``` + + The secrets in your original config should be migrated into a YAML file that is included via `extraConfigFiles`. + + Additionally a few option defaults have been synced up with upstream default values, for example the `max_upload_size` grew from `10M` to `50M`. + - The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs. +- Services in the `hadoop` module previously set `openFirewall` to true by default. + This has now been changed to false. Node definitions for multi-node clusters would need + `openFirewall = true;` to be added to to hadoop services when upgrading from NixOS 21.11. + +- `services.hadoop.yarn.nodemanager` now uses cgroup-based CPU limit enforcement by default. + Additionally, the option `useCGroups` was added to nodemanagers as an easy way to switch + back to the old behavior. + - The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`. - `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2. @@ -180,6 +306,9 @@ In addition to numerous new and upgraded packages, this release has the followin - `tilp2` was removed together with its module +- The F-PROT antivirus (`fprot` package) and its service module were removed because it + reached [end-of-life](https://kb.cyren.com/av-support/index.php?/Knowledgebase/Article/View/434/0/end-of-sale--end-of-life-for-f-prot-and-csam). + - `bird1` and its modules `services.bird` as well as `services.bird6` have been removed. Upgrade to `services.bird2`. - The options `networking.interfaces.<name>.ipv4.routes` and `networking.interfaces.<name>.ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`. @@ -193,6 +322,14 @@ In addition to numerous new and upgraded packages, this release has the followin This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly. +- The `dendrite` package has been upgraded from 0.5.1 to + [0.6.5](https://github.com/matrix-org/dendrite/releases/tag/v0.6.5). Instances + configured with split sqlite databases, which has been the default + in NixOS, require merging of the federation sender and signing key + databases. See upstream [release + notes](https://github.com/matrix-org/dendrite/releases/tag/v0.6.0) + on version 0.6.0 for details on database changes. + - The existing `pkgs.opentelemetry-collector` has been moved to `pkgs.opentelemetry-collector-contrib` to match the actual source being the "contrib" edition. `pkgs.opentelemetry-collector` is now the actual core @@ -209,6 +346,30 @@ In addition to numerous new and upgraded packages, this release has the followin `pkgs.noto-fonts-cjk` is currently an alias of `pkgs.noto-fonts-cjk-sans` and doesn't include serif fonts. +- `pkgs.epgstation` has been upgraded from v1 to v2, resulting in incompatible + changes in the database scheme and configuration format. + +- Some top-level settings under [services.epgstation](#opt-services.epgstation.enable) + is now deprecated because it was redudant due to the same options being + present in [services.epgstation.settings](#opt-services.epgstation.settings). + +- The option `services.epgstation.basicAuth` was removed because basic + authentication support was dropped by upstream. + +- The option [services.epgstation.database.passwordFile](#opt-services.epgstation.database.passwordFile) + no longer has a default value. Make sure to set this option explicitly before + upgrading. Change the database password if necessary. + +- The [services.epgstation.settings](#opt-services.epgstation.settings) + option now expects options for `config.yml` in EPGStation v2. + +- Existing data for the [services.epgstation](#opt-services.epgstation.enable) + module would have to be backed up prior to the upgrade. To back up exising + data to `/tmp/epgstation.bak`, run + `sudo -u epgstation epgstation run backup /tmp/epgstation.bak`. + To import that data after to the upgrade, run + `sudo -u epgstation epgstation run v1migrate /tmp/epgstation.bak` + - `switch-to-configuration` (the script that is run when running `nixos-rebuild switch` for example) has been reworked * The interface that allows activation scripts to restart units has been streamlined. Restarting and reloading is now done by a single file `/run/nixos/activation-restart-list` that honors `restartIfChanged` and `reloadIfChanged` of the units. * Preferring to reload instead of restarting can still be achieved using `/run/nixos/activation-reload-list`. @@ -283,6 +444,11 @@ In addition to numerous new and upgraded packages, this release has the followin - The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added. +- Some improvements have been made to the `hadoop` module: + - A `gatewayRole` option has been added, for deploying hadoop cluster configuration files to a node that does not have any active services + - Support for older versions of hadoop have been added to the module + - Overriding and extending site XML files has been made easier + - If you are using Wayland you can choose to use the Ozone Wayland support in Chrome and several Electron apps by setting the environment variable `NIXOS_OZONE_WL=1` (for example via @@ -296,6 +462,8 @@ In addition to numerous new and upgraded packages, this release has the followin combined `influxdb2` package is still provided in this release for backwards compatibilty, but will be removed at a later date. +- `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string. + - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11. Configurations using this default will print a warning when rebuilt. @@ -327,6 +495,14 @@ In addition to numerous new and upgraded packages, this release has the followin - `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`. +- ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which introduces some breaking changes: + - If you are relying on the SQLite images, update your Docker Pull commands as follows: + - `docker pull oryd/kratos:{version}` + - Additionally, all passwords now have to be at least 8 characters long. + - For more details, see: + - [Release Notes for v0.8.1-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.1-alpha.1) + - [Release Notes for v0.8.2-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.2-alpha.1) + - `fetchFromSourcehut` now allows fetching repositories recursively using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` is set to `true`. @@ -337,6 +513,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`. +- The option `services.xserver.videoDriver = [ "nvidia" ];` will now also install [nvidia VA-API drivers](https://github.com/elFarto/nvidia-vaapi-driver) by default. + - The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`. - It is now possible to specify wordlists to include as handy to access environment variables using the `config.environment.wordlist` configuration options. @@ -365,6 +543,11 @@ In addition to numerous new and upgraded packages, this release has the followin Reason is that the old name has been deprecated upstream. Using the old option name will still work, but produce a warning. +- The `pomerium-cli` command has been moved out of the `pomerium` package into + the `pomerium-cli` package, following upstream's repository split. If you are + using the `pomerium-cli` command, you should now install the `pomerium-cli` + package. + - The option [services.networking.networkmanager.enableFccUnlock](#opt-networking.networkmanager.enableFccUnlock) was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager @@ -373,4 +556,15 @@ In addition to numerous new and upgraded packages, this release has the followin - `programs.tmux` has a new option `plugins` that accepts a list of packages from the `tmuxPlugins` group. The specified packages are added to the system and loaded by `tmux`. +- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed. + +- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)). + +- The `R` package now builds again on `aarch64-darwin` ([#158992](https://github.com/NixOS/nixpkgs/pull/158992)). + +- The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)): + + - Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`. + - The `spark3` package is now usable on `aarch64-darwin` as a result of [#158613](https://github.com/NixOS/nixpkgs/pull/158613) and [#158992](https://github.com/NixOS/nixpkgs/pull/158992). + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index ab166d7327c..a472d97f5cc 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.systemd; lndir = "${pkgs.buildPackages.xorg.lndir}/bin/lndir"; + systemd = cfg.package; in rec { shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s); @@ -235,4 +236,205 @@ in rec { ''} ''; # */ + makeJobScript = name: text: + let + scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name); + out = (pkgs.writeShellScriptBin scriptName '' + set -e + ${text} + '').overrideAttrs (_: { + # The derivation name is different from the script file name + # to keep the script file name short to avoid cluttering logs. + name = "unit-script-${scriptName}"; + }); + in "${out}/bin/${scriptName}"; + + unitConfig = { config, options, ... }: { + config = { + unitConfig = + optionalAttrs (config.requires != []) + { Requires = toString config.requires; } + // optionalAttrs (config.wants != []) + { Wants = toString config.wants; } + // optionalAttrs (config.after != []) + { After = toString config.after; } + // optionalAttrs (config.before != []) + { Before = toString config.before; } + // optionalAttrs (config.bindsTo != []) + { BindsTo = toString config.bindsTo; } + // optionalAttrs (config.partOf != []) + { PartOf = toString config.partOf; } + // optionalAttrs (config.conflicts != []) + { Conflicts = toString config.conflicts; } + // optionalAttrs (config.requisite != []) + { Requisite = toString config.requisite; } + // optionalAttrs (config.restartTriggers != []) + { X-Restart-Triggers = toString config.restartTriggers; } + // optionalAttrs (config.reloadTriggers != []) + { X-Reload-Triggers = toString config.reloadTriggers; } + // optionalAttrs (config.description != "") { + Description = config.description; } + // optionalAttrs (config.documentation != []) { + Documentation = toString config.documentation; } + // optionalAttrs (config.onFailure != []) { + OnFailure = toString config.onFailure; } + // optionalAttrs (options.startLimitIntervalSec.isDefined) { + StartLimitIntervalSec = toString config.startLimitIntervalSec; + } // optionalAttrs (options.startLimitBurst.isDefined) { + StartLimitBurst = toString config.startLimitBurst; + }; + }; + }; + + serviceConfig = { name, config, ... }: { + config = mkMerge + [ { # Default path for systemd services. Should be quite minimal. + path = mkAfter + [ pkgs.coreutils + pkgs.findutils + pkgs.gnugrep + pkgs.gnused + systemd + ]; + environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}"; + } + (mkIf (config.preStart != "") + { serviceConfig.ExecStartPre = + [ (makeJobScript "${name}-pre-start" config.preStart) ]; + }) + (mkIf (config.script != "") + { serviceConfig.ExecStart = + makeJobScript "${name}-start" config.script + " " + config.scriptArgs; + }) + (mkIf (config.postStart != "") + { serviceConfig.ExecStartPost = + [ (makeJobScript "${name}-post-start" config.postStart) ]; + }) + (mkIf (config.reload != "") + { serviceConfig.ExecReload = + makeJobScript "${name}-reload" config.reload; + }) + (mkIf (config.preStop != "") + { serviceConfig.ExecStop = + makeJobScript "${name}-pre-stop" config.preStop; + }) + (mkIf (config.postStop != "") + { serviceConfig.ExecStopPost = + makeJobScript "${name}-post-stop" config.postStop; + }) + ]; + }; + + mountConfig = { config, ... }: { + config = { + mountConfig = + { What = config.what; + Where = config.where; + } // optionalAttrs (config.type != "") { + Type = config.type; + } // optionalAttrs (config.options != "") { + Options = config.options; + }; + }; + }; + + automountConfig = { config, ... }: { + config = { + automountConfig = + { Where = config.where; + }; + }; + }; + + commonUnitText = def: '' + [Unit] + ${attrsToSection def.unitConfig} + ''; + + targetToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = + '' + [Unit] + ${attrsToSection def.unitConfig} + ''; + }; + + serviceToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Service] + ${let env = cfg.globalEnvironment // def.environment; + in concatMapStrings (n: + let s = optionalString (env.${n} != null) + "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n"; + # systemd max line length is now 1MiB + # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af + in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} + ${if def.reloadIfChanged then '' + X-ReloadIfChanged=true + '' else if !def.restartIfChanged then '' + X-RestartIfChanged=false + '' else ""} + ${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"} + ${attrsToSection def.serviceConfig} + ''; + }; + + socketToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Socket] + ${attrsToSection def.socketConfig} + ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)} + ${concatStringsSep "\n" (map (s: "ListenDatagram=${s}") def.listenDatagrams)} + ''; + }; + + timerToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Timer] + ${attrsToSection def.timerConfig} + ''; + }; + + pathToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Path] + ${attrsToSection def.pathConfig} + ''; + }; + + mountToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Mount] + ${attrsToSection def.mountConfig} + ''; + }; + + automountToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Automount] + ${attrsToSection def.automountConfig} + ''; + }; + + sliceToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Slice] + ${attrsToSection def.sliceConfig} + ''; + }; } diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 733f9ca522b..ae68c3920c5 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -45,6 +45,26 @@ rec { replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"] (removePrefix "/" s); + # Quotes an argument for use in Exec* service lines. + # systemd accepts "-quoted strings with escape sequences, toJSON produces + # a subset of these. + # Additionally we escape % to disallow expansion of % specifiers. Any lone ; + # in the input will be turned it ";" and thus lose its special meaning. + # Every $ is escaped to $$, this makes it unnecessary to disable environment + # substitution for the directive. + escapeSystemdExecArg = arg: + let + s = if builtins.isPath arg then "${arg}" + else if builtins.isString arg then arg + else if builtins.isInt arg || builtins.isFloat arg then toString arg + else throw "escapeSystemdExecArg only allows strings, paths and numbers"; + in + replaceChars [ "%" "$" ] [ "%%" "$$" ] (builtins.toJSON s); + + # Quotes a list of arguments into a single string for use in a Exec* + # line. + escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg; + # Returns a system path for a given shell package toShellPath = shell: if types.shellPackage.check shell then diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index 04952898cb7..adc6654afc7 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -39,11 +39,6 @@ let defaultXFonts = [ (if hasHidpi then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc) pkgs.xorg.fontmiscmisc - ] ++ optionals (config.nixpkgs.config.allowUnfree or false) - [ # these are unfree, and will make usage with xserver fail - pkgs.xorg.fontbhlucidatypewriter100dpi - pkgs.xorg.fontbhlucidatypewriter75dpi - pkgs.xorg.fontbh100dpi ]; in diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 99bdb11b011..5b60b17312f 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -83,6 +83,7 @@ in { b43Firmware_5_1_138 b43Firmware_6_30_163_46 b43FirmwareCutter + xow_dongle-firmware ] ++ optional pkgs.stdenv.hostPlatform.isx86 facetimehd-firmware; }) (mkIf cfg.wirelessRegulatoryDatabase { diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index c0ba60e49a7..a81220a92a1 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -285,8 +285,12 @@ in hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out; hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_x11.lib32; - hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out; - hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32; + hardware.opengl.extraPackages = [ + pkgs.nvidia-vaapi-driver + ] ++ optional offloadCfg.enable nvidia_x11.out; + hardware.opengl.extraPackages32 = [ + pkgs.pkgsi686Linux.nvidia-vaapi-driver + ] ++ optional offloadCfg.enable nvidia_x11.lib32; environment.systemPackages = [ nvidia_x11.bin ] ++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ] diff --git a/nixos/modules/hardware/xone.nix b/nixos/modules/hardware/xone.nix new file mode 100644 index 00000000000..89690d8c6fb --- /dev/null +++ b/nixos/modules/hardware/xone.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.xone; +in +{ + options.hardware.xone = { + enable = mkEnableOption "the xone driver for Xbox One and Xbobx Series X|S accessories"; + }; + + config = mkIf cfg.enable { + boot = { + blacklistedKernelModules = [ "xpad" "mt76x2u" ]; + extraModulePackages = with config.boot.kernelPackages; [ xone ]; + }; + hardware.firmware = [ pkgs.xow_dongle-firmware ]; + }; + + meta = { + maintainers = with maintainers; [ rhysmdnz ]; + }; +} diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 31aeaad80d6..dfafda77cb5 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0"; - i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0"; - aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0"; - x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0"; - aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0"; + x86_64-linux = "/nix/store/0n2wfvi1i3fg97cjc54wslvk0804y0sn-nix-2.7.0"; + i686-linux = "/nix/store/4p27c1k9z99pli6x8cxfph20yfyzn9nh-nix-2.7.0"; + aarch64-linux = "/nix/store/r9yr8ijsb0gi9r7y92y3yzyld59yp0kj-nix-2.7.0"; + x86_64-darwin = "/nix/store/hyfj5imsd0c4amlcjpf8l6w4q2draaj3-nix-2.7.0"; + aarch64-darwin = "/nix/store/9l96qllhbb6xrsjaai76dn74ap7rq92n-nix-2.7.0"; } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 1b4105c676d..7d1faa50f4b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -89,7 +89,7 @@ in prayer = 49; mpd = 50; clamav = 51; - fprot = 52; + #fprot = 52; # unused # bind = 53; #dynamically allocated as of 2021-09-03 wwwrun = 54; #adm = 55; # unused @@ -412,7 +412,7 @@ in prayer = 49; mpd = 50; clamav = 51; - fprot = 52; + #fprot = 52; # unused #bind = 53; # unused wwwrun = 54; adm = 55; diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 66a49b0b888..204a8914300 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -183,7 +183,11 @@ in pruneNames = mkOption { type = listOf str; - default = [ ".bzr" ".cache" ".git" ".hg" ".svn" ]; + default = lib.optionals (!isFindutils) [ ".bzr" ".cache" ".git" ".hg" ".svn" ]; + defaultText = literalDocBook '' + <literal>[ ".bzr" ".cache" ".git" ".hg" ".svn" ]</literal>, if + supported by the locate implementation (i.e. mlocate or plocate). + ''; description = '' Directory components which should exclude paths containing them from indexing ''; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 6c526f6d4f2..d825f4beb30 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -1,12 +1,21 @@ { config, lib, options, pkgs, ... }: -with lib; - let cfg = config.system.nixos; opt = options.system.nixos; -in + inherit (lib) + concatStringsSep mapAttrsToList toLower + literalExpression mkRenamedOptionModule mkDefault mkOption trivial types; + + needsEscaping = s: null != builtins.match "[a-zA-Z0-9]+" s; + escapeIfNeccessary = s: if needsEscaping s then s else ''"${lib.escape [ "\$" "\"" "\\" "\`" ] s}"''; + attrsToText = attrs: + concatStringsSep "\n" ( + mapAttrsToList (n: v: ''${n}=${escapeIfNeccessary (toString v)}'') attrs + ); + +in { imports = [ (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) @@ -101,22 +110,30 @@ in # Generate /etc/os-release. See # https://www.freedesktop.org/software/systemd/man/os-release.html for the # format. - environment.etc.os-release.text = - '' - NAME=NixOS - ID=nixos - VERSION="${cfg.release} (${cfg.codeName})" - VERSION_CODENAME=${toLower cfg.codeName} - VERSION_ID="${cfg.release}" - BUILD_ID="${cfg.version}" - PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})" - LOGO="nix-snowflake" - HOME_URL="https://nixos.org/" - DOCUMENTATION_URL="https://nixos.org/learn.html" - SUPPORT_URL="https://nixos.org/community.html" - BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues" - ''; - + environment.etc = { + "lsb-release".text = attrsToText { + LSB_VERSION = "${cfg.release} (${cfg.codeName})"; + DISTRIB_ID = "nixos"; + DISTRIB_RELEASE = cfg.release; + DISTRIB_CODENAME = toLower cfg.codeName; + DISTRIB_DESCRIPTION = "NixOS ${cfg.release} (${cfg.codeName})"; + }; + + "os-release".text = attrsToText { + NAME = "NixOS"; + ID = "nixos"; + VERSION = "${cfg.release} (${cfg.codeName})"; + VERSION_CODENAME = toLower cfg.codeName; + VERSION_ID = cfg.release; + BUILD_ID = cfg.version; + PRETTY_NAME = "NixOS ${cfg.release} (${cfg.codeName})"; + LOGO = "nix-snowflake"; + HOME_URL = "https://nixos.org/"; + DOCUMENTATION_URL = "https://nixos.org/learn.html"; + SUPPORT_URL = "https://nixos.org/community.html"; + BUG_REPORT_URL = "https://github.com/NixOS/nixpkgs/issues"; + }; + }; }; # uses version info nixpkgs, which requires a full nixpkgs path diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c6f4ec5f08c..68f9c6c1227 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -91,6 +91,7 @@ ./hardware/video/switcheroo-control.nix ./hardware/video/uvcvideo/default.nix ./hardware/video/webcam/facetimehd.nix + ./hardware/xone.nix ./hardware/xpadneo.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix @@ -168,6 +169,7 @@ ./programs/iotop.nix ./programs/java.nix ./programs/k40-whisperer.nix + ./programs/kclock.nix ./programs/kdeconnect.nix ./programs/kbdlight.nix ./programs/less.nix @@ -178,6 +180,7 @@ ./programs/msmtp.nix ./programs/mtr.nix ./programs/nano.nix + ./programs/nbd.nix ./programs/neovim.nix ./programs/nm-applet.nix ./programs/npm.nix @@ -299,6 +302,7 @@ ./services/backup/znapzend.nix ./services/blockchain/ethereum/geth.nix ./services/backup/zrepl.nix + ./services/cluster/corosync/default.nix ./services/cluster/hadoop/default.nix ./services/cluster/k3s/default.nix ./services/cluster/kubernetes/addons/dns.nix @@ -311,6 +315,7 @@ ./services/cluster/kubernetes/pki.nix ./services/cluster/kubernetes/proxy.nix ./services/cluster/kubernetes/scheduler.nix + ./services/cluster/pacemaker/default.nix ./services/cluster/spark/default.nix ./services/computing/boinc/client.nix ./services/computing/foldingathome/client.nix @@ -454,6 +459,7 @@ ./services/hardware/vdr.nix ./services/hardware/xow.nix ./services/home-automation/home-assistant.nix + ./services/home-automation/zigbee2mqtt.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix ./services/logging/filebeat.nix @@ -498,6 +504,7 @@ ./services/mail/roundcube.nix ./services/mail/sympa.nix ./services/mail/nullmailer.nix + ./services/matrix/matrix-synapse.nix ./services/matrix/mjolnir.nix ./services/matrix/pantalaimon.nix ./services/misc/ananicy.nix @@ -564,7 +571,6 @@ ./services/misc/matrix-appservice-discord.nix ./services/misc/matrix-appservice-irc.nix ./services/misc/matrix-conduit.nix - ./services/misc/matrix-synapse.nix ./services/misc/mautrix-facebook.nix ./services/misc/mautrix-telegram.nix ./services/misc/mbpfan.nix @@ -625,7 +631,6 @@ ./services/misc/weechat.nix ./services/misc/xmr-stak.nix ./services/misc/xmrig.nix - ./services/misc/zigbee2mqtt.nix ./services/misc/zoneminder.nix ./services/misc/zookeeper.nix ./services/monitoring/alerta.nix @@ -817,6 +822,7 @@ ./services/networking/nar-serve.nix ./services/networking/nat.nix ./services/networking/nats.nix + ./services/networking/nbd.nix ./services/networking/ndppd.nix ./services/networking/nebula.nix ./services/networking/networkmanager.nix @@ -876,6 +882,7 @@ ./services/networking/shorewall6.nix ./services/networking/shout.nix ./services/networking/sniproxy.nix + ./services/networking/snowflake-proxy.nix ./services/networking/smartdns.nix ./services/networking/smokeping.nix ./services/networking/softether.nix @@ -950,7 +957,6 @@ ./services/security/clamav.nix ./services/security/fail2ban.nix ./services/security/fprintd.nix - ./services/security/fprot.nix ./services/security/haka.nix ./services/security/haveged.nix ./services/security/hockeypuck.nix @@ -983,6 +989,7 @@ ./services/system/nscd.nix ./services/system/saslauthd.nix ./services/system/self-deploy.nix + ./services/system/systembus-notify.nix ./services/system/uptimed.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index dc054504ea4..aad554c2bd6 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -1,8 +1,12 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.programs.captive-browser; + + inherit (lib) + concatStringsSep escapeShellArgs optionalString + literalExpression mkEnableOption mkIf mkOption mkOptionDefault types; + browserDefault = chromium: concatStringsSep " " [ ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"'' ''${chromium}/bin/chromium'' @@ -15,6 +19,15 @@ let ''-no-default-browser-check'' ''http://cache.nixos.org/'' ]; + + desktopItem = pkgs.makeDesktopItem { + name = "captive-browser"; + desktopName = "Captive Portal Browser"; + exec = "/run/wrappers/bin/captive-browser"; + icon = "nix-snowflake"; + categories = [ "Network" ]; + }; + in { ###### interface @@ -84,6 +97,11 @@ in ###### implementation config = mkIf cfg.enable { + environment.systemPackages = [ + (pkgs.runCommandNoCC "captive-browser-desktop-item" { } '' + install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop + '') + ]; programs.captive-browser.dhcp-dns = let diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index d552c751afd..a448727be77 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -40,13 +40,15 @@ in KDEDIRS = [ "" ]; QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ]; QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ]; - GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ]; + GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ]; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; XDG_DATA_DIRS = [ "/share" ]; MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ]; LIBEXEC_PATH = [ "/lib/libexec" ]; }; + environment.pathsToLink = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ]; + environment.extraInit = '' unset ASPELL_CONF diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix index 8c10d7c4df3..76b42168c19 100644 --- a/nixos/modules/programs/firejail.nix +++ b/nixos/modules/programs/firejail.nix @@ -17,8 +17,8 @@ let then value else { executable = value; profile = null; extraArgs = []; }; args = lib.escapeShellArgs ( - (optional (opts.profile != null) "--profile=${toString opts.profile}") - ++ opts.extraArgs + opts.extraArgs + ++ (optional (opts.profile != null) "--profile=${toString opts.profile}") ); in '' diff --git a/nixos/modules/programs/kclock.nix b/nixos/modules/programs/kclock.nix new file mode 100644 index 00000000000..42d81d2798b --- /dev/null +++ b/nixos/modules/programs/kclock.nix @@ -0,0 +1,13 @@ +{ lib, pkgs, config, ... }: +with lib; +let + cfg = config.programs.kclock; + kclockPkg = pkgs.libsForQt5.kclock; +in { + options.programs.kclock = { enable = mkEnableOption "Enable KClock"; }; + + config = mkIf cfg.enable { + services.dbus.packages = [ kclockPkg ]; + environment.systemPackages = [ kclockPkg ]; + }; +} diff --git a/nixos/modules/programs/nbd.nix b/nixos/modules/programs/nbd.nix new file mode 100644 index 00000000000..fea9bc1ff71 --- /dev/null +++ b/nixos/modules/programs/nbd.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.nbd; +in +{ + options = { + programs.nbd = { + enable = mkEnableOption "Network Block Device (nbd) support"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ nbd ]; + boot.kernelModules = [ "nbd" ]; + }; +} diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index bb9904d1956..01b04728134 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -134,6 +134,7 @@ in { ''; }; }; + security.polkit.enable = true; security.pam.services.swaylock = {}; hardware.opengl.enable = mkDefault true; fonts.enableDefaultFonts = mkDefault true; diff --git a/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/nixos/modules/programs/zsh/zsh-autosuggestions.nix index fee324cc732..2e53e907d54 100644 --- a/nixos/modules/programs/zsh/zsh-autosuggestions.nix +++ b/nixos/modules/programs/zsh/zsh-autosuggestions.nix @@ -22,17 +22,18 @@ in }; strategy = mkOption { - type = types.enum [ "history" "match_prev_cmd" ]; - default = "history"; + type = types.listOf (types.enum [ "history" "completion" "match_prev_cmd" ]); + default = [ "history" ]; description = '' - Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions. - There are currently two to choose from: + `ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated. + The strategies in the array are tried successively until a suggestion is found. + There are currently three built-in strategies to choose from: - * history: Chooses the most recent match. - * match_prev_cmd: Chooses the most recent match whose preceding history item matches - the most recently executed command (more info). Note that this strategy won't work as - expected with ZSH options that don't preserve the history order such as - HIST_IGNORE_ALL_DUPS or HIST_EXPIRE_DUPS_FIRST. + - `history`: Chooses the most recent match from history. + - `completion`: Chooses a suggestion based on what tab-completion would suggest. (requires `zpty` module) + - `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches + the most recently executed command. Note that this strategy won't work as expected with ZSH options that + don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`. ''; }; @@ -62,7 +63,7 @@ in source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}" - export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}") + export ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.strategy}) ${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"} ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index d72ff1c6f17..195cf87e6a8 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -50,6 +50,7 @@ with lib; (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") (mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed") (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") + (mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed") (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 9f295db84fd..c0ef8b5f30b 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -518,7 +518,7 @@ let auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.storeOnly " store-only"} '' + optionalString cfg.googleAuthenticator.enable '' - auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp + auth required ${pkgs.google-authenticator}/lib/security/pam_google_authenticator.so no_increment_hotp '' + optionalString cfg.duoSecurity.enable '' auth required ${pkgs.duo-unix}/lib/security/pam_duo.so diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index d9c58152f1f..1ba149745c6 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -12,11 +12,7 @@ in options = { - security.polkit.enable = mkOption { - type = types.bool; - default = true; - description = "Whether to enable PolKit."; - }; + security.polkit.enable = mkEnableOption "polkit"; security.polkit.extraConfig = mkOption { type = types.lines; diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index 0e3ec5af323..f3a2de3bf87 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -175,8 +175,8 @@ in { serviceName = "${name}.service"; excludedPath = rootPaths; } '' - mkdir -p "$out/lib/systemd/system" - serviceFile="$out/lib/systemd/system/$serviceName" + mkdir -p "$out/lib/systemd/system/$serviceName.d" + serviceFile="$out/lib/systemd/system/$serviceName.d/confinement.conf" echo '[Service]' > "$serviceFile" diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix index 05506f5bcc7..36295e21c60 100644 --- a/nixos/modules/services/audio/squeezelite.nix +++ b/nixos/modules/services/audio/squeezelite.nix @@ -1,50 +1,46 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkEnableOption mkIf mkOption optionalString types; + dataDir = "/var/lib/squeezelite"; cfg = config.services.squeezelite; + pkg = if cfg.pulseAudio then pkgs.squeezelite-pulse else pkgs.squeezelite; + bin = "${pkg}/bin/${pkg.pname}"; -in { +in +{ ###### interface - options = { - - services.squeezelite= { + options.services.squeezelite = { + enable = mkEnableOption "Squeezelite, a software Squeezebox emulator"; - enable = mkEnableOption "Squeezelite, a software Squeezebox emulator"; - - extraArguments = mkOption { - default = ""; - type = types.str; - description = '' - Additional command line arguments to pass to Squeezelite. - ''; - }; + pulseAudio = mkEnableOption "pulseaudio support"; + extraArguments = mkOption { + default = ""; + type = types.str; + description = '' + Additional command line arguments to pass to Squeezelite. + ''; }; - }; ###### implementation config = mkIf cfg.enable { - - systemd.services.squeezelite= { + systemd.services.squeezelite = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "sound.target" ]; description = "Software Squeezebox emulator"; serviceConfig = { DynamicUser = true; - ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${dataDir}/player-name ${cfg.extraArguments}"; + ExecStart = "${bin} -N ${dataDir}/player-name ${cfg.extraArguments}"; StateDirectory = builtins.baseNameOf dataDir; SupplementaryGroups = "audio"; }; }; - }; - } diff --git a/nixos/modules/services/cluster/corosync/default.nix b/nixos/modules/services/cluster/corosync/default.nix new file mode 100644 index 00000000000..b4144917fee --- /dev/null +++ b/nixos/modules/services/cluster/corosync/default.nix @@ -0,0 +1,112 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.corosync; +in +{ + # interface + options.services.corosync = { + enable = mkEnableOption "corosync"; + + package = mkOption { + type = types.package; + default = pkgs.corosync; + defaultText = literalExpression "pkgs.corosync"; + description = "Package that should be used for corosync."; + }; + + clusterName = mkOption { + type = types.str; + default = "nixcluster"; + description = "Name of the corosync cluster."; + }; + + extraOptions = mkOption { + type = with types; listOf str; + default = []; + description = "Additional options with which to start corosync."; + }; + + nodelist = mkOption { + description = "Corosync nodelist: all cluster members."; + default = []; + type = with types; listOf (submodule { + options = { + nodeid = mkOption { + type = int; + description = "Node ID number"; + }; + name = mkOption { + type = str; + description = "Node name"; + }; + ring_addrs = mkOption { + type = listOf str; + description = "List of addresses, one for each ring."; + }; + }; + }); + }; + }; + + # implementation + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + environment.etc."corosync/corosync.conf".text = '' + totem { + version: 2 + secauth: on + cluster_name: ${cfg.clusterName} + transport: knet + } + + nodelist { + ${concatMapStrings ({ nodeid, name, ring_addrs }: '' + node { + nodeid: ${toString nodeid} + name: ${name} + ${concatStrings (imap0 (i: addr: '' + ring${toString i}_addr: ${addr} + '') ring_addrs)} + } + '') cfg.nodelist} + } + + quorum { + # only corosync_votequorum is supported + provider: corosync_votequorum + wait_for_all: 0 + ${optionalString (builtins.length cfg.nodelist < 3) '' + two_node: 1 + ''} + } + + logging { + to_syslog: yes + } + ''; + + environment.etc."corosync/uidgid.d/root".text = '' + # allow pacemaker connection by root + uidgid { + uid: 0 + gid: 0 + } + ''; + + systemd.packages = [ cfg.package ]; + systemd.services.corosync = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + StateDirectory = "corosync"; + StateDirectoryMode = "0700"; + }; + }; + + environment.etc."sysconfig/corosync".text = lib.optionalString (cfg.extraOptions != []) '' + COROSYNC_OPTIONS="${lib.escapeShellArgs cfg.extraOptions}" + ''; + }; +} diff --git a/nixos/modules/services/cluster/hadoop/conf.nix b/nixos/modules/services/cluster/hadoop/conf.nix index 0caec5cfc20..e3c26a0d550 100644 --- a/nixos/modules/services/cluster/hadoop/conf.nix +++ b/nixos/modules/services/cluster/hadoop/conf.nix @@ -1,6 +1,6 @@ { cfg, pkgs, lib }: let - propertyXml = name: value: '' + propertyXml = name: value: lib.optionalString (value != null) '' <property> <name>${name}</name> <value>${builtins.toString value}</value> @@ -29,16 +29,16 @@ let export HADOOP_LOG_DIR=/tmp/hadoop/$USER ''; in -pkgs.runCommand "hadoop-conf" {} '' +pkgs.runCommand "hadoop-conf" {} (with cfg; '' mkdir -p $out/ - cp ${siteXml "core-site.xml" cfg.coreSite}/* $out/ - cp ${siteXml "hdfs-site.xml" cfg.hdfsSite}/* $out/ - cp ${siteXml "mapred-site.xml" cfg.mapredSite}/* $out/ - cp ${siteXml "yarn-site.xml" cfg.yarnSite}/* $out/ - cp ${siteXml "httpfs-site.xml" cfg.httpfsSite}/* $out/ - cp ${cfgFile "container-executor.cfg" cfg.containerExecutorCfg}/* $out/ + cp ${siteXml "core-site.xml" (coreSite // coreSiteInternal)}/* $out/ + cp ${siteXml "hdfs-site.xml" (hdfsSiteDefault // hdfsSite // hdfsSiteInternal)}/* $out/ + cp ${siteXml "mapred-site.xml" (mapredSiteDefault // mapredSite)}/* $out/ + cp ${siteXml "yarn-site.xml" (yarnSiteDefault // yarnSite // yarnSiteInternal)}/* $out/ + cp ${siteXml "httpfs-site.xml" httpfsSite}/* $out/ + cp ${cfgFile "container-executor.cfg" containerExecutorCfg}/* $out/ cp ${pkgs.writeTextDir "hadoop-user-functions.sh" userFunctions}/* $out/ cp ${pkgs.writeTextDir "hadoop-env.sh" hadoopEnv}/* $out/ - cp ${cfg.log4jProperties} $out/log4j.properties - ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") cfg.extraConfDirs} -'' + cp ${log4jProperties} $out/log4j.properties + ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") extraConfDirs} +'') diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index a1a95fe31ca..a4fdea81037 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -21,24 +21,50 @@ with lib; <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/core-default.xml"/> ''; }; + coreSiteInternal = mkOption { + default = {}; + type = types.attrsOf types.anything; + internal = true; + description = '' + Internal option to add configs to core-site.xml based on module options + ''; + }; - hdfsSite = mkOption { + hdfsSiteDefault = mkOption { default = { "dfs.namenode.rpc-bind-host" = "0.0.0.0"; + "dfs.namenode.http-address" = "0.0.0.0:9870"; + "dfs.namenode.servicerpc-bind-host" = "0.0.0.0"; + "dfs.namenode.http-bind-host" = "0.0.0.0"; }; type = types.attrsOf types.anything; + description = '' + Default options for hdfs-site.xml + ''; + }; + hdfsSite = mkOption { + default = {}; + type = types.attrsOf types.anything; example = literalExpression '' { "dfs.nameservices" = "namenode1"; } ''; description = '' - Hadoop hdfs-site.xml definition + Additional options and overrides for hdfs-site.xml <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/hdfs-default.xml"/> ''; }; + hdfsSiteInternal = mkOption { + default = {}; + type = types.attrsOf types.anything; + internal = true; + description = '' + Internal option to add configs to hdfs-site.xml based on module options + ''; + }; - mapredSite = mkOption { + mapredSiteDefault = mkOption { default = { "mapreduce.framework.name" = "yarn"; "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=${cfg.package}/lib/${cfg.package.untarDir}"; @@ -54,18 +80,25 @@ with lib; } ''; type = types.attrsOf types.anything; + description = '' + Default options for mapred-site.xml + ''; + }; + mapredSite = mkOption { + default = {}; + type = types.attrsOf types.anything; example = literalExpression '' - options.services.hadoop.mapredSite.default // { + { "mapreduce.map.java.opts" = "-Xmx900m -XX:+UseParallelGC"; } ''; description = '' - Hadoop mapred-site.xml definition + Additional options and overrides for mapred-site.xml <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml"/> ''; }; - yarnSite = mkOption { + yarnSiteDefault = mkOption { default = { "yarn.nodemanager.admin-env" = "PATH=$PATH"; "yarn.nodemanager.aux-services" = "mapreduce_shuffle"; @@ -77,19 +110,34 @@ with lib; "yarn.nodemanager.linux-container-executor.path" = "/run/wrappers/yarn-nodemanager/bin/container-executor"; "yarn.nodemanager.log-dirs" = "/var/log/hadoop/yarn/nodemanager"; "yarn.resourcemanager.bind-host" = "0.0.0.0"; - "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler"; + "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler"; }; type = types.attrsOf types.anything; + description = '' + Default options for yarn-site.xml + ''; + }; + yarnSite = mkOption { + default = {}; + type = types.attrsOf types.anything; example = literalExpression '' - options.services.hadoop.yarnSite.default // { + { "yarn.resourcemanager.hostname" = "''${config.networking.hostName}"; } ''; description = '' - Hadoop yarn-site.xml definition + Additional options and overrides for yarn-site.xml <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-common/yarn-default.xml"/> ''; }; + yarnSiteInternal = mkOption { + default = {}; + type = types.attrsOf types.anything; + internal = true; + description = '' + Internal option to add configs to yarn-site.xml based on module options + ''; + }; httpfsSite = mkOption { default = { }; @@ -123,6 +171,7 @@ with lib; "yarn.nodemanager.linux-container-executor.group"="hadoop"; "min.user.id"=1000; "feature.terminal.enabled"=1; + "feature.mount-cgroup.enabled" = 1; }; type = types.attrsOf types.anything; example = literalExpression '' @@ -148,6 +197,8 @@ with lib; description = "Directories containing additional config files to be added to HADOOP_CONF_DIR"; }; + gatewayRole.enable = mkEnableOption "gateway role for deploying hadoop configs"; + package = mkOption { type = types.package; default = pkgs.hadoop; @@ -157,20 +208,16 @@ with lib; }; - config = mkMerge [ - (mkIf (builtins.hasAttr "yarn" config.users.users || - builtins.hasAttr "hdfs" config.users.users || - builtins.hasAttr "httpfs" config.users.users) { - users.groups.hadoop = { - gid = config.ids.gids.hadoop; - }; - environment = { - systemPackages = [ cfg.package ]; - etc."hadoop-conf".source = let - hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/"; - in "${hadoopConf}"; - }; - }) - - ]; + config = mkIf cfg.gatewayRole.enable { + users.groups.hadoop = { + gid = config.ids.gids.hadoop; + }; + environment = { + systemPackages = [ cfg.package ]; + etc."hadoop-conf".source = let + hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/"; + in "${hadoopConf}"; + variables.HADOOP_CONF_DIR = "/etc/hadoop-conf/"; + }; + }; } diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix index be667aa82d8..325a002ad32 100644 --- a/nixos/modules/services/cluster/hadoop/hdfs.nix +++ b/nixos/modules/services/cluster/hadoop/hdfs.nix @@ -1,191 +1,191 @@ -{ config, lib, pkgs, ...}: +{ config, lib, pkgs, ... }: with lib; let cfg = config.services.hadoop; + + # Config files for hadoop services hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/"; - restartIfChanged = mkOption { - type = types.bool; - description = '' - Automatically restart the service on config change. - This can be set to false to defer restarts on clusters running critical applications. - Please consider the security implications of inadvertently running an older version, - and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. - ''; - default = false; - }; + + # Generator for HDFS service options + hadoopServiceOption = { serviceName, firewallOption ? true, extraOpts ? null }: { + enable = mkEnableOption serviceName; + restartIfChanged = mkOption { + type = types.bool; + description = '' + Automatically restart the service on config change. + This can be set to false to defer restarts on clusters running critical applications. + Please consider the security implications of inadvertently running an older version, + and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. + ''; + default = false; + }; + extraFlags = mkOption{ + type = with types; listOf str; + default = []; + description = "Extra command line flags to pass to ${serviceName}"; + example = [ + "-Dcom.sun.management.jmxremote" + "-Dcom.sun.management.jmxremote.port=8010" + ]; + }; + extraEnv = mkOption{ + type = with types; attrsOf str; + default = {}; + description = "Extra environment variables for ${serviceName}"; + }; + } // (optionalAttrs firewallOption { + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open firewall ports for ${serviceName}."; + }; + }) // (optionalAttrs (extraOpts != null) extraOpts); + + # Generator for HDFS service configs + hadoopServiceConfig = + { name + , serviceOptions ? cfg.hdfs."${toLower name}" + , description ? "Hadoop HDFS ${name}" + , User ? "hdfs" + , allowedTCPPorts ? [ ] + , preStart ? "" + , environment ? { } + , extraConfig ? { } + }: ( + + mkIf serviceOptions.enable ( mkMerge [{ + systemd.services."hdfs-${toLower name}" = { + inherit description preStart; + environment = environment // serviceOptions.extraEnv; + wantedBy = [ "multi-user.target" ]; + inherit (serviceOptions) restartIfChanged; + serviceConfig = { + inherit User; + SyslogIdentifier = "hdfs-${toLower name}"; + ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} ${toLower name} ${escapeShellArgs serviceOptions.extraFlags}"; + Restart = "always"; + }; + }; + + services.hadoop.gatewayRole.enable = true; + + networking.firewall.allowedTCPPorts = mkIf + ((builtins.hasAttr "openFirewall" serviceOptions) && serviceOptions.openFirewall) + allowedTCPPorts; + } extraConfig]) + ); + in { options.services.hadoop.hdfs = { - namenode = { - enable = mkEnableOption "Whether to run the HDFS NameNode"; + + namenode = hadoopServiceOption { serviceName = "HDFS NameNode"; } // { formatOnInit = mkOption { type = types.bool; default = false; description = '' - Format HDFS namenode on first start. This is useful for quickly spinning up ephemeral HDFS clusters with a single namenode. - For HA clusters, initialization involves multiple steps across multiple nodes. Follow [this guide](https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html) - to initialize an HA cluster manually. - ''; - }; - inherit restartIfChanged; - openFirewall = mkOption { - type = types.bool; - default = true; - description = '' - Open firewall ports for namenode - ''; - }; - }; - datanode = { - enable = mkEnableOption "Whether to run the HDFS DataNode"; - inherit restartIfChanged; - openFirewall = mkOption { - type = types.bool; - default = true; - description = '' - Open firewall ports for datanode + Format HDFS namenode on first start. This is useful for quickly spinning up + ephemeral HDFS clusters with a single namenode. + For HA clusters, initialization involves multiple steps across multiple nodes. + Follow this guide to initialize an HA cluster manually: + <link xlink:href="https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html"/> ''; }; }; - journalnode = { - enable = mkEnableOption "Whether to run the HDFS JournalNode"; - inherit restartIfChanged; - openFirewall = mkOption { - type = types.bool; - default = true; - description = '' - Open firewall ports for journalnode - ''; + + datanode = hadoopServiceOption { serviceName = "HDFS DataNode"; } // { + dataDirs = mkOption { + default = null; + description = "Tier and path definitions for datanode storage."; + type = with types; nullOr (listOf (submodule { + options = { + type = mkOption { + type = enum [ "SSD" "DISK" "ARCHIVE" "RAM_DISK" ]; + description = '' + Storage types ([SSD]/[DISK]/[ARCHIVE]/[RAM_DISK]) for HDFS storage policies. + ''; + }; + path = mkOption { + type = path; + example = [ "/var/lib/hadoop/hdfs/dn" ]; + description = "Determines where on the local filesystem a data node should store its blocks."; + }; + }; + })); }; }; - zkfc = { - enable = mkEnableOption "Whether to run the HDFS ZooKeeper failover controller"; - inherit restartIfChanged; + + journalnode = hadoopServiceOption { serviceName = "HDFS JournalNode"; }; + + zkfc = hadoopServiceOption { + serviceName = "HDFS ZooKeeper failover controller"; + firewallOption = false; }; - httpfs = { - enable = mkEnableOption "Whether to run the HDFS HTTPfs server"; + + httpfs = hadoopServiceOption { serviceName = "HDFS JournalNode"; } // { tempPath = mkOption { type = types.path; default = "/tmp/hadoop/httpfs"; - description = '' - HTTPFS_TEMP path used by HTTPFS - ''; - }; - inherit restartIfChanged; - openFirewall = mkOption { - type = types.bool; - default = true; - description = '' - Open firewall ports for HTTPFS - ''; + description = "HTTPFS_TEMP path used by HTTPFS"; }; }; + }; config = mkMerge [ - (mkIf cfg.hdfs.namenode.enable { - systemd.services.hdfs-namenode = { - description = "Hadoop HDFS NameNode"; - wantedBy = [ "multi-user.target" ]; - inherit (cfg.hdfs.namenode) restartIfChanged; - - preStart = (mkIf cfg.hdfs.namenode.formatOnInit '' - ${cfg.package}/bin/hdfs --config ${hadoopConf} namenode -format -nonInteractive || true - ''); - - serviceConfig = { - User = "hdfs"; - SyslogIdentifier = "hdfs-namenode"; - ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} namenode"; - Restart = "always"; - }; - }; - - networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.namenode.openFirewall [ + (hadoopServiceConfig { + name = "NameNode"; + allowedTCPPorts = [ 9870 # namenode.http-address 8020 # namenode.rpc-address - 8022 # namenode. servicerpc-address - ]); + 8022 # namenode.servicerpc-address + 8019 # dfs.ha.zkfc.port + ]; + preStart = (mkIf cfg.hdfs.namenode.formatOnInit + "${cfg.package}/bin/hdfs --config ${hadoopConf} namenode -format -nonInteractive || true" + ); }) - (mkIf cfg.hdfs.datanode.enable { - systemd.services.hdfs-datanode = { - description = "Hadoop HDFS DataNode"; - wantedBy = [ "multi-user.target" ]; - inherit (cfg.hdfs.datanode) restartIfChanged; - - serviceConfig = { - User = "hdfs"; - SyslogIdentifier = "hdfs-datanode"; - ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} datanode"; - Restart = "always"; - }; - }; - networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.datanode.openFirewall [ + (hadoopServiceConfig { + name = "DataNode"; + # port numbers for datanode changed between hadoop 2 and 3 + allowedTCPPorts = if versionAtLeast cfg.package.version "3" then [ 9864 # datanode.http.address 9866 # datanode.address 9867 # datanode.ipc.address - ]); + ] else [ + 50075 # datanode.http.address + 50010 # datanode.address + 50020 # datanode.ipc.address + ]; + extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = let d = cfg.hdfs.datanode.dataDirs; in + if (d!= null) then (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs) else d; }) - (mkIf cfg.hdfs.journalnode.enable { - systemd.services.hdfs-journalnode = { - description = "Hadoop HDFS JournalNode"; - wantedBy = [ "multi-user.target" ]; - inherit (cfg.hdfs.journalnode) restartIfChanged; - - serviceConfig = { - User = "hdfs"; - SyslogIdentifier = "hdfs-journalnode"; - ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} journalnode"; - Restart = "always"; - }; - }; - networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.journalnode.openFirewall [ + (hadoopServiceConfig { + name = "JournalNode"; + allowedTCPPorts = [ 8480 # dfs.journalnode.http-address 8485 # dfs.journalnode.rpc-address - ]); + ]; }) - (mkIf cfg.hdfs.zkfc.enable { - systemd.services.hdfs-zkfc = { - description = "Hadoop HDFS ZooKeeper failover controller"; - wantedBy = [ "multi-user.target" ]; - inherit (cfg.hdfs.zkfc) restartIfChanged; - - serviceConfig = { - User = "hdfs"; - SyslogIdentifier = "hdfs-zkfc"; - ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} zkfc"; - Restart = "always"; - }; - }; - }) - (mkIf cfg.hdfs.httpfs.enable { - systemd.services.hdfs-httpfs = { - description = "Hadoop httpfs"; - wantedBy = [ "multi-user.target" ]; - inherit (cfg.hdfs.httpfs) restartIfChanged; - - environment.HTTPFS_TEMP = cfg.hdfs.httpfs.tempPath; - preStart = '' - mkdir -p $HTTPFS_TEMP - ''; + (hadoopServiceConfig { + name = "zkfc"; + description = "Hadoop HDFS ZooKeeper failover controller"; + }) - serviceConfig = { - User = "httpfs"; - SyslogIdentifier = "hdfs-httpfs"; - ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} httpfs"; - Restart = "always"; - }; - }; - networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.httpfs.openFirewall [ + (hadoopServiceConfig { + name = "HTTPFS"; + environment.HTTPFS_TEMP = cfg.hdfs.httpfs.tempPath; + preStart = "mkdir -p $HTTPFS_TEMP"; + User = "httpfs"; + allowedTCPPorts = [ 14000 # httpfs.http.port - ]); + ]; }) - (mkIf ( - cfg.hdfs.namenode.enable || cfg.hdfs.datanode.enable || cfg.hdfs.journalnode.enable || cfg.hdfs.zkfc.enable - ) { + + (mkIf cfg.gatewayRole.enable { users.users.hdfs = { description = "Hadoop HDFS user"; group = "hadoop"; @@ -199,5 +199,6 @@ in isSystemUser = true; }; }) + ]; } diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix index 37c26ea10f7..74e16bdec68 100644 --- a/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/nixos/modules/services/cluster/hadoop/yarn.nix @@ -13,23 +13,77 @@ let ''; default = false; }; + extraFlags = mkOption{ + type = with types; listOf str; + default = []; + description = "Extra command line flags to pass to the service"; + example = [ + "-Dcom.sun.management.jmxremote" + "-Dcom.sun.management.jmxremote.port=8010" + ]; + }; + extraEnv = mkOption{ + type = with types; attrsOf str; + default = {}; + description = "Extra environment variables"; + }; in { options.services.hadoop.yarn = { resourcemanager = { - enable = mkEnableOption "Whether to run the Hadoop YARN ResourceManager"; - inherit restartIfChanged; + enable = mkEnableOption "Hadoop YARN ResourceManager"; + inherit restartIfChanged extraFlags extraEnv; + openFirewall = mkOption { type = types.bool; - default = true; + default = false; description = '' Open firewall ports for resourcemanager ''; }; }; nodemanager = { - enable = mkEnableOption "Whether to run the Hadoop YARN NodeManager"; - inherit restartIfChanged; + enable = mkEnableOption "Hadoop YARN NodeManager"; + inherit restartIfChanged extraFlags extraEnv; + + resource = { + cpuVCores = mkOption { + description = "Number of vcores that can be allocated for containers."; + type = with types; nullOr ints.positive; + default = null; + }; + maximumAllocationVCores = mkOption { + description = "The maximum virtual CPU cores any container can be allocated."; + type = with types; nullOr ints.positive; + default = null; + }; + memoryMB = mkOption { + description = "Amount of physical memory, in MB, that can be allocated for containers."; + type = with types; nullOr ints.positive; + default = null; + }; + maximumAllocationMB = mkOption { + description = "The maximum physical memory any container can be allocated."; + type = with types; nullOr ints.positive; + default = null; + }; + }; + + useCGroups = mkOption { + type = types.bool; + default = true; + description = '' + Use cgroups to enforce resource limits on containers + ''; + }; + + localDir = mkOption { + description = "List of directories to store localized files in."; + type = with types; nullOr (listOf path); + example = [ "/var/lib/hadoop/yarn/nm" ]; + default = null; + }; + addBinBash = mkOption { type = types.bool; default = true; @@ -39,7 +93,7 @@ in }; openFirewall = mkOption { type = types.bool; - default = true; + default = false; description = '' Open firewall ports for nodemanager. Because containers can listen on any ephemeral port, TCP ports 1024–65535 will be opened. @@ -49,10 +103,7 @@ in }; config = mkMerge [ - (mkIf ( - cfg.yarn.resourcemanager.enable || cfg.yarn.nodemanager.enable - ) { - + (mkIf cfg.gatewayRole.enable { users.users.yarn = { description = "Hadoop YARN user"; group = "hadoop"; @@ -65,15 +116,19 @@ in description = "Hadoop YARN ResourceManager"; wantedBy = [ "multi-user.target" ]; inherit (cfg.yarn.resourcemanager) restartIfChanged; + environment = cfg.yarn.resourcemanager.extraEnv; serviceConfig = { User = "yarn"; SyslogIdentifier = "yarn-resourcemanager"; ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " + - " resourcemanager"; + " resourcemanager ${escapeShellArgs cfg.yarn.resourcemanager.extraFlags}"; Restart = "always"; }; }; + + services.hadoop.gatewayRole.enable = true; + networking.firewall.allowedTCPPorts = (mkIf cfg.yarn.resourcemanager.openFirewall [ 8088 # resourcemanager.webapp.address 8030 # resourcemanager.scheduler.address @@ -94,6 +149,7 @@ in description = "Hadoop YARN NodeManager"; wantedBy = [ "multi-user.target" ]; inherit (cfg.yarn.nodemanager) restartIfChanged; + environment = cfg.yarn.nodemanager.extraEnv; preStart = '' # create log dir @@ -101,8 +157,9 @@ in chown yarn:hadoop /var/log/hadoop/yarn/nodemanager # set up setuid container executor binary + umount /run/wrappers/yarn-nodemanager/cgroup/cpu || true rm -rf /run/wrappers/yarn-nodemanager/ || true - mkdir -p /run/wrappers/yarn-nodemanager/{bin,etc/hadoop} + mkdir -p /run/wrappers/yarn-nodemanager/{bin,etc/hadoop,cgroup/cpu} cp ${cfg.package}/lib/${cfg.package.untarDir}/bin/container-executor /run/wrappers/yarn-nodemanager/bin/ chgrp hadoop /run/wrappers/yarn-nodemanager/bin/container-executor chmod 6050 /run/wrappers/yarn-nodemanager/bin/container-executor @@ -114,11 +171,26 @@ in SyslogIdentifier = "yarn-nodemanager"; PermissionsStartOnly = true; ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " + - " nodemanager"; + " nodemanager ${escapeShellArgs cfg.yarn.nodemanager.extraFlags}"; Restart = "always"; }; }; + services.hadoop.gatewayRole.enable = true; + + services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; { + "yarn.nodemanager.local-dirs" = localDir; + "yarn.scheduler.maximum-allocation-vcores" = resource.maximumAllocationVCores; + "yarn.scheduler.maximum-allocation-mb" = resource.maximumAllocationMB; + "yarn.nodemanager.resource.cpu-vcores" = resource.cpuVCores; + "yarn.nodemanager.resource.memory-mb" = resource.memoryMB; + } // mkIf useCGroups { + "yarn.nodemanager.linux-container-executor.cgroups.hierarchy" = "/hadoop-yarn"; + "yarn.nodemanager.linux-container-executor.resources-handler.class" = "org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler"; + "yarn.nodemanager.linux-container-executor.cgroups.mount" = "true"; + "yarn.nodemanager.linux-container-executor.cgroups.mount-path" = "/run/wrappers/yarn-nodemanager/cgroup"; + }; + networking.firewall.allowedTCPPortRanges = [ (mkIf (cfg.yarn.nodemanager.openFirewall) {from = 1024; to = 65535;}) ]; diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 50b6780bbe6..3a36cfa3f37 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -91,11 +91,6 @@ in virtualisation.docker = mkIf cfg.docker { enable = mkDefault true; }; - - # TODO: disable this once k3s supports cgroupsv2, either by docker - # supporting it, or their bundled containerd - systemd.enableUnifiedCgroupHierarchy = false; - environment.systemPackages = [ config.services.k3s.package ]; systemd.services.k3s = { @@ -119,6 +114,7 @@ in [ "${cfg.package}/bin/k3s ${cfg.role}" ] ++ (optional cfg.docker "--docker") + ++ (optional (cfg.docker && config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd") ++ (optional cfg.disableAgent "--disable-agent") ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}") ++ (optional (cfg.token != "") "--token ${cfg.token}") diff --git a/nixos/modules/services/cluster/pacemaker/default.nix b/nixos/modules/services/cluster/pacemaker/default.nix new file mode 100644 index 00000000000..7eeadffcc58 --- /dev/null +++ b/nixos/modules/services/cluster/pacemaker/default.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.pacemaker; +in +{ + # interface + options.services.pacemaker = { + enable = mkEnableOption "pacemaker"; + + package = mkOption { + type = types.package; + default = pkgs.pacemaker; + defaultText = literalExpression "pkgs.pacemaker"; + description = "Package that should be used for pacemaker."; + }; + }; + + # implementation + config = mkIf cfg.enable { + assertions = [ { + assertion = config.services.corosync.enable; + message = '' + Enabling services.pacemaker requires a services.corosync configuration. + ''; + } ]; + + environment.systemPackages = [ cfg.package ]; + + # required by pacemaker + users.users.hacluster = { + isSystemUser = true; + group = "pacemaker"; + home = "/var/lib/pacemaker"; + }; + users.groups.pacemaker = {}; + + systemd.tmpfiles.rules = [ + "d /var/log/pacemaker 0700 hacluster pacemaker -" + ]; + + systemd.packages = [ cfg.package ]; + systemd.services.pacemaker = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + StateDirectory = "pacemaker"; + StateDirectoryMode = "0700"; + }; + }; + }; +} diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index c3bd8f99c57..a7645e1f56e 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -34,6 +34,14 @@ in Repository to add the runner to. Changing this option triggers a new runner registration. + + IMPORTANT: If your token is org-wide (not per repository), you need to + provide a github org link, not a single repository, so do it like this + <literal>https://github.com/nixos</literal>, not like this + <literal>https://github.com/nixos/nixpkgs</literal>. + Otherwise, you are going to get a <literal>404 NotFound</literal> + from <literal>POST https://api.github.com/actions/runner-registration</literal> + in the configure script. ''; example = "https://github.com/nixos/nixpkgs"; }; diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index e0269a962fd..a1bd73c9e37 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -81,7 +81,9 @@ in { user = mkOption { type = types.str; default = redisName name; - defaultText = "\"redis\" or \"redis-\${name}\" if name != \"\""; + defaultText = literalExpression '' + if name == "" then "redis" else "redis-''${name}" + ''; description = "The username and groupname for redis-server."; }; @@ -105,8 +107,7 @@ in { bind = mkOption { type = with types; nullOr str; - default = if name == "" then "127.0.0.1" else null; - defaultText = literalExpression ''if name == "" then "127.0.0.1" else null''; + default = "127.0.0.1"; description = '' The IP interface to bind to. <literal>null</literal> means "all interfaces". @@ -117,7 +118,9 @@ in { unixSocket = mkOption { type = with types; nullOr path; default = "/run/${redisName name}/redis.sock"; - defaultText = "\"/run/redis/redis.sock\" or \"/run/redis-\${name}/redis.sock\" if name != \"\""; + defaultText = literalExpression '' + if name == "" then "/run/redis/redis.sock" else "/run/redis-''${name}/redis.sock" + ''; description = "The path to the socket to bind to."; }; @@ -370,7 +373,7 @@ in { ProtectKernelTunables = true; ProtectControlGroups = true; RestrictAddressFamilies = - optionals (conf.bind != null) ["AF_INET" "AF_INET6"] ++ + optionals (conf.port != 0) ["AF_INET" "AF_INET6"] ++ optional (conf.unixSocket != null) "AF_UNIX"; RestrictNamespaces = true; LockPersonality = true; diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 7da92cc9f26..5fecc64b4f7 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -30,6 +30,8 @@ in { environment.systemPackages = [ pkgs.flatpak ]; + security.polkit.enable = true; + services.dbus.packages = [ pkgs.flatpak ]; systemd.packages = [ pkgs.flatpak ]; diff --git a/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json b/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json index 284d8c394a6..9aa51b61431 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json @@ -8,7 +8,7 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", + "name": "libpipewire-module-rt", "args": {}, "flags": [ "ifexists", diff --git a/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json b/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json new file mode 100644 index 00000000000..c7f58fd5799 --- /dev/null +++ b/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json @@ -0,0 +1,118 @@ +{ + "context.properties": { + "link.max-buffers": 16, + "core.daemon": true, + "core.name": "pipewire-0", + "settings.check-quantum": true, + "settings.check-rate": true, + "vm.overrides": { + "default.clock.min-quantum": 1024 + } + }, + "context.spa-libs": { + "audio.convert.*": "audioconvert/libspa-audioconvert", + "api.alsa.*": "alsa/libspa-alsa", + "support.*": "support/libspa-support" + }, + "context.modules": [ + { + "name": "libpipewire-module-rt", + "args": { + "nice.level": -11 + }, + "flags": [ + "ifexists", + "nofail" + ] + }, + { + "name": "libpipewire-module-protocol-native" + }, + { + "name": "libpipewire-module-profiler" + }, + { + "name": "libpipewire-module-metadata" + }, + { + "name": "libpipewire-module-spa-node-factory" + }, + { + "name": "libpipewire-module-client-node" + }, + { + "name": "libpipewire-module-access", + "args": {} + }, + { + "name": "libpipewire-module-adapter" + }, + { + "name": "libpipewire-module-link-factory" + } + ], + "context.objects": [ + { + "factory": "metadata", + "args": { + "metadata.name": "default" + } + }, + { + "factory": "spa-node-factory", + "args": { + "factory.name": "support.node.driver", + "node.name": "Dummy-Driver", + "node.group": "pipewire.dummy", + "priority.driver": 20000 + } + }, + { + "factory": "spa-node-factory", + "args": { + "factory.name": "support.node.driver", + "node.name": "Freewheel-Driver", + "priority.driver": 19000, + "node.group": "pipewire.freewheel", + "node.freewheel": true + } + }, + { + "factory": "adapter", + "args": { + "factory.name": "api.alsa.pcm.source", + "node.name": "system", + "node.description": "system", + "media.class": "Audio/Source", + "api.alsa.path": "hw:0", + "node.suspend-on-idle": true, + "resample.disable": true, + "channelmix.disable": true, + "adapter.auto-port-config": { + "mode": "dsp", + "monitor": false, + "position": "unknown" + } + } + }, + { + "factory": "adapter", + "args": { + "factory.name": "api.alsa.pcm.sink", + "node.name": "system", + "node.description": "system", + "media.class": "Audio/Sink", + "api.alsa.path": "hw:0", + "node.suspend-on-idle": true, + "resample.disable": true, + "channelmix.disable": true, + "adapter.auto-port-config": { + "mode": "dsp", + "monitor": false, + "position": "unknown" + } + } + } + ], + "context.exec": [] +} diff --git a/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json index 3ed994f1114..df0f62556df 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json @@ -6,8 +6,10 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", - "args": {}, + "name": "libpipewire-module-rt", + "args": { + "nice.level": -11 + }, "flags": [ "ifexists", "nofail" @@ -37,6 +39,61 @@ } } ], - "context.exec": [], - "stream.properties": {} + "context.exec": [ + { + "path": "pactl", + "args": "load-module module-always-sink" + } + ], + "stream.properties": {}, + "pulse.rules": [ + { + "matches": [ + {} + ], + "actions": { + "update-props": {} + } + }, + { + "matches": [ + { + "application.process.binary": "teams" + }, + { + "application.process.binary": "skypeforlinux" + } + ], + "actions": { + "quirks": [ + "force-s16-info" + ] + } + }, + { + "matches": [ + { + "application.process.binary": "firefox" + } + ], + "actions": { + "quirks": [ + "remove-capture-dont-move" + ] + } + }, + { + "matches": [ + { + "application.name": "~speech-dispatcher*" + } + ], + "actions": { + "update-props": { + "pulse.min.req": "1024/48000", + "pulse.min.quantum": "1024/48000" + } + } + } + ] } diff --git a/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json index a923ab4db23..7c79f0168c0 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json @@ -3,6 +3,7 @@ "link.max-buffers": 16, "core.daemon": true, "core.name": "pipewire-0", + "default.clock.min-quantum": 16, "vm.overrides": { "default.clock.min-quantum": 1024 } @@ -19,8 +20,10 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", - "args": {}, + "name": "libpipewire-module-rt", + "args": { + "nice.level": -11 + }, "flags": [ "ifexists", "nofail" diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index c3cfd46e61c..59e9342a6ea 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -25,15 +25,18 @@ let client = lib.importJSON ./daemon/client.conf.json; client-rt = lib.importJSON ./daemon/client-rt.conf.json; jack = lib.importJSON ./daemon/jack.conf.json; + minimal = lib.importJSON ./daemon/minimal.conf.json; pipewire = lib.importJSON ./daemon/pipewire.conf.json; pipewire-pulse = lib.importJSON ./daemon/pipewire-pulse.conf.json; }; + useSessionManager = cfg.wireplumber.enable || cfg.media-session.enable; + configs = { client = recursiveUpdate defaults.client cfg.config.client; client-rt = recursiveUpdate defaults.client-rt cfg.config.client-rt; jack = recursiveUpdate defaults.jack cfg.config.jack; - pipewire = recursiveUpdate defaults.pipewire cfg.config.pipewire; + pipewire = recursiveUpdate (if useSessionManager then defaults.pipewire else defaults.minimal) cfg.config.pipewire; pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse; }; in { diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index e898f326058..6be23f39754 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -32,6 +32,8 @@ with lib; environment.systemPackages = [ pkgs.udisks2 ]; + security.polkit.enable = true; + services.dbus.packages = [ pkgs.udisks2 ]; systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]; diff --git a/nixos/modules/services/misc/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix index ff6d595e5a6..ff6d595e5a6 100644 --- a/nixos/modules/services/misc/zigbee2mqtt.nix +++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix diff --git a/nixos/modules/services/misc/matrix-synapse-log_config.yaml b/nixos/modules/services/matrix/matrix-synapse-log_config.yaml index d85bdd1208f..d85bdd1208f 100644 --- a/nixos/modules/services/misc/matrix-synapse-log_config.yaml +++ b/nixos/modules/services/matrix/matrix-synapse-log_config.yaml diff --git a/nixos/modules/services/matrix/matrix-synapse.nix b/nixos/modules/services/matrix/matrix-synapse.nix new file mode 100644 index 00000000000..c4d14dbd547 --- /dev/null +++ b/nixos/modules/services/matrix/matrix-synapse.nix @@ -0,0 +1,773 @@ +{ config, lib, options, pkgs, ... }: + +with lib; + +let + cfg = config.services.matrix-synapse; + format = pkgs.formats.yaml {}; + + # remove null values from the final configuration + finalSettings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings; + configFile = format.generate "homeserver.yaml" finalSettings; + logConfigFile = format.generate "log_config.yaml" cfg.logConfig; + + pluginsEnv = cfg.package.python.buildEnv.override { + extraLibs = cfg.plugins; + }; + + usePostgresql = cfg.settings.database.name == "psycopg2"; + hasLocalPostgresDB = let args = cfg.settings.database.args; in + usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ])); + + registerNewMatrixUser = + let + isIpv6 = x: lib.length (lib.splitString ":" x) > 1; + listener = + lib.findFirst ( + listener: lib.any ( + resource: lib.any ( + name: name == "client" + ) resource.names + ) listener.resources + ) (lib.last cfg.settings.listeners) cfg.settings.listeners; + # FIXME: Handle cases with missing client listener properly, + # don't rely on lib.last, this will not work. + + # add a tail, so that without any bind_addresses we still have a useable address + bindAddress = head (listener.bind_addresses ++ [ "127.0.0.1" ]); + listenerProtocol = if listener.tls + then "https" + else "http"; + in + pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" '' + exec ${cfg.package}/bin/register_new_matrix_user \ + $@ \ + ${lib.concatMapStringsSep " " (x: "-c ${x}") ([ configFile ] ++ cfg.extraConfigFiles)} \ + "${listenerProtocol}://${ + if (isIpv6 bindAddress) then + "[${bindAddress}]" + else + "${bindAddress}" + }:${builtins.toString listener.port}/" + ''; +in { + + imports = [ + + (mkRemovedOptionModule [ "services" "matrix-synapse" "trusted_third_party_id_servers" ] '' + The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0 + as the behavior is now obsolete. + '') + (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] '' + Database configuration must be done manually. An exemplary setup is demonstrated in + <nixpkgs/nixos/tests/matrix-synapse.nix> + '') + (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "") + (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] '' + You may add additional event types via + `services.matrix-synapse.room_prejoin_state.additional_event_types` and + disable the default events via + `services.matrix-synapse.room_prejoin_state.disable_default_event_types`. + '') + + # options that don't exist in synapse anymore + (mkRemovedOptionModule [ "services" "matrix-synapse" "bind_host" ] "Use listener settings instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "bind_port" ] "Use listener settings instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "expire_access_tokens" ] "" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "no_tls" ] "It is no longer supported by synapse." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_dh_param_path" ] "It was removed from synapse." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "unsecure_port" ] "Use settings.listeners instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "user_creation_max_duration" ] "It is no longer supported by synapse." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "verbose" ] "Use a log config instead." ) + + # options that were moved into rfc42 style settigns + (mkRemovedOptionModule [ "services" "matrix-synapse" "app_service_config_files" ] "Use settings.app_service_config_Files instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_args" ] "Use settings.database.args instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_name" ] "Use settings.database.args.database instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_type" ] "Use settings.database.name instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_user" ] "Use settings.database.args.user instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "dynamic_thumbnails" ] "Use settings.dynamic_thumbnails instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_metrics" ] "Use settings.enable_metrics instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_registration" ] "Use settings.enable_registration instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "extraConfig" ] "Use settings instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "listeners" ] "Use settings.listeners instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "logConfig" ] "Use settings.log_config instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "max_image_pixels" ] "Use settings.max_image_pixels instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "max_upload_size" ] "Use settings.max_upload_size instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "presence" "enabled" ] "Use settings.presence.enabled instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "public_baseurl" ] "Use settings.public_baseurl instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "report_stats" ] "Use settings.report_stats instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "server_name" ] "Use settings.server_name instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "servers" ] "Use settings.trusted_key_servers instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_certificate_path" ] "Use settings.tls_certificate_path instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_private_key_path" ] "Use settings.tls_private_key_path instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_shared_secret" ] "Use settings.turn_shared_secret instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_uris" ] "Use settings.turn_uris instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_user_lifetime" ] "Use settings.turn_user_lifetime instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_enabled" ] "Use settings.url_preview_enabled instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_ip_range_blacklist" ] "Use settings.url_preview_ip_range_blacklist instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_ip_range_whitelist" ] "Use settings.url_preview_ip_range_whitelist instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_url_blacklist" ] "Use settings.url_preview_url_blacklist instead" ) + + # options that are too specific to mention them explicitly in settings + (mkRemovedOptionModule [ "services" "matrix-synapse" "account_threepid_delegates" "email" ] "Use settings.account_threepid_delegates.email instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "account_threepid_delegates" "msisdn" ] "Use settings.account_threepid_delegates.msisdn instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "allow_guest_access" ] "Use settings.allow_guest_access instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "bcrypt_rounds" ] "Use settings.bcrypt_rounds instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_registration_captcha" ] "Use settings.enable_registration_captcha instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "event_cache_size" ] "Use settings.event_cache_size instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_concurrent" ] "Use settings.rc_federation.concurrent instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_reject_limit" ] "Use settings.rc_federation.reject_limit instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_sleep_delay" ] "Use settings.rc_federation.sleep_delay instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_sleep_limit" ] "Use settings.rc_federation.sleep_limit instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_window_size" ] "Use settings.rc_federation.window_size instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "key_refresh_interval" ] "Use settings.key_refresh_interval instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "rc_messages_burst_count" ] "Use settings.rc_messages.burst_count instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "rc_messages_per_second" ] "Use settings.rc_messages.per_second instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "recaptcha_private_key" ] "Use settings.recaptcha_private_key instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "recaptcha_public_key" ] "Use settings.recaptcha_public_key instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "redaction_retention_period" ] "Use settings.redaction_retention_period instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "room_prejoin_state" "additional_event_types" ] "Use settings.room_prejoin_state.additional_event_types instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "room_prejoin_state" "disable_default_event_types" ] "Use settings.room_prejoin-state.disable_default_event_types instead" ) + + # Options that should be passed via extraConfigFiles, so they are not persisted into the nix store + (mkRemovedOptionModule [ "services" "matrix-synapse" "macaroon_secret_key" ] "Pass this value via extraConfigFiles instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "registration_shared_secret" ] "Pass this value via extraConfigFiles instead" ) + + ]; + + options = { + services.matrix-synapse = { + enable = mkEnableOption "matrix.org synapse"; + + configFile = mkOption { + type = types.str; + readOnly = true; + description = '' + Path to the configuration file on the target system. Useful to configure e.g. workers + that also need this. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.matrix-synapse; + defaultText = literalExpression "pkgs.matrix-synapse"; + description = '' + Overridable attribute of the matrix synapse server package to use. + ''; + }; + + plugins = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExpression '' + with config.services.matrix-synapse.package.plugins; [ + matrix-synapse-ldap3 + matrix-synapse-pam + ]; + ''; + description = '' + List of additional Matrix plugins to make available. + ''; + }; + + withJemalloc = mkOption { + type = types.bool; + default = false; + description = '' + Whether to preload jemalloc to reduce memory fragmentation and overall usage. + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/matrix-synapse"; + description = '' + The directory where matrix-synapse stores its stateful data such as + certificates, media and uploads. + ''; + }; + + settings = mkOption { + default = {}; + description = '' + The primary synapse configuration. See the + <link xlink:href="https://github.com/matrix-org/synapse/blob/v${cfg.package.version}/docs/sample_config.yaml">sample configuration</link> + for possible values. + + Secrets should be passed in by using the <literal>extraConfigFiles</literal> option. + ''; + type = with types; submodule { + freeformType = format.type; + options = { + # This is a reduced set of popular options and defaults + # Do not add every available option here, they can be specified + # by the user at their own discretion. This is a freeform type! + + server_name = mkOption { + type = types.str; + example = "example.com"; + default = config.networking.hostName; + defaultText = literalExpression "config.networking.hostName"; + description = '' + The domain name of the server, with optional explicit port. + This is used by remote servers to look up the server address. + This is also the last part of your UserID. + + The server_name cannot be changed later so it is important to configure this correctly before you start Synapse. + ''; + }; + + enable_registration = mkOption { + type = types.bool; + default = false; + description = '' + Enable registration for new users. + ''; + }; + + registration_shared_secret = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + If set, allows registration by anyone who also has the shared + secret, even if registration is otherwise disabled. + + Secrets should be passed in via <literal>extraConfigFiles</literal>! + ''; + }; + + macaroon_secret_key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Secret key for authentication tokens. If none is specified, + the registration_shared_secret is used, if one is given; otherwise, + a secret key is derived from the signing key. + + Secrets should be passed in via <literal>extraConfigFiles</literal>! + ''; + }; + + enable_metrics = mkOption { + type = types.bool; + default = false; + description = '' + Enable collection and rendering of performance metrics + ''; + }; + + report_stats = mkOption { + type = types.bool; + default = false; + description = '' + Whether or not to report anonymized homeserver usage statistics. + ''; + }; + + signing_key_path = mkOption { + type = types.path; + default = "${cfg.dataDir}/homeserver.signing.key"; + description = '' + Path to the signing key to sign messages with. + ''; + }; + + pid_file = mkOption { + type = types.path; + default = "/run/matrix-synapse.pid"; + readOnly = true; + description = '' + The file to store the PID in. + ''; + }; + + log_config = mkOption { + type = types.path; + default = ./matrix-synapse-log_config.yaml; + description = '' + The file that holds the logging configuration. + ''; + }; + + media_store_path = mkOption { + type = types.path; + default = if lib.versionAtLeast config.system.stateVersion "22.05" + then "${cfg.dataDir}/media_store" + else "${cfg.dataDir}/media"; + description = '' + Directory where uploaded images and attachments are stored. + ''; + }; + + public_baseurl = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://example.com:8448/"; + description = '' + The public-facing base URL for the client API (not including _matrix/...) + ''; + }; + + tls_certificate_path = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/acme/example.com/fullchain.pem"; + description = '' + PEM encoded X509 certificate for TLS. + You can replace the self-signed certificate that synapse + autogenerates on launch with your own SSL certificate + key pair + if you like. Any required intermediary certificates can be + appended after the primary certificate in hierarchical order. + ''; + }; + + tls_private_key_path = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/acme/example.com/key.pem"; + description = '' + PEM encoded private key for TLS. Specify null if synapse is not + speaking TLS directly. + ''; + }; + + presence.enabled = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Whether to enable presence tracking. + + Presence tracking allows users to see the state (e.g online/offline) + of other local and remote users. + ''; + }; + + listeners = mkOption { + type = types.listOf (types.submodule { + options = { + port = mkOption { + type = types.port; + example = 8448; + description = '' + The port to listen for HTTP(S) requests on. + ''; + }; + + bind_addresses = mkOption { + type = types.listOf types.str; + default = [ + "::1" + "127.0.0.1" + ]; + example = literalExpression '' + [ + "::" + "0.0.0.0" + ] + ''; + description = '' + IP addresses to bind the listener to. + ''; + }; + + type = mkOption { + type = types.enum [ + "http" + "manhole" + "metrics" + "replication" + ]; + default = "http"; + example = "metrics"; + description = '' + The type of the listener, usually http. + ''; + }; + + tls = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Whether to enable TLS on the listener socket. + ''; + }; + + x_forwarded = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Use the X-Forwarded-For (XFF) header as the client IP and not the + actual client IP. + ''; + }; + + resources = mkOption { + type = types.listOf (types.submodule { + options = { + names = mkOption { + type = types.listOf (types.enum [ + "client" + "consent" + "federation" + "keys" + "media" + "metrics" + "openid" + "replication" + "static" + ]); + description = '' + List of resources to host on this listener. + ''; + example = [ + "client" + ]; + }; + compress = mkOption { + type = types.bool; + description = '' + Should synapse compress HTTP responses to clients that support it? + This should be disabled if running synapse behind a load balancer + that can do automatic compression. + ''; + }; + }; + }); + description = '' + List of HTTP resources to serve on this listener. + ''; + }; + }; + }); + default = [ { + port = 8008; + bind_addresses = [ "127.0.0.1" ]; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + description = '' + List of ports that Synapse should listen on, their purpose and their configuration. + ''; + }; + + database.name = mkOption { + type = types.enum [ + "sqlite3" + "psycopg2" + ]; + default = if versionAtLeast config.system.stateVersion "18.03" + then "psycopg2" + else "sqlite3"; + defaultText = literalExpression '' + if versionAtLeast config.system.stateVersion "18.03" + then "psycopg2" + else "sqlite3" + ''; + description = '' + The database engine name. Can be sqlite3 or psycopg2. + ''; + }; + + database.args.database = mkOption { + type = types.str; + default = { + sqlite3 = "${cfg.dataDir}/homeserver.db"; + psycopg2 = "matrix-synapse"; + }.${cfg.settings.database.name}; + defaultText = literalExpression '' + { + sqlite3 = "''${${options.services.matrix-synapse.dataDir}}/homeserver.db"; + psycopg2 = "matrix-synapse"; + }.''${${options.services.matrix-synapse.settings}.database.name}; + ''; + description = '' + Name of the database when using the psycopg2 backend, + path to the database location when using sqlite3. + ''; + }; + + database.args.user = mkOption { + type = types.nullOr types.str; + default = { + sqlite3 = null; + psycopg2 = "matrix-synapse"; + }.${cfg.settings.database.name}; + description = '' + Username to connect with psycopg2, set to null + when using sqlite3. + ''; + }; + + url_preview_enabled = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Is the preview URL API enabled? If enabled, you *must* specify an + explicit url_preview_ip_range_blacklist of IPs that the spider is + denied from accessing. + ''; + }; + + url_preview_ip_range_blacklist = mkOption { + type = types.listOf types.str; + default = [ + "10.0.0.0/8" + "100.64.0.0/10" + "127.0.0.0/8" + "169.254.0.0/16" + "172.16.0.0/12" + "192.0.0.0/24" + "192.0.2.0/24" + "192.168.0.0/16" + "192.88.99.0/24" + "198.18.0.0/15" + "198.51.100.0/24" + "2001:db8::/32" + "203.0.113.0/24" + "224.0.0.0/4" + "::1/128" + "fc00::/7" + "fe80::/10" + "fec0::/10" + "ff00::/8" + ]; + description = '' + List of IP address CIDR ranges that the URL preview spider is denied + from accessing. + ''; + }; + + url_preview_ip_range_whitelist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of IP address CIDR ranges that the URL preview spider is allowed + to access even if they are specified in url_preview_ip_range_blacklist. + ''; + }; + + url_preview_url_blacklist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Optional list of URL matches that the URL preview spider is + denied from accessing. + ''; + }; + + max_upload_size = mkOption { + type = types.str; + default = "50M"; + example = "100M"; + description = '' + The largest allowed upload size in bytes + ''; + }; + + max_image_pixels = mkOption { + type = types.str; + default = "32M"; + example = "64M"; + description = '' + Maximum number of pixels that will be thumbnailed + ''; + }; + + dynamic_thumbnails = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to generate new thumbnails on the fly to precisely match + the resolution requested by the client. If true then whenever + a new resolution is requested by the client the server will + generate a new thumbnail. If false the server will pick a thumbnail + from a precalculated list. + ''; + }; + + turn_uris = mkOption { + type = types.listOf types.str; + default = []; + example = [ + "turn:turn.example.com:3487?transport=udp" + "turn:turn.example.com:3487?transport=tcp" + "turns:turn.example.com:5349?transport=udp" + "turns:turn.example.com:5349?transport=tcp" + ]; + description = '' + The public URIs of the TURN server to give to clients + ''; + }; + turn_shared_secret = mkOption { + type = types.str; + default = ""; + example = literalExpression '' + config.services.coturn.static-auth-secret + ''; + description = '' + The shared secret used to compute passwords for the TURN server. + + Secrets should be passed in via <literal>extraConfigFiles</literal>! + ''; + }; + + trusted_key_servers = mkOption { + type = types.listOf (types.submodule { + options = { + server_name = mkOption { + type = types.str; + example = "matrix.org"; + description = '' + Hostname of the trusted server. + ''; + }; + + verify_keys = mkOption { + type = types.nullOr (types.attrsOf types.str); + default = null; + example = literalExpression '' + { + "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; + } + ''; + description = '' + Attribute set from key id to base64 encoded public key. + + If specified synapse will check that the response is signed + by at least one of the given keys. + ''; + }; + }; + }); + default = [ { + server_name = "matrix.org"; + verify_keys = { + "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; + }; + } ]; + description = '' + The trusted servers to download signing keys from. + ''; + }; + + app_service_config_files = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + A list of application service config file to use + ''; + }; + + }; + }; + }; + + extraConfigFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Extra config files to include. + + The configuration files will be included based on the command line + argument --config-path. This allows to configure secrets without + having to go through the Nix store, e.g. based on deployment keys if + NixOps is in use. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { assertion = hasLocalPostgresDB -> config.services.postgresql.enable; + message = '' + Cannot deploy matrix-synapse with a configuration for a local postgresql database + and a missing postgresql service. Since 20.03 it's mandatory to manually configure the + database (please read the thread in https://github.com/NixOS/nixpkgs/pull/80447 for + further reference). + + If you + - try to deploy a fresh synapse, you need to configure the database yourself. An example + for this can be found in <nixpkgs/nixos/tests/matrix-synapse.nix> + - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true` + to your configuration. + + For further information about this update, please read the release-notes of 20.03 carefully. + ''; + } + ]; + + services.matrix-synapse.configFile = configFile; + + users.users.matrix-synapse = { + group = "matrix-synapse"; + home = cfg.dataDir; + createHome = true; + shell = "${pkgs.bash}/bin/bash"; + uid = config.ids.uids.matrix-synapse; + }; + + users.groups.matrix-synapse = { + gid = config.ids.gids.matrix-synapse; + }; + + systemd.services.matrix-synapse = { + description = "Synapse Matrix homeserver"; + after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + ${cfg.package}/bin/synapse_homeserver \ + --config-path ${configFile} \ + --keys-directory ${cfg.dataDir} \ + --generate-keys + ''; + environment = { + PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ]; + } // optionalAttrs (cfg.withJemalloc) { + LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; + }; + serviceConfig = { + Type = "notify"; + User = "matrix-synapse"; + Group = "matrix-synapse"; + WorkingDirectory = cfg.dataDir; + ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" '' + chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key + chmod 0600 ${cfg.dataDir}/homeserver.signing.key + '')) ]; + ExecStart = '' + ${cfg.package}/bin/synapse_homeserver \ + ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } + --keys-directory ${cfg.dataDir} + ''; + ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; + Restart = "on-failure"; + UMask = "0077"; + }; + }; + + environment.systemPackages = [ registerNewMatrixUser ]; + }; + + meta = { + buildDocsInSandbox = false; + doc = ./matrix-synapse.xml; + maintainers = teams.matrix.members; + }; + +} diff --git a/nixos/modules/services/misc/matrix-synapse.xml b/nixos/modules/services/matrix/matrix-synapse.xml index 41a56df0f2b..cdc4b4de1a7 100644 --- a/nixos/modules/services/misc/matrix-synapse.xml +++ b/nixos/modules/services/matrix/matrix-synapse.xml @@ -115,20 +115,21 @@ in { }; services.matrix-synapse = { <link linkend="opt-services.matrix-synapse.enable">enable</link> = true; - <link linkend="opt-services.matrix-synapse.server_name">server_name</link> = config.networking.domain; - <link linkend="opt-services.matrix-synapse.listeners">listeners</link> = [ + <link linkend="opt-services.matrix-synapse.settings.server_name">server_name</link> = config.networking.domain; + <link linkend="opt-services.matrix-synapse.settings.listeners">listeners</link> = [ { - <link linkend="opt-services.matrix-synapse.listeners._.port">port</link> = 8008; - <link linkend="opt-services.matrix-synapse.listeners._.bind_address">bind_address</link> = "::1"; - <link linkend="opt-services.matrix-synapse.listeners._.type">type</link> = "http"; - <link linkend="opt-services.matrix-synapse.listeners._.tls">tls</link> = false; - <link linkend="opt-services.matrix-synapse.listeners._.x_forwarded">x_forwarded</link> = true; - <link linkend="opt-services.matrix-synapse.listeners._.resources">resources</link> = [ - { - <link linkend="opt-services.matrix-synapse.listeners._.resources._.names">names</link> = [ "client" "federation" ]; - <link linkend="opt-services.matrix-synapse.listeners._.resources._.compress">compress</link> = false; - } - ]; + <link linkend="opt-services.matrix-synapse.settings.listeners._.port">port</link> = 8008; + <link linkend="opt-services.matrix-synapse.settings.listeners._.bind_addresses">bind_address</link> = [ "::1" ]; + <link linkend="opt-services.matrix-synapse.settings.listeners._.type">type</link> = "http"; + <link linkend="opt-services.matrix-synapse.settings.listeners._.tls">tls</link> = false; + <link linkend="opt-services.matrix-synapse.settings.listeners._.x_forwarded">x_forwarded</link> = true; + <link linkend="opt-services.matrix-synapse.settings.listeners._.resources">resources</link> = [ { + <link linkend="opt-services.matrix-synapse.settings.listeners._.resources._.names">names</link> = [ "client" ]; + <link linkend="opt-services.matrix-synapse.settings.listeners._.resources._.compress">compress</link> = true; + } { + <link linkend="opt-services.matrix-synapse.settings.listeners._.resources._.names">names</link> = [ "federation" ]; + <link linkend="opt-services.matrix-synapse.settings.listeners._.resources._.compress">compress</link> = false; + } ]; } ]; }; @@ -151,11 +152,11 @@ in { <para> If you want to run a server with public registration by anybody, you can - then enable <literal><link linkend="opt-services.matrix-synapse.enable_registration">services.matrix-synapse.enable_registration</link> = + then enable <literal><link linkend="opt-services.matrix-synapse.settings.enable_registration">services.matrix-synapse.enable_registration</link> = true;</literal>. Otherwise, or you can generate a registration secret with <command>pwgen -s 64 1</command> and set it with - <option><link linkend="opt-services.matrix-synapse.registration_shared_secret">services.matrix-synapse.registration_shared_secret</link></option>. To - create a new user or admin, run the following after you have set the secret + <option><link linkend="opt-services.matrix-synapse.settings.registration_shared_secret">services.matrix-synapse.registration_shared_secret</link></option>. + To create a new user or admin, run the following after you have set the secret and have rebuilt NixOS: <screen> <prompt>$ </prompt>nix run nixpkgs.matrix-synapse @@ -170,7 +171,7 @@ Success! <literal>@your-username:example.org</literal>. Note that the registration secret ends up in the nix store and therefore is world-readable by any user on your machine, so it makes sense to only temporarily activate the - <link linkend="opt-services.matrix-synapse.registration_shared_secret">registration_shared_secret</link> + <link linkend="opt-services.matrix-synapse.settings.registration_shared_secret">registration_shared_secret</link> option until a better solution for NixOS is in place. </para> </section> diff --git a/nixos/modules/services/misc/dendrite.nix b/nixos/modules/services/misc/dendrite.nix index c967fc3a362..b2885b09415 100644 --- a/nixos/modules/services/misc/dendrite.nix +++ b/nixos/modules/services/misc/dendrite.nix @@ -110,6 +110,15 @@ in ''; }; }; + options.app_service_api.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:federationapi.db"; + description = '' + Database for the Appservice API. + ''; + }; + }; options.client_api = { registration_disabled = lib.mkOption { type = lib.types.bool; @@ -120,6 +129,91 @@ in ''; }; }; + options.federation_api.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:federationapi.db"; + description = '' + Database for the Federation API. + ''; + }; + }; + options.key_server.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:keyserver.db"; + description = '' + Database for the Key Server (for end-to-end encryption). + ''; + }; + }; + options.media_api = { + database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:mediaapi.db"; + description = '' + Database for the Media API. + ''; + }; + }; + base_path = lib.mkOption { + type = lib.types.str; + default = "${workingDir}/media_store"; + description = '' + Storage path for uploaded media. + ''; + }; + }; + options.room_server.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:roomserver.db"; + description = '' + Database for the Room Server. + ''; + }; + }; + options.sync_api.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:syncserver.db"; + description = '' + Database for the Sync API. + ''; + }; + }; + options.user_api = { + account_database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:userapi_accounts.db"; + description = '' + Database for the User API, accounts. + ''; + }; + }; + device_database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:userapi_devices.db"; + description = '' + Database for the User API, devices. + ''; + }; + }; + }; + options.mscs = { + database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:mscs.db"; + description = '' + Database for exerimental MSC's. + ''; + }; + }; + }; }; default = { }; description = '' diff --git a/nixos/modules/services/misc/input-remapper.nix b/nixos/modules/services/misc/input-remapper.nix index c2da0d616a3..f5fb2bf5308 100644 --- a/nixos/modules/services/misc/input-remapper.nix +++ b/nixos/modules/services/misc/input-remapper.nix @@ -7,23 +7,24 @@ let cfg = config.services.input-remapper; in options = { services.input-remapper = { enable = mkEnableOption "input-remapper, an easy to use tool to change the mapping of your input device buttons."; - package = mkOption { - type = types.package; - default = pkgs.input-remapper; - defaultText = literalExpression "pkgs.input-remapper"; - description = '' - The input-remapper package to use. - ''; + package = options.mkPackageOption pkgs "input-remapper" { }; + enableUdevRules = mkEnableOption "udev rules added by input-remapper to handle hotplugged devices. Currently disabled by default due to https://github.com/sezanzeb/input-remapper/issues/140"; + serviceWantedBy = mkOption { + default = [ "graphical.target" ]; + example = [ "multi-user.target" ]; + type = types.listOf types.str; + description = "Specifies the WantedBy setting for the input-remapper service."; }; }; }; config = mkIf cfg.enable { - # FIXME: udev rule hangs sometimes when lots of devices connected, so let's not use it - # config.services.udev.packages = mapper-pkg; - services.dbus.packages = cfg.package; - systemd.packages = cfg.package; - environment.systemPackages = cfg.package; - systemd.services.input-remapper.wantedBy = [ "graphical.target" ]; + services.udev.packages = mkIf cfg.enableUdevRules [ cfg.package ]; + services.dbus.packages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ]; + systemd.services.input-remapper.wantedBy = cfg.serviceWantedBy; }; + + meta.maintainers = with lib.maintainers; [ LunNova ]; } diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index b9d54f27edc..04cf82f8a46 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -70,10 +70,12 @@ in LockPersonality = true; PrivateTmp = true; - PrivateDevices = true; + # Disabled to allow Jellyfin to access hw accel devices endpoints + # PrivateDevices = true; PrivateUsers = true; - ProtectClock = true; + # Disabled as it does not allow Jellyfin to interface with CUDA devices + # ProtectClock = true; ProtectControlGroups = true; ProtectHostname = true; ProtectKernelLogs = true; @@ -84,7 +86,7 @@ in RestrictNamespaces = true; # AF_NETLINK needed because Jellyfin monitors the network connection - RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET" "AF_INET6" "AF_UNIX" ]; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix deleted file mode 100644 index feca4c5465f..00000000000 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ /dev/null @@ -1,844 +0,0 @@ -{ config, lib, options, pkgs, ... }: - -with lib; - -let - cfg = config.services.matrix-synapse; - opt = options.services.matrix-synapse; - pg = config.services.postgresql; - usePostgresql = cfg.database_type == "psycopg2"; - logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; - mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}''; - mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; - pluginsEnv = cfg.package.python.buildEnv.override { - extraLibs = cfg.plugins; - }; - configFile = pkgs.writeText "homeserver.yaml" '' -${optionalString (cfg.tls_certificate_path != null) '' -tls_certificate_path: "${cfg.tls_certificate_path}" -''} -${optionalString (cfg.tls_private_key_path != null) '' -tls_private_key_path: "${cfg.tls_private_key_path}" -''} -${optionalString (cfg.tls_dh_params_path != null) '' -tls_dh_params_path: "${cfg.tls_dh_params_path}" -''} -no_tls: ${boolToString cfg.no_tls} -${optionalString (cfg.bind_port != null) '' -bind_port: ${toString cfg.bind_port} -''} -${optionalString (cfg.unsecure_port != null) '' -unsecure_port: ${toString cfg.unsecure_port} -''} -${optionalString (cfg.bind_host != null) '' -bind_host: "${cfg.bind_host}" -''} -server_name: "${cfg.server_name}" -pid_file: "/run/matrix-synapse.pid" -${optionalString (cfg.public_baseurl != null) '' -public_baseurl: "${cfg.public_baseurl}" -''} -listeners: [${concatStringsSep "," (map mkListener cfg.listeners)}] -database: { - name: "${cfg.database_type}", - args: { - ${concatStringsSep ",\n " ( - mapAttrsToList (n: v: "\"${n}\": ${builtins.toJSON v}") cfg.database_args - )} - } -} -event_cache_size: "${cfg.event_cache_size}" -verbose: ${cfg.verbose} -log_config: "${logConfigFile}" -rc_messages_per_second: ${cfg.rc_messages_per_second} -rc_message_burst_count: ${cfg.rc_message_burst_count} -federation_rc_window_size: ${cfg.federation_rc_window_size} -federation_rc_sleep_limit: ${cfg.federation_rc_sleep_limit} -federation_rc_sleep_delay: ${cfg.federation_rc_sleep_delay} -federation_rc_reject_limit: ${cfg.federation_rc_reject_limit} -federation_rc_concurrent: ${cfg.federation_rc_concurrent} -media_store_path: "${cfg.dataDir}/media" -uploads_path: "${cfg.dataDir}/uploads" -max_upload_size: "${cfg.max_upload_size}" -max_image_pixels: "${cfg.max_image_pixels}" -dynamic_thumbnails: ${boolToString cfg.dynamic_thumbnails} -url_preview_enabled: ${boolToString cfg.url_preview_enabled} -${optionalString (cfg.url_preview_enabled == true) '' -url_preview_ip_range_blacklist: ${builtins.toJSON cfg.url_preview_ip_range_blacklist} -url_preview_ip_range_whitelist: ${builtins.toJSON cfg.url_preview_ip_range_whitelist} -url_preview_url_blacklist: ${builtins.toJSON cfg.url_preview_url_blacklist} -''} -recaptcha_private_key: "${cfg.recaptcha_private_key}" -recaptcha_public_key: "${cfg.recaptcha_public_key}" -enable_registration_captcha: ${boolToString cfg.enable_registration_captcha} -turn_uris: ${builtins.toJSON cfg.turn_uris} -turn_shared_secret: "${cfg.turn_shared_secret}" -enable_registration: ${boolToString cfg.enable_registration} -${optionalString (cfg.registration_shared_secret != null) '' -registration_shared_secret: "${cfg.registration_shared_secret}" -''} -recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify" -turn_user_lifetime: "${cfg.turn_user_lifetime}" -user_creation_max_duration: ${cfg.user_creation_max_duration} -bcrypt_rounds: ${cfg.bcrypt_rounds} -allow_guest_access: ${boolToString cfg.allow_guest_access} - -account_threepid_delegates: - ${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"} - ${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"} - -room_prejoin_state: - disable_default_event_types: ${boolToString cfg.room_prejoin_state.disable_default_event_types} - additional_event_types: ${builtins.toJSON cfg.room_prejoin_state.additional_event_types} -${optionalString (cfg.macaroon_secret_key != null) '' - macaroon_secret_key: "${cfg.macaroon_secret_key}" -''} -expire_access_token: ${boolToString cfg.expire_access_token} -enable_metrics: ${boolToString cfg.enable_metrics} -report_stats: ${boolToString cfg.report_stats} -signing_key_path: "${cfg.dataDir}/homeserver.signing.key" -key_refresh_interval: "${cfg.key_refresh_interval}" -perspectives: - servers: { - ${concatStringsSep "},\n" (mapAttrsToList (n: v: '' - "${n}": { - "verify_keys": { - ${concatStringsSep "},\n" (mapAttrsToList (n: v: '' - "${n}": { - "key": "${v}" - }'') v)} - } - '') cfg.servers)} - } - } -redaction_retention_period: ${toString cfg.redaction_retention_period} -app_service_config_files: ${builtins.toJSON cfg.app_service_config_files} - -${cfg.extraConfig} -''; - - hasLocalPostgresDB = let args = cfg.database_args; in - usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ])); - - registerNewMatrixUser = - let - isIpv6 = x: lib.length (lib.splitString ":" x) > 1; - listener = - lib.findFirst ( - listener: lib.any ( - resource: lib.any ( - name: name == "client" - ) resource.names - ) listener.resources - ) (lib.last cfg.listeners) cfg.listeners; - in - pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" '' - exec ${cfg.package}/bin/register_new_matrix_user \ - $@ \ - ${lib.concatMapStringsSep " " (x: "-c ${x}") ([ configFile ] ++ cfg.extraConfigFiles)} \ - "${listener.type}://${ - if (isIpv6 listener.bind_address) then - "[${listener.bind_address}]" - else - "${listener.bind_address}" - }:${builtins.toString listener.port}/" - ''; -in { - options = { - services.matrix-synapse = { - enable = mkEnableOption "matrix.org synapse"; - configFile = mkOption { - type = types.str; - readOnly = true; - description = '' - Path to the configuration file on the target system. Useful to configure e.g. workers - that also need this. - ''; - }; - package = mkOption { - type = types.package; - default = pkgs.matrix-synapse; - defaultText = literalExpression "pkgs.matrix-synapse"; - description = '' - Overridable attribute of the matrix synapse server package to use. - ''; - }; - plugins = mkOption { - type = types.listOf types.package; - default = [ ]; - example = literalExpression '' - with config.services.matrix-synapse.package.plugins; [ - matrix-synapse-ldap3 - matrix-synapse-pam - ]; - ''; - description = '' - List of additional Matrix plugins to make available. - ''; - }; - withJemalloc = mkOption { - type = types.bool; - default = false; - description = '' - Whether to preload jemalloc to reduce memory fragmentation and overall usage. - ''; - }; - no_tls = mkOption { - type = types.bool; - default = false; - description = '' - Don't bind to the https port - ''; - }; - bind_port = mkOption { - type = types.nullOr types.int; - default = null; - example = 8448; - description = '' - DEPRECATED: Use listeners instead. - The port to listen for HTTPS requests on. - For when matrix traffic is sent directly to synapse. - ''; - }; - unsecure_port = mkOption { - type = types.nullOr types.int; - default = null; - example = 8008; - description = '' - DEPRECATED: Use listeners instead. - The port to listen for HTTP requests on. - For when matrix traffic passes through loadbalancer that unwraps TLS. - ''; - }; - bind_host = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - DEPRECATED: Use listeners instead. - Local interface to listen on. - The empty string will cause synapse to listen on all interfaces. - ''; - }; - tls_certificate_path = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.crt"; - description = '' - PEM encoded X509 certificate for TLS. - You can replace the self-signed certificate that synapse - autogenerates on launch with your own SSL certificate + key pair - if you like. Any required intermediary certificates can be - appended after the primary certificate in hierarchical order. - ''; - }; - tls_private_key_path = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.key"; - description = '' - PEM encoded private key for TLS. Specify null if synapse is not - speaking TLS directly. - ''; - }; - tls_dh_params_path = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.dh"; - description = '' - PEM dh parameters for ephemeral keys - ''; - }; - server_name = mkOption { - type = types.str; - example = "example.com"; - default = config.networking.hostName; - defaultText = literalExpression "config.networking.hostName"; - description = '' - The domain name of the server, with optional explicit port. - This is used by remote servers to look up the server address. - This is also the last part of your UserID. - - The server_name cannot be changed later so it is important to configure this correctly before you start Synapse. - ''; - }; - public_baseurl = mkOption { - type = types.nullOr types.str; - default = null; - example = "https://example.com:8448/"; - description = '' - The public-facing base URL for the client API (not including _matrix/...) - ''; - }; - listeners = mkOption { - type = types.listOf (types.submodule { - options = { - port = mkOption { - type = types.port; - example = 8448; - description = '' - The port to listen for HTTP(S) requests on. - ''; - }; - bind_address = mkOption { - type = types.str; - default = ""; - example = "203.0.113.42"; - description = '' - Local interface to listen on. - The empty string will cause synapse to listen on all interfaces. - ''; - }; - type = mkOption { - type = types.str; - default = "http"; - description = '' - Type of listener. - ''; - }; - tls = mkOption { - type = types.bool; - default = true; - description = '' - Whether to listen for HTTPS connections rather than HTTP. - ''; - }; - x_forwarded = mkOption { - type = types.bool; - default = false; - description = '' - Use the X-Forwarded-For (XFF) header as the client IP and not the - actual client IP. - ''; - }; - resources = mkOption { - type = types.listOf (types.submodule { - options = { - names = mkOption { - type = types.listOf types.str; - description = '' - List of resources to host on this listener. - ''; - example = ["client" "federation"]; - }; - compress = mkOption { - type = types.bool; - description = '' - Should synapse compress HTTP responses to clients that support it? - This should be disabled if running synapse behind a load balancer - that can do automatic compression. - ''; - }; - }; - }); - description = '' - List of HTTP resources to serve on this listener. - ''; - }; - }; - }); - default = [{ - port = 8448; - bind_address = ""; - type = "http"; - tls = true; - x_forwarded = false; - resources = [ - { names = ["client"]; compress = true; } - { names = ["federation"]; compress = false; } - ]; - }]; - description = '' - List of ports that Synapse should listen on, their purpose and their configuration. - ''; - }; - verbose = mkOption { - type = types.str; - default = "0"; - description = "Logging verbosity level."; - }; - rc_messages_per_second = mkOption { - type = types.str; - default = "0.2"; - description = "Number of messages a client can send per second"; - }; - rc_message_burst_count = mkOption { - type = types.str; - default = "10.0"; - description = "Number of message a client can send before being throttled"; - }; - federation_rc_window_size = mkOption { - type = types.str; - default = "1000"; - description = "The federation window size in milliseconds"; - }; - federation_rc_sleep_limit = mkOption { - type = types.str; - default = "10"; - description = '' - The number of federation requests from a single server in a window - before the server will delay processing the request. - ''; - }; - federation_rc_sleep_delay = mkOption { - type = types.str; - default = "500"; - description = '' - The duration in milliseconds to delay processing events from - remote servers by if they go over the sleep limit. - ''; - }; - federation_rc_reject_limit = mkOption { - type = types.str; - default = "50"; - description = '' - The maximum number of concurrent federation requests allowed - from a single server - ''; - }; - federation_rc_concurrent = mkOption { - type = types.str; - default = "3"; - description = "The number of federation requests to concurrently process from a single server"; - }; - database_type = mkOption { - type = types.enum [ "sqlite3" "psycopg2" ]; - default = if versionAtLeast config.system.stateVersion "18.03" - then "psycopg2" - else "sqlite3"; - defaultText = literalExpression '' - if versionAtLeast config.system.stateVersion "18.03" - then "psycopg2" - else "sqlite3" - ''; - description = '' - The database engine name. Can be sqlite or psycopg2. - ''; - }; - database_name = mkOption { - type = types.str; - default = "matrix-synapse"; - description = "Database name."; - }; - database_user = mkOption { - type = types.str; - default = "matrix-synapse"; - description = "Database user name."; - }; - database_args = mkOption { - type = types.attrs; - default = { - sqlite3 = { database = "${cfg.dataDir}/homeserver.db"; }; - psycopg2 = { - user = cfg.database_user; - database = cfg.database_name; - }; - }.${cfg.database_type}; - defaultText = literalDocBook '' - <variablelist> - <varlistentry> - <term>using sqlite3</term> - <listitem> - <programlisting> - { database = "''${config.${opt.dataDir}}/homeserver.db"; } - </programlisting> - </listitem> - </varlistentry> - <varlistentry> - <term>using psycopg2</term> - <listitem> - <programlisting> - psycopg2 = { - user = config.${opt.database_user}; - database = config.${opt.database_name}; - } - </programlisting> - </listitem> - </varlistentry> - </variablelist> - ''; - description = '' - Arguments to pass to the engine. - ''; - }; - event_cache_size = mkOption { - type = types.str; - default = "10K"; - description = "Number of events to cache in memory."; - }; - url_preview_enabled = mkOption { - type = types.bool; - default = false; - description = '' - Is the preview URL API enabled? If enabled, you *must* specify an - explicit url_preview_ip_range_blacklist of IPs that the spider is - denied from accessing. - ''; - }; - url_preview_ip_range_blacklist = mkOption { - type = types.listOf types.str; - default = [ - "127.0.0.0/8" - "10.0.0.0/8" - "172.16.0.0/12" - "192.168.0.0/16" - "100.64.0.0/10" - "169.254.0.0/16" - "::1/128" - "fe80::/64" - "fc00::/7" - ]; - description = '' - List of IP address CIDR ranges that the URL preview spider is denied - from accessing. - ''; - }; - url_preview_ip_range_whitelist = mkOption { - type = types.listOf types.str; - default = []; - description = '' - List of IP address CIDR ranges that the URL preview spider is allowed - to access even if they are specified in - url_preview_ip_range_blacklist. - ''; - }; - url_preview_url_blacklist = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Optional list of URL matches that the URL preview spider is - denied from accessing. - ''; - }; - recaptcha_private_key = mkOption { - type = types.str; - default = ""; - description = '' - This Home Server's ReCAPTCHA private key. - ''; - }; - recaptcha_public_key = mkOption { - type = types.str; - default = ""; - description = '' - This Home Server's ReCAPTCHA public key. - ''; - }; - enable_registration_captcha = mkOption { - type = types.bool; - default = false; - description = '' - Enables ReCaptcha checks when registering, preventing signup - unless a captcha is answered. Requires a valid ReCaptcha - public/private key. - ''; - }; - turn_uris = mkOption { - type = types.listOf types.str; - default = []; - description = '' - The public URIs of the TURN server to give to clients - ''; - }; - turn_shared_secret = mkOption { - type = types.str; - default = ""; - description = '' - The shared secret used to compute passwords for the TURN server - ''; - }; - turn_user_lifetime = mkOption { - type = types.str; - default = "1h"; - description = "How long generated TURN credentials last"; - }; - enable_registration = mkOption { - type = types.bool; - default = false; - description = '' - Enable registration for new users. - ''; - }; - registration_shared_secret = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - If set, allows registration by anyone who also has the shared - secret, even if registration is otherwise disabled. - ''; - }; - enable_metrics = mkOption { - type = types.bool; - default = false; - description = '' - Enable collection and rendering of performance metrics - ''; - }; - report_stats = mkOption { - type = types.bool; - default = false; - description = ""; - }; - servers = mkOption { - type = types.attrsOf (types.attrsOf types.str); - default = { - "matrix.org" = { - "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; - }; - }; - description = '' - The trusted servers to download signing keys from. - ''; - }; - max_upload_size = mkOption { - type = types.str; - default = "10M"; - description = "The largest allowed upload size in bytes"; - }; - max_image_pixels = mkOption { - type = types.str; - default = "32M"; - description = "Maximum number of pixels that will be thumbnailed"; - }; - dynamic_thumbnails = mkOption { - type = types.bool; - default = false; - description = '' - Whether to generate new thumbnails on the fly to precisely match - the resolution requested by the client. If true then whenever - a new resolution is requested by the client the server will - generate a new thumbnail. If false the server will pick a thumbnail - from a precalculated list. - ''; - }; - user_creation_max_duration = mkOption { - type = types.str; - default = "1209600000"; - description = '' - Sets the expiry for the short term user creation in - milliseconds. The default value is two weeks. - ''; - }; - bcrypt_rounds = mkOption { - type = types.str; - default = "12"; - description = '' - Set the number of bcrypt rounds used to generate password hash. - Larger numbers increase the work factor needed to generate the hash. - ''; - }; - allow_guest_access = mkOption { - type = types.bool; - default = false; - description = '' - Allows users to register as guests without a password/email/etc, and - participate in rooms hosted on this server which have been made - accessible to anonymous users. - ''; - }; - account_threepid_delegates.email = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Delegate email sending to https://example.org - ''; - }; - account_threepid_delegates.msisdn = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Delegate SMS sending to this local process (https://localhost:8090) - ''; - }; - room_prejoin_state.additional_event_types = mkOption { - default = []; - type = types.listOf types.str; - description = '' - Additional events to share with users who received an invite. - ''; - }; - room_prejoin_state.disable_default_event_types = mkOption { - default = false; - type = types.bool; - description = '' - Whether to disable the default state-event types for users invited to a room. - These are: - - <itemizedlist> - <listitem><para>m.room.join_rules</para></listitem> - <listitem><para>m.room.canonical_alias</para></listitem> - <listitem><para>m.room.avatar</para></listitem> - <listitem><para>m.room.encryption</para></listitem> - <listitem><para>m.room.name</para></listitem> - <listitem><para>m.room.create</para></listitem> - </itemizedlist> - ''; - }; - macaroon_secret_key = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Secret key for authentication tokens - ''; - }; - expire_access_token = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable access token expiration. - ''; - }; - key_refresh_interval = mkOption { - type = types.str; - default = "1d"; - description = '' - How long key response published by this server is valid for. - Used to set the valid_until_ts in /key/v2 APIs. - Determines how quickly servers will query to check which keys - are still valid. - ''; - }; - app_service_config_files = mkOption { - type = types.listOf types.path; - default = [ ]; - description = '' - A list of application service config file to use - ''; - }; - redaction_retention_period = mkOption { - type = types.int; - default = 7; - description = '' - How long to keep redacted events in unredacted form in the database. - ''; - }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra config options for matrix-synapse. - ''; - }; - extraConfigFiles = mkOption { - type = types.listOf types.path; - default = []; - description = '' - Extra config files to include. - - The configuration files will be included based on the command line - argument --config-path. This allows to configure secrets without - having to go through the Nix store, e.g. based on deployment keys if - NixOPS is in use. - ''; - }; - logConfig = mkOption { - type = types.lines; - default = readFile ./matrix-synapse-log_config.yaml; - description = '' - A yaml python logging config file - ''; - }; - dataDir = mkOption { - type = types.str; - default = "/var/lib/matrix-synapse"; - description = '' - The directory where matrix-synapse stores its stateful data such as - certificates, media and uploads. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - assertions = [ - { assertion = hasLocalPostgresDB -> config.services.postgresql.enable; - message = '' - Cannot deploy matrix-synapse with a configuration for a local postgresql database - and a missing postgresql service. Since 20.03 it's mandatory to manually configure the - database (please read the thread in https://github.com/NixOS/nixpkgs/pull/80447 for - further reference). - - If you - - try to deploy a fresh synapse, you need to configure the database yourself. An example - for this can be found in <nixpkgs/nixos/tests/matrix-synapse.nix> - - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true` - to your configuration. - - For further information about this update, please read the release-notes of 20.03 carefully. - ''; - } - ]; - - services.matrix-synapse.configFile = "${configFile}"; - - users.users.matrix-synapse = { - group = "matrix-synapse"; - home = cfg.dataDir; - createHome = true; - shell = "${pkgs.bash}/bin/bash"; - uid = config.ids.uids.matrix-synapse; - }; - - users.groups.matrix-synapse = { - gid = config.ids.gids.matrix-synapse; - }; - - systemd.services.matrix-synapse = { - description = "Synapse Matrix homeserver"; - after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - ${cfg.package}/bin/synapse_homeserver \ - --config-path ${configFile} \ - --keys-directory ${cfg.dataDir} \ - --generate-keys - ''; - environment = { - PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ]; - } // optionalAttrs (cfg.withJemalloc) { - LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; - }; - serviceConfig = { - Type = "notify"; - User = "matrix-synapse"; - Group = "matrix-synapse"; - WorkingDirectory = cfg.dataDir; - ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" '' - chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key - chmod 0600 ${cfg.dataDir}/homeserver.signing.key - '')) ]; - ExecStart = '' - ${cfg.package}/bin/synapse_homeserver \ - ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } - --keys-directory ${cfg.dataDir} - ''; - ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; - Restart = "on-failure"; - UMask = "0077"; - }; - }; - - environment.systemPackages = [ registerNewMatrixUser ]; - }; - - imports = [ - (mkRemovedOptionModule [ "services" "matrix-synapse" "trusted_third_party_id_servers" ] '' - The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0 - as the behavior is now obsolete. - '') - (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] '' - Database configuration must be done manually. An exemplary setup is demonstrated in - <nixpkgs/nixos/tests/matrix-synapse.nix> - '') - (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "") - (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] '' - You may add additional event types via - `services.matrix-synapse.room_prejoin_state.additional_event_types` and - disable the default events via - `services.matrix-synapse.room_prejoin_state.disable_default_event_types`. - '') - ]; - - meta.doc = ./matrix-synapse.xml; - meta.maintainers = teams.matrix.members; - -} diff --git a/nixos/modules/services/misc/nitter.nix b/nixos/modules/services/misc/nitter.nix index 6a9eeb02095..97005c9d914 100644 --- a/nixos/modules/services/misc/nitter.nix +++ b/nixos/modules/services/misc/nitter.nix @@ -49,6 +49,13 @@ in services.nitter = { enable = mkEnableOption "If enabled, start Nitter."; + package = mkOption { + default = pkgs.nitter; + type = types.package; + defaultText = literalExpression "pkgs.nitter"; + description = "The nitter derivation to use."; + }; + server = { address = mkOption { type = types.str; @@ -78,8 +85,8 @@ in staticDir = mkOption { type = types.path; - default = "${pkgs.nitter}/share/nitter/public"; - defaultText = literalExpression ''"''${pkgs.nitter}/share/nitter/public"''; + default = "${cfg.package}/share/nitter/public"; + defaultText = literalExpression ''"''${config.services.nitter.package}/share/nitter/public"''; description = "Path to the static files directory."; }; @@ -306,8 +313,8 @@ in Environment = [ "NITTER_CONF_FILE=/var/lib/nitter/nitter.conf" ]; # Some parts of Nitter expect `public` folder in working directory, # see https://github.com/zedeus/nitter/issues/414 - WorkingDirectory = "${pkgs.nitter}/share/nitter"; - ExecStart = "${pkgs.nitter}/bin/nitter"; + WorkingDirectory = "${cfg.package}/share/nitter"; + ExecStart = "${cfg.package}/bin/nitter"; ExecStartPre = "${preStart}"; AmbientCapabilities = lib.mkIf (cfg.server.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; Restart = "on-failure"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index d29d50706ef..41302d6d3ce 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -29,6 +29,7 @@ let "blackbox" "buildkite-agent" "collectd" + "dmarc" "dnsmasq" "domain" "dovecot" @@ -55,6 +56,7 @@ let "postfix" "postgres" "process" + "pve" "py-air-control" "redis" "rspamd" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix b/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix new file mode 100644 index 00000000000..330610a15d9 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix @@ -0,0 +1,117 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.dmarc; + + json = builtins.toJSON { + inherit (cfg) folders port; + listen_addr = cfg.listenAddress; + storage_path = "$STATE_DIRECTORY"; + imap = (builtins.removeAttrs cfg.imap [ "passwordFile" ]) // { password = "$IMAP_PASSWORD"; use_ssl = true; }; + poll_interval_seconds = cfg.pollIntervalSeconds; + deduplication_max_seconds = cfg.deduplicationMaxSeconds; + logging = { + version = 1; + disable_existing_loggers = false; + }; + }; +in { + port = 9797; + extraOpts = { + imap = { + host = mkOption { + type = types.str; + default = "localhost"; + description = '' + Hostname of IMAP server to connect to. + ''; + }; + port = mkOption { + type = types.port; + default = 993; + description = '' + Port of the IMAP server to connect to. + ''; + }; + username = mkOption { + type = types.str; + example = "postmaster@example.org"; + description = '' + Login username for the IMAP connection. + ''; + }; + passwordFile = mkOption { + type = types.str; + example = "/run/secrets/dovecot_pw"; + description = '' + File containing the login password for the IMAP connection. + ''; + }; + }; + folders = { + inbox = mkOption { + type = types.str; + default = "INBOX"; + description = '' + IMAP mailbox that is checked for incoming DMARC aggregate reports + ''; + }; + done = mkOption { + type = types.str; + default = "Archive"; + description = '' + IMAP mailbox that successfully processed reports are moved to. + ''; + }; + error = mkOption { + type = types.str; + default = "Invalid"; + description = '' + IMAP mailbox that emails are moved to that could not be processed. + ''; + }; + }; + pollIntervalSeconds = mkOption { + type = types.ints.unsigned; + default = 60; + description = '' + How often to poll the IMAP server in seconds. + ''; + }; + deduplicationMaxSeconds = mkOption { + type = types.ints.unsigned; + default = 604800; + defaultText = "7 days (in seconds)"; + description = '' + How long individual report IDs will be remembered to avoid + counting double delivered reports twice. + ''; + }; + debug = mkOption { + type = types.bool; + default = false; + description = '' + Whether to declare enable <literal>--debug</literal>. + ''; + }; + }; + serviceOpts = { + path = with pkgs; [ envsubst coreutils ]; + serviceConfig = { + StateDirectory = "prometheus-dmarc-exporter"; + WorkingDirectory = "/var/lib/prometheus-dmarc-exporter"; + ExecStart = "${pkgs.writeShellScript "setup-cfg" '' + export IMAP_PASSWORD="$(<${cfg.imap.passwordFile})" + envsubst \ + -i ${pkgs.writeText "dmarc-exporter.json.template" json} \ + -o ''${STATE_DIRECTORY}/dmarc-exporter.json + + exec ${pkgs.prometheus-dmarc-exporter}/bin/prometheus-dmarc-exporter \ + --configuration /var/lib/prometheus-dmarc-exporter/dmarc-exporter.json \ + ${optionalString cfg.debug "--debug"} + ''}"; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix new file mode 100644 index 00000000000..ef708414c95 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix @@ -0,0 +1,118 @@ +{ config, lib, pkgs, options }: + +with lib; +let + cfg = config.services.prometheus.exporters.pve; + + # pve exporter requires a config file so create an empty one if configFile is not provided + emptyConfigFile = pkgs.writeTextFile { + name = "pve.yml"; + text = "default:"; + }; + + computedConfigFile = "${if cfg.configFile == null then emptyConfigFile else cfg.configFile}"; +in +{ + port = 9221; + extraOpts = { + package = mkOption { + type = types.package; + default = pkgs.prometheus-pve-exporter; + defaultText = literalExpression "pkgs.prometheus-pve-exporter"; + example = literalExpression "pkgs.prometheus-pve-exporter"; + description = '' + The package to use for prometheus-pve-exporter + ''; + }; + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/etc/prometheus-pve-exporter/pve.env"; + description = '' + Path to the service's environment file. This path can either be a computed path in /nix/store or a path in the local filesystem. + + The environment file should NOT be stored in /nix/store as it contains passwords and/or keys in plain text. + + Environment reference: https://github.com/prometheus-pve/prometheus-pve-exporter#authentication + ''; + }; + + configFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/etc/prometheus-pve-exporter/pve.yml"; + description = '' + Path to the service's config file. This path can either be a computed path in /nix/store or a path in the local filesystem. + + The config file should NOT be stored in /nix/store as it will contain passwords and/or keys in plain text. + + If both configFile and environmentFile are provided, the configFile option will be ignored. + + Configuration reference: https://github.com/prometheus-pve/prometheus-pve-exporter/#authentication + ''; + }; + + collectors = { + status = mkOption { + type = types.bool; + default = true; + description = '' + Collect Node/VM/CT status + ''; + }; + version = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE version info + ''; + }; + node = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE node info + ''; + }; + cluster = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE cluster info + ''; + }; + resources = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE resources info + ''; + }; + config = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE onboot status + ''; + }; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/pve_exporter \ + --${if cfg.collectors.status == true then "" else "no-"}collector.status \ + --${if cfg.collectors.version == true then "" else "no-"}collector.version \ + --${if cfg.collectors.node == true then "" else "no-"}collector.node \ + --${if cfg.collectors.cluster == true then "" else "no-"}collector.cluster \ + --${if cfg.collectors.resources == true then "" else "no-"}collector.resources \ + --${if cfg.collectors.config == true then "" else "no-"}collector.config \ + ${computedConfigFile} \ + ${toString cfg.port} ${cfg.listenAddress} + ''; + } // optionalAttrs (cfg.environmentFile != null) { + EnvironmentFile = cfg.environmentFile; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix b/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix index c0a50f07d71..2edd1de83e1 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix @@ -11,7 +11,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.prometheus-systemd-exporter}/bin/systemd_exporter \ - --web.listen-address ${cfg.listenAddress}:${toString cfg.port} + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags} ''; RestrictAddressFamilies = [ # Need AF_UNIX to collect data diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index e55ac7a6b18..aa72a047526 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -76,7 +76,7 @@ in script = '' ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \ - -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled' + -c 'HOME="${cfg.dataDir}" ${pkgs.amule-daemon}/bin/amuled' ''; }; }; diff --git a/nixos/modules/services/networking/nbd.nix b/nixos/modules/services/networking/nbd.nix new file mode 100644 index 00000000000..87f8c41a8e5 --- /dev/null +++ b/nixos/modules/services/networking/nbd.nix @@ -0,0 +1,146 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.nbd; + configFormat = pkgs.formats.ini { }; + iniFields = with types; attrsOf (oneOf [ bool int float str ]); + serverConfig = configFormat.generate "nbd-server-config" + ({ + generic = + (cfg.server.extraOptions // { + user = "root"; + group = "root"; + port = cfg.server.listenPort; + } // (optionalAttrs (cfg.server.listenAddress != null) { + listenaddr = cfg.server.listenAddress; + })); + } + // (mapAttrs + (_: { path, allowAddresses, extraOptions }: + extraOptions // { + exportname = path; + } // (optionalAttrs (allowAddresses != null) { + authfile = pkgs.writeText "authfile" (concatStringsSep "\n" allowAddresses); + })) + cfg.server.exports) + ); + splitLists = + partition + (path: hasPrefix "/dev/" path) + (mapAttrsToList (_: { path, ... }: path) cfg.server.exports); + allowedDevices = splitLists.right; + boundPaths = splitLists.wrong; +in +{ + options = { + services.nbd = { + server = { + enable = mkEnableOption "the Network Block Device (nbd) server"; + + listenPort = mkOption { + type = types.port; + default = 10809; + description = "Port to listen on. The port is NOT automatically opened in the firewall."; + }; + + extraOptions = mkOption { + type = iniFields; + default = { + allowlist = false; + }; + description = '' + Extra options for the server. See + <citerefentry><refentrytitle>nbd-server</refentrytitle> + <manvolnum>5</manvolnum></citerefentry>. + ''; + }; + + exports = mkOption { + description = "Files or block devices to make available over the network."; + default = { }; + type = with types; attrsOf + (submodule { + options = { + path = mkOption { + type = str; + description = "File or block device to export."; + example = "/dev/sdb1"; + }; + + allowAddresses = mkOption { + type = nullOr (listOf str); + default = null; + example = [ "10.10.0.0/24" "127.0.0.1" ]; + description = "IPs and subnets that are authorized to connect for this device. If not specified, the server will allow all connections."; + }; + + extraOptions = mkOption { + type = iniFields; + default = { + flush = true; + fua = true; + }; + description = '' + Extra options for this export. See + <citerefentry><refentrytitle>nbd-server</refentrytitle> + <manvolnum>5</manvolnum></citerefentry>. + ''; + }; + }; + }); + }; + + listenAddress = mkOption { + type = with types; nullOr str; + description = "Address to listen on. If not specified, the server will listen on all interfaces."; + default = null; + example = "10.10.0.1"; + }; + }; + }; + }; + + config = mkIf cfg.server.enable { + boot.kernelModules = [ "nbd" ]; + + systemd.services.nbd-server = { + after = [ "network-online.target" ]; + before = [ "multi-user.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.nbd}/bin/nbd-server -C ${serverConfig}"; + Type = "forking"; + + DeviceAllow = map (path: "${path} rw") allowedDevices; + BindPaths = boundPaths; + + CapabilityBoundingSet = ""; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = false; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "noaccess"; + ProtectSystem = "strict"; + RestrictAddressFamilies = "AF_INET AF_INET6"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + UMask = "0077"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index a9801036b00..7a9d9e5428a 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -556,6 +556,7 @@ in { boot.kernelModules = [ "ctr" ]; + security.polkit.enable = true; security.polkit.extraConfig = polkitConf; services.dbus.packages = cfg.packages diff --git a/nixos/modules/services/networking/snowflake-proxy.nix b/nixos/modules/services/networking/snowflake-proxy.nix new file mode 100644 index 00000000000..2124644ed9b --- /dev/null +++ b/nixos/modules/services/networking/snowflake-proxy.nix @@ -0,0 +1,81 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.snowflake-proxy; +in +{ + options = { + services.snowflake-proxy = { + enable = mkEnableOption "System to defeat internet censorship"; + + broker = mkOption { + description = "Broker URL (default \"https://snowflake-broker.torproject.net/\")"; + type = with types; nullOr str; + default = null; + }; + + capacity = mkOption { + description = "Limits the amount of maximum concurrent clients allowed."; + type = with types; nullOr int; + default = null; + }; + + relay = mkOption { + description = "websocket relay URL (default \"wss://snowflake.bamsoftware.com/\")"; + type = with types; nullOr str; + default = null; + }; + + stun = mkOption { + description = "STUN broker URL (default \"stun:stun.stunprotocol.org:3478\")"; + type = with types; nullOr str; + default = null; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.snowflake-proxy = { + wantedBy = [ "network-online.target" ]; + serviceConfig = { + ExecStart = + "${pkgs.snowflake}/bin/proxy " + concatStringsSep " " ( + optional (cfg.broker != null) "-broker ${cfg.broker}" + ++ optional (cfg.capacity != null) "-capacity ${builtins.toString cfg.capacity}" + ++ optional (cfg.relay != null) "-relay ${cfg.relay}" + ++ optional (cfg.stun != null) "-stun ${cfg.stun}" + ); + + # Security Hardening + # Refer to systemd.exec(5) for option descriptions. + CapabilityBoundingSet = ""; + + # implies RemoveIPC=, PrivateTmp=, NoNewPrivileges=, RestrictSUIDSGID=, + # ProtectSystem=strict, ProtectHome=read-only + DynamicUser = true; + LockPersonality = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectProc = "invisible"; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "~@clock @cpu-emulation @debug @mount @obsolete @reboot @swap @privileged @resources"; + UMask = "0077"; + }; + }; + }; + + meta.maintainers = with maintainers; [ yayayayaka ]; +} diff --git a/nixos/modules/services/networking/tox-node.nix b/nixos/modules/services/networking/tox-node.nix index c24e7fd1285..c6e5c2d6e81 100644 --- a/nixos/modules/services/networking/tox-node.nix +++ b/nixos/modules/services/networking/tox-node.nix @@ -8,12 +8,7 @@ let homeDir = "/var/lib/tox-node"; configFile = let - # fetchurl should be switched to getting this file from tox-node.src once - # the dpkg directory is in a release - src = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/tox-rs/tox-node/master/dpkg/config.yml"; - sha256 = "1431wzpzm786mcvyzk1rp7ar418n45dr75hdggxvlm7pkpam31xa"; - }; + src = "${pkg.src}/dpkg/config.yml"; confJSON = pkgs.writeText "config.json" ( builtins.toJSON { log-type = cfg.logType; diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 340cbbf02fb..95a0ad8770e 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -9,7 +9,7 @@ let pkg = pkgs.clamav; toKeyValue = generators.toKeyValue { - mkKeyValue = generators.mkKeyValueDefault {} " "; + mkKeyValue = generators.mkKeyValueDefault { } " "; listsAsDuplicateKeys = true; }; @@ -30,7 +30,7 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); - default = {}; + default = { }; description = '' ClamAV configuration. Refer to <link xlink:href="https://linux.die.net/man/5/clamd.conf"/>, for details on supported values. @@ -59,7 +59,7 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); - default = {}; + default = { }; description = '' freshclam configuration. Refer to <link xlink:href="https://linux.die.net/man/5/freshclam.conf"/>, for details on supported values. @@ -104,7 +104,6 @@ in systemd.services.clamav-daemon = mkIf cfg.daemon.enable { description = "ClamAV daemon (clamd)"; after = optional cfg.updater.enable "clamav-freshclam.service"; - requires = optional cfg.updater.enable "clamav-freshclam.service"; wantedBy = [ "multi-user.target" ]; restartTriggers = [ clamdConfigFile ]; @@ -134,7 +133,7 @@ in systemd.services.clamav-freshclam = mkIf cfg.updater.enable { description = "ClamAV virus database updater (freshclam)"; restartTriggers = [ freshclamConfigFile ]; - + after = [ "network-online.target" ]; preStart = '' mkdir -m 0755 -p ${stateDir} chown ${clamavUser}:${clamavGroup} ${stateDir} diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix deleted file mode 100644 index df60d553e85..00000000000 --- a/nixos/modules/services/security/fprot.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; -let - fprotUser = "fprot"; - stateDir = "/var/lib/fprot"; - fprotGroup = fprotUser; - cfg = config.services.fprot; -in { - options = { - - services.fprot = { - updater = { - enable = mkEnableOption "automatic F-Prot virus definitions database updates"; - - productData = mkOption { - description = '' - product.data file. Defaults to the one supplied with installation package. - ''; - type = types.path; - }; - - frequency = mkOption { - default = 30; - type = types.int; - description = '' - Update virus definitions every X minutes. - ''; - }; - - licenseKeyfile = mkOption { - type = types.path; - description = '' - License keyfile. Defaults to the one supplied with installation package. - ''; - }; - - }; - }; - }; - - ###### implementation - - config = mkIf cfg.updater.enable { - - services.fprot.updater.productData = mkDefault "${pkgs.fprot}/opt/f-prot/product.data"; - services.fprot.updater.licenseKeyfile = mkDefault "${pkgs.fprot}/opt/f-prot/license.key"; - - environment.systemPackages = [ pkgs.fprot ]; - environment.etc."f-prot.conf" = { - source = "${pkgs.fprot}/opt/f-prot/f-prot.conf"; - }; - - users.users.${fprotUser} = - { uid = config.ids.uids.fprot; - description = "F-Prot daemon user"; - home = stateDir; - }; - - users.groups.${fprotGroup} = - { gid = config.ids.gids.fprot; }; - - services.cron.systemCronJobs = [ "*/${toString cfg.updater.frequency} * * * * root start fprot-updater" ]; - - systemd.services.fprot-updater = { - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = false; - }; - wantedBy = [ "multi-user.target" ]; - - # have to copy fpupdate executable because it insists on storing the virus database in the same dir - preStart = '' - mkdir -m 0755 -p ${stateDir} - chown ${fprotUser}:${fprotGroup} ${stateDir} - cp ${pkgs.fprot}/opt/f-prot/fpupdate ${stateDir} - ln -sf ${cfg.updater.productData} ${stateDir}/product.data - ''; - - script = "/var/lib/fprot/fpupdate --keyfile ${cfg.updater.licenseKeyfile}"; - }; - }; -} diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 919346cf2bb..f9b4985e199 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -3,22 +3,123 @@ with lib; let - name = "opensnitch"; cfg = config.services.opensnitch; + format = pkgs.formats.json {}; in { options = { services.opensnitch = { enable = mkEnableOption "Opensnitch application firewall"; + settings = mkOption { + type = types.submodule { + freeformType = format.type; + + options = { + Server = { + + Address = mkOption { + type = types.str; + description = '' + Unix socket path (unix:///tmp/osui.sock, the "unix:///" part is + mandatory) or TCP socket (192.168.1.100:50051). + ''; + }; + + LogFile = mkOption { + type = types.path; + description = '' + File to write logs to (use /dev/stdout to write logs to standard + output). + ''; + }; + + }; + + DefaultAction = mkOption { + type = types.enum [ "allow" "deny" ]; + description = '' + Default action whether to block or allow application internet + access. + ''; + }; + + DefaultDuration = mkOption { + type = types.enum [ + "once" "always" "until restart" "30s" "5m" "15m" "30m" "1h" + ]; + description = '' + Default duration of firewall rule. + ''; + }; + + InterceptUnknown = mkOption { + type = types.bool; + description = '' + Wheter to intercept spare connections. + ''; + }; + + ProcMonitorMethod = mkOption { + type = types.enum [ "ebpf" "proc" "ftrace" "audit" ]; + description = '' + Which process monitoring method to use. + ''; + }; + + LogLevel = mkOption { + type = types.enum [ 0 1 2 3 4 ]; + description = '' + Default log level from 0 to 4 (debug, info, important, warning, + error). + ''; + }; + + Firewall = mkOption { + type = types.enum [ "iptables" "nftables" ]; + description = '' + Which firewall backend to use. + ''; + }; + + Stats = { + + MaxEvents = mkOption { + type = types.int; + description = '' + Max events to send to the GUI. + ''; + }; + + MaxStats = mkOption { + type = types.int; + description = '' + Max stats per item to keep in backlog. + ''; + }; + + }; + }; + }; + description = '' + opensnitchd configuration. Refer to + <link xlink:href="https://github.com/evilsocket/opensnitch/wiki/Configurations"/> + for details on supported values. + ''; + }; }; }; config = mkIf cfg.enable { + # pkg.opensnitch is referred to elsewhere in the module so we don't need to worry about it being garbage collected + services.opensnitch.settings = mapAttrs (_: v: mkDefault v) (builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile "${pkgs.opensnitch}/etc/default-config.json"))); + systemd = { packages = [ pkgs.opensnitch ]; services.opensnitchd.wantedBy = [ "multi-user.target" ]; }; + environment.etc."opensnitchd/default-config.json".source = format.generate "default-config.json" cfg.settings; + }; } diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index cafb44e1242..ddd216ca7fd 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -962,7 +962,7 @@ in '') onion.authorizedClients ++ optional (onion.secretKey != null) '' install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path} - key="$(cut -f1 -d: ${escapeShellArg onion.secretKey})" + key="$(cut -f1 -d: ${escapeShellArg onion.secretKey} | head -1)" case "$key" in ("== ed25519v"*"-secret") install -o tor -g tor -m 0400 ${escapeShellArg onion.secretKey} ${escapeShellArg onion.path}/hs_ed25519_secret_key;; @@ -1008,7 +1008,11 @@ in #InaccessiblePaths = [ "-+${runDir}/root" ]; UMask = "0066"; BindPaths = [ stateDir ]; - BindReadOnlyPaths = [ storeDir "/etc" ]; + BindReadOnlyPaths = [ storeDir "/etc" ] ++ + optionals config.services.resolved.enable [ + "/run/systemd/resolve/stub-resolv.conf" + "/run/systemd/resolve/resolv.conf" + ]; AmbientCapabilities = [""] ++ lib.optional bindsPrivilegedPort "CAP_NET_BIND_SERVICE"; CapabilityBoundingSet = [""] ++ lib.optional bindsPrivilegedPort "CAP_NET_BIND_SERVICE"; # ProtectClock= adds DeviceAllow=char-rtc r diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix index 452efc73643..ddd5bcebcdd 100644 --- a/nixos/modules/services/system/earlyoom.nix +++ b/nixos/modules/services/system/earlyoom.nix @@ -1,124 +1,104 @@ { config, lib, pkgs, ... }: -with lib; - let - ecfg = config.services.earlyoom; + cfg = config.services.earlyoom; + + inherit (lib) + mkDefault mkEnableOption mkIf mkOption types + mkRemovedOptionModule + concatStringsSep optional; + in { - options = { - services.earlyoom = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable early out of memory killing. - ''; - }; + options.services.earlyoom = { + enable = mkEnableOption "Early out of memory killing"; - freeMemThreshold = mkOption { - type = types.int; - default = 10; - description = '' - Minimum of availabe memory (in percent). - If the free memory falls below this threshold and the analog is true for - <option>services.earlyoom.freeSwapThreshold</option> - the killing begins. - ''; - }; + freeMemThreshold = mkOption { + type = types.ints.between 1 100; + default = 10; + description = '' + Minimum of availabe memory (in percent). + If the free memory falls below this threshold and the analog is true for + <option>services.earlyoom.freeSwapThreshold</option> + the killing begins. + ''; + }; - freeSwapThreshold = mkOption { - type = types.int; - default = 10; - description = '' - Minimum of availabe swap space (in percent). - If the available swap space falls below this threshold and the analog - is true for <option>services.earlyoom.freeMemThreshold</option> - the killing begins. - ''; - }; + freeSwapThreshold = mkOption { + type = types.ints.between 1 100; + default = 10; + description = '' + Minimum of availabe swap space (in percent). + If the available swap space falls below this threshold and the analog + is true for <option>services.earlyoom.freeMemThreshold</option> + the killing begins. + ''; + }; - useKernelOOMKiller= mkOption { - type = types.bool; - default = false; - description = '' - Use kernel OOM killer instead of own user-space implementation. - ''; - }; + # TODO: remove or warn after 1.7 (https://github.com/rfjakob/earlyoom/commit/7ebc4554) + ignoreOOMScoreAdjust = mkOption { + type = types.bool; + default = false; + description = '' + Ignore oom_score_adjust values of processes. + ''; + }; - ignoreOOMScoreAdjust = mkOption { - type = types.bool; - default = false; - description = '' - Ignore oom_score_adjust values of processes. - User-space implementation only. - ''; - }; + enableDebugInfo = mkOption { + type = types.bool; + default = false; + description = '' + Enable debugging messages. + ''; + }; - enableDebugInfo = mkOption { - type = types.bool; - default = false; - description = '' - Enable debugging messages. - ''; - }; + enableNotifications = mkOption { + type = types.bool; + default = false; + description = '' + Send notifications about killed processes via the system d-bus. - notificationsCommand = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - This option is deprecated and ignored by earlyoom since 1.6. - Use <option>services.earlyoom.enableNotifications</option> instead. - ''; - }; + WARNING: enabling this option (while convenient) should *not* be done on a + machine where you do not trust the other users as it allows any other + local user to DoS your session by spamming notifications. - enableNotifications = mkOption { - type = types.bool; - default = false; - description = '' - Send notifications about killed processes via the system d-bus. - To actually see the notifications in your GUI session, you need to have - <literal>systembus-notify</literal> running as your user. + To actually see the notifications in your GUI session, you need to have + <literal>systembus-notify</literal> running as your user which this + option handles. - See <link xlink:href="https://github.com/rfjakob/earlyoom#notifications">README</link> for details. - ''; - }; + See <link xlink:href="https://github.com/rfjakob/earlyoom#notifications">README</link> for details. + ''; }; }; - config = mkIf ecfg.enable { - assertions = [ - { assertion = ecfg.freeMemThreshold > 0 && ecfg.freeMemThreshold <= 100; - message = "Needs to be a positive percentage"; } - { assertion = ecfg.freeSwapThreshold > 0 && ecfg.freeSwapThreshold <= 100; - message = "Needs to be a positive percentage"; } - { assertion = !ecfg.useKernelOOMKiller || !ecfg.ignoreOOMScoreAdjust; - message = "Both options in conjunction do not make sense"; } - ]; + imports = [ + (mkRemovedOptionModule [ "services" "earlyoom" "useKernelOOMKiller" ] '' + This option is deprecated and ignored by earlyoom since 1.2. + '') + (mkRemovedOptionModule [ "services" "earlyoom" "notificationsCommand" ] '' + This option is deprecated and ignored by earlyoom since 1.6. + '') + ]; - warnings = optional (ecfg.notificationsCommand != null) - "`services.earlyoom.notificationsCommand` is deprecated and ignored by earlyoom since 1.6."; + config = mkIf cfg.enable { + services.systembus-notify.enable = mkDefault cfg.enableNotifications; systemd.services.earlyoom = { description = "Early OOM Daemon for Linux"; wantedBy = [ "multi-user.target" ]; - path = optional ecfg.enableNotifications pkgs.dbus; + path = optional cfg.enableNotifications pkgs.dbus; serviceConfig = { - StandardOutput = "null"; StandardError = "journal"; - ExecStart = '' - ${pkgs.earlyoom}/bin/earlyoom \ - -m ${toString ecfg.freeMemThreshold} \ - -s ${toString ecfg.freeSwapThreshold} \ - ${optionalString ecfg.useKernelOOMKiller "-k"} \ - ${optionalString ecfg.ignoreOOMScoreAdjust "-i"} \ - ${optionalString ecfg.enableDebugInfo "-d"} \ - ${optionalString ecfg.enableNotifications "-n"} - ''; + ExecStart = concatStringsSep " " ([ + "${pkgs.earlyoom}/bin/earlyoom" + "-m ${toString cfg.freeMemThreshold}" + "-s ${toString cfg.freeSwapThreshold}" + ] + ++ optional cfg.ignoreOOMScoreAdjust "-i" + ++ optional cfg.enableDebugInfo "-d" + ++ optional cfg.enableNotifications "-n" + ); }; }; - - environment.systemPackages = optional ecfg.enableNotifications pkgs.systembus-notify; }; } diff --git a/nixos/modules/services/system/systembus-notify.nix b/nixos/modules/services/system/systembus-notify.nix new file mode 100644 index 00000000000..e918bc552ec --- /dev/null +++ b/nixos/modules/services/system/systembus-notify.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.systembus-notify; + + inherit (lib) mkEnableOption mkIf; + +in +{ + options.services.systembus-notify = { + enable = mkEnableOption '' + System bus notification support + + WARNING: enabling this option (while convenient) should *not* be done on a + machine where you do not trust the other users as it allows any other + local user to DoS your session by spamming notifications. + ''; + }; + + config = mkIf cfg.enable { + systemd = { + packages = with pkgs; [ systembus-notify ]; + + user.services.systembus-notify.wantedBy = [ "graphical-session.target" ]; + }; + }; +} diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index 41613dcbb3b..191f6eb52e5 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -1,30 +1,40 @@ { config, lib, options, pkgs, ... }: -with lib; - let cfg = config.services.epgstation; opt = options.services.epgstation; + description = "EPGStation: DVR system for Mirakurun-managed TV tuners"; + username = config.users.users.epgstation.name; groupname = config.users.users.epgstation.group; + mirakurun = { + sock = config.services.mirakurun.unixSocket; + option = options.services.mirakurun.unixSocket; + }; - settingsFmt = pkgs.formats.json {}; - settingsTemplate = settingsFmt.generate "config.json" cfg.settings; + yaml = pkgs.formats.yaml { }; + settingsTemplate = yaml.generate "config.yml" cfg.settings; preStartScript = pkgs.writeScript "epgstation-prestart" '' #!${pkgs.runtimeShell} - PASSWORD="$(head -n1 "${cfg.basicAuth.passwordFile}")" - DB_PASSWORD="$(head -n1 "${cfg.database.passwordFile}")" + DB_PASSWORD_FILE=${lib.escapeShellArg cfg.database.passwordFile} + + if [[ ! -f "$DB_PASSWORD_FILE" ]]; then + printf "[FATAL] File containing the DB password was not found in '%s'. Double check the NixOS option '%s'." \ + "$DB_PASSWORD_FILE" ${lib.escapeShellArg opt.database.passwordFile} >&2 + exit 1 + fi + + DB_PASSWORD="$(head -n1 ${lib.escapeShellArg cfg.database.passwordFile})" # setup configuration - touch /etc/epgstation/config.json - chmod 640 /etc/epgstation/config.json + touch /etc/epgstation/config.yml + chmod 640 /etc/epgstation/config.yml sed \ - -e "s,@password@,$PASSWORD,g" \ -e "s,@dbPassword@,$DB_PASSWORD,g" \ - ${settingsTemplate} > /etc/epgstation/config.json - chown "${username}:${groupname}" /etc/epgstation/config.json + ${settingsTemplate} > /etc/epgstation/config.yml + chown "${username}:${groupname}" /etc/epgstation/config.yml # NOTE: Use password authentication, since mysqljs does not yet support auth_socket if [ ! -e /var/lib/epgstation/db-created ]; then @@ -35,7 +45,7 @@ let ''; streamingConfig = lib.importJSON ./streaming.json; - logConfig = { + logConfig = yaml.generate "logConfig.yml" { appenders.stdout.type = "stdout"; categories = { default = { appenders = [ "stdout" ]; level = "info"; }; @@ -45,53 +55,51 @@ let }; }; - defaultPassword = "INSECURE_GO_CHECK_CONFIGURATION_NIX\n"; + # Deprecate top level options that are redundant. + deprecateTopLevelOption = config: + lib.mkRenamedOptionModule + ([ "services" "epgstation" ] ++ config) + ([ "services" "epgstation" "settings" ] ++ config); + + removeOption = config: instruction: + lib.mkRemovedOptionModule + ([ "services" "epgstation" ] ++ config) + instruction; in { - options.services.epgstation = { - enable = mkEnableOption "EPGStation: DTV Software in Japan"; + meta.maintainers = with lib.maintainers; [ midchildan ]; - usePreconfiguredStreaming = mkOption { - type = types.bool; - default = true; - description = '' - Use preconfigured default streaming options. + imports = [ + (deprecateTopLevelOption [ "port" ]) + (deprecateTopLevelOption [ "socketioPort" ]) + (deprecateTopLevelOption [ "clientSocketioPort" ]) + (removeOption [ "basicAuth" ] + "Use a TLS-terminated reverse proxy with authentication instead.") + ]; - Upstream defaults: - <link xlink:href="https://github.com/l3tnun/EPGStation/blob/master/config/config.sample.json"/> - ''; - }; + options.services.epgstation = { + enable = lib.mkEnableOption description; - port = mkOption { - type = types.port; - default = 20772; - description = '' - HTTP port for EPGStation to listen on. - ''; + package = lib.mkOption { + default = pkgs.epgstation; + type = lib.types.package; + defaultText = lib.literalExpression "pkgs.epgstation"; + description = "epgstation package to use"; }; - socketioPort = mkOption { - type = types.port; - default = cfg.port + 1; - defaultText = literalExpression "config.${opt.port} + 1"; + usePreconfiguredStreaming = lib.mkOption { + type = lib.types.bool; + default = true; description = '' - Socket.io port for EPGStation to listen on. - ''; - }; + Use preconfigured default streaming options. - clientSocketioPort = mkOption { - type = types.port; - default = cfg.socketioPort; - defaultText = literalExpression "config.${opt.socketioPort}"; - description = '' - Socket.io port that the web client is going to connect to. This may be - different from <option>socketioPort</option> if EPGStation is hidden - behind a reverse proxy. + Upstream defaults: + <link xlink:href="https://github.com/l3tnun/EPGStation/blob/master/config/config.yml.template"/> ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Open ports in the firewall for the EPGStation web interface. @@ -106,50 +114,17 @@ in ''; }; - basicAuth = { - user = mkOption { - type = with types; nullOr str; - default = null; - example = "epgstation"; - description = '' - Basic auth username for EPGStation. If <literal>null</literal>, basic - auth will be disabled. - - <warning> - <para> - Basic authentication has known weaknesses, the most critical being - that it sends passwords over the network in clear text. Use this - feature to control access to EPGStation within your family and - friends, but don't rely on it for security. - </para> - </warning> - ''; - }; - - passwordFile = mkOption { - type = types.path; - default = pkgs.writeText "epgstation-password" defaultPassword; - defaultText = literalDocBook ''a file containing <literal>${defaultPassword}</literal>''; - example = "/run/keys/epgstation-password"; - description = '' - A file containing the password for <option>basicAuth.user</option>. - ''; - }; - }; - - database = { - name = mkOption { - type = types.str; + database = { + name = lib.mkOption { + type = lib.types.str; default = "epgstation"; description = '' Name of the MySQL database that holds EPGStation's data. ''; }; - passwordFile = mkOption { - type = types.path; - default = pkgs.writeText "epgstation-db-password" defaultPassword; - defaultText = literalDocBook ''a file containing <literal>${defaultPassword}</literal>''; + passwordFile = lib.mkOption { + type = lib.types.path; example = "/run/keys/epgstation-db-password"; description = '' A file containing the password for the database named @@ -158,69 +133,106 @@ in }; }; - settings = mkOption { + # The defaults for some options come from the upstream template + # configuration, which is the one that users would get if they follow the + # upstream instructions. This is, in some cases, different from the + # application defaults. Some options like encodeProcessNum and + # concurrentEncodeNum doesn't have an optimal default value that works for + # all hardware setups and/or performance requirements. For those kind of + # options, the application default wouldn't always result in the expected + # out-of-the-box behavior because it's the responsibility of the user to + # configure them according to their needs. In these cases, the value in the + # upstream template configuration should serve as a "good enough" default. + settings = lib.mkOption { description = '' - Options to add to config.json. + Options to add to config.yml. Documentation: <link xlink:href="https://github.com/l3tnun/EPGStation/blob/master/doc/conf-manual.md"/> ''; - default = {}; + default = { }; example = { recPriority = 20; conflictPriority = 10; }; - type = types.submodule { - freeformType = settingsFmt.type; + type = lib.types.submodule { + freeformType = yaml.type; + + options.port = lib.mkOption { + type = lib.types.port; + default = 20772; + description = '' + HTTP port for EPGStation to listen on. + ''; + }; - options.readOnlyOnce = mkOption { - type = types.bool; - default = false; - description = "Don't reload configuration files at runtime."; + options.socketioPort = lib.mkOption { + type = lib.types.port; + default = cfg.settings.port + 1; + defaultText = lib.literalExpression "config.${opt.settings}.port + 1"; + description = '' + Socket.io port for EPGStation to listen on. It is valid to share + ports with <option>${opt.settings}.port</option>. + ''; }; - options.mirakurunPath = mkOption (let - sockPath = config.services.mirakurun.unixSocket; - in { - type = types.str; - default = "http+unix://${replaceStrings ["/"] ["%2F"] sockPath}"; - defaultText = literalExpression '' - "http+unix://''${replaceStrings ["/"] ["%2F"] config.${options.services.mirakurun.unixSocket}}" + options.clientSocketioPort = lib.mkOption { + type = lib.types.port; + default = cfg.settings.socketioPort; + defaultText = lib.literalExpression "config.${opt.settings}.socketioPort"; + description = '' + Socket.io port that the web client is going to connect to. This may + be different from <option>${opt.settings}.socketioPort</option> if + EPGStation is hidden behind a reverse proxy. + ''; + }; + + options.mirakurunPath = with mirakurun; lib.mkOption { + type = lib.types.str; + default = "http+unix://${lib.replaceStrings ["/"] ["%2F"] sock}"; + defaultText = lib.literalExpression '' + "http+unix://''${lib.replaceStrings ["/"] ["%2F"] config.${option}}" ''; example = "http://localhost:40772"; description = "URL to connect to Mirakurun."; - }); + }; + + options.encodeProcessNum = lib.mkOption { + type = lib.types.ints.positive; + default = 4; + description = '' + The maximum number of processes that EPGStation would allow to run + at the same time for encoding or streaming videos. + ''; + }; + + options.concurrentEncodeNum = lib.mkOption { + type = lib.types.ints.positive; + default = 1; + description = '' + The maximum number of encoding jobs that EPGStation would run at the + same time. + ''; + }; - options.encode = mkOption { - type = with types; listOf attrs; + options.encode = lib.mkOption { + type = with lib.types; listOf attrs; description = "Encoding presets for recorded videos."; default = [ { - name = "H264"; - cmd = "${pkgs.epgstation}/libexec/enc.sh main"; + name = "H.264"; + cmd = "%NODE% ${cfg.package}/libexec/enc.js"; suffix = ".mp4"; - default = true; - } - { - name = "H264-sub"; - cmd = "${pkgs.epgstation}/libexec/enc.sh sub"; - suffix = "-sub.mp4"; } ]; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' [ { - name = "H264"; - cmd = "''${pkgs.epgstation}/libexec/enc.sh main"; + name = "H.264"; + cmd = "%NODE% config.${opt.package}/libexec/enc.js"; suffix = ".mp4"; - default = true; - } - { - name = "H264-sub"; - cmd = "''${pkgs.epgstation}/libexec/enc.sh sub"; - suffix = "-sub.mp4"; } ] ''; @@ -229,14 +241,25 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !(lib.hasAttr "readOnlyOnce" cfg.settings); + message = '' + The option config.${opt.settings}.readOnlyOnce can no longer be used + since it's been removed. No replacements are available. + ''; + } + ]; + environment.etc = { - "epgstation/operatorLogConfig.json".text = builtins.toJSON logConfig; - "epgstation/serviceLogConfig.json".text = builtins.toJSON logConfig; + "epgstation/epgUpdaterLogConfig.yml".source = logConfig; + "epgstation/operatorLogConfig.yml".source = logConfig; + "epgstation/serviceLogConfig.yml".source = logConfig; }; - networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = with cfg; [ port socketioPort ]; + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = with cfg.settings; [ port socketioPort ]; }; users.users.epgstation = { @@ -245,13 +268,13 @@ in isSystemUser = true; }; - users.groups.epgstation = {}; + users.groups.epgstation = { }; - services.mirakurun.enable = mkDefault true; + services.mirakurun.enable = lib.mkDefault true; services.mysql = { - enable = mkDefault true; - package = mkDefault pkgs.mariadb; + enable = lib.mkDefault true; + package = lib.mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; # FIXME: enable once mysqljs supports auth_socket # ensureUsers = [ { @@ -260,39 +283,28 @@ in # } ]; }; - services.epgstation.settings = let - defaultSettings = { - serverPort = cfg.port; - socketioPort = cfg.socketioPort; - clientSocketioPort = cfg.clientSocketioPort; - - dbType = mkDefault "mysql"; - mysql = { - user = username; - database = cfg.database.name; - socketPath = mkDefault "/run/mysqld/mysqld.sock"; - password = mkDefault "@dbPassword@"; - connectTimeout = mkDefault 1000; - connectionLimit = mkDefault 10; + services.epgstation.settings = + let + defaultSettings = { + dbtype = lib.mkDefault "mysql"; + mysql = { + socketPath = lib.mkDefault "/run/mysqld/mysqld.sock"; + user = username; + password = lib.mkDefault "@dbPassword@"; + database = cfg.database.name; + }; + + ffmpeg = lib.mkDefault "${pkgs.ffmpeg-full}/bin/ffmpeg"; + ffprobe = lib.mkDefault "${pkgs.ffmpeg-full}/bin/ffprobe"; + + # for disambiguation with TypeScript files + recordedFileExtension = lib.mkDefault ".m2ts"; }; - - basicAuth = mkIf (cfg.basicAuth.user != null) { - user = mkDefault cfg.basicAuth.user; - password = mkDefault "@password@"; - }; - - ffmpeg = mkDefault "${pkgs.ffmpeg-full}/bin/ffmpeg"; - ffprobe = mkDefault "${pkgs.ffmpeg-full}/bin/ffprobe"; - - fileExtension = mkDefault ".m2ts"; - maxEncode = mkDefault 2; - maxStreaming = mkDefault 2; - }; - in - mkMerge [ - defaultSettings - (mkIf cfg.usePreconfiguredStreaming streamingConfig) - ]; + in + lib.mkMerge [ + defaultSettings + (lib.mkIf cfg.usePreconfiguredStreaming streamingConfig) + ]; systemd.tmpfiles.rules = [ "d '/var/lib/epgstation/streamfiles' - ${username} ${groupname} - -" @@ -301,15 +313,15 @@ in ]; systemd.services.epgstation = { - description = pkgs.epgstation.meta.description; + inherit description; + wantedBy = [ "multi-user.target" ]; - after = [ - "network.target" - ] ++ optional config.services.mirakurun.enable "mirakurun.service" - ++ optional config.services.mysql.enable "mysql.service"; + after = [ "network.target" ] + ++ lib.optional config.services.mirakurun.enable "mirakurun.service" + ++ lib.optional config.services.mysql.enable "mysql.service"; serviceConfig = { - ExecStart = "${pkgs.epgstation}/bin/epgstation start"; + ExecStart = "${cfg.package}/bin/epgstation start"; ExecStartPre = "+${preStartScript}"; User = username; Group = groupname; diff --git a/nixos/modules/services/video/epgstation/streaming.json b/nixos/modules/services/video/epgstation/streaming.json index 8eb99cf8558..7f8df0817fc 100644 --- a/nixos/modules/services/video/epgstation/streaming.json +++ b/nixos/modules/services/video/epgstation/streaming.json @@ -1,119 +1,140 @@ { - "liveHLS": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + "urlscheme": { + "m2ts": { + "ios": "vlc-x-callback://x-callback-url/stream?url=PROTOCOL://ADDRESS", + "android": "intent://ADDRESS#Intent;package=org.videolan.vlc;type=video;scheme=PROTOCOL;end" }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" + "video": { + "ios": "infuse://x-callback-url/play?url=PROTOCOL://ADDRESS", + "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=PROTOCOL;end" }, - { - "name": "180p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 48k -ac 2 -c:v libx264 -vf yadif,scale=-2:180 -b:v 100k -preset veryfast -maxrate 110k -bufsize 1000k -flags +loop-global_header %OUTPUT%" + "download": { + "ios": "vlc-x-callback://x-callback-url/download?url=PROTOCOL://ADDRESS&filename=FILENAME" } - ], - "liveMP4": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" - }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" - } - ], - "liveWebM": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" - }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" - } - ], - "mpegTsStreaming": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1" - }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1" - }, - { - "name": "Original" - } - ], - "mpegTsViewer": { - "ios": "vlc-x-callback://x-callback-url/stream?url=http://ADDRESS", - "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end" - }, - "recordedDownloader": { - "ios": "vlc-x-callback://x-callback-url/download?url=http://ADDRESS&filename=FILENAME", - "android": "intent://ADDRESS#Intent;package=com.dv.adm;type=video;scheme=http;end" }, - "recordedStreaming": { - "webm": [ - { - "name": "720p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", - "vb": "3000k", - "ab": "192k" - }, - { - "name": "360p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", - "vb": "1500k", - "ab": "128k" - } - ], - "mp4": [ - { - "name": "720p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", - "vb": "3000k", - "ab": "192k" - }, - { - "name": "360p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", - "vb": "1500k", - "ab": "128k" + "stream": { + "live": { + "ts": { + "m2ts": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1" + }, + { + "name": "無変換" + } + ], + "m2tsll": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -f mpegts -analyzeduration 500000 -i pipe:0 -map 0 -c:s copy -c:d copy -ignore_unknown -fflags nobuffer -flags low_delay -max_delay 250000 -max_interleave_delta 1 -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -flags +cgop -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -f mpegts -analyzeduration 500000 -i pipe:0 -map 0 -c:s copy -c:d copy -ignore_unknown -fflags nobuffer -flags low_delay -max_delay 250000 -max_interleave_delta 1 -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -flags +cgop -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1" + } + ], + "webm": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + } + ], + "mp4": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + } + ], + "hls": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" + } + ] } - ], - "mpegTs": [ - { - "name": "720p (H.264)", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", - "vb": "3000k", - "ab": "192k" + }, + "recorded": { + "ts": { + "webm": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + } + ], + "mp4": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + } + ], + "hls": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" + } + ] }, - { - "name": "360p (H.264)", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", - "vb": "1500k", - "ab": "128k" + "encoded": { + "webm": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + } + ], + "mp4": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + } + ], + "hls": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf scale=-2:480 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + } + ] } - ] - }, - "recordedHLS": [ - { - "name": "720p", - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" - }, - { - "name": "480p", - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" - }, - { - "name": "480p(h265)", - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_type fmp4 -hls_fmp4_init_filename stream%streamNum%-init.mp4 -hls_segment_filename stream%streamNum%-%09d.m4s -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx265 -vf yadif,scale=-2:480 -b:v 350k -preset veryfast -tag:v hvc1 %OUTPUT%" } - ], - "recordedViewer": { - "ios": "infuse://x-callback-url/play?url=http://ADDRESS", - "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end" } } diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index d2bbc4fc057..a32b81a916f 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -81,6 +81,8 @@ in { }; }; + security.polkit.enable = true; + security.pam.services.cage.text = '' auth required pam_unix.so nullok account required pam_unix.so diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index a01f0049b2c..22c16be7613 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -693,6 +693,7 @@ in RemainAfterExit = true; User = "postgres"; Group = "postgres"; + LoadCredential = [ "db_password:${cfg.database.passwordFile}" ]; }; script = '' set -o errexit -o pipefail -o nounset -o errtrace @@ -701,7 +702,8 @@ in create_role="$(mktemp)" trap 'rm -f "$create_role"' ERR EXIT - echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$(<'${cfg.database.passwordFile}')' CREATEDB" > "$create_role" + db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" + echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role" psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role" psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"' ''; @@ -717,14 +719,14 @@ in RemainAfterExit = true; User = config.services.mysql.user; Group = config.services.mysql.group; + LoadCredential = [ "db_password:${cfg.database.passwordFile}" ]; }; script = '' set -o errexit -o pipefail -o nounset -o errtrace shopt -s inherit_errexit - - db_password="$(<'${cfg.database.passwordFile}')" + db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';" - echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;" + echo "CREATE DATABASE IF NOT EXISTS keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;" echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';" ) | mysql -N ''; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 141ab98e29b..b32220a5e57 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -153,7 +153,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" ]; + relatedPackages = [ "nextcloud22" "nextcloud23" ]; }; phpPackage = mkOption { type = types.package; @@ -571,15 +571,6 @@ in { nextcloud defined in an overlay, please set `services.nextcloud.package` to `pkgs.nextcloud`. '' - # 21.03 will not be an official release - it was instead 21.05. - # This versionOlder statement remains set to 21.03 for backwards compatibility. - # See https://github.com/NixOS/nixpkgs/pull/108899 and - # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md. - # FIXME(@Ma27) remove this else-if as soon as 21.05 is EOL! This is only here - # to ensure that users who are on Nextcloud 19 with a stateVersion <21.05 with - # no explicit services.nextcloud.package don't upgrade to v21 by accident ( - # nextcloud20 throws an eval-error because it's dropped). - else if versionOlder stateVersion "21.03" then nextcloud20 else if versionOlder stateVersion "21.11" then nextcloud21 else if versionOlder stateVersion "22.05" then nextcloud22 else nextcloud23 diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index f4bf43f56b9..9ea37b8a4ca 100644 --- a/nixos/modules/services/web-apps/plantuml-server.nix +++ b/nixos/modules/services/web-apps/plantuml-server.nix @@ -20,6 +20,21 @@ in description = "PlantUML server package to use"; }; + packages = { + jdk = mkOption { + type = types.package; + default = pkgs.jdk; + defaultText = literalExpression "pkgs.jdk"; + description = "JDK package to use for the server"; + }; + jetty = mkOption { + type = types.package; + default = pkgs.jetty; + defaultText = literalExpression "pkgs.jetty"; + description = "Jetty package to use for the server"; + }; + }; + user = mkOption { type = types.str; default = "plantuml"; @@ -105,10 +120,10 @@ in ALLOW_PLANTUML_INCLUDE = if cfg.allowPlantumlInclude then "true" else "false"; }; script = '' - ${pkgs.jre}/bin/java \ - -jar ${pkgs.jetty}/start.jar \ + ${cfg.packages.jdk}/bin/java \ + -jar ${cfg.packages.jetty}/start.jar \ --module=deploy,http,jsp \ - jetty.home=${pkgs.jetty} \ + jetty.home=${cfg.packages.jetty} \ jetty.base=${cfg.package} \ jetty.http.host=${cfg.listenHost} \ jetty.http.port=${builtins.toString cfg.listenPort} diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 7daf0f158b3..e046c28dd6b 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -924,7 +924,8 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ]; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] + ++ optionals ((cfg.package != pkgs.tengine) && (!lib.any (mod: (mod.disableIPC or false)) cfg.package.modules)) [ "~@ipc" ]; }; }; diff --git a/nixos/modules/services/web-servers/pomerium.nix b/nixos/modules/services/web-servers/pomerium.nix index 2bc7d01c7c2..0b460755f50 100644 --- a/nixos/modules/services/web-servers/pomerium.nix +++ b/nixos/modules/services/web-servers/pomerium.nix @@ -69,11 +69,16 @@ in CERTIFICATE_KEY_FILE = "key.pem"; }; startLimitIntervalSec = 60; + script = '' + if [[ -v CREDENTIALS_DIRECTORY ]]; then + cd "$CREDENTIALS_DIRECTORY" + fi + exec "${pkgs.pomerium}/bin/pomerium" -config "${cfgFile}" + ''; serviceConfig = { DynamicUser = true; StateDirectory = [ "pomerium" ]; - ExecStart = "${pkgs.pomerium}/bin/pomerium -config ${cfgFile}"; PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE MemoryDenyWriteExecute = false; # breaks LuaJIT @@ -99,7 +104,6 @@ in AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; - WorkingDirectory = mkIf (cfg.useACMEHost != null) "$CREDENTIALS_DIRECTORY"; LoadCredential = optionals (cfg.useACMEHost != null) [ "fullchain.pem:/var/lib/acme/${cfg.useACMEHost}/fullchain.pem" "key.pem:/var/lib/acme/${cfg.useACMEHost}/key.pem" @@ -124,7 +128,7 @@ in Type = "oneshot"; TimeoutSec = 60; ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active pomerium.service"; - ExecStart = "/run/current-system/systemd/bin/systemctl restart pomerium.service"; + ExecStart = "/run/current-system/systemd/bin/systemctl --no-block restart pomerium.service"; }; }; }); diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index f9446fe125a..877097cf378 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -23,8 +23,8 @@ in package = mkOption { type = types.package; - default = pkgs.tomcat85; - defaultText = literalExpression "pkgs.tomcat85"; + default = pkgs.tomcat9; + defaultText = literalExpression "pkgs.tomcat9"; example = lib.literalExpression "pkgs.tomcat9"; description = '' Which tomcat package to use. @@ -127,7 +127,7 @@ in webapps = mkOption { type = types.listOf types.path; default = [ tomcat.webapps ]; - defaultText = literalExpression "[ pkgs.tomcat85.webapps ]"; + defaultText = literalExpression "[ config.services.tomcat.package.webapps ]"; description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; @@ -201,6 +201,7 @@ in { uid = config.ids.uids.tomcat; description = "Tomcat user"; home = "/homeless-shelter"; + group = "tomcat"; extraGroups = cfg.extraGroups; }; diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index f8f47a06145..a7fda4be979 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -74,11 +74,9 @@ in # Debugging environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; - environment.systemPackages = - pkgs.mate.basePackages ++ - (pkgs.gnome.removePackagesByName - pkgs.mate.extraPackages - config.environment.mate.excludePackages) ++ + environment.systemPackages = pkgs.gnome.removePackagesByName + (pkgs.mate.basePackages ++ + pkgs.mate.extraPackages ++ [ pkgs.desktop-file-utils pkgs.glib @@ -87,7 +85,8 @@ in pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ pkgs.mate.mate-settings-daemon pkgs.yelp # for 'Contents' in 'Help' menus - ]; + ]) + config.environment.mate.excludePackages; programs.dconf.enable = true; # Shell integration for VTE terminals diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 6a7d2a8aa6c..8ff9b0b756d 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -227,6 +227,7 @@ in # Settings from elementary-default-settings environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; + xdg.portal.enable = true; xdg.portal.extraPortals = with pkgs.pantheon; [ elementary-files elementary-settings-daemon diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 84b75c83aea..27dfed3cc14 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -267,6 +267,8 @@ in # Enable the accounts daemon to find lightdm's dbus interface environment.systemPackages = [ lightdm ]; + security.polkit.enable = true; + security.pam.services.lightdm.text = '' auth substack login account include login diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index ec6d86d59bd..0c50d82b23b 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -620,9 +620,6 @@ in in optional (driver != null) ({ inherit name; modules = []; driverName = name; display = true; } // driver)); assertions = [ - { assertion = config.security.polkit.enable; - message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’)."; - } (let primaryHeads = filter (x: x.primary) cfg.xrandrHeads; in { assertion = length primaryHeads < 2; message = "Only one head is allowed to be primary in " diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index a8fe14c58f0..459d09faa53 100644..100755 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -10,6 +10,8 @@ use Net::DBus; use Sys::Syslog qw(:standard :macros); use Cwd 'abs_path'; +## no critic(CodeLayout::ProhibitParensWithBuiltins) + my $out = "@out@"; my $curSystemd = abs_path("/run/current-system/sw/bin"); @@ -36,13 +38,13 @@ my $dryReloadByActivationFile = "/run/nixos/dry-activation-reload-list"; make_path("/run/nixos", { mode => oct(755) }); -my $action = shift @ARGV; +my $action = shift(@ARGV); if ("@localeArchive@" ne "") { $ENV{LOCALE_ARCHIVE} = "@localeArchive@"; } -if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) { +if (!defined($action) || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) { print STDERR <<EOF; Usage: $0 [switch|boot|test] @@ -51,27 +53,30 @@ boot: make the configuration the boot default test: activate the configuration, but don\'t make it the boot default dry-activate: show what would be done if this configuration were activated EOF - exit 1; + exit(1); } $ENV{NIXOS_ACTION} = $action; # This is a NixOS installation if it has /etc/NIXOS or a proper # /etc/os-release. -die "This is not a NixOS installation!\n" unless - -f "/etc/NIXOS" || (read_file("/etc/os-release", err_mode => 'quiet') // "") =~ /ID=nixos/s; +die("This is not a NixOS installation!\n") unless + -f "/etc/NIXOS" || (read_file("/etc/os-release", err_mode => 'quiet') // "") =~ /ID="?nixos"?/s; openlog("nixos", "", LOG_USER); # Install or update the bootloader. if ($action eq "switch" || $action eq "boot") { - system("@installBootLoader@ $out") == 0 or exit 1; + chomp(my $installBootLoader = <<'EOFBOOTLOADER'); +@installBootLoader@ +EOFBOOTLOADER + system("$installBootLoader $out") == 0 or exit 1; } # Just in case the new configuration hangs the system, do a sync now. system("@coreutils@/bin/sync", "-f", "/nix/store") unless ($ENV{"NIXOS_NO_SYNC"} // "") eq "1"; -exit 0 if $action eq "boot"; +exit(0) if $action eq "boot"; # Check if we can activate the new configuration. my $oldVersion = read_file("/run/current-system/init-interface-version", err_mode => 'quiet') // ""; @@ -83,7 +88,7 @@ Warning: the new NixOS configuration has an ‘init’ that is incompatible with the current configuration. The new configuration won\'t take effect until you reboot the system. EOF - exit 100; + exit(100); } # Ignore SIGHUP so that we're not killed if we're running on (say) @@ -104,14 +109,27 @@ sub getActiveUnits { return $res; } +# Returns whether a systemd unit is active +sub unit_is_active { + my ($unit_name) = @_; + + my $mgr = Net::DBus->system->get_service('org.freedesktop.systemd1')->get_object('/org/freedesktop/systemd1'); + my $units = $mgr->ListUnitsByNames([$unit_name]); + if (scalar(@{$units}) == 0) { + return 0; + } + my $active_state = $units->[0]->[3]; ## no critic (ValuesAndExpressions::ProhibitMagicNumbers) + return $active_state eq 'active' || $active_state eq 'activating'; +} + sub parseFstab { my ($filename) = @_; my ($fss, $swaps); foreach my $line (read_file($filename, err_mode => 'quiet')) { - chomp $line; + chomp($line); $line =~ s/^\s*#.*//; next if $line =~ /^\s*$/; - my @xs = split / /, $line; + my @xs = split(/ /, $line); if ($xs[2] eq "swap") { $swaps->{$xs[0]} = { options => $xs[3] // "" }; } else { @@ -133,17 +151,16 @@ sub parseFstab { sub parseSystemdIni { my ($unitContents, $path) = @_; # Tie the ini file to a hash for easier access - my %fileContents; - tie %fileContents, "Config::IniFiles", (-file => $path, -allowempty => 1, -allowcontinue => 1); + tie(my %fileContents, 'Config::IniFiles', (-file => $path, -allowempty => 1, -allowcontinue => 1)); ## no critic(Miscellanea::ProhibitTies) # Copy over all sections - foreach my $sectionName (keys %fileContents) { + foreach my $sectionName (keys(%fileContents)) { if ($sectionName eq "Install") { # Skip the [Install] section because it has no relevant keys for us next; } # Copy over all keys - foreach my $iniKey (keys %{$fileContents{$sectionName}}) { + foreach my $iniKey (keys(%{$fileContents{$sectionName}})) { # Ensure the value is an array so it's easier to work with my $iniValue = $fileContents{$sectionName}{$iniKey}; my @iniValues; @@ -181,7 +198,7 @@ sub parse_unit { # Replace \ with \\ so glob() still works with units that have a \ in them # Valid characters in unit names are ASCII letters, digits, ":", "-", "_", ".", and "\" $unit_path =~ s/\\/\\\\/gmsx; - foreach (glob "${unit_path}{,.d/*.conf}") { + foreach (glob("${unit_path}{,.d/*.conf}")) { parseSystemdIni(\%unit_data, "$_") } return %unit_data; @@ -194,7 +211,7 @@ sub parseSystemdBool { my @values = @{$unitConfig->{$sectionName}{$boolName} // []}; # Return default if value is not set - if (scalar @values lt 1 || not defined $values[-1]) { + if (scalar(@values) lt 1 || not defined($values[-1])) { return $default; } # If value is defined multiple times, use the last definition @@ -211,7 +228,7 @@ sub recordUnit { # The opposite of recordUnit, removes a unit name from a file sub unrecord_unit { my ($fn, $unit) = @_; - edit_file { s/^$unit\n//msx } $fn if $action ne "dry-activate"; + edit_file(sub { s/^$unit\n//msx }, $fn) if $action ne "dry-activate"; } # Compare the contents of two unit files and return whether the unit @@ -226,6 +243,16 @@ sub unrecord_unit { sub compare_units { my ($old_unit, $new_unit) = @_; my $ret = 0; + # Keys to ignore in the [Unit] section + my %unit_section_ignores = map { $_ => 1 } qw( + X-Reload-Triggers + Description Documentation + OnFailure OnSuccess OnFailureJobMode + IgnoreOnIsolate StopWhenUnneeded + RefuseManualStart RefuseManualStop + AllowIsolate CollectMode + SourcePath + ); my $comp_array = sub { my ($a, $b) = @_; @@ -233,11 +260,23 @@ sub compare_units { }; # Comparison hash for the sections - my %section_cmp = map { $_ => 1 } keys %{$new_unit}; + my %section_cmp = map { $_ => 1 } keys(%{$new_unit}); # Iterate over the sections - foreach my $section_name (keys %{$old_unit}) { + foreach my $section_name (keys(%{$old_unit})) { # Missing section in the new unit? - if (not exists $section_cmp{$section_name}) { + if (not exists($section_cmp{$section_name})) { + # If the [Unit] section was removed, make sure that only keys + # were in it that are ignored + if ($section_name eq 'Unit') { + foreach my $ini_key (keys(%{$old_unit->{'Unit'}})) { + if (not defined($unit_section_ignores{$ini_key})) { + return 1; + } + } + next; # check the next section + } else { + return 1; + } if ($section_name eq 'Unit' and %{$old_unit->{'Unit'}} == 1 and defined(%{$old_unit->{'Unit'}}{'X-Reload-Triggers'})) { # If a new [Unit] section was removed that only contained X-Reload-Triggers, # do nothing. @@ -248,15 +287,15 @@ sub compare_units { } delete $section_cmp{$section_name}; # Comparison hash for the section contents - my %ini_cmp = map { $_ => 1 } keys %{$new_unit->{$section_name}}; + my %ini_cmp = map { $_ => 1 } keys(%{$new_unit->{$section_name}}); # Iterate over the keys of the section - foreach my $ini_key (keys %{$old_unit->{$section_name}}) { + foreach my $ini_key (keys(%{$old_unit->{$section_name}})) { delete $ini_cmp{$ini_key}; my @old_value = @{$old_unit->{$section_name}{$ini_key}}; # If the key is missing in the new unit, they are different... if (not $new_unit->{$section_name}{$ini_key}) { - # ... unless the key that is now missing was the reload trigger - if ($section_name eq 'Unit' and $ini_key eq 'X-Reload-Triggers') { + # ... unless the key that is now missing is one of the ignored keys + if ($section_name eq 'Unit' and defined($unit_section_ignores{$ini_key})) { next; } return 1; @@ -264,19 +303,30 @@ sub compare_units { my @new_value = @{$new_unit->{$section_name}{$ini_key}}; # If the contents are different, the units are different if (not $comp_array->(\@old_value, \@new_value)) { - # Check if only the reload triggers changed - if ($section_name eq 'Unit' and $ini_key eq 'X-Reload-Triggers') { - $ret = 2; - } else { - return 1; + # Check if only the reload triggers changed or one of the ignored keys + if ($section_name eq 'Unit') { + if ($ini_key eq 'X-Reload-Triggers') { + $ret = 2; + next; + } elsif (defined($unit_section_ignores{$ini_key})) { + next; + } } + return 1; } } # A key was introduced that was missing in the old unit if (%ini_cmp) { - if ($section_name eq 'Unit' and %ini_cmp == 1 and defined($ini_cmp{'X-Reload-Triggers'})) { - # If the newly introduced key was the reload triggers, reload the unit - $ret = 2; + if ($section_name eq 'Unit') { + foreach my $ini_key (keys(%ini_cmp)) { + if ($ini_key eq 'X-Reload-Triggers') { + $ret = 2; + } elsif (defined($unit_section_ignores{$ini_key})) { + next; + } else { + return 1; + } + } } else { return 1; } @@ -284,10 +334,14 @@ sub compare_units { } # A section was introduced that was missing in the old unit if (%section_cmp) { - if (%section_cmp == 1 and defined($section_cmp{'Unit'}) and %{$new_unit->{'Unit'}} == 1 and defined(%{$new_unit->{'Unit'}}{'X-Reload-Triggers'})) { - # If a new [Unit] section was introduced that only contains X-Reload-Triggers, - # reload instead of restarting - $ret = 2; + if (%section_cmp == 1 and defined($section_cmp{'Unit'})) { + foreach my $ini_key (keys(%{$new_unit->{'Unit'}})) { + if (not defined($unit_section_ignores{$ini_key})) { + return 1; + } elsif ($ini_key eq 'X-Reload-Triggers') { + $ret = 2; + } + } } else { return 1; } @@ -307,6 +361,7 @@ sub handleModifiedUnit { # seem to get applied on daemon-reload. } elsif ($unit =~ /\.mount$/) { # Reload the changed mount unit to force a remount. + # FIXME: only reload when Options= changed, restart otherwise $unitsToReload->{$unit} = 1; recordUnit($reloadListFile, $unit); } elsif ($unit =~ /\.socket$/) { @@ -339,21 +394,27 @@ sub handleModifiedUnit { # If this unit is socket-activated, then stop the # socket unit(s) as well, and restart the # socket(s) instead of the service. - my $socketActivated = 0; + my $socket_activated = 0; if ($unit =~ /\.service$/) { my @sockets = split(/ /, join(" ", @{$unitInfo{Service}{Sockets} // []})); - if (scalar @sockets == 0) { + if (scalar(@sockets) == 0) { @sockets = ("$baseName.socket"); } foreach my $socket (@sockets) { - if (defined $activePrev->{$socket}) { + if (defined($activePrev->{$socket})) { + # We can now be sure this is a socket-activate unit + $unitsToStop->{$socket} = 1; # Only restart sockets that actually # exist in new configuration: if (-e "$out/etc/systemd/system/$socket") { $unitsToStart->{$socket} = 1; - recordUnit($startListFile, $socket); - $socketActivated = 1; + if ($unitsToStart eq $unitsToRestart) { + recordUnit($restartListFile, $socket); + } else { + recordUnit($startListFile, $socket); + } + $socket_activated = 1; } # Remove from units to reload so we don't restart and reload if ($unitsToReload->{$unit}) { @@ -368,9 +429,13 @@ sub handleModifiedUnit { # that this unit needs to be started below. # We write this to a file to ensure that the # service gets restarted if we're interrupted. - if (!$socketActivated) { + if (!$socket_activated) { $unitsToStart->{$unit} = 1; - recordUnit($startListFile, $unit); + if ($unitsToStart eq $unitsToRestart) { + recordUnit($restartListFile, $unit); + } else { + recordUnit($startListFile, $unit); + } } $unitsToStop->{$unit} = 1; @@ -398,8 +463,8 @@ $unitsToRestart{$_} = 1 foreach $unitsToReload{$_} = 1 foreach split('\n', read_file($reloadListFile, err_mode => 'quiet') // ""); -my $activePrev = getActiveUnits; -while (my ($unit, $state) = each %{$activePrev}) { +my $activePrev = getActiveUnits(); +while (my ($unit, $state) = each(%{$activePrev})) { my $baseUnit = $unit; my $prevUnitFile = "/etc/systemd/system/$baseUnit"; @@ -459,9 +524,9 @@ while (my ($unit, $state) = each %{$activePrev}) { my %old_unit_info = parse_unit($prevUnitFile); my %new_unit_info = parse_unit($newUnitFile); my $diff = compare_units(\%old_unit_info, \%new_unit_info); - if ($diff eq 1) { + if ($diff == 1) { handleModifiedUnit($unit, $baseName, $newUnitFile, \%new_unit_info, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); - } elsif ($diff eq 2 and not $unitsToRestart{$unit}) { + } elsif ($diff == 2 and not $unitsToRestart{$unit}) { $unitsToReload{$unit} = 1; recordUnit($reloadListFile, $unit); } @@ -472,11 +537,11 @@ while (my ($unit, $state) = each %{$activePrev}) { sub pathToUnitName { my ($path) = @_; # Use current version of systemctl binary before daemon is reexeced. - open my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path + open(my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path) or die "Unable to escape $path!\n"; - my $escaped = join "", <$cmd>; - chomp $escaped; - close $cmd or die; + my $escaped = join("", <$cmd>); + chomp($escaped); + close($cmd) or die('Unable to close systemd-escape pipe'); return $escaped; } @@ -485,13 +550,13 @@ sub pathToUnitName { # automatically by starting local-fs.target. FIXME: might be nicer if # we generated units for all mounts; then we could unify this with the # unit checking code above. -my ($prevFss, $prevSwaps) = parseFstab "/etc/fstab"; -my ($newFss, $newSwaps) = parseFstab "$out/etc/fstab"; -foreach my $mountPoint (keys %$prevFss) { +my ($prevFss, $prevSwaps) = parseFstab("/etc/fstab"); +my ($newFss, $newSwaps) = parseFstab("$out/etc/fstab"); +foreach my $mountPoint (keys(%$prevFss)) { my $prev = $prevFss->{$mountPoint}; my $new = $newFss->{$mountPoint}; my $unit = pathToUnitName($mountPoint); - if (!defined $new) { + if (!defined($new)) { # Filesystem entry disappeared, so unmount it. $unitsToStop{$unit} = 1; } elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) { @@ -507,10 +572,10 @@ foreach my $mountPoint (keys %$prevFss) { } # Also handles swap devices. -foreach my $device (keys %$prevSwaps) { +foreach my $device (keys(%$prevSwaps)) { my $prev = $prevSwaps->{$device}; my $new = $newSwaps->{$device}; - if (!defined $new) { + if (!defined($new)) { # Swap entry disappeared, so turn it off. Can't use # "systemctl stop" here because systemd has lots of alias # units that prevent a stop from actually calling @@ -541,8 +606,8 @@ if ($prevSystemdSystemConfig ne $newSystemdSystemConfig) { sub filterUnits { my ($units) = @_; my @res; - foreach my $unit (sort(keys %{$units})) { - push @res, $unit if !defined $unitsToFilter{$unit}; + foreach my $unit (sort(keys(%{$units}))) { + push(@res, $unit) if !defined($unitsToFilter{$unit}); } return @res; } @@ -553,9 +618,9 @@ my @unitsToStopFiltered = filterUnits(\%unitsToStop); # Show dry-run actions. if ($action eq "dry-activate") { print STDERR "would stop the following units: ", join(", ", @unitsToStopFiltered), "\n" - if scalar @unitsToStopFiltered > 0; - print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" - if scalar(keys %unitsToSkip) > 0; + if scalar(@unitsToStopFiltered) > 0; + print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys(%unitsToSkip))), "\n" + if scalar(keys(%unitsToSkip)) > 0; print STDERR "would activate the configuration...\n"; system("$out/dry-activate", "$out"); @@ -576,7 +641,7 @@ if ($action eq "dry-activate") { $baseName =~ s/\.[a-z]*$//; # Start units if they were not active previously - if (not defined $activePrev->{$unit}) { + if (not defined($activePrev->{$unit})) { $unitsToStart{$unit} = 1; next; } @@ -596,28 +661,28 @@ if ($action eq "dry-activate") { unlink($dryReloadByActivationFile); print STDERR "would restart systemd\n" if $restartSystemd; - print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" - if scalar(keys %unitsToReload) > 0; - print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" - if scalar(keys %unitsToRestart) > 0; + print STDERR "would reload the following units: ", join(", ", sort(keys(%unitsToReload))), "\n" + if scalar(keys(%unitsToReload)) > 0; + print STDERR "would restart the following units: ", join(", ", sort(keys(%unitsToRestart))), "\n" + if scalar(keys(%unitsToRestart)) > 0; my @unitsToStartFiltered = filterUnits(\%unitsToStart); print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n" - if scalar @unitsToStartFiltered; + if scalar(@unitsToStartFiltered); exit 0; } syslog(LOG_NOTICE, "switching to system configuration $out"); -if (scalar (keys %unitsToStop) > 0) { +if (scalar(keys(%unitsToStop)) > 0) { print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" - if scalar @unitsToStopFiltered; + if scalar(@unitsToStopFiltered); # Use current version of systemctl binary before daemon is reexeced. - system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); + system("$curSystemd/systemctl", "stop", "--", sort(keys(%unitsToStop))); } -print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" - if scalar(keys %unitsToSkip) > 0; +print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys(%unitsToSkip))), "\n" + if scalar(keys(%unitsToSkip)) > 0; # Activate the new configuration (i.e., update /etc, make accounts, # and so on). @@ -641,7 +706,7 @@ foreach (split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // $baseName =~ s/\.[a-z]*$//; # Start units if they were not active previously - if (not defined $activePrev->{$unit}) { + if (not defined($activePrev->{$unit})) { $unitsToStart{$unit} = 1; recordUnit($startListFile, $unit); next; @@ -678,7 +743,7 @@ system("@systemd@/bin/systemctl", "reset-failed"); system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3; # Reload user units -open my $listActiveUsers, '-|', '@systemd@/bin/loginctl', 'list-users', '--no-legend'; +open(my $listActiveUsers, '-|', '@systemd@/bin/loginctl', 'list-users', '--no-legend'); while (my $f = <$listActiveUsers>) { next unless $f =~ /^\s*(?<uid>\d+)\s+(?<user>\S+)/; my ($uid, $name) = ($+{uid}, $+{user}); @@ -690,25 +755,43 @@ while (my $f = <$listActiveUsers>) { "@systemd@/bin/systemctl --user start nixos-activation.service"); } -close $listActiveUsers; +close($listActiveUsers); # Set the new tmpfiles print STDERR "setting up tmpfiles\n"; system("@systemd@/bin/systemd-tmpfiles", "--create", "--remove", "--exclude-prefix=/dev") == 0 or $res = 3; +# Before reloading we need to ensure that the units are still active. They may have been +# deactivated because one of their requirements got stopped. If they are inactive +# but should have been reloaded, the user probably expects them to be started. +if (scalar(keys(%unitsToReload)) > 0) { + for my $unit (keys(%unitsToReload)) { + if (!unit_is_active($unit)) { + # Figure out if we need to start the unit + my %unit_info = parse_unit("$out/etc/systemd/system/$unit"); + if (!(parseSystemdBool(\%unit_info, 'Unit', 'RefuseManualStart', 0) || parseSystemdBool(\%unit_info, 'Unit', 'X-OnlyManualStart', 0))) { + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); + } + # Don't reload the unit, reloading would fail + delete %unitsToReload{$unit}; + unrecord_unit($reloadListFile, $unit); + } + } +} # Reload units that need it. This includes remounting changed mount # units. -if (scalar(keys %unitsToReload) > 0) { - print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; - system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; +if (scalar(keys(%unitsToReload)) > 0) { + print STDERR "reloading the following units: ", join(", ", sort(keys(%unitsToReload))), "\n"; + system("@systemd@/bin/systemctl", "reload", "--", sort(keys(%unitsToReload))) == 0 or $res = 4; unlink($reloadListFile); } # Restart changed services (those that have to be restarted rather # than stopped and started). -if (scalar(keys %unitsToRestart) > 0) { - print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"; - system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4; +if (scalar(keys(%unitsToRestart)) > 0) { + print STDERR "restarting the following units: ", join(", ", sort(keys(%unitsToRestart))), "\n"; + system("@systemd@/bin/systemctl", "restart", "--", sort(keys(%unitsToRestart))) == 0 or $res = 4; unlink($restartListFile); } @@ -720,17 +803,17 @@ if (scalar(keys %unitsToRestart) > 0) { # systemd. my @unitsToStartFiltered = filterUnits(\%unitsToStart); print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n" - if scalar @unitsToStartFiltered; -system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; + if scalar(@unitsToStartFiltered); +system("@systemd@/bin/systemctl", "start", "--", sort(keys(%unitsToStart))) == 0 or $res = 4; unlink($startListFile); # Print failed and new units. my (@failed, @new); -my $activeNew = getActiveUnits; -while (my ($unit, $state) = each %{$activeNew}) { +my $activeNew = getActiveUnits(); +while (my ($unit, $state) = each(%{$activeNew})) { if ($state->{state} eq "failed") { - push @failed, $unit; + push(@failed, $unit); next; } @@ -740,7 +823,7 @@ while (my ($unit, $state) = each %{$activeNew}) { chomp($main_status); if ($main_status ne "0") { - push @failed, $unit; + push(@failed, $unit); next; } } @@ -748,19 +831,19 @@ while (my ($unit, $state) = each %{$activeNew}) { # Ignore scopes since they are not managed by this script but rather # created and managed by third-party services via the systemd dbus API. # This only lists units that are not failed (including ones that are in auto-restart but have not failed previously) - if ($state->{state} ne "failed" && !defined $activePrev->{$unit} && $unit !~ /\.scope$/msx) { - push @new, $unit; + if ($state->{state} ne "failed" && !defined($activePrev->{$unit}) && $unit !~ /\.scope$/msx) { + push(@new, $unit); } } -if (scalar @new > 0) { +if (scalar(@new) > 0) { print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n" } -if (scalar @failed > 0) { - my @failed_sorted = sort @failed; +if (scalar(@failed) > 0) { + my @failed_sorted = sort(@failed); print STDERR "warning: the following units failed: ", join(", ", @failed_sorted), "\n\n"; - system "@systemd@/bin/systemctl status --no-pager --full '" . join("' '", @failed_sorted) . "' >&2"; + system("@systemd@/bin/systemctl status --no-pager --full '" . join("' '", @failed_sorted) . "' >&2"); $res = 4; } @@ -770,4 +853,4 @@ if ($res == 0) { syslog(LOG_ERR, "switching to system configuration $out failed (status $res)"); } -exit $res; +exit($res); diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index adc89306309..fa879437fd8 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -15,9 +15,12 @@ import re import datetime import glob import os.path -from typing import Tuple, List, Optional +from typing import NamedTuple, List, Optional -SystemIdentifier = Tuple[Optional[str], int, Optional[str]] +class SystemIdentifier(NamedTuple): + profile: Optional[str] + generation: int + specialisation: Optional[str] def copy_if_not_exists(source: str, dest: str) -> None: @@ -151,7 +154,14 @@ def get_generations(profile: Optional[str] = None) -> List[SystemIdentifier]: gen_lines.pop() configurationLimit = @configurationLimit@ - configurations: List[SystemIdentifier] = [ (profile, int(line.split()[0]), None) for line in gen_lines ] + configurations = [ + SystemIdentifier( + profile=profile, + generation=int(line.split()[0]), + specialisation=None + ) + for line in gen_lines + ] return configurations[-configurationLimit:] @@ -160,7 +170,7 @@ def get_specialisations(profile: Optional[str], generation: int, _: Optional[str system_dir(profile, generation, None), "specialisation") if not os.path.exists(specialisations_dir): return [] - return [(profile, generation, spec) for spec in os.listdir(specialisations_dir)] + return [SystemIdentifier(profile, generation, spec) for spec in os.listdir(specialisations_dir)] def remove_old_entries(gens: List[SystemIdentifier]) -> None: @@ -271,7 +281,8 @@ def main() -> None: if os.readlink(system_dir(*gen)) == args.default_config: write_loader_conf(*gen) except OSError as e: - print("ignoring generation '{}' in the list of boot entries because of the following error:\n{}".format(*gen, e), file=sys.stderr) + profile = f"profile '{gen.profile}'" if gen.profile else "default profile" + print("ignoring {} in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr) for root, _, files in os.walk('@efiSysMountPoint@/efi/nixos/.extra-files', topdown=False): relative_root = root.removeprefix("@efiSysMountPoint@/efi/nixos/.extra-files").removeprefix("/") diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 4019af63ad3..ff002d87a12 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -11,6 +11,22 @@ let systemd = cfg.package; + inherit (systemdUtils.lib) + makeJobScript + unitConfig + serviceConfig + mountConfig + automountConfig + commonUnitText + targetToUnit + serviceToUnit + socketToUnit + timerToUnit + pathToUnit + mountToUnit + automountToUnit + sliceToUnit; + upstreamSystemUnits = [ # Targets. "basic.target" @@ -209,207 +225,6 @@ let "xdg-desktop-autostart.target" ]; - makeJobScript = name: text: - let - scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name); - out = (pkgs.writeShellScriptBin scriptName '' - set -e - ${text} - '').overrideAttrs (_: { - # The derivation name is different from the script file name - # to keep the script file name short to avoid cluttering logs. - name = "unit-script-${scriptName}"; - }); - in "${out}/bin/${scriptName}"; - - unitConfig = { config, options, ... }: { - config = { - unitConfig = - optionalAttrs (config.requires != []) - { Requires = toString config.requires; } - // optionalAttrs (config.wants != []) - { Wants = toString config.wants; } - // optionalAttrs (config.after != []) - { After = toString config.after; } - // optionalAttrs (config.before != []) - { Before = toString config.before; } - // optionalAttrs (config.bindsTo != []) - { BindsTo = toString config.bindsTo; } - // optionalAttrs (config.partOf != []) - { PartOf = toString config.partOf; } - // optionalAttrs (config.conflicts != []) - { Conflicts = toString config.conflicts; } - // optionalAttrs (config.requisite != []) - { Requisite = toString config.requisite; } - // optionalAttrs (config.restartTriggers != []) - { X-Restart-Triggers = toString config.restartTriggers; } - // optionalAttrs (config.reloadTriggers != []) - { X-Reload-Triggers = toString config.reloadTriggers; } - // optionalAttrs (config.description != "") { - Description = config.description; } - // optionalAttrs (config.documentation != []) { - Documentation = toString config.documentation; } - // optionalAttrs (config.onFailure != []) { - OnFailure = toString config.onFailure; } - // optionalAttrs (options.startLimitIntervalSec.isDefined) { - StartLimitIntervalSec = toString config.startLimitIntervalSec; - } // optionalAttrs (options.startLimitBurst.isDefined) { - StartLimitBurst = toString config.startLimitBurst; - }; - }; - }; - - serviceConfig = { name, config, ... }: { - config = mkMerge - [ { # Default path for systemd services. Should be quite minimal. - path = mkAfter - [ pkgs.coreutils - pkgs.findutils - pkgs.gnugrep - pkgs.gnused - systemd - ]; - environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}"; - } - (mkIf (config.preStart != "") - { serviceConfig.ExecStartPre = - [ (makeJobScript "${name}-pre-start" config.preStart) ]; - }) - (mkIf (config.script != "") - { serviceConfig.ExecStart = - makeJobScript "${name}-start" config.script + " " + config.scriptArgs; - }) - (mkIf (config.postStart != "") - { serviceConfig.ExecStartPost = - [ (makeJobScript "${name}-post-start" config.postStart) ]; - }) - (mkIf (config.reload != "") - { serviceConfig.ExecReload = - makeJobScript "${name}-reload" config.reload; - }) - (mkIf (config.preStop != "") - { serviceConfig.ExecStop = - makeJobScript "${name}-pre-stop" config.preStop; - }) - (mkIf (config.postStop != "") - { serviceConfig.ExecStopPost = - makeJobScript "${name}-post-stop" config.postStop; - }) - ]; - }; - - mountConfig = { config, ... }: { - config = { - mountConfig = - { What = config.what; - Where = config.where; - } // optionalAttrs (config.type != "") { - Type = config.type; - } // optionalAttrs (config.options != "") { - Options = config.options; - }; - }; - }; - - automountConfig = { config, ... }: { - config = { - automountConfig = - { Where = config.where; - }; - }; - }; - - commonUnitText = def: '' - [Unit] - ${attrsToSection def.unitConfig} - ''; - - targetToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = - '' - [Unit] - ${attrsToSection def.unitConfig} - ''; - }; - - serviceToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Service] - ${let env = cfg.globalEnvironment // def.environment; - in concatMapStrings (n: - let s = optionalString (env.${n} != null) - "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n"; - # systemd max line length is now 1MiB - # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af - in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} - ${if def.reloadIfChanged then '' - X-ReloadIfChanged=true - '' else if !def.restartIfChanged then '' - X-RestartIfChanged=false - '' else ""} - ${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"} - ${attrsToSection def.serviceConfig} - ''; - }; - - socketToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Socket] - ${attrsToSection def.socketConfig} - ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)} - ${concatStringsSep "\n" (map (s: "ListenDatagram=${s}") def.listenDatagrams)} - ''; - }; - - timerToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Timer] - ${attrsToSection def.timerConfig} - ''; - }; - - pathToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Path] - ${attrsToSection def.pathConfig} - ''; - }; - - mountToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Mount] - ${attrsToSection def.mountConfig} - ''; - }; - - automountToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Automount] - ${attrsToSection def.automountConfig} - ''; - }; - - sliceToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Slice] - ${attrsToSection def.sliceConfig} - ''; - }; logindHandlerType = types.enum [ "ignore" "poweroff" "reboot" "halt" "kexec" "suspend" diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 5af9baff8bc..f4048172783 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -22,11 +22,13 @@ let type = with types; nullOr package; default = null; description = '' - Path to an image file to load instead of pulling from a registry. - If defined, do not pull from registry. + Path to an image file to load before running the image. This can + be used to bypass pulling the image from the registry. - You still need to set the <literal>image</literal> attribute, as it - will be used as the image name for docker to start a container. + The <literal>image</literal> attribute must match the name and + tag of the image contained in this file, as they will be used to + run the container with that image. If they do not match, the + image will be pulled from the registry as usual. ''; example = literalExpression "pkgs.dockerTools.buildImage {...};"; }; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 295aa4ea84f..fd8a39cfb92 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -98,7 +98,6 @@ in rec { (onFullSupported "nixos.tests.login") (onFullSupported "nixos.tests.misc") (onFullSupported "nixos.tests.mutableUsers") - (onFullSupported "nixos.tests.nano") (onFullSupported "nixos.tests.nat.firewall-conntrack") (onFullSupported "nixos.tests.nat.firewall") (onFullSupported "nixos.tests.nat.standalone") diff --git a/nixos/release-small.nix b/nixos/release-small.nix index c2ac4c653ea..1d51b4e7f28 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -38,7 +38,8 @@ in rec { login misc nat - nfs3 + # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 + #nfs3 openssh php predictable-interface-names diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5d03893a56b..b2b35119ce3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -189,9 +189,9 @@ in grocy = handleTest ./grocy.nix {}; grub = handleTest ./grub.nix {}; gvisor = handleTest ./gvisor.nix {}; - hadoop.all = handleTestOn [ "x86_64-linux" ] ./hadoop/hadoop.nix {}; - hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; - hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {}; + hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; }; + hadoop_3_2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop_3_2; }; + hadoop2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop2; }; haka = handleTest ./haka.nix {}; haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; @@ -224,6 +224,7 @@ in initrd-network-ssh = handleTest ./initrd-network-ssh {}; initrdNetwork = handleTest ./initrd-network.nix {}; initrd-secrets = handleTest ./initrd-secrets.nix {}; + input-remapper = handleTest ./input-remapper.nix {}; inspircd = handleTest ./inspircd.nix {}; installer = handleTest ./installer.nix {}; invoiceplane = handleTest ./invoiceplane.nix {}; @@ -328,6 +329,7 @@ in nat.standalone = handleTest ./nat.nix { withFirewall = false; }; nats = handleTest ./nats.nix {}; navidrome = handleTest ./navidrome.nix {}; + nbd = handleTest ./nbd.nix {}; ncdns = handleTest ./ncdns.nix {}; ndppd = handleTest ./ndppd.nix {}; nebula = handleTest ./nebula.nix {}; @@ -382,6 +384,7 @@ in os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; osrm-backend = handleTest ./osrm-backend.nix {}; overlayfs = handleTest ./overlayfs.nix {}; + pacemaker = handleTest ./pacemaker.nix {}; packagekit = handleTest ./packagekit.nix {}; pam-file-contents = handleTest ./pam/pam-file-contents.nix {}; pam-oath-login = handleTest ./pam/pam-oath-login.nix {}; @@ -431,6 +434,7 @@ in prometheus = handleTest ./prometheus.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; prosody = handleTest ./xmpp/prosody.nix {}; + prosody-mysql = handleTest ./xmpp/prosody-mysql.nix {}; proxy = handleTest ./proxy.nix {}; prowlarr = handleTest ./prowlarr.nix {}; pt2-clone = handleTest ./pt2-clone.nix {}; @@ -481,7 +485,7 @@ in sonarr = handleTest ./sonarr.nix {}; sourcehut = handleTest ./sourcehut.nix {}; spacecookie = handleTest ./spacecookie.nix {}; - spark = handleTestOn ["x86_64-linux"] ./spark {}; + spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; sslh = handleTest ./sslh.nix {}; sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {}; sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; @@ -501,6 +505,7 @@ in systemd-boot = handleTest ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; + systemd-escaping = handleTest ./systemd-escaping.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; systemd-machinectl = handleTest ./systemd-machinectl.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; @@ -522,6 +527,7 @@ in tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; tinywl = handleTest ./tinywl.nix {}; + tomcat = handleTest ./tomcat.nix {}; tor = handleTest ./tor.nix {}; # traefik test relies on docker-containers traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {}; @@ -554,6 +560,7 @@ in vikunja = handleTest ./vikunja.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; vscodium = discoverTests (import ./vscodium.nix); + vsftpd = handleTest ./vsftpd.nix {}; wasabibackend = handleTest ./wasabibackend.nix {}; wiki-js = handleTest ./wiki-js.nix {}; wine = handleTest ./wine.nix {}; diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 211195586ed..44997a74687 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; networking.hostId = "deadbeef"; boot.supportedFilesystems = [ "bcachefs" ]; - environment.systemPackages = with pkgs; [ parted ]; + environment.systemPackages = with pkgs; [ parted keyutils ]; }; testScript = '' @@ -20,10 +20,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { "parted --script /dev/vdb mklabel msdos", "parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s", "udevadm settle", - # Due to #32279, we cannot use encryption for this test yet - # "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", - # "echo password | bcachefs unlock /dev/vdb1", - "bcachefs format --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", + "keyctl link @u @s", + "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", + "echo password | bcachefs unlock /dev/vdb1", "mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt", "udevadm settle", "bcachefs fs usage /tmp/mnt", diff --git a/nixos/tests/cntr.nix b/nixos/tests/cntr.nix index 66847075620..e4e13545b87 100644 --- a/nixos/tests/cntr.nix +++ b/nixos/tests/cntr.nix @@ -28,10 +28,16 @@ let testScript = '' start_all() ${backend}.wait_for_unit("${backend}-nginx.service") - result = ${backend}.wait_until_succeeds( - "cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello'" + ${backend}.wait_for_open_port(8181) + # For some reason, the cntr command hangs when run without the &. + # As such, we have to do some messy things to ensure we check the exitcode and output in a race-condition-safe manner + ${backend}.execute( + "(cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello' > /tmp/result; echo $? > /tmp/exitcode; touch /tmp/done) &" ) - assert "Hello" in result + + ${backend}.wait_for_file("/tmp/done") + assert "0" == ${backend}.succeed("cat /tmp/exitcode").strip(), "non-zero exit code" + assert "Hello" in ${backend}.succeed("cat /tmp/result"), "no greeting in output" ''; }; @@ -54,7 +60,13 @@ let testScript = '' machine.start() machine.wait_for_unit("container@test.service") - machine.succeed("cntr attach test sh -- -c 'ping -c5 172.16.0.1'") + # I haven't observed the same hanging behaviour in this version as in the OCI version which necessetates this messy invocation, but it's probably better to be safe than sorry and use it here as well + machine.execute( + "(cntr attach test sh -- -c 'ping -c5 172.16.0.1'; echo $? > /tmp/exitcode; touch /tmp/done) &" + ) + + machine.wait_for_file("/tmp/done") + assert "0" == machine.succeed("cat /tmp/exitcode").strip(), "non-zero exit code" ''; }; in { diff --git a/nixos/tests/empty-file b/nixos/tests/empty-file new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/nixos/tests/empty-file diff --git a/nixos/tests/hadoop/default.nix b/nixos/tests/hadoop/default.nix new file mode 100644 index 00000000000..d2a97cbeffb --- /dev/null +++ b/nixos/tests/hadoop/default.nix @@ -0,0 +1,7 @@ +{ handleTestOn, package, ... }: + +{ + all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop.nix { inherit package; }; + hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hdfs.nix { inherit package; }; + yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./yarn.nix { inherit package; }; +} diff --git a/nixos/tests/hadoop/hadoop.nix b/nixos/tests/hadoop/hadoop.nix index 48737debab5..b132f4fa58b 100644 --- a/nixos/tests/hadoop/hadoop.nix +++ b/nixos/tests/hadoop/hadoop.nix @@ -1,121 +1,148 @@ # This test is very comprehensive. It tests whether all hadoop services work well with each other. # Run this when updating the Hadoop package or making significant changes to the hadoop module. # For a more basic test, see hdfs.nix and yarn.nix -import ../make-test-python.nix ({pkgs, ...}: { - - nodes = let - package = pkgs.hadoop; - coreSite = { - "fs.defaultFS" = "hdfs://ns1"; - }; - hdfsSite = { - "dfs.namenode.rpc-bind-host" = "0.0.0.0"; - "dfs.namenode.http-bind-host" = "0.0.0.0"; - "dfs.namenode.servicerpc-bind-host" = "0.0.0.0"; - - # HA Quorum Journal Manager configuration - "dfs.nameservices" = "ns1"; - "dfs.ha.namenodes.ns1" = "nn1,nn2"; - "dfs.namenode.shared.edits.dir.ns1.nn1" = "qjournal://jn1:8485;jn2:8485;jn3:8485/ns1"; - "dfs.namenode.shared.edits.dir.ns1.nn2" = "qjournal://jn1:8485;jn2:8485;jn3:8485/ns1"; - "dfs.namenode.rpc-address.ns1.nn1" = "nn1:8020"; - "dfs.namenode.rpc-address.ns1.nn2" = "nn2:8020"; - "dfs.namenode.servicerpc-address.ns1.nn1" = "nn1:8022"; - "dfs.namenode.servicerpc-address.ns1.nn2" = "nn2:8022"; - "dfs.namenode.http-address.ns1.nn1" = "nn1:9870"; - "dfs.namenode.http-address.ns1.nn2" = "nn2:9870"; - - # Automatic failover configuration - "dfs.client.failover.proxy.provider.ns1" = "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider"; - "dfs.ha.automatic-failover.enabled.ns1" = "true"; - "dfs.ha.fencing.methods" = "shell(true)"; - "ha.zookeeper.quorum" = "zk1:2181"; - }; - yarnSiteHA = { - "yarn.resourcemanager.zk-address" = "zk1:2181"; - "yarn.resourcemanager.ha.enabled" = "true"; - "yarn.resourcemanager.ha.rm-ids" = "rm1,rm2"; - "yarn.resourcemanager.hostname.rm1" = "rm1"; - "yarn.resourcemanager.hostname.rm2" = "rm2"; - "yarn.resourcemanager.ha.automatic-failover.enabled" = "true"; - "yarn.resourcemanager.cluster-id" = "cluster1"; - # yarn.resourcemanager.webapp.address needs to be defined even though yarn.resourcemanager.hostname is set. This shouldn't be necessary, but there's a bug in - # hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java:70 - # that causes AM containers to fail otherwise. - "yarn.resourcemanager.webapp.address.rm1" = "rm1:8088"; - "yarn.resourcemanager.webapp.address.rm2" = "rm2:8088"; - }; - in { - zk1 = { ... }: { - services.zookeeper.enable = true; - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; - - # HDFS cluster - nn1 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.namenode.enable = true; - hdfs.zkfc.enable = true; +import ../make-test-python.nix ({ package, ... }: { + name = "hadoop-combined"; + + nodes = + let + coreSite = { + "fs.defaultFS" = "hdfs://ns1"; + }; + hdfsSite = { + # HA Quorum Journal Manager configuration + "dfs.nameservices" = "ns1"; + "dfs.ha.namenodes.ns1" = "nn1,nn2"; + "dfs.namenode.shared.edits.dir.ns1" = "qjournal://jn1:8485;jn2:8485;jn3:8485/ns1"; + "dfs.namenode.rpc-address.ns1.nn1" = "nn1:8020"; + "dfs.namenode.rpc-address.ns1.nn2" = "nn2:8020"; + "dfs.namenode.servicerpc-address.ns1.nn1" = "nn1:8022"; + "dfs.namenode.servicerpc-address.ns1.nn2" = "nn2:8022"; + "dfs.namenode.http-address.ns1.nn1" = "nn1:9870"; + "dfs.namenode.http-address.ns1.nn2" = "nn2:9870"; + + # Automatic failover configuration + "dfs.client.failover.proxy.provider.ns1" = "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider"; + "dfs.ha.automatic-failover.enabled.ns1" = "true"; + "dfs.ha.fencing.methods" = "shell(true)"; + "ha.zookeeper.quorum" = "zk1:2181"; + }; + yarnSite = { + "yarn.resourcemanager.zk-address" = "zk1:2181"; + "yarn.resourcemanager.ha.enabled" = "true"; + "yarn.resourcemanager.ha.rm-ids" = "rm1,rm2"; + "yarn.resourcemanager.hostname.rm1" = "rm1"; + "yarn.resourcemanager.hostname.rm2" = "rm2"; + "yarn.resourcemanager.ha.automatic-failover.enabled" = "true"; + "yarn.resourcemanager.cluster-id" = "cluster1"; + # yarn.resourcemanager.webapp.address needs to be defined even though yarn.resourcemanager.hostname is set. This shouldn't be necessary, but there's a bug in + # hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java:70 + # that causes AM containers to fail otherwise. + "yarn.resourcemanager.webapp.address.rm1" = "rm1:8088"; + "yarn.resourcemanager.webapp.address.rm2" = "rm2:8088"; + }; + in + { + zk1 = { ... }: { + services.zookeeper.enable = true; + networking.firewall.allowedTCPPorts = [ 2181 ]; }; - }; - nn2 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.namenode.enable = true; - hdfs.zkfc.enable = true; + + # HDFS cluster + nn1 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.namenode = { + enable = true; + openFirewall = true; + }; + hdfs.zkfc.enable = true; + }; + }; + nn2 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.namenode = { + enable = true; + openFirewall = true; + }; + hdfs.zkfc.enable = true; + }; }; - }; - jn1 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.journalnode.enable = true; + jn1 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.journalnode = { + enable = true; + openFirewall = true; + }; + }; }; - }; - jn2 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.journalnode.enable = true; + jn2 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.journalnode = { + enable = true; + openFirewall = true; + }; + }; }; - }; - jn3 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.journalnode.enable = true; + jn3 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.journalnode = { + enable = true; + openFirewall = true; + }; + }; + }; + + dn1 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.datanode = { + enable = true; + openFirewall = true; + }; + }; }; - }; - dn1 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.datanode.enable = true; + # YARN cluster + rm1 = { options, ... }: { + services.hadoop = { + inherit package coreSite hdfsSite yarnSite; + yarn.resourcemanager = { + enable = true; + openFirewall = true; + }; + }; }; - }; - - # YARN cluster - rm1 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA; - yarn.resourcemanager.enable = true; + rm2 = { options, ... }: { + services.hadoop = { + inherit package coreSite hdfsSite yarnSite; + yarn.resourcemanager = { + enable = true; + openFirewall = true; + }; + }; }; - }; - rm2 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA; - yarn.resourcemanager.enable = true; + nm1 = { options, ... }: { + virtualisation.memorySize = 2048; + services.hadoop = { + inherit package coreSite hdfsSite yarnSite; + yarn.nodemanager = { + enable = true; + openFirewall = true; + }; + }; }; - }; - nm1 = {pkgs, options, ...}: { - virtualisation.memorySize = 2048; - services.hadoop = { - inherit package coreSite hdfsSite; - yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA; - yarn.nodemanager.enable = true; + client = { options, ... }: { + services.hadoop = { + gatewayRole.enable = true; + inherit package coreSite hdfsSite yarnSite; + }; }; - }; }; testScript = '' @@ -173,26 +200,26 @@ import ../make-test-python.nix ({pkgs, ...}: { # DN should have started by now, but confirm anyway dn1.wait_for_unit("hdfs-datanode") # Print states of namenodes - dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") # Wait for cluster to exit safemode - dn1.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") - dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") + client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") # test R/W - dn1.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile") - assert "testfilecontents" in dn1.succeed("sudo -u hdfs hdfs dfs -cat /testfile") + client.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile") + assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile") # Test NN failover nn1.succeed("systemctl stop hdfs-namenode") - assert "active" in dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") - dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") - assert "testfilecontents" in dn1.succeed("sudo -u hdfs hdfs dfs -cat /testfile") + assert "active" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") + client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile") nn1.succeed("systemctl start hdfs-namenode") nn1.wait_for_open_port(9870) nn1.wait_for_open_port(8022) nn1.wait_for_open_port(8020) - assert "standby" in dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") - dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + assert "standby" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") + client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") #### YARN tests #### @@ -208,21 +235,21 @@ import ../make-test-python.nix ({pkgs, ...}: { nm1.wait_for_unit("yarn-nodemanager") nm1.wait_for_open_port(8042) nm1.wait_for_open_port(8040) - nm1.wait_until_succeeds("yarn node -list | grep Nodes:1") - nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") - nm1.succeed("sudo -u yarn yarn node -list | systemd-cat") + client.wait_until_succeeds("yarn node -list | grep Nodes:1") + client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u yarn yarn node -list | systemd-cat") # Test RM failover rm1.succeed("systemctl stop yarn-resourcemanager") - assert "standby" not in nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") - nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") + assert "standby" not in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") + client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") rm1.succeed("systemctl start yarn-resourcemanager") rm1.wait_for_unit("yarn-resourcemanager") rm1.wait_for_open_port(8088) - assert "standby" in nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") - nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") + assert "standby" in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") + client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") - assert "Estimated value of Pi is" in nm1.succeed("HADOOP_USER_NAME=hdfs yarn jar $(readlink $(which yarn) | sed -r 's~bin/yarn~lib/hadoop-*/share/hadoop/mapreduce/hadoop-mapreduce-examples-*.jar~g') pi 2 10") - assert "SUCCEEDED" in nm1.succeed("yarn application -list -appStates FINISHED") + assert "Estimated value of Pi is" in client.succeed("HADOOP_USER_NAME=hdfs yarn jar $(readlink $(which yarn) | sed -r 's~bin/yarn~lib/hadoop-*/share/hadoop/mapreduce/hadoop-mapreduce-examples-*.jar~g') pi 2 10") + assert "SUCCEEDED" in client.succeed("yarn application -list -appStates FINISHED") ''; }) diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix index b63cbf48032..9415500463d 100644 --- a/nixos/tests/hadoop/hdfs.nix +++ b/nixos/tests/hadoop/hdfs.nix @@ -1,32 +1,46 @@ # Test a minimal HDFS cluster with no HA -import ../make-test-python.nix ({...}: { - nodes = { - namenode = {pkgs, ...}: { +import ../make-test-python.nix ({ package, lib, ... }: +with lib; +{ + name = "hadoop-hdfs"; + + nodes = let + coreSite = { + "fs.defaultFS" = "hdfs://namenode:8020"; + "hadoop.proxyuser.httpfs.groups" = "*"; + "hadoop.proxyuser.httpfs.hosts" = "*"; + }; + in { + namenode = { pkgs, ... }: { services.hadoop = { - package = pkgs.hadoop; + inherit package; hdfs = { namenode = { enable = true; + openFirewall = true; formatOnInit = true; }; - httpfs.enable = true; - }; - coreSite = { - "fs.defaultFS" = "hdfs://namenode:8020"; - "hadoop.proxyuser.httpfs.groups" = "*"; - "hadoop.proxyuser.httpfs.hosts" = "*"; + httpfs = { + # The NixOS hadoop module only support webHDFS on 3.3 and newer + enable = mkIf (versionAtLeast package.version "3.3") true; + openFirewall = true; + }; }; + inherit coreSite; }; }; - datanode = {pkgs, ...}: { + datanode = { pkgs, ... }: { services.hadoop = { - package = pkgs.hadoop; - hdfs.datanode.enable = true; - coreSite = { - "fs.defaultFS" = "hdfs://namenode:8020"; - "hadoop.proxyuser.httpfs.groups" = "*"; - "hadoop.proxyuser.httpfs.hosts" = "*"; + inherit package; + hdfs.datanode = { + enable = true; + openFirewall = true; + dataDirs = [{ + type = "DISK"; + path = "/tmp/dn1"; + }]; }; + inherit coreSite; }; }; }; @@ -37,21 +51,32 @@ import ../make-test-python.nix ({...}: { namenode.wait_for_unit("hdfs-namenode") namenode.wait_for_unit("network.target") namenode.wait_for_open_port(8020) + namenode.succeed("ss -tulpne | systemd-cat") + namenode.succeed("cat /etc/hadoop*/hdfs-site.xml | systemd-cat") namenode.wait_for_open_port(9870) datanode.wait_for_unit("hdfs-datanode") datanode.wait_for_unit("network.target") + '' + ( if versionAtLeast package.version "3" then '' datanode.wait_for_open_port(9864) datanode.wait_for_open_port(9866) datanode.wait_for_open_port(9867) - namenode.succeed("curl -f http://namenode:9870") datanode.succeed("curl -f http://datanode:9864") + '' else '' + datanode.wait_for_open_port(50075) + datanode.wait_for_open_port(50010) + datanode.wait_for_open_port(50020) + + datanode.succeed("curl -f http://datanode:50075") + '' ) + '' + namenode.succeed("curl -f http://namenode:9870") datanode.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") datanode.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile") assert "testfilecontents" in datanode.succeed("sudo -u hdfs hdfs dfs -cat /testfile") + '' + optionalString ( versionAtLeast package.version "3.3" ) '' namenode.wait_for_unit("hdfs-httpfs") namenode.wait_for_open_port(14000) assert "testfilecontents" in datanode.succeed("curl -f \"http://namenode:14000/webhdfs/v1/testfile?user.name=hdfs&op=OPEN\" 2>&1") diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix index 09bdb35791c..1bf8e3831f6 100644 --- a/nixos/tests/hadoop/yarn.nix +++ b/nixos/tests/hadoop/yarn.nix @@ -1,22 +1,30 @@ # This only tests if YARN is able to start its services -import ../make-test-python.nix ({...}: { +import ../make-test-python.nix ({ package, ... }: { + name = "hadoop-yarn"; + nodes = { - resourcemanager = {pkgs, ...}: { - services.hadoop.package = pkgs.hadoop; - services.hadoop.yarn.resourcemanager.enable = true; - services.hadoop.yarnSite = { - "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler"; + resourcemanager = { ... }: { + services.hadoop = { + inherit package; + yarn.resourcemanager = { + enable = true; + openFirewall = true; + }; }; }; - nodemanager = {pkgs, ...}: { - services.hadoop.package = pkgs.hadoop; - services.hadoop.yarn.nodemanager.enable = true; - services.hadoop.yarnSite = { - "yarn.resourcemanager.hostname" = "resourcemanager"; - "yarn.nodemanager.log-dirs" = "/tmp/userlogs"; + nodemanager = { options, lib, ... }: { + services.hadoop = { + inherit package; + yarn.nodemanager = { + enable = true; + openFirewall = true; + }; + yarnSite = options.services.hadoop.yarnSite.default // { + "yarn.resourcemanager.hostname" = "resourcemanager"; + "yarn.nodemanager.log-dirs" = "/tmp/userlogs"; + }; }; }; - }; testScript = '' diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 31f8a4bcc19..10f9cb05c9c 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -2,8 +2,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let configDir = "/var/lib/foobar"; - mqttUsername = "homeassistant"; - mqttPassword = "secret"; in { name = "home-assistant"; meta.maintainers = lib.teams.home-assistant.members; @@ -11,18 +9,6 @@ in { nodes.hass = { pkgs, ... }: { environment.systemPackages = with pkgs; [ mosquitto ]; - services.mosquitto = { - enable = true; - listeners = [ { - users = { - "${mqttUsername}" = { - acl = [ "readwrite #" ]; - password = mqttPassword; - }; - }; - } ]; - }; - services.postgresql = { enable = true; ensureDatabases = [ "hass" ]; @@ -76,23 +62,6 @@ in { # https://www.home-assistant.io/integrations/frontend/ frontend = {}; - # configure an mqtt broker connection - # https://www.home-assistant.io/integrations/mqtt - mqtt = { - broker = "127.0.0.1"; - username = mqttUsername; - password = mqttPassword; - }; - - # create a mqtt sensor that syncs state with its mqtt topic - # https://www.home-assistant.io/integrations/sensor.mqtt/ - binary_sensor = [ { - platform = "mqtt"; - state_topic = "home-assistant/test"; - payload_on = "let_there_be_light"; - payload_off = "off"; - } ]; - # set up a wake-on-lan switch to test capset capability required # for the ping suid wrapper # https://www.home-assistant.io/integrations/wake_on_lan/ @@ -109,11 +78,9 @@ in { listen_port = 80; }; - # show mqtt interaction in the log # https://www.home-assistant.io/integrations/logger/ logger = { default = "info"; - logs."homeassistant.components.mqtt" = "debug"; }; }; @@ -167,12 +134,6 @@ in { hass.wait_for_open_port(8123) hass.succeed("curl --fail http://localhost:8123/lovelace") - with subtest("Toggle a binary sensor using MQTT"): - hass.wait_for_open_port(1883) - hass.succeed( - "mosquitto_pub -V mqttv5 -t home-assistant/test -u ${mqttUsername} -P '${mqttPassword}' -m let_there_be_light" - ) - with subtest("Check that capabilities are passed for emulated_hue to bind to port 80"): hass.wait_for_open_port(80) hass.succeed("curl --fail http://localhost:80/description.xml") @@ -188,10 +149,6 @@ in { with subtest("Check that no errors were logged"): assert "ERROR" not in output_log - # example line: 2020-06-20 10:01:32 DEBUG (MainThread) [homeassistant.components.mqtt] Received message on home-assistant/test: b'let_there_be_light' - with subtest("Check we received the mosquitto message"): - assert "let_there_be_light" in output_log - with subtest("Check systemd unit hardening"): hass.log(hass.succeed("systemctl cat home-assistant.service")) hass.log(hass.succeed("systemd-analyze security home-assistant.service")) diff --git a/nixos/tests/input-remapper.nix b/nixos/tests/input-remapper.nix new file mode 100644 index 00000000000..f692564caa5 --- /dev/null +++ b/nixos/tests/input-remapper.nix @@ -0,0 +1,52 @@ +import ./make-test-python.nix ({ pkgs, ... }: + + { + name = "input-remapper"; + meta = { + maintainers = with pkgs.lib.maintainers; [ LunNova ]; + }; + + machine = { config, ... }: + let user = config.users.users.sybil; in + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + services.xserver.enable = true; + services.input-remapper.enable = true; + users.users.sybil = { isNormalUser = true; group = "wheel"; }; + test-support.displayManager.auto.user = user.name; + # workaround for pkexec not working in the test environment + # Error creating textual authentication agent: + # Error opening current controlling terminal for the process (`/dev/tty'): + # No such device or address + # passwordless pkexec with polkit module also doesn't work + # to allow the program to run, we replace pkexec with sudo + # and turn on passwordless sudo + # this is not correct in general but good enough for this test + security.sudo = { enable = true; wheelNeedsPassword = false; }; + security.wrappers.pkexec = pkgs.lib.mkForce + { + setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.sudo}/bin/sudo"; + }; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + start_all() + machine.wait_for_x() + + machine.succeed("systemctl status input-remapper.service") + machine.execute("su - sybil -c input-remapper-gtk >&2 &") + + machine.wait_for_text("Input Remapper") + machine.wait_for_text("Preset") + machine.wait_for_text("Change Key") + ''; + }) diff --git a/nixos/tests/installed-tests/appstream-qt.nix b/nixos/tests/installed-tests/appstream-qt.nix new file mode 100644 index 00000000000..d08187bfe46 --- /dev/null +++ b/nixos/tests/installed-tests/appstream-qt.nix @@ -0,0 +1,9 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.libsForQt5.appstream-qt; + + testConfig = { + appstream.enable = true; + }; +} diff --git a/nixos/tests/installed-tests/appstream.nix b/nixos/tests/installed-tests/appstream.nix new file mode 100644 index 00000000000..f71a095d445 --- /dev/null +++ b/nixos/tests/installed-tests/appstream.nix @@ -0,0 +1,9 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.appstream; + + testConfig = { + appstream.enable = true; + }; +} diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index 08785e5e666..079fd54e71e 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -84,6 +84,8 @@ let in { + appstream = callInstalledTest ./appstream.nix {}; + appstream-qt = callInstalledTest ./appstream-qt.nix {}; colord = callInstalledTest ./colord.nix {}; flatpak = callInstalledTest ./flatpak.nix {}; flatpak-builder = callInstalledTest ./flatpak-builder.nix {}; diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 1be3fed6acc..6367ed808e0 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -40,7 +40,7 @@ let environment.systemPackages = with pkgs; [ xmlstarlet - libtidy + html-tidy jq ]; }; diff --git a/nixos/tests/matrix-appservice-irc.nix b/nixos/tests/matrix-appservice-irc.nix index e1da410af06..d1c561f95db 100644 --- a/nixos/tests/matrix-appservice-irc.nix +++ b/nixos/tests/matrix-appservice-irc.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: let - homeserverUrl = "http://homeserver:8448"; + homeserverUrl = "http://homeserver:8008"; in { name = "matrix-appservice-irc"; @@ -14,28 +14,32 @@ import ./make-test-python.nix ({ pkgs, ... }: specialisation.running.configuration = { services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - app_service_config_files = [ "/registration.yml" ]; - - enable_registration = true; - - listeners = [ - # The default but tls=false - { - "bind_address" = ""; - "port" = 8448; - "resources" = [ - { "compress" = true; "names" = [ "client" ]; } - { "compress" = false; "names" = [ "federation" ]; } + settings = { + database.name = "sqlite3"; + app_service_config_files = [ "/registration.yml" ]; + + enable_registration = true; + + listeners = [ { + # The default but tls=false + bind_addresses = [ + "0.0.0.0" ]; - "tls" = false; - "type" = "http"; - "x_forwarded" = false; - } - ]; + port = 8008; + resources = [ { + "compress" = true; + "names" = [ "client" ]; + } { + "compress" = false; + "names" = [ "federation" ]; + } ]; + tls = false; + type = "http"; + } ]; + }; }; - networking.firewall.allowedTCPPorts = [ 8448 ]; + networking.firewall.allowedTCPPorts = [ 8008 ]; }; }; @@ -209,7 +213,7 @@ import ./make-test-python.nix ({ pkgs, ... }: ) homeserver.wait_for_unit("matrix-synapse.service") - homeserver.wait_for_open_port(8448) + homeserver.wait_for_open_port(8008) with subtest("ensure messages can be exchanged"): client.succeed("do_test ${homeserverUrl} >&2") diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index 21e8c24e471..1ff1e47b284 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -33,6 +33,29 @@ import ./make-test-python.nix ({ pkgs, ... } : let testUser = "alice"; testPassword = "alicealice"; testEmail = "alice@example.com"; + + listeners = [ { + port = 8448; + bind_addresses = [ + "127.0.0.1" + "::1" + ]; + type = "http"; + tls = true; + x_forwarded = false; + resources = [ { + names = [ + "client" + ]; + compress = true; + } { + names = [ + "federation" + ]; + compress = false; + } ]; + } ]; + in { name = "matrix-synapse"; @@ -48,22 +71,24 @@ in { { services.matrix-synapse = { enable = true; - database_type = "psycopg2"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; - database_args = { - password = "synapse"; + settings = { + inherit listeners; + database = { + name = "psycopg2"; + args.password = "synapse"; + }; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + registration_shared_secret = registrationSharedSecret; + public_baseurl = "https://example.com"; + email = { + smtp_host = mailerDomain; + smtp_port = 25; + require_transport_security = true; + notif_from = "matrix <matrix@${mailerDomain}>"; + app_name = "Matrix"; + }; }; - registration_shared_secret = registrationSharedSecret; - public_baseurl = "https://example.com"; - extraConfig = '' - email: - smtp_host: "${mailerDomain}" - smtp_port: 25 - require_transport_security: true - notif_from: "matrix <matrix@${mailerDomain}>" - app_name: "Matrix" - ''; }; services.postgresql = { enable = true; @@ -165,9 +190,12 @@ in { serversqlite = args: { services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; + settings = { + inherit listeners; + database.name = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + }; }; }; }; diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index bb55f6f5440..54094ab9d61 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -38,26 +38,31 @@ import ../make-test-python.nix ( homeserver = { pkgs, ... }: { services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; - enable_registration = true; - registration_shared_secret = "supersecret-registration"; - - listeners = [ - # The default but tls=false - { - "bind_address" = ""; - "port" = 8448; - "resources" = [ - { "compress" = true; "names" = [ "client" "webclient" ]; } - { "compress" = false; "names" = [ "federation" ]; } + settings = { + database.name = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + enable_registration = true; + registration_shared_secret = "supersecret-registration"; + + listeners = [ { + # The default but tls=false + bind_addresses = [ + "0.0.0.0" ]; - "tls" = false; - "type" = "http"; - "x_forwarded" = false; - } - ]; + port = 8448; + resources = [ { + compress = true; + names = [ "client" ]; + } { + compress = false; + names = [ "federation" ]; + } ]; + tls = false; + type = "http"; + x_forwarded = false; + } ]; + }; }; networking.firewall.allowedTCPPorts = [ 8448 ]; diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix index fcb9904b213..1a9894dd215 100644 --- a/nixos/tests/matrix/pantalaimon.nix +++ b/nixos/tests/matrix/pantalaimon.nix @@ -47,9 +47,32 @@ import ../make-test-python.nix ( services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; + settings = { + listeners = [ { + port = 8448; + bind_addresses = [ + "127.0.0.1" + "::1" + ]; + type = "http"; + tls = true; + x_forwarded = false; + resources = [ { + names = [ + "client" + ]; + compress = true; + } { + names = [ + "federation" + ]; + compress = false; + } ]; + } ]; + database.name = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + }; }; }; diff --git a/nixos/tests/minidlna.nix b/nixos/tests/minidlna.nix index d852c7f60bc..104b79078fd 100644 --- a/nixos/tests/minidlna.nix +++ b/nixos/tests/minidlna.nix @@ -33,7 +33,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { server.succeed("mkdir -p /tmp/stuff && chown minidlna: /tmp/stuff") server.wait_for_unit("minidlna") server.wait_for_open_port("8200") - server.succeed("curl --fail http://localhost:8200/") - client.succeed("curl --fail http://server:8200/") + # requests must be made *by IP* to avoid triggering minidlna's + # DNS-rebinding protection + server.succeed("curl --fail http://$(getent ahostsv4 localhost | head -n1 | cut -f 1 -d ' '):8200/") + client.succeed("curl --fail http://$(getent ahostsv4 server | head -n1 | cut -f 1 -d ' '):8200/") ''; }) diff --git a/nixos/tests/nats.nix b/nixos/tests/nats.nix index bee36f262f4..c650904e53b 100644 --- a/nixos/tests/nats.nix +++ b/nixos/tests/nats.nix @@ -45,21 +45,19 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: { "{}" ).format(" ".join(args)) + def parallel(*fns): + from threading import Thread + threads = [ Thread(target=fn) for fn in fns ] + for t in threads: t.start() + for t in threads: t.join() + start_all() server.wait_for_unit("nats.service") - client1.fail("test -f ${file}") - - # Subscribe on topic on client1 and echo messages to file. - client1.execute("({} | tee ${file} &)".format(nats_cmd("sub", "--raw", "${topic}"))) - - # Give client1 some time to subscribe. - client1.execute("sleep 2") - - # Publish message on client2. - client2.execute(nats_cmd("pub", "${topic}", "hello")) - - # Check if message has been received. - client1.succeed("grep -q hello ${file}") + with subtest("pub sub"): + parallel( + lambda: client1.succeed(nats_cmd("sub", "--count", "1", "${topic}")), + lambda: client2.succeed("sleep 2 && {}".format(nats_cmd("pub", "${topic}", "hello"))), + ) ''; }) diff --git a/nixos/tests/nbd.nix b/nixos/tests/nbd.nix new file mode 100644 index 00000000000..16255e68e8a --- /dev/null +++ b/nixos/tests/nbd.nix @@ -0,0 +1,87 @@ +import ./make-test-python.nix ({ pkgs, ... }: + let + listenPort = 30123; + testString = "It works!"; + mkCreateSmallFileService = { path, loop ? false }: { + script = '' + ${pkgs.coreutils}/bin/dd if=/dev/zero of=${path} bs=1K count=100 + ${pkgs.lib.optionalString loop + "${pkgs.util-linux}/bin/losetup --find ${path}"} + ''; + serviceConfig = { + Type = "oneshot"; + }; + wantedBy = [ "multi-user.target" ]; + before = [ "nbd-server.service" ]; + }; + in + { + name = "nbd"; + + nodes = { + server = { config, pkgs, ... }: { + # Create some small files of zeros to use as the ndb disks + ## `vault-pub.disk` is accessible from any IP + systemd.services.create-pub-file = + mkCreateSmallFileService { path = "/vault-pub.disk"; }; + ## `vault-priv.disk` is accessible only from localhost. + ## It's also a loopback device to test exporting /dev/... + systemd.services.create-priv-file = + mkCreateSmallFileService { path = "/vault-priv.disk"; loop = true; }; + + # Needed only for nbd-client used in the tests. + environment.systemPackages = [ pkgs.nbd ]; + + # Open the nbd port in the firewall + networking.firewall.allowedTCPPorts = [ listenPort ]; + + # Run the nbd server and expose the small file created above + services.nbd.server = { + enable = true; + exports = { + vault-pub = { + path = "/vault-pub.disk"; + }; + vault-priv = { + path = "/dev/loop0"; + allowAddresses = [ "127.0.0.1" "::1" ]; + }; + }; + listenAddress = "0.0.0.0"; + listenPort = listenPort; + }; + }; + + client = { config, pkgs, ... }: { + programs.nbd.enable = true; + }; + }; + + testScript = '' + testString = "${testString}" + + start_all() + server.wait_for_open_port(${toString listenPort}) + + # Client: Connect to the server, write a small string to the nbd disk, and cleanly disconnect + client.succeed("nbd-client server ${toString listenPort} /dev/nbd0 -name vault-pub -persist") + client.succeed(f"echo '{testString}' | dd of=/dev/nbd0 conv=notrunc") + client.succeed("nbd-client -d /dev/nbd0") + + # Server: Check that the string written by the client is indeed in the file + foundString = server.succeed(f"dd status=none if=/vault-pub.disk count={len(testString)}")[:len(testString)] + if foundString != testString: + raise Exception(f"Read the wrong string from nbd disk. Expected: '{testString}'. Found: '{foundString}'") + + # Client: Fail to connect to the private disk + client.fail("nbd-client server ${toString listenPort} /dev/nbd0 -name vault-priv -persist") + + # Server: Successfully connect to the private disk + server.succeed("nbd-client localhost ${toString listenPort} /dev/nbd0 -name vault-priv -persist") + server.succeed(f"echo '{testString}' | dd of=/dev/nbd0 conv=notrunc") + foundString = server.succeed(f"dd status=none if=/dev/loop0 count={len(testString)}")[:len(testString)] + if foundString != testString: + raise Exception(f"Read the wrong string from nbd disk. Expected: '{testString}'. Found: '{foundString}'") + server.succeed("nbd-client -d /dev/nbd0") + ''; + }) diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 34d3c345354..b7b1c5c6600 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -18,4 +18,4 @@ foldl }; }) { } - [ 21 22 23 ] + [ 22 23 ] diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix index b25fc95f4b3..f0834c51f0b 100644 --- a/nixos/tests/nixops/default.nix +++ b/nixos/tests/nixops/default.nix @@ -9,7 +9,7 @@ let # - Alternatively, blocked on a NixOps 2 release # https://github.com/NixOS/nixops/issues/1242 # stable = testsLegacyNetwork { nixopsPkg = pkgs.nixops; }; - unstable = testsForPackage { nixopsPkg = pkgs.nixopsUnstable; }; + unstable = testsForPackage { nixopsPkg = pkgs.nixops_unstable; }; # inherit testsForPackage; }; diff --git a/nixos/tests/pacemaker.nix b/nixos/tests/pacemaker.nix new file mode 100644 index 00000000000..68455761495 --- /dev/null +++ b/nixos/tests/pacemaker.nix @@ -0,0 +1,110 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: rec { + name = "pacemaker"; + meta = with pkgs.lib.maintainers; { + maintainers = [ astro ]; + }; + + nodes = + let + node = i: { + networking.interfaces.eth1.ipv4.addresses = [ { + address = "192.168.0.${toString i}"; + prefixLength = 24; + } ]; + + services.corosync = { + enable = true; + clusterName = "zentralwerk-network"; + nodelist = lib.imap (i: name: { + nodeid = i; + inherit name; + ring_addrs = [ + (builtins.head nodes.${name}.networking.interfaces.eth1.ipv4.addresses).address + ]; + }) (builtins.attrNames nodes); + }; + environment.etc."corosync/authkey" = { + source = builtins.toFile "authkey" + # minimum length: 128 bytes + "testtesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttest"; + mode = "0400"; + }; + + services.pacemaker.enable = true; + + # used for pacemaker resource + systemd.services.ha-cat = { + description = "Highly available netcat"; + serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l discard"; + }; + }; + in { + node1 = node 1; + node2 = node 2; + node3 = node 3; + }; + + # sets up pacemaker with resources configuration, then crashes a + # node and waits for service restart on another node + testScript = + let + resources = builtins.toFile "cib-resources.xml" '' + <resources> + <primitive id="cat" class="systemd" type="ha-cat"> + <operations> + <op id="stop-cat" name="start" interval="0" timeout="1s"/> + <op id="start-cat" name="start" interval="0" timeout="1s"/> + <op id="monitor-cat" name="monitor" interval="1s" timeout="1s"/> + </operations> + </primitive> + </resources> + ''; + in '' + import re + import time + + start_all() + + ${lib.concatMapStrings (node: '' + ${node}.wait_until_succeeds("corosync-quorumtool") + ${node}.wait_for_unit("pacemaker.service") + '') (builtins.attrNames nodes)} + + # No STONITH device + node1.succeed("crm_attribute -t crm_config -n stonith-enabled -v false") + # Configure the cat resource + node1.succeed("cibadmin --replace --scope resources --xml-file ${resources}") + + # wait until the service is started + while True: + output = node1.succeed("crm_resource -r cat --locate") + match = re.search("is running on: (.+)", output) + if match: + for machine in machines: + if machine.name == match.group(1): + current_node = machine + break + time.sleep(1) + + current_node.log("Service running here!") + current_node.crash() + + # pick another node that's still up + for machine in machines: + if machine.booted: + check_node = machine + # find where the service has been started next + while True: + output = check_node.succeed("crm_resource -r cat --locate") + match = re.search("is running on: (.+)", output) + # output will remain the old current_node until the crash is detected by pacemaker + if match and match.group(1) != current_node.name: + for machine in machines: + if machine.name == match.group(1): + next_node = machine + break + time.sleep(1) + + next_node.log("Service migrated here!") + ''; +}) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 323d79c5b86..ce3b3fbf3bf 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -933,6 +933,27 @@ let ''; }; + pve = let + pveExporterEnvFile = pkgs.writeTextFile { + name = "pve.env"; + text = '' + PVE_USER="test_user@pam" + PVE_PASSWORD="hunter3" + PVE_VERIFY_SSL="false" + ''; + }; + in { + exporterConfig = { + enable = true; + environmentFile = pveExporterEnvFile; + }; + exporterTest = '' + wait_for_unit("prometheus-pve-exporter.service") + wait_for_open_port(9221) + wait_until_succeeds("curl localhost:9221") + ''; + }; + py-air-control = { nodeName = "py_air_control"; exporterConfig = { @@ -1156,6 +1177,10 @@ let systemd = { exporterConfig = { enable = true; + + extraFlags = [ + "--collector.enable-restart-count" + ]; }; metricProvider = { }; exporterTest = '' @@ -1166,6 +1191,11 @@ let 'systemd_unit_state{name="basic.target",state="active",type="target"} 1' ) ) + succeed( + "curl -sSf localhost:9558/metrics | grep '{}'".format( + 'systemd_service_restart_total{state="prometheus-systemd-exporter.service"} 0' + ) + ) ''; }; diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index b429babce83..93eee4babc2 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -1,6 +1,46 @@ # Test configuration switching. -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : let + + # Simple service that can either be socket-activated or that will + # listen on port 1234 if not socket-activated. + # A connection to the socket causes 'hello' to be written to the client. + socketTest = pkgs.writeScript "socket-test.py" /* python */ '' + #!${pkgs.python3}/bin/python3 + + from socketserver import TCPServer, StreamRequestHandler + import socket + import os + + + class Handler(StreamRequestHandler): + def handle(self): + self.wfile.write("hello".encode("utf-8")) + + + class Server(TCPServer): + def __init__(self, server_address, handler_cls): + listenFds = os.getenv('LISTEN_FDS') + if listenFds is None or int(listenFds) < 1: + print(f'Binding to {server_address}') + TCPServer.__init__( + self, server_address, handler_cls, bind_and_activate=True) + else: + TCPServer.__init__( + self, server_address, handler_cls, bind_and_activate=False) + # Override socket + print(f'Got activated by {os.getenv("LISTEN_FDNAMES")} ' + f'with {listenFds} FDs') + self.socket = socket.fromfd(3, self.address_family, + self.socket_type) + + + if __name__ == "__main__": + server = Server(("localhost", 1234), Handler) + server.serve_forever() + ''; + +in { name = "switch-test"; meta = with pkgs.lib.maintainers; { maintainers = [ gleber das_j ]; @@ -8,6 +48,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { nodes = { machine = { pkgs, lib, ... }: { + environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff users.mutableUsers = false; specialisation = rec { @@ -23,6 +64,11 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; }; + simpleServiceDifferentDescription.configuration = { + imports = [ simpleService.configuration ]; + systemd.services.test.description = "Test unit"; + }; + simpleServiceModified.configuration = { imports = [ simpleService.configuration ]; systemd.services.test.serviceConfig.X-Test = true; @@ -162,6 +208,39 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test"; }; + unitWithRequirement.configuration = { + systemd.services.required-service = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + systemd.services.test-service = { + wantedBy = [ "multi-user.target" ]; + requires = [ "required-service.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + unitWithRequirementModified.configuration = { + imports = [ unitWithRequirement.configuration ]; + systemd.services.required-service.serviceConfig.X-Test = "test"; + systemd.services.test-service.reloadTriggers = [ "test" ]; + }; + + unitWithRequirementModifiedNostart.configuration = { + imports = [ unitWithRequirement.configuration ]; + systemd.services.test-service.unitConfig.RefuseManualStart = true; + }; + restart-and-reload-by-activation-script.configuration = { systemd.services = rec { simple-service = { @@ -231,6 +310,40 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.reload-triggers-and-restart.serviceConfig.X-Modified = "test"; }; + simple-socket.configuration = { + systemd.services.socket-activated = { + description = "A socket-activated service"; + stopIfChanged = lib.mkDefault false; + serviceConfig = { + ExecStart = socketTest; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + systemd.sockets.socket-activated = { + wantedBy = [ "sockets.target" ]; + listenStreams = [ "/run/test.sock" ]; + socketConfig.SocketMode = lib.mkDefault "0777"; + }; + }; + + simple-socket-service-modified.configuration = { + imports = [ simple-socket.configuration ]; + systemd.services.socket-activated.serviceConfig.X-Test = "test"; + }; + + simple-socket-stop-if-changed.configuration = { + imports = [ simple-socket.configuration ]; + systemd.services.socket-activated.stopIfChanged = true; + }; + + simple-socket-stop-if-changed-and-reloadtrigger.configuration = { + imports = [ simple-socket.configuration ]; + systemd.services.socket-activated = { + stopIfChanged = true; + reloadTriggers = [ "test" ]; + }; + }; + mount.configuration = { systemd.mounts = [ { @@ -275,6 +388,31 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.timers.test-timer.timerConfig.OnCalendar = lib.mkForce "Fri 2012-11-23 16:00:00"; }; + hybridSleepModified.configuration = { + systemd.targets.hybrid-sleep.unitConfig.X-Test = true; + }; + + target.configuration = { + systemd.targets.test-target.wantedBy = [ "multi-user.target" ]; + # We use this service to figure out whether the target was modified. + # This is the only way because targets are filtered and therefore not + # printed when they are started/stopped. + systemd.services.test-service = { + bindsTo = [ "test-target.target" ]; + serviceConfig.ExecStart = "${pkgs.coreutils}/bin/sleep infinity"; + }; + }; + + targetModified.configuration = { + imports = [ target.configuration ]; + systemd.targets.test-target.unitConfig.X-Test = true; + }; + + targetModifiedStopOnReconfig.configuration = { + imports = [ target.configuration ]; + systemd.targets.test-target.unitConfig.X-StopOnReconfiguration = true; + }; + path.configuration = { systemd.paths.test-watch = { wantedBy = [ "paths.target" ]; @@ -378,7 +516,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Start a simple service out = switch_to_specialisation("${machine}", "simpleService") @@ -388,7 +525,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: test.service\n") - assert_lacks(out, "as well:") # Not changing anything doesn't do anything out = switch_to_specialisation("${machine}", "simpleService") @@ -398,7 +534,15 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") + + # Only changing the description does nothing + out = switch_to_specialisation("${machine}", "simpleServiceDifferentDescription") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") # Restart the simple service out = switch_to_specialisation("${machine}", "simpleServiceModified") @@ -408,7 +552,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_contains(out, "\nstarting the following units: test.service\n") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Restart the service with stopIfChanged=false out = switch_to_specialisation("${machine}", "simpleServiceNostop") @@ -418,7 +561,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Reload the service with reloadIfChanged=true out = switch_to_specialisation("${machine}", "simpleServiceReload") @@ -428,7 +570,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Nothing happens when restartIfChanged=false out = switch_to_specialisation("${machine}", "simpleServiceNorestart") @@ -438,7 +579,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Dry mode shows different messages out = switch_to_specialisation("${machine}", "simpleService", action="dry-activate") @@ -448,7 +588,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") assert_contains(out, "would start the following units: test.service\n") # Ensure \ works in unit names @@ -459,7 +598,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: escaped\\x2ddash.service\n") - assert_lacks(out, "as well:") out = switch_to_specialisation("${machine}", "unitWithBackslashModified") assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") @@ -468,7 +606,32 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") + + # Ensure units that require changed units are properly reloaded + out = switch_to_specialisation("${machine}", "unitWithRequirement") + assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: required-service.service, test-service.service\n") + + out = switch_to_specialisation("${machine}", "unitWithRequirementModified") + assert_contains(out, "stopping the following units: required-service.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: required-service.service, test-service.service\n") + assert_lacks(out, "the following new units were started:") + + # Unless the unit asks to be not restarted + out = switch_to_specialisation("${machine}", "unitWithRequirementModifiedNostart") + assert_contains(out, "stopping the following units: required-service.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: required-service.service\n") + assert_lacks(out, "the following new units were started:") with subtest("failing units"): # Let the simple service fail @@ -482,7 +645,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "the following new units were started:") assert_contains(out, "warning: the following units failed: test.service\n") assert_contains(out, "Main PID:") # output of systemctl - assert_lacks(out, "as well:") # A unit that gets into autorestart without failing is not treated as failed out = switch_to_specialisation("${machine}", "autorestartService") @@ -492,7 +654,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: autorestart.service\n") - assert_lacks(out, "as well:") machine.systemctl('stop autorestart.service') # cancel the 20y timer # Switching to the same system should do nothing (especially not treat the unit as failed) @@ -503,7 +664,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: autorestart.service\n") - assert_lacks(out, "as well:") machine.systemctl('stop autorestart.service') # cancel the 20y timer # If systemd thinks the unit has failed and is in autorestart, we should show it as failed @@ -516,7 +676,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "the following new units were started:") assert_contains(out, "warning: the following units failed: autorestart.service\n") assert_contains(out, "Main PID:") # output of systemctl - assert_lacks(out, "as well:") with subtest("unit file parser"): # Switch to a well-known state @@ -530,7 +689,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Rename it out = switch_to_specialisation("${machine}", "simpleServiceWithExtraSectionOtherName") @@ -540,7 +698,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Remove it out = switch_to_specialisation("${machine}", "simpleServiceNostop") @@ -550,7 +707,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # [Install] section is ignored out = switch_to_specialisation("${machine}", "simpleServiceWithInstallSection") @@ -560,7 +716,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Add a key out = switch_to_specialisation("${machine}", "simpleServiceWithExtraKey") @@ -570,7 +725,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Change its value out = switch_to_specialisation("${machine}", "simpleServiceWithExtraKeyOtherValue") @@ -580,7 +734,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Rename it out = switch_to_specialisation("${machine}", "simpleServiceWithExtraKeyOtherName") @@ -590,7 +743,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Remove it out = switch_to_specialisation("${machine}", "simpleServiceNostop") @@ -600,7 +752,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Add a reload trigger out = switch_to_specialisation("${machine}", "simpleServiceReloadTrigger") @@ -610,7 +761,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Modify the reload trigger out = switch_to_specialisation("${machine}", "simpleServiceReloadTriggerModified") @@ -620,7 +770,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Modify the reload trigger and something else out = switch_to_specialisation("${machine}", "simpleServiceReloadTriggerModifiedAndSomethingElse") @@ -630,7 +779,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Remove the reload trigger out = switch_to_specialisation("${machine}", "simpleServiceReloadTriggerModifiedSomethingElse") @@ -640,7 +788,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") with subtest("restart and reload by activation script"): switch_to_specialisation("${machine}", "simpleServiceNorestart") @@ -650,7 +797,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "reloading the following units:") assert_lacks(out, "restarting the following units:") assert_contains(out, "\nstarting the following units: no-restart-service.service, reload-triggers-and-restart-by-as.service, simple-reload-service.service, simple-restart-service.service, simple-service.service\n") - assert_lacks(out, "as well:") + assert_contains(out, "the following new units were started: no-restart-service.service, reload-triggers-and-restart-by-as.service, reload-triggers-and-restart.service, reload-triggers.service, simple-reload-service.service, simple-restart-service.service, simple-service.service\n") # Switch to the same system where the example services get restarted # and reloaded by the activation script out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script") @@ -659,7 +806,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "reloading the following units: reload-triggers-and-restart.service, reload-triggers.service, simple-reload-service.service\n") assert_contains(out, "restarting the following units: reload-triggers-and-restart-by-as.service, simple-restart-service.service, simple-service.service\n") assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "as well:") + assert_lacks(out, "the following new units were started:") # Switch to the same system and see if the service gets restarted when it's modified # while the fact that it's supposed to be reloaded by the activation script is ignored. out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script-modified") @@ -668,7 +815,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "reloading the following units: reload-triggers.service, simple-reload-service.service\n") assert_contains(out, "restarting the following units: reload-triggers-and-restart-by-as.service, reload-triggers-and-restart.service, simple-restart-service.service, simple-service.service\n") assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "as well:") + assert_lacks(out, "the following new units were started:") # The same, but in dry mode out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script", action="dry-activate") assert_lacks(out, "would stop the following units:") @@ -676,7 +823,71 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "would reload the following units: reload-triggers.service, simple-reload-service.service\n") assert_contains(out, "would restart the following units: reload-triggers-and-restart-by-as.service, reload-triggers-and-restart.service, simple-restart-service.service, simple-service.service\n") assert_lacks(out, "\nwould start the following units:") - assert_lacks(out, "as well:") + + with subtest("socket-activated services"): + # Socket-activated services don't get started, just the socket + machine.fail("[ -S /run/test.sock ]") + out = switch_to_specialisation("${machine}", "simple-socket") + # assert_lacks(out, "stopping the following units:") not relevant + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: socket-activated.socket\n") + machine.succeed("[ -S /run/test.sock ]") + + # Changing a non-activated service does nothing + out = switch_to_specialisation("${machine}", "simple-socket-service-modified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # The unit is properly activated when the socket is accessed + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated") # idk how that would happen tbh + + # Changing an activated service with stopIfChanged=false restarts the service + out = switch_to_specialisation("${machine}", "simple-socket") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: socket-activated.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # Socket-activation of the unit still works + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated after the service was restarted") + + # Changing an activated service with stopIfChanged=true stops the service and + # socket and starts the socket + out = switch_to_specialisation("${machine}", "simple-socket-stop-if-changed") + assert_contains(out, "stopping the following units: socket-activated.service, socket-activated.socket\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: socket-activated.socket\n") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # Socket-activation of the unit still works + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated after the service was restarted") + + # Changing a reload trigger of a socket-activated unit only reloads it + out = switch_to_specialisation("${machine}", "simple-socket-stop-if-changed-and-reloadtrigger") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: socket-activated.service\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units: socket-activated.socket") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # Socket-activation of the unit still works + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated after the service was restarted") with subtest("mounts"): switch_to_specialisation("${machine}", "mount") @@ -689,7 +900,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # It changed out = machine.succeed("mount | grep 'on /testmount'") assert_contains(out, "size=10240k") @@ -700,15 +910,64 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "OnCalendar=2014-03-25 02:59:56 UTC") out = switch_to_specialisation("${machine}", "timerModified") assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following units:") assert_lacks(out, "reloading the following units:") - assert_contains(out, "restarting the following units: test-timer.timer\n") + assert_contains(out, "\nrestarting the following units: test-timer.timer\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # It changed out = machine.succeed("systemctl show test-timer.timer") assert_contains(out, "OnCalendar=Fri 2012-11-23 16:00:00") + with subtest("targets"): + # Modifying some special targets like hybrid-sleep.target does nothing + out = switch_to_specialisation("${machine}", "hybridSleepModified") + assert_contains(out, "stopping the following units: test-timer.timer\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Adding a new target starts it + out = switch_to_specialisation("${machine}", "target") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: test-target.target\n") + + # Changing a target doesn't print anything because the unit is filtered + machine.systemctl("start test-service.service") + out = switch_to_specialisation("${machine}", "targetModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.succeed("systemctl is-active test-service.service") # target was not restarted + + # With X-StopOnReconfiguration, the target gets stopped and started + out = switch_to_specialisation("${machine}", "targetModifiedStopOnReconfig") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.fail("systemctl is-active test-service.servce") # target was restarted + + # Remove the target by switching to the old specialisation + out = switch_to_specialisation("${machine}", "timerModified") + assert_contains(out, "stopping the following units: test-target.target\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: test-timer.timer\n") + with subtest("paths"): out = switch_to_specialisation("${machine}", "path") assert_contains(out, "stopping the following units: test-timer.timer\n") @@ -716,8 +975,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") - assert_contains(out, "the following new units were started: test-watch.path") - assert_lacks(out, "as well:") + assert_contains(out, "the following new units were started: test-watch.path\n") machine.fail("test -f /testpath-modified") # touch the file, unit should be triggered @@ -739,8 +997,21 @@ import ./make-test-python.nix ({ pkgs, ...} : { with subtest("slices"): machine.succeed("echo 0 > /proc/sys/vm/panic_on_oom") # allow OOMing out = switch_to_specialisation("${machine}", "slice") + # assert_lacks(out, "stopping the following units:") not relevant + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") machine.fail("systemctl start testservice.service") + out = switch_to_specialisation("${machine}", "sliceModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") machine.succeed("systemctl start testservice.service") machine.succeed("echo 1 > /proc/sys/vm/panic_on_oom") # disallow OOMing ''; diff --git a/nixos/tests/systemd-confinement.nix b/nixos/tests/systemd-confinement.nix index 8fafb11e1e8..3181af309a6 100644 --- a/nixos/tests/systemd-confinement.nix +++ b/nixos/tests/systemd-confinement.nix @@ -17,15 +17,19 @@ import ./make-test-python.nix { exit "''${ret:-1}" ''; - mkTestStep = num: { config ? {}, testScript }: { - systemd.sockets."test${toString num}" = { + mkTestStep = num: { + testScript, + config ? {}, + serviceName ? "test${toString num}", + }: { + systemd.sockets.${serviceName} = { description = "Socket for Test Service ${toString num}"; wantedBy = [ "sockets.target" ]; socketConfig.ListenStream = "/run/test${toString num}.sock"; socketConfig.Accept = true; }; - systemd.services."test${toString num}@" = { + systemd.services."${serviceName}@" = { description = "Confined Test Service ${toString num}"; confinement = (config.confinement or {}) // { enable = true; }; serviceConfig = (config.serviceConfig or {}) // { @@ -135,6 +139,16 @@ import ./make-test-python.nix { machine.succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" = eek') ''; } + { serviceName = "shipped-unitfile"; + config.confinement.mode = "chroot-only"; + testScript = '' + with subtest("check if shipped unit file still works"): + machine.succeed( + 'chroot-exec \'kill -9 $$ 2>&1 || :\' | ' + 'grep -q "Too many levels of symbolic links"' + ) + ''; + } ]; options.__testSteps = lib.mkOption { @@ -143,6 +157,15 @@ import ./make-test-python.nix { }; config.environment.systemPackages = lib.singleton testClient; + config.systemd.packages = lib.singleton (pkgs.writeTextFile { + name = "shipped-unitfile"; + destination = "/etc/systemd/system/shipped-unitfile@.service"; + text = '' + [Service] + SystemCallFilter=~kill + SystemCallErrorNumber=ELOOP + ''; + }); config.users.groups.chroot-testgroup = {}; config.users.users.chroot-testuser = { diff --git a/nixos/tests/systemd-escaping.nix b/nixos/tests/systemd-escaping.nix new file mode 100644 index 00000000000..7f93eb5e4f7 --- /dev/null +++ b/nixos/tests/systemd-escaping.nix @@ -0,0 +1,45 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + echoAll = pkgs.writeScript "echo-all" '' + #! ${pkgs.runtimeShell} + for s in "$@"; do + printf '%s\n' "$s" + done + ''; + # deliberately using a local empty file instead of pkgs.emptyFile to have + # a non-store path in the test + args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ./empty-file 4.2 23 ]; +in +{ + name = "systemd-escaping"; + + machine = { pkgs, lib, utils, ... }: { + systemd.services.echo = + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ [] ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ {} ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ null ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ false ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ (_:_) ])).success; + { description = "Echo to the journal"; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + ${echoAll} ${utils.escapeSystemdExecArgs args} + ''; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.succeed("systemctl start echo.service") + # skip the first 'Starting <service> ...' line + logs = machine.succeed("journalctl -u echo.service -o cat").splitlines()[1:] + assert "a%Nything" == logs[0] + assert "lang=''${LANG}" == logs[1] + assert ";" == logs[2] + assert "/bin/sh -c date" == logs[3] + assert "/nix/store/ij3gw72f4n5z4dz6nnzl1731p9kmjbwr-empty-file" == logs[4] + assert "4.2" in logs[5] # toString produces extra fractional digits! + assert "23" == logs[6] + ''; +}) diff --git a/nixos/tests/tinywl.nix b/nixos/tests/tinywl.nix index b286cab7794..8fb87b53330 100644 --- a/nixos/tests/tinywl.nix +++ b/nixos/tests/tinywl.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # Automatically login on tty1 as a normal user: imports = [ ./common/user-account.nix ]; services.getty.autologinUser = "alice"; + security.polkit.enable = true; environment = { systemPackages = with pkgs; [ tinywl foot wayland-utils ]; diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix new file mode 100644 index 00000000000..e383f224e3d --- /dev/null +++ b/nixos/tests/tomcat.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "tomcat"; + + machine = { pkgs, ... }: { + services.tomcat.enable = true; + }; + + testScript = '' + machine.wait_for_unit("tomcat.service") + machine.wait_for_open_port(8080) + machine.wait_for_file("/var/tomcat/webapps/examples"); + machine.succeed( + "curl --fail http://localhost:8080/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'" + ) + machine.succeed( + "curl --fail http://localhost:8080/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'" + ) + ''; +}) diff --git a/nixos/tests/vsftpd.nix b/nixos/tests/vsftpd.nix new file mode 100644 index 00000000000..4bea27f0eb1 --- /dev/null +++ b/nixos/tests/vsftpd.nix @@ -0,0 +1,42 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "vsftpd"; + + nodes = { + server = { + services.vsftpd = { + enable = true; + userlistDeny = false; + localUsers = true; + userlist = [ "ftp-test-user" ]; + writeEnable = true; + localRoot = "/tmp"; + }; + networking.firewall.enable = false; + + users = { + users.ftp-test-user = { + isSystemUser = true; + password = "ftp-test-password"; + group = "ftp-test-group"; + }; + groups.ftp-test-group = {}; + }; + }; + + client = {}; + }; + + testScript = '' + client.start() + server.wait_for_unit("vsftpd") + server.wait_for_open_port("21") + + client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server") + client.succeed('echo "this is a test" > /tmp/test.file.up') + client.succeed("curl -v -T /tmp/test.file.up -u ftp-test-user:ftp-test-password ftp://server") + client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server/test.file.up > /tmp/test.file.down") + client.succeed("diff /tmp/test.file.up /tmp/test.file.down") + assert client.succeed("cat /tmp/test.file.up") == server.succeed("cat /tmp/test.file.up") + assert client.succeed("cat /tmp/test.file.down") == server.succeed("cat /tmp/test.file.up") + ''; +}) diff --git a/nixos/tests/xmpp/prosody-mysql.nix b/nixos/tests/xmpp/prosody-mysql.nix new file mode 100644 index 00000000000..40f3e308a04 --- /dev/null +++ b/nixos/tests/xmpp/prosody-mysql.nix @@ -0,0 +1,124 @@ +let + cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -days 36500 + mkdir -p $out + cp key.pem cert.pem $out + ''; + createUsers = pkgs: pkgs.writeScriptBin "create-prosody-users" '' + #!${pkgs.bash}/bin/bash + set -e + + # Creates and set password for the 2 xmpp test users. + # + # Doing that in a bash script instead of doing that in the test + # script allow us to easily provision the users when running that + # test interactively. + + prosodyctl register cthon98 example.com nothunter2 + prosodyctl register azurediamond example.com hunter2 + ''; + delUsers = pkgs: pkgs.writeScriptBin "delete-prosody-users" '' + #!${pkgs.bash}/bin/bash + set -e + + # Deletes the test users. + # + # Doing that in a bash script instead of doing that in the test + # script allow us to easily provision the users when running that + # test interactively. + + prosodyctl deluser cthon98@example.com + prosodyctl deluser azurediamond@example.com + ''; +in import ../make-test-python.nix { + name = "prosody-mysql"; + nodes = { + client = { nodes, pkgs, config, ... }: { + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + console.keyMap = "fr-bepo"; + networking.extraHosts = '' + ${nodes.server.config.networking.primaryIPAddress} example.com + ${nodes.server.config.networking.primaryIPAddress} conference.example.com + ${nodes.server.config.networking.primaryIPAddress} uploads.example.com + ''; + environment.systemPackages = [ + (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) + ]; + }; + server = { config, pkgs, ... }: { + nixpkgs.overlays = [ + (self: super: { + prosody = super.prosody.override { + withExtraLuaPackages = p: [ p.luadbi-mysql ]; + }; + }) + ]; + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + console.keyMap = "fr-bepo"; + networking.extraHosts = '' + ${config.networking.primaryIPAddress} example.com + ${config.networking.primaryIPAddress} conference.example.com + ${config.networking.primaryIPAddress} uploads.example.com + ''; + networking.firewall.enable = false; + environment.systemPackages = [ + (createUsers pkgs) + (delUsers pkgs) + ]; + services.prosody = { + enable = true; + ssl.cert = "${cert pkgs}/cert.pem"; + ssl.key = "${cert pkgs}/key.pem"; + virtualHosts.example = { + domain = "example.com"; + enabled = true; + ssl.cert = "${cert pkgs}/cert.pem"; + ssl.key = "${cert pkgs}/key.pem"; + }; + muc = [ + { + domain = "conference.example.com"; + } + ]; + uploadHttp = { + domain = "uploads.example.com"; + }; + extraConfig = '' + storage = "sql" + sql = { + driver = "MySQL"; + database = "prosody"; + host = "mysql"; + port = 3306; + username = "prosody"; + password = "password123"; + }; + ''; + }; + }; + mysql = { config, pkgs, ... }: { + networking.firewall.enable = false; + services.mysql = { + enable = true; + initialScript = pkgs.writeText "mysql_init.sql" '' + CREATE DATABASE prosody; + CREATE USER 'prosody'@'server' IDENTIFIED BY 'password123'; + GRANT ALL PRIVILEGES ON prosody.* TO 'prosody'@'server'; + FLUSH PRIVILEGES; + ''; + package = pkgs.mariadb; + }; + }; + }; + + testScript = { nodes, ... }: '' + # Check with mysql storage + mysql.wait_for_unit("mysql.service") + server.wait_for_unit("prosody.service") + server.succeed('prosodyctl status | grep "Prosody is running"') + + server.succeed("create-prosody-users") + client.succeed("send-message") + server.succeed("delete-prosody-users") + ''; +} diff --git a/nixos/tests/xmpp/prosody.nix b/nixos/tests/xmpp/prosody.nix index c343b580879..14eab56fb82 100644 --- a/nixos/tests/xmpp/prosody.nix +++ b/nixos/tests/xmpp/prosody.nix @@ -81,6 +81,7 @@ in import ../make-test-python.nix { }; testScript = { nodes, ... }: '' + # Check with sqlite storage server.wait_for_unit("prosody.service") server.succeed('prosodyctl status | grep "Prosody is running"') diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 24cc45a3aaf..7b527139e91 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.1.6"; + version = "4.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-Q4YYdMUd/T8tGGcakhoLdHvWsHwOq7LgIb77sr2OWuQ="; + sha256 = "sha256-hIIEVj5sM/NdhBiwerFvyIXqj0R8EvcxwM6UZ0CE428="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 45482c4de00..c5f3cfe5b68 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -78,13 +78,13 @@ let in mkDerivation rec { pname = "cantata"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "15qfx9bpfdplxxs08inwf2j8kvf7g5cln5sv1wj1l2l41vbf1mjr"; + sha256 = "sha256-UaZEKZvCA50WsdQSSJQQ11KTK6rM4ouCHDX7pn3NlQw="; }; patches = [ diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix new file mode 100644 index 00000000000..9200a36f9f3 --- /dev/null +++ b/pkgs/applications/audio/cardinal/default.nix @@ -0,0 +1,76 @@ +{ + stdenv +, fetchFromGitHub +, fetchpatch +, fetchurl +, fetchzip +, freetype +, jansson +, lib +, libGL +, libX11 +, libXcursor +, libXext +, libXrandr +, libarchive +, liblo +, libsamplerate +, mesa +, pkg-config +, python3 +, speexdsp +}: + +stdenv.mkDerivation rec { + name = "cardinal-${version}"; + version = "22.02"; + + src = fetchurl { + url = + "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz"; + sha256 = "sha256-IVlAROFGFffTEU00NCmv74w1DRb7dNMp20FeBVoDrdM="; + }; + + patches = [ + # see https://github.com/DISTRHO/Cardinal/issues/151#issuecomment-1041886260 + (fetchpatch { + url = + "https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch"; + sha256 = "sha256-NYUYLbLeBX1WEzjPi0s/T1N+EXQKyi0ifbPxgBYDjRs="; + }) + ]; + + prePatch = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + freetype + jansson + libGL + libX11 + libXcursor + libXext + libXrandr + libXrandr + libarchive + liblo + libsamplerate + mesa + python3 + speexdsp + ]; + + makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]; + + meta = { + description = "Plugin wrapper around VCV Rack"; + homepage = "https://github.com/DISTRHO/cardinal"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index ab3267eae7f..ebcdb8f4290 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "csound"; - version = "6.16.2"; + version = "6.17.0"; hardeningDisable = [ "format" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "sha256-1rcS3kOspU9ACx45yB8betph4G0hso1OSJQRiabX6tE="; + sha256 = "sha256-O19jm3JxHg4TcQzWQZu1uFjfYN2FR41fCRq5YGnTGD0="; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; - homepage = "http://www.csounds.com/"; - license = licenses.gpl2; + homepage = "https://csound.com/"; + license = licenses.lgpl21Plus; maintainers = [maintainers.marcweber]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 23ca109c6b4..de4b7a3176f 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.2.3"; + version = "6.2.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-A1UanrAbmZFGCmDNIr1h+v5RVMsIl4qgM/veBirudQM="; + sha256 = "sha256-g/qN1Tafh71HdPLHW43Zva9MK6G+qxSnb1aRisuwdBw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index a5fc9a8789b..7e0fcf2717e 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.51"; + version = "1.52"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-g8LZhP6qHctmvbmrhJ8gAOeAd57SePeO2tdFi9SVjQ0="; + sha256 = "sha256-RyZ3PV7jaTN3DEYMT0BqKDHbb+7/IgiRaCra1xA0h1A="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix new file mode 100644 index 00000000000..e7794175ac9 --- /dev/null +++ b/pkgs/applications/audio/furnace/default.nix @@ -0,0 +1,99 @@ +{ stdenv +, lib +, nix-update-script +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, makeWrapper +, fmt_8 +, libsndfile +, SDL2 +, zlib +, withJACK ? stdenv.hostPlatform.isUnix +, libjack2 +, withGUI ? true +, Cocoa +}: + +stdenv.mkDerivation rec { + pname = "furnace"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "tildearrow"; + repo = "furnace"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-BcaPQuDFkAaxFQKwoI6xdSWcyHo5VsqZcwf++JISqRs="; + }; + + patches = [ + (fetchpatch { + name = "0001-furnace-fix-wrong-include-path.patch"; + url = "https://github.com/tildearrow/furnace/commit/456db22f9d9f0ed40d74fe50dde492e69e901fcc.patch"; + sha256 = "17ikb1z9ldm7kdj00m4swsrq1qx94vlzhc6h020x3ryzwnglc8d3"; + }) + ]; + + postPatch = '' + # rtmidi is not used yet + sed -i -e '/add_subdirectory(extern\/rtmidi/d' -e '/DEPENDENCIES_LIBRARIES rtmidi/d' CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper + ]; + + buildInputs = [ + fmt_8 + libsndfile + SDL2 + zlib + ] ++ lib.optionals withJACK [ + libjack2 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + ]; + + cmakeFlags = [ + "-DBUILD_GUI=${if withGUI then "ON" else "OFF"}" + "-DSYSTEM_FMT=ON" + "-DSYSTEM_LIBSNDFILE=ON" + "-DSYSTEM_ZLIB=ON" + "-DSYSTEM_SDL2=ON" + "-DWITH_JACK=${if withJACK then "ON" else "OFF"}" + "-DWARNINGS_ARE_ERRORS=ON" + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a + # bundle. That adds alot of overhead for not much benefit (CPack is currently abit broken, and needs impure access + # to /usr/bin/hdiutil). So we'll manually assemble & install everything instead. + + mkdir -p $out/{Applications/Furnace.app/Contents/{MacOS,Resources},share/{,doc,licenses}/furnace} + mv $out/{bin,Applications/Furnace.app/Contents/MacOS}/furnace + makeWrapper $out/{Applications/Furnace.app/Contents/MacOS,bin}/furnace + + install -m644 {../res,$out/Applications/Furnace.app/Contents}/Info.plist + install -m644 ../res/icon.icns $out/Applications/Furnace.app/Contents/Resources/Furnace.icns + install -m644 {..,$out/share/licenses/furnace}/LICENSE + cp -r ../papers $out/share/doc/furnace/ + cp -r ../demos $out/share/furnace/ + ''; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Multi-system chiptune tracker compatible with DefleMask modules"; + homepage = "https://github.com/tildearrow/furnace"; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index cd5e476b884..6db530a2c23 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.17"; + version = "3.10.21"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd"; + sha256 = "0n73jm5ypsj962gpr0dk10lqh83giqsczm63wchyhmrkyf1wgga1"; }; patches = [ @@ -42,7 +42,10 @@ python3Packages.buildPythonApplication rec { ]; checkInputs = with python3Packages; [ - coverage minimock + minimock + pytest + pytest-httpserver + pytest-cov ]; doCheck = true; @@ -51,6 +54,7 @@ python3Packages.buildPythonApplication rec { feedparser dbus-python mygpoclient + requests pygobject3 eyeD3 podcastparser @@ -69,7 +73,8 @@ python3Packages.buildPythonApplication rec { ''; installCheckPhase = '' - LC_ALL=C PYTHONPATH=./src:$PYTHONPATH python3 -m gpodder.unittests + LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py + LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder ''; meta = with lib; { diff --git a/pkgs/applications/audio/gpodder/disable-autoupdate.patch b/pkgs/applications/audio/gpodder/disable-autoupdate.patch index 8f77518d03e..c7c81761328 100644 --- a/pkgs/applications/audio/gpodder/disable-autoupdate.patch +++ b/pkgs/applications/audio/gpodder/disable-autoupdate.patch @@ -11,41 +11,20 @@ </section> <section> <item> -@@ -201,4 +197,4 @@ - </submenu> - </menu> - </interface> --<!-- :noTabs=true:tabSize=2:indentSize=2: --> -\ No newline at end of file -+<!-- :noTabs=true:tabSize=2:indentSize=2: --> --- a/src/gpodder/config.py +++ b/src/gpodder/config.py -@@ -91,13 +91,6 @@ - 'retries': 3, # number of retries when downloads time out - }, +@@ -94,7 +94,7 @@ -- # Software updates from gpodder.org -- 'software_update': { + # Software updates from gpodder.org + 'software_update': { - 'check_on_startup': True, # check for updates on start -- 'last_check': 0, # unix timestamp of last update check -- 'interval': 5, # interval (in days) to check for updates -- }, -- - 'ui': { - # Settings for the Command-Line Interface - 'cli': { ++ 'check_on_startup': False, # check for updates on start + 'last_check': 0, # unix timestamp of last update check + 'interval': 5, # interval (in days) to check for updates + }, --- a/src/gpodder/gtkui/main.py +++ b/src/gpodder/gtkui/main.py -@@ -224,7 +224,7 @@ - util.idle_add(self.subscribe_to_url, self.options.subscribe) - elif not self.channels: - self.on_itemUpdate_activate() -- elif self.config.software_update.check_on_startup: -+ elif False and self.config.software_update.check_on_startup: - # Check for software updates from gpodder.org - diff = time.time() - self.config.software_update.last_check - if diff > (60 * 60 * 24) * self.config.software_update.interval: -@@ -3288,6 +3288,7 @@ +@@ -3445,6 +3445,7 @@ If silent=False, a message will be shown even if no updates are available (set silent=False when the check is manually triggered). """ diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/applications/audio/jellycli/default.nix new file mode 100644 index 00000000000..cfb9deb5872 --- /dev/null +++ b/pkgs/applications/audio/jellycli/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildGoModule, alsa-lib }: + +buildGoModule rec { + pname = "jellycli"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "tryffel"; + repo = "jellycli"; + rev = "v${version}"; + sha256 = "1awzcxnf175a794rhzbmqxxjss77mfa1yrr0wgdxaivrlkibxjys"; + }; + + vendorSha256 = "02fwsnrhj09m0aa199plpqlsjrwpmrk4c80fszzm07s5vmjqvnfy"; + + patches = [ + # Fixes log file path for tests. + ./fix-test-dir.patch + ]; + + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "Jellyfin terminal client"; + longDescription = '' + Terminal music player, works with Jellyfin (>= 10.6) , Emby (>= 4.4), and + Subsonic comptabile servers (API >= 1.16), e.g., Navidrome. + ''; + homepage = "https://github.com/tryffel/jellycli"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/applications/audio/jellycli/fix-test-dir.patch b/pkgs/applications/audio/jellycli/fix-test-dir.patch new file mode 100644 index 00000000000..83cacfe9af0 --- /dev/null +++ b/pkgs/applications/audio/jellycli/fix-test-dir.patch @@ -0,0 +1,13 @@ +diff --git a/config/config_test.go b/config/config_test.go +index 9f63a7e..7e790b8 100644 +--- a/config/config_test.go ++++ b/config/config_test.go +@@ -110,7 +110,7 @@ func TestInitEmptyConfig(t *testing.T) { + Subsonic: Subsonic{}, + Player: Player{ + Server: "jellyfin", +- LogFile: "/tmp/jellycli.log", ++ LogFile: "/build/jellycli.log", + LogLevel: "info", + AudioBufferingMs: 150, + HttpBufferingS: 5, diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix index 92b75414785..9f393a0e752 100644 --- a/pkgs/applications/audio/mopidy/ytmusic.nix +++ b/pkgs/applications/audio/mopidy/ytmusic.nix @@ -2,24 +2,33 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-ytmusic"; - version = "0.3.2"; + version = "0.3.5"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YTMusic"; - sha256 = "sha256-BZtW+qHsTnOMj+jdAFI8ZMwGxJc9lNosgPJZGbt4JgU="; + sha256 = "0pncyxfqxvznb9y4ksndbny1yf5mxh4089ak0yz86dp2qi5j99iv"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'ytmusicapi>=0.20.0,<0.21.0' 'ytmusicapi>=0.20.0' + ''; + propagatedBuildInputs = [ mopidy python3Packages.ytmusicapi python3Packages.pytube ]; + pythonImportsCheck = [ "mopidy_ytmusic" ]; + + # has no tests doCheck = false; meta = with lib; { description = "Mopidy extension for playing music from YouTube Music"; + homepage = "https://github.com/OzymandiasTheGreat/mopidy-ytmusic"; license = licenses.asl20; maintainers = [ maintainers.nickhu ]; }; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 3ecfde7819f..b4f450b3101 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.07"; + version = "6.2.09"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-MM8uC1+d1P7aZI460fCcHWtE7+xfJV1ZFj2cdp/b1rY="; + sha256 = "sha256-BhsbTFwxgWwMwe1ow0ppVsLjfMC7QMA/fq09Utwe+KA="; }; configurePhase = '' diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix new file mode 100644 index 00000000000..d2d4927c113 --- /dev/null +++ b/pkgs/applications/audio/psst/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, rustPlatform, alsa-lib, atk, cairo, dbus, gdk-pixbuf, glib, gtk3, pango, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "psst"; + version = "unstable-2022-01-25"; + + src = fetchFromGitHub { + owner = "jpochyla"; + repo = pname; + rev = "1627cd4a301dd51e9ee3034294cd7b0d94d02ddc"; + sha256 = "sha256-kepvYhmieXx6Hj79aqaA7tYUnueaBsNx0U4lV7K6LuU="; + }; + + cargoSha256 = "sha256-DcdlQudGyWUUAacV7pAOLDvhd1fgAkEesdxDkHSYm4M="; + # specify the subdirectory of the binary crate to build from the workspace + buildAndTestSubdir = "psst-gui"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + atk + cairo + dbus + gdk-pixbuf + glib + gtk3 + pango + ]; + + meta = with lib; { + description = "Fast and multi-platform Spotify client with native GUI"; + homepage = "https://github.com/jpochyla/psst"; + license = licenses.mit; + maintainers = [ maintainers.vbrandl ]; + }; +} diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index a44dd941c57..57c327d429d 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.40"; + version = "1.42"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-0qEhhkprIpseCEFStgJ0035TX0e9s271BK/1hVkn/JU="; + sha256 = "sha256-CwnEvQsxrYStJ4RxnE0lHt1fBHQEZrjSldnQnTOPaE0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index efa1d943610..701e6fffbbb 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,26 +1,62 @@ -{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +# As of 2.1, puddletag has started pinning versions of all dependencies that it +# was built against which is an issue as the chances of us having the exact same +# versions in nixpkgs are slim to none. +# +# There is a difference between explicit and implicit version requirements and +# we should be able to safely ignore the latter. Therefore use requirements.in +# which contains just the explicit version dependencies instead of +# requirements.txt. +# +# Additionally, we do need to override some of the explicit requirements through +# `overrideVersions`. While we technically run the risk of breaking something by +# ignoring the pinned versions, it's just something we will have to accept +# unless we want to vendor those versions. + +let + # NOTE: check if we can drop any of these overrides when bumping the version + overrideVersions = [ + "pyparsing" + "pyqt5" + ]; + +in python3Packages.buildPythonApplication rec { pname = "puddletag"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { - owner = "keithgg"; + owner = "puddletag"; repo = "puddletag"; rev = version; - sha256 = "sha256-9l8Pc77MX5zFkOqU00HFS8//3Bzd2OMnVV1brmWsNAQ="; + hash = "sha256-eilETaFvvPMopIbccV1uLbpD55kHX9KGTCcGVXaHPgM="; }; - sourceRoot = "source/source"; + postPatch = '' + substituteInPlace setup.py \ + --replace share/pixmaps share/icons + + cp requirements.in requirements.txt + '' + lib.concatMapStringsSep "\n" + (e: '' + sed -i requirements.txt -e 's/^${e}.*/${e}/' + '') + overrideVersions; nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ + propagatedBuildInputs = with python3Packages; [ + pyacoustid + chromaprint configobj + levenshtein + lxml mutagen pyparsing pyqt5 - ]); + rapidfuzz + ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") @@ -33,8 +69,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; homepage = "https://docs.puddletag.net"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg dschrempf ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index c92e9cf7a46..860eca652e7 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-SGx80fMFomNEa/jgH8Yeof+f7zXCDxx3Yqd0GxHZGMw="; + sha256 = "sha256-BBvF1L3IqkYqSghHxcbwOBizdu6GtxaWof3Q/bc+aTY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index fae8700d811..b02ab65cd87 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceChars [ "." ] [ "_" ] version}.sh"; - sha256 = "0m2b5hwazy4vyjk51cmayys250rircs3c0v7bv5mn28h7hyq29s8"; + sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U="; }; dontUnpack = true; diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index e8a275db98d..0af80c991c2 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -1,26 +1,38 @@ -{ lib, stdenv, fetchurl, ruby, cdparanoia, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper +, cdparanoia, cddiscid, ruby }: + stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.8.0rc3"; pname = "rubyripper"; - src = fetchurl { - url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2"; - sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1"; + + src = fetchFromGitHub { + owner = "bleskodev"; + repo = pname; + rev = "v${version}"; + sha256 = "1qfwv8bgc9pyfh3d40bvyr9n7sjc2na61481693wwww640lm0f9f"; }; preConfigure = "patchShebangs ."; configureFlags = [ "--enable-cli" ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ruby cdparanoia ]; - postInstall = '' - wrapProgram "$out/bin/rrip_cli" \ - --prefix PATH : "${ruby}/bin" \ - --prefix PATH : "${cdparanoia}/bin" + + buildInputs = [ + cddiscid + cdparanoia + ruby + ]; + + postFixup = '' + wrapProgram $out/bin/rrip_cli \ + --prefix PATH : ${lib.makeBinPath [ cddiscid cdparanoia ruby ]} ''; meta = with lib; { description = "High quality CD audio ripper"; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; + homepage = "https://github.com/bleskodev/rubyripper"; }; } diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix new file mode 100644 index 00000000000..c0966e9ab3f --- /dev/null +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -0,0 +1,85 @@ +{ lib, fetchurl +# Optional due to unfree license. +, faacSupport ? false +, glib, python3Packages, gtk3, wrapGAppsHook +, gsettings-desktop-schemas, intltool, xvfb-run +, gobject-introspection, gst_all_1, fdk-aac-encoder }: + +python3Packages.buildPythonApplication rec { + pname = "soundconverter"; + version = "4.0.3"; + + src = fetchurl { + url = "https://launchpad.net/soundconverter/trunk/${version}/+download/${pname}-${version}.tar.gz"; + sha256 = "sha256-hzIG/4LD3705erPYvXb7uoRwF9LtKKIKB3jrhpYMsZ0="; + }; + + buildInputs = [ + gtk3 + fdk-aac-encoder + gobject-introspection + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + (gst_all_1.gst-plugins-bad.override { inherit faacSupport; }) + ]; + + nativeBuildInputs = [ + intltool + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + python3Packages.gst-python + python3Packages.distutils_extra + python3Packages.setuptools + python3Packages.pygobject3 + ]; + + checkInputs = [ + xvfb-run + ]; + + postPatch = '' + substituteInPlace bin/soundconverter --replace \ + "DATA_PATH = os.path.join(SOURCE_PATH, 'data')" \ + "DATA_PATH = '$out/share/soundconverter'" + ''; + + preCheck = let + self = { outPath = "$out"; name = "${pname}-${version}"; }; + xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath; + in '' + export HOME=$TMPDIR + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${xdgPaths [gtk3 gsettings-desktop-schemas self]} + # FIXME: Fails due to weird Gio.file_parse_name() behavior. + sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py + '' + lib.optionalString (!faacSupport) '' + substituteInPlace tests/testcases/integration.py --replace \ + "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ + "for encoder in ['fdkaacenc', 'avenc_aac']:" + ''; + + checkPhase = '' + runHook preCheck + xvfb-run python tests/test.py + runHook postCheck + ''; + + # Necessary to set GDK_PIXBUF_MODULE_FILE. + strictDeps = false; + + meta = with lib; { + homepage = "https://soundconverter.org/"; + description = "Leading audio file converter for the GNOME Desktop"; + longDescription = '' + SoundConverter reads anything the GStreamer library can read, + and writes WAV, FLAC, MP3, AAC and Ogg Vorbis files. + Uses Python and GTK+ GUI toolkit, and runs on X Window System. + ''; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ jakubgs ]; + }; +} diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index fa9860ab248..3ec2cda4280 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv -, fetchgit +{ lib +, stdenv +, fetchFromGitHub , autoreconfHook , help2man , pkg-config @@ -11,24 +12,25 @@ , boost , ecasound , glibcLocales -, libGLU, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL +, libGLU +, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL }: stdenv.mkDerivation { - pname = "soundscape-renderer-unstable"; + pname = "soundscape-renderer"; + version = "unstable-2016-11-03"; - version = "2016-11-03"; - - src = fetchgit { - url = "https://github.com/SoundScapeRenderer/ssr"; + src = fetchFromGitHub { + owner = "SoundScapeRenderer"; + repo = "ssr"; rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9"; - sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7"; + sha256 = "sha256-9s+Elaxz9kX+Nle1CqBU/9r0hdI4dhsJ6GrNqvP5HIs="; }; # Without it doesn't find all of the boost libraries. - BOOST_LIB_DIR="${boost}/lib"; + BOOST_LIB_DIR = "${boost}/lib"; # uses the deprecated get_generic_category() in boost_system - NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; + NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix index 1d53c2f4cea..2ec9562c620 100644 --- a/pkgs/applications/audio/sptlrx/default.nix +++ b/pkgs/applications/audio/sptlrx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sptlrx"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "raitonoberu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wk4vXm6sB+Rw0VFAhfD0GKxsP+1LwpS6VFHa3UENuJk="; + sha256 = "sha256-b38DACSdnjwPsLMrkt0Ubpqpn/4SDAgrdSlp9iAcxfE="; }; - vendorSha256 = "sha256-l5gIbjB2rJyNmZBqrHo4kwClmAgjgDWHTs5KWzrfC08="; + vendorSha256 = "sha256-/fqWnRQBpLNoTwqrFDKqQuv1r9do1voysBhLuj223S0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 31fe69b00de..5fc0d6f4200 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,39 +1,50 @@ -{ lib, stdenv, fetchFromGitHub -, alsa-lib, flac, libmad, libvorbis, mpg123 +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, flac +, libmad +, libpulseaudio +, libvorbis +, mpg123 +, audioBackend ? "alsa" , dsdSupport ? true -, faad2Support ? true, faad2 -, ffmpegSupport ? true, ffmpeg -, opusSupport ? true, opusfile -, resampleSupport ? true, soxr -, sslSupport ? true, openssl +, faad2Support ? true +, faad2 +, ffmpegSupport ? true +, ffmpeg +, opusSupport ? true +, opusfile +, resampleSupport ? true +, soxr +, sslSupport ? true +, openssl }: let - concatStringsSep = lib.concatStringsSep; - optional = lib.optional; - opts = [ "-DLINKALL" ] - ++ optional dsdSupport "-DDSD" - ++ optional (!faad2Support) "-DNO_FAAD" - ++ optional ffmpegSupport "-DFFMPEG" - ++ optional opusSupport "-DOPUS" - ++ optional resampleSupport "-DRESAMPLE" - ++ optional sslSupport "-DUSE_SSL"; + inherit (lib) optional optionalString; -in stdenv.mkDerivation { - pname = "squeezelite"; + pulseSupport = audioBackend == "pulse"; + binName = "squeezelite${optionalString pulseSupport "-pulse"}"; + +in +stdenv.mkDerivation { + # the nixos module uses the pname as the binary name + pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.6.1196"; + version = "1.9.9.1401"; src = fetchFromGitHub { - owner = "ralph-irving"; - repo = "squeezelite"; - rev = "2b508464dce2cbdb2a3089c58df2a6fbc36328c0"; - sha256 = "024ypr1da2r079k3hgiifzd3d3wcfprhbl5zdm40zm0c7frzmr8i"; + owner = "ralph-irving"; + repo = "squeezelite"; + rev = "894df3ea80f66a27a9ae5fab918acf62a6798b8b"; + hash = "sha256-LIi+9vb0+56AGvVrLx4gQaUkUNjIi6PmqrLViLT1DSU="; }; - buildInputs = [ alsa-lib flac libmad libvorbis mpg123 ] + buildInputs = [ flac libmad libvorbis mpg123 ] + ++ lib.singleton (if pulseSupport then libpulseaudio else alsa-lib) ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile @@ -47,15 +58,22 @@ in stdenv.mkDerivation { --replace "<opusfile.h>" "<opus/opusfile.h>" ''; - preBuild = '' - export OPTS="${concatStringsSep " " opts}" - ''; + EXECUTABLE = binName; + + OPTS = [ "-DLINKALL" ] + ++ optional dsdSupport "-DDSD" + ++ optional (!faad2Support) "-DNO_FAAD" + ++ optional ffmpegSupport "-DFFMPEG" + ++ optional opusSupport "-DOPUS" + ++ optional pulseSupport "-DPULSEAUDIO" + ++ optional resampleSupport "-DRESAMPLE" + ++ optional sslSupport "-DUSE_SSL"; installPhase = '' runHook preInstall - install -Dm755 -t $out/bin squeezelite - install -Dm644 -t $out/share/doc/squeezelite *.txt *.md + install -Dm555 -t $out/bin ${binName} + install -Dm444 -t $out/share/doc/squeezelite *.txt *.md runHook postInstall ''; @@ -63,7 +81,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Lightweight headless squeezebox client emulator"; homepage = "https://github.com/ralph-irving/squeezelite"; - license = with licenses; [ gpl3 ] ++ optional dsdSupport bsd2; + license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2; maintainers = with maintainers; [ samdoshi ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 7223812e57d..d9effb3f1af 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.1.2"; + version = "7.1.3"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-0/xWSae5TD5qI+HgoJ2DAHxqv/Z0E4DGiQhfTA03xkM="; + sha256 = "sha256-UadE8qsQxRjE+POHLAUY1tRUInNXsMEqTAP02zSDSZ4="; }; postPatch = '' diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index a68ed3ceae5..ff9b6c679aa 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "vmpk"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-SPome4UKGOWQLT9RMoGZ0wUdwodG8mSIaGFCg0i5CmY="; + sha256 = "sha256-cwfJJVeUokyZI1iGvqBvXjcBR36VGodzrUx5Atv3POM="; }; nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index dfb6a419c3d..fe9da33e5ca 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,33 +1,64 @@ -{ lib, stdenv, fetchFromGitHub , alsa-lib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre -, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, boost +, cairo +, cmake +, fftwSinglePrec +, fltk +, libGLU +, libjack2 +, libsndfile +, libXdmcp +, lv2 +, minixml +, pcre +, pkg-config +, readline +, xorg +, zlib }: assert stdenv ? glibc; -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "yoshimi"; - # Fix build with lv2 1.18: https://github.com/Yoshimi/yoshimi/pull/102/commits/86996cbb235f0fe138ae814a6758c2c8ba1c2a38 - version = "unstable-2020-05-10"; + version = "2.1.2.2"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; - rev = "86996cbb235f0fe138ae814a6758c2c8ba1c2a38"; - sha256 = "0bgcc5fbgwpdjircq00wlii30pakf45yzligpbnf02a554hh4j01"; + rev = version; + hash = "sha256-6YsA6tC94yJuuWp5rXXqHzqRy28tvmJzjOR92YwQYO0="; }; - buildInputs = [ - alsa-lib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL - minixml zlib xorg.libpthreadstubs pcre - ]; - nativeBuildInputs = [ cmake pkg-config ]; + sourceRoot = "source/src"; - patchPhase = '' - substituteInPlace src/Misc/Config.cpp --replace /usr $out - substituteInPlace src/Misc/Bank.cpp --replace /usr $out + postPatch = '' + substituteInPlace Misc/Config.cpp --replace /usr $out + substituteInPlace Misc/Bank.cpp --replace /usr $out ''; - preConfigure = "cd src"; + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + alsa-lib + boost + cairo + fftwSinglePrec + fltk + libGLU + libjack2 + libsndfile + libXdmcp + lv2 + minixml + pcre + readline + xorg.libpthreadstubs + zlib + ]; cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ]; @@ -38,8 +69,8 @@ stdenv.mkDerivation rec { ZynAddSubFX along with very good Jack and Alsa midi/audio functionality on Linux ''; - homepage = "http://yoshimi.sourceforge.net"; - license = licenses.gpl2; + homepage = "https://yoshimi.github.io/"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 0e1e9f29112..869f8dcad05 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "154b8whbbpnb8lk1b3an44h53gh5fdzxkg5vdfrw1ld6miy68kii"; + sha256 = "09bpkmn22kal3cxg8sil02wy2f2gplsbdkp4viagn0jppma02jid"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ]; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 8500bbc993f..4a06592ce01 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-G6/juGBdiOc8Gh9pKFQlBfUDJzDFMd9gMtILeoF8SMk="; + sha256 = "sha256-Qz4BNrhK+NPnKBgjXGYl4P2R878LCuMGZxLECawA12E="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 207b42e5584..f912ef41677 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.11"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - sha256 = "sha256-hRpZce8ydEsyq7htNfzlRSKPwMAOUurC3uiQpX6WiB8="; + hash = "sha256-eUvZc/7gqGkCB2tNKdwqKOmOgEcG9a/7TSvvyQzhNcQ="; }; postPatch = '' @@ -31,6 +31,7 @@ let chia = python3Packages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; propagatedBuildInputs = with python3Packages; [ + aiofiles aiohttp aiosqlite bitstring @@ -46,6 +47,7 @@ let chia = python3Packages.buildPythonApplication rec { colorlog concurrent-log-handler cryptography + dnslib dnspythonchia fasteners keyrings-cryptfile @@ -55,6 +57,7 @@ let chia = python3Packages.buildPythonApplication rec { sortedcontainers watchdog websockets + zstd ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index df7eace3284..b58524d1eee 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, darwin , fetchurl , autoconf , automake @@ -27,16 +28,25 @@ stdenv.mkDerivation rec { sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809"; }; - nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ]; + # when building on darwin we need dawin.cctools to provide the correct libtool + # as libwally-core detects the host as darwin and tries to add the -static + # option to libtool, also we have to add the modified gsed package. + nativeBuildInputs = [ autogen autoconf automake gettext pkg-config py3 unzip which ] + ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ] ++ [ libtool ]; buildInputs = [ gmp libsodium sqlite zlib ]; - postPatch = '' + # this causes some python trouble on a darwin host so we skip this step. + # also we have to tell libwally-core to use sed instead of gsed. + postPatch = if !stdenv.isDarwin then '' patchShebangs \ tools/generate-wire.py \ tools/update-mocks.sh \ tools/mockup.sh \ devtools/sql-rewrite.py + '' else '' + substituteInPlace external/libwally-core/tools/autogen.sh --replace gsed sed && \ + substituteInPlace external/libwally-core/configure.ac --replace gsed sed ''; configureFlags = [ "--disable-developer" "--disable-valgrind" ]; @@ -56,6 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ElementsProject/lightning"; maintainers = with maintainers; [ jb55 prusnak ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 4928f363d70..f78c0fa3e35 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-6TR9OeIAVVbwDrshb9zHTS39x6taNWYK0UyRLbkW+g0="; + hash = "sha256-BI7hxlpg2sggD1ag73n+tRre+Ja2ZFhDPzy1DV8aEHw="; }; - cargoHash = "sha256-taOrbtx74DICvPLrwym70X3pv7EBA/H22VZmlxefANM="; + cargoHash = "sha256-Oy2mOulSB2a9LaT47G+BzjidcjPjHeaoesQ7g6M8M1Q="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 6c8d895e03a..be124d6f34d 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -24,13 +24,13 @@ with lib; stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; - version = "0.21.0.1"; + version = "0.21.0.2"; src = fetchFromGitHub { owner = "ElementsProject"; repo = "elements"; rev = "elements-${version}"; - sha256 = "sha256-nZa5doiFQJhtK8cUUISTZhS61HzW7CMB9pPsWKc8Gac="; + sha256 = "sha256-5b3wylp9Z2U0ueu2gI9jGeWiiJoddjcjQ/6zkFATyvA="; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 9c560b0fabc..22f2c970935 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "erigon"; - version = "2022.02.03"; + version = "2022.02.04"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M8rCLkKoCx+5Eg53HfK6Ui4UrYsujGd7G8ckONclhTM="; + sha256 = "sha256-86a1VtVyTRKpY41fAHskUfPZpXUutpyvxlRLhkiHTZ0="; }; - vendorSha256 = "sha256-loYo1nAR1lARsfoY5Q+k/tgVBxNxcr++zwUjLN3TRLA="; + vendorSha256 = "sha256-P3jdK+ubBHusTL4eWlA/TDJIrbuV17tL8Cv6c3ubjlc="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 3660aebef70..d13278b7dee 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "22.2.11"; + version = "22.2.25"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-/K5dB5Qfaiv68YWTQ4j5QnqSo+TXPkWcQ+PlJpzDoe8="; + sha256 = "sha256-YbApI9rIk1653Hp3hsXJrxBMpaGn6Wv3WhZiQWAfPQM="; }; sourceRoot = "."; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 297eca24542..6dc644fbb96 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.38.3"; + version = "2.39.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-svNsVdenolrfMGKJvB/8HQMq08Ov5Oe5QooI1jFAcbI="; + hash = "sha256-zVefF5CsyVVMNffec/xwA3KmMtZepM51C3Xh0ZCGl0c="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index faa89b9c877..3b497f34a43 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk +, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }: @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration" diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index a6ab483a7b0..f5ed28cedf6 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (rec { pname = "ed"; - version = "1.17"; + version = "1.18"; src = fetchurl { url = "mirror://gnu/ed/${pname}-${version}.tar.lz"; - sha256 = "0m2yrkfjjraakxr98nsiakqrn351h99n706x9asgmdi57j43kpki"; + sha256 = "sha256-rKjvrZgAxYdySiC5eqj8R+a1pH34Fgb+q6gxsHRGK08="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix index 3202e5f5ac5..ad4f2095657 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix @@ -2,11 +2,11 @@ trivialBuild rec { pname = "ebuild-mode"; - version = "1.53"; + version = "1.55"; src = fetchurl { url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz"; - sha256 = "1l740qp71df9ids0c49kvp942rk8k1rfkg1hyv7ysfns5shk7b9l"; + sha256 = "1bs2s5g79vrbk8544lvp388cdbig0s121kwk0h10hif4kp56ka9w"; }; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 946dba0af8f..82a1d6af832 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -53,7 +53,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // { - inherit pname version; + pname = pname + lib.optionalString ( !withX && !withNS && !withGTK2 && !withGTK3 ) "-nox"; + inherit version; patches = patches fetchpatch; diff --git a/pkgs/applications/editors/jetbrains/darwin.nix b/pkgs/applications/editors/jetbrains/darwin.nix new file mode 100644 index 00000000000..b1002e23582 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/darwin.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, undmg +, ... +}: + +{ meta +, name +, product +, productShort ? product +, src +, version +, ... +}: + +let + loname = lib.toLower productShort; +in + stdenvNoCC.mkDerivation { + inherit meta src version; + desktopName = product; + installPhase = '' + runHook preInstall + APP_DIR="$out/Applications/${product}.app" + mkdir -p "$APP_DIR" + cp -Tr "${product}.app" "$APP_DIR" + mkdir -p "$out/bin" + cat << EOF > "$out/bin/${loname}" + open -na '$APP_DIR' --args "\$@" + EOF + chmod +x "$out/bin/${loname}" + runHook postInstall + ''; + nativeBuildInputs = [ undmg ]; + pname = lib.concatStringsSep "-" (lib.init (lib.splitString "-" name)); + sourceRoot = "."; + } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 5f4700c1662..b47c1270790 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -10,7 +10,18 @@ with lib; let - mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; }; + 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)); + versionKey = if stdenv.isLinux then "linux" else system; + products = versions.${versionKey} or (throw "Unsupported system: ${system}"); + + package = if stdenv.isDarwin then ./darwin.nix else ./linux.nix; + mkJetBrainsProduct = callPackage package { inherit vmopts; }; + # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: @@ -19,13 +30,12 @@ let product = "CLion"; meta = with lib; { homepage = "https://www.jetbrains.com/clion/"; - inherit description license; + inherit description license platforms; longDescription = '' Enhancing productivity for every C and C++ developer on Linux, macOS and Windows. ''; maintainers = with maintainers; [ edwtjo mic92 ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [ @@ -58,14 +68,13 @@ let product = "DataGrip"; meta = with lib; { homepage = "https://www.jetbrains.com/datagrip/"; - inherit description license; + inherit description license platforms; longDescription = '' DataGrip is a new IDE from JetBrains built for database admins. It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more. ''; maintainers = with maintainers; [ ]; - platforms = platforms.linux; }; }); @@ -75,7 +84,7 @@ let product = "Goland"; meta = with lib; { homepage = "https://www.jetbrains.com/go/"; - inherit description license; + inherit description license platforms; longDescription = '' Goland is the codename for a new commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development. @@ -83,10 +92,9 @@ let and tool integrations specific for the Go language ''; maintainers = [ maintainers.miltador ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + '' + postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv @@ -98,10 +106,10 @@ let ''; }); - buildIdea = { name, version, src, license, description, wmClass, ... }: + buildIdea = { name, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; - product = "IDEA"; + inherit name version src wmClass jdk product; + productShort = "IDEA"; extraLdPath = [ zlib ]; extraWrapperArgs = [ ''--set M2_HOME "${maven}/maven"'' @@ -116,18 +124,18 @@ let with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ. ''; - maintainers = with maintainers; [ edwtjo gytis-ivaskevicius ]; - platforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot ]; + platforms = ideaPlatforms; }; }); - buildMps = { name, version, src, license, description, wmClass, ... }: + buildMps = { name, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct rec { - inherit name version src wmClass jdk; - product = "MPS"; + inherit name version src wmClass jdk product; + productShort = "MPS"; meta = with lib; { homepage = "https://www.jetbrains.com/mps/"; - inherit license description; + inherit license description platforms; longDescription = '' A metaprogramming system which uses projectional editing which allows users to overcome the limits of language @@ -135,7 +143,6 @@ let diagrams. ''; maintainers = with maintainers; [ rasendubi ]; - platforms = platforms.linux; }; }); @@ -145,24 +152,23 @@ let product = "PhpStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/phpstorm/"; - inherit description license; + inherit description license platforms; longDescription = '' PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ''; maintainers = with maintainers; [ schristo ma27 ]; - platforms = platforms.linux; }; }); - buildPycharm = { name, version, src, license, description, wmClass, ... }: + buildPycharm = { name, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; - product = "PyCharm"; + inherit name version src wmClass jdk product; + productShort = "PyCharm"; meta = with lib; { homepage = "https://www.jetbrains.com/pycharm/"; - inherit description license; + inherit description license platforms; longDescription = '' Python IDE with complete set of tools for productive development with Python programming language. In addition, the @@ -177,11 +183,8 @@ let and productive development! ''; maintainers = with maintainers; [ ]; - platforms = platforms.linux; }; - }).override { - propagatedUserEnvPkgs = [ python3 ]; - }; + }); buildRider = { name, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { @@ -189,7 +192,7 @@ let product = "Rider"; meta = with lib; { homepage = "https://www.jetbrains.com/rider/"; - inherit description license; + inherit description license platforms; longDescription = '' JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper. Rider supports .NET Core, @@ -199,7 +202,6 @@ let ASP.NET Core web applications. ''; maintainers = [ maintainers.miltador ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' @@ -215,10 +217,9 @@ let product = "RubyMine"; meta = with lib; { homepage = "https://www.jetbrains.com/ruby/"; - inherit description license; + inherit description license platforms; longDescription = description; maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; }; }); @@ -228,14 +229,13 @@ let product = "WebStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/webstorm/"; - inherit description license; + inherit description license platforms; longDescription = '' WebStorm provides an editor for HTML, JavaScript (incl. Node.js), and CSS with on-the-fly code analysis, error prevention and automated refactorings for JavaScript code. ''; maintainers = with maintainers; [ abaldeau ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { postPatch = (attrs.postPatch or "") + optionalString (stdenv.isLinux) '' @@ -244,6 +244,7 @@ let rm -r jbr ''; }); + in { @@ -251,12 +252,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.3.3"; /* updated by script */ + version = products.clion.version; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "03gil00srq3jljc13iyb7v1yc6l6yhdhqm9d1ld2j2pympl6p61m"; /* updated by script */ + url = products.clion.url; + sha256 = products.clion.sha256; }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -264,12 +265,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.3.4"; /* updated by script */ + version = products.datagrip.version; description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "09dkxj5vn99gkgc1yd18w7gqkw2vzci0z9q2fcih0zn7lvqp0im3"; /* updated by script */ + url = products.datagrip.url; + sha256 = products.datagrip.sha256; }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -277,12 +278,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.3.3"; /* updated by script */ + version = products.goland.version; description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "18z4mvxhds5fgdwcfywc4pj8s9ifvsknhradgzmxsvji0fbp0awx"; /* updated by script */ + url = products.goland.url; + sha256 = products.goland.sha256; }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -290,12 +291,13 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "IntelliJ IDEA CE"; + version = products.idea-community.version; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1j889b2r950bl9wiqq1z8v8s2qicidfcdar300cy666i8rc25qlr"; /* updated by script */ + url = products.idea-community.url; + sha256 = products.idea-community.sha256; }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -303,12 +305,13 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "IntelliJ IDEA"; + version = products.idea-ultimate.version; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0w36qnqgkvw6j1ks09h515237bhqfaixrimzg2r494ic98amvkps"; /* updated by script */ + url = products.idea-ultimate.url; + sha256 = products.idea-ultimate.sha256; }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -316,13 +319,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.3"; /* updated by script */ - versionMajorMinor = "2021.3"; /* updated by script */ + product = "MPS ${products.mps.version-major-minor}"; + version = products.mps.version; description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; - sha256 = "0zw5xqdlhjfg0smfjl8xy7drf9spiwqbmqq8z22x4zb61lpvdbp9"; /* updated by script */ + url = products.mps.url; + sha256 = products.mps.sha256; }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -330,12 +333,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.3.2"; /* updated by script */ + version = products.phpstorm.version; description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1qi0zq3gzcfnikky37g2dqgmzm7r1883k6asris8nph389qk86vn"; /* updated by script */ + url = products.phpstorm.url; + sha256 = products.phpstorm.sha256; }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -343,12 +346,13 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "PyCharm CE"; + version = products.pycharm-community.version; description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1s36basydp7cxgbgdapjhkslx0x9vv3639xhm84ny76hf7s03bpi"; /* updated by script */ + url = products.pycharm-community.url; + sha256 = products.pycharm-community.sha256; }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -356,12 +360,13 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.3.2"; /* updated by script */ + product = "PyCharm"; + version = products.pycharm-professional.version; description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0rwykngqgby05mh47kls8wzi68gfka2z04k6kdmsxwn1hhx5gnbb"; /* updated by script */ + url = products.pycharm-professional.url; + sha256 = products.pycharm-professional.sha256; }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -369,12 +374,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.3.3"; /* updated by script */ + version = products.rider.version; description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "13q6hk5l3fqmz818z5wj014jd5iglpdcpi8zlpgaim1jg5fpvi8x"; /* updated by script */ + url = products.rider.url; + sha256 = products.rider.sha256; }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -382,12 +387,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.3.2"; /* updated by script */ + version = products.ruby-mine.version; description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "18ny40zl9hgkynkc5yyy2xqngl9diifh2gqrfnz7rfq14kp10xb9"; /* updated by script */ + url = products.ruby-mine.url; + sha256 = products.ruby-mine.sha256; }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -395,12 +400,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.3.2"; /* updated by script */ + version = products.webstorm.version; description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0q2hn48499hv7licpl84ly0bhiizya8a69dl2vjvgscj3cdkr98q"; /* updated by script */ + url = products.webstorm.url; + sha256 = products.webstorm.sha256; }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/linux.nix index a5e0a2611f0..d150368ca82 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -3,17 +3,15 @@ , vmopts ? null }: -{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: +{ name, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: with lib; -let loName = toLower product; - hiName = toUpper product; +let loName = toLower productShort; + hiName = toUpper productShort; mainProgram = concatStringsSep "-" (init (splitString "-" name)); vmoptsName = loName - + ( if (with stdenv.hostPlatform; (is32bit || isDarwin)) - then "" - else "64" ) + + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions"; in @@ -36,7 +34,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { nativeBuildInputs = [ makeWrapper patchelf unzip ]; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = '' get_file_size() { local fname="$1" echo $(ls -l $fname | cut -d ' ' -f5) @@ -73,7 +71,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { item=${desktopItem} makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \ - --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix PATH : "$out/libexec/${name}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl deleted file mode 100755 index 201c51094dc..00000000000 --- a/pkgs/applications/editors/jetbrains/update.pl +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i perl -p perl perlPackages.LWPProtocolHttps perlPackages.FileSlurp - -use strict; -use List::Util qw(reduce); -use File::Slurp; -use LWP::Simple; - -my $only_free = grep { $_ eq "--only-free" } @ARGV; - -sub semantic_less { - my ($a, $b) = @_; - $a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; - $b =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; - return $a lt $b; -} - -sub get_latest_versions { - my @channels = get("https://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs; - my %h = {}; - for my $ch (@channels) { - my ($id) = $ch =~ /^<channel id="[^"]+" name="([^"]+)"/; - my @builds = $ch =~ /(<build .+?<\/build>)/gs; - my $latest_build = reduce { - my ($aversion) = $a =~ /^<build [^>]*version="([^"]+)"/; die "no version in $a" unless $aversion; - my ($bversion) = $b =~ /^<build [^>]*version="([^"]+)"/; die "no version in $b" unless $bversion; - semantic_less($aversion, $bversion) ? $b : $a; - } @builds; - next unless $latest_build; - - # version as in download url - my ($version) = $latest_build =~ /^<build [^>]*version="([^"]+)"/; - my ($fullNumber) = $latest_build =~ /^<build [^>]*fullNumber="([^"]+)"/; - my $latest_version_full1 = "$version-$fullNumber"; - $latest_version_full1 =~ s/\s*EAP//; - - my ($latest_version) = $latest_build =~ /^<build [^>]*version="([^"]+)"/; - ($latest_version) = $latest_build =~ /^<build [^>]*fullNumber="([^"]+)"/ if $latest_version =~ / /; - - $h{$id} = $latest_version; - $h{"full1_" . $id} = $latest_version_full1; - } - return %h; -} - -my %latest_versions = get_latest_versions(); -# for my $ch (sort keys %latest_versions) { -# print("$ch $latest_versions{$ch}\n"); -# } - -sub update_nix_block { - my ($block) = @_; - my ($channel) = $block =~ /update-channel\s*=\s*"([^"]+)"/; - if ($channel) { - if ($latest_versions{$channel}) { - my ($version) = $block =~ /version\s*=\s*"([^"]+)"/; - die "no version in $block" unless $version; - if ($version eq $latest_versions{$channel}) { - print("$channel is up to date at $version\n"); - } elsif ($only_free && $block =~ /licenses\.unfree/) { - print("$channel is unfree, skipping\n"); - } else { - my $version_string = $latest_versions{$channel}; - my $versionMajorMinor = $version_string =~ s/^([0-9]+[.][0-9]+).*/$1/r; - - print("updating $channel: $version -> $version_string\n"); - my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; - # try to interpret some nix - my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; - $name =~ s/\$\{version\}/$version_string/; - # Some url pattern contain variables more than once - $url =~ s/\$\{name\}/$name/g; - $url =~ s/\$\{version\}/$version_string/g; - $url =~ s/\$\{versionMajorMinor\}/$versionMajorMinor/g; - die "$url still has some interpolation" if $url =~ /\$/; - my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; - unless ( $sha256 ) { - my $full_version = $latest_versions{"full1_" . $channel}; - $url =~ s/$version_string/$full_version/; - ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; - $version_string = $full_version; - } - die "invalid sha256 in $url.sha256" unless $sha256; - my ($sha256Base32) = readpipe("nix-hash --type sha256 --to-base32 $sha256"); - chomp $sha256Base32; - print "Jetbrains published SHA256: $sha256\n"; - print "Conversion into base32 yields: $sha256Base32\n"; - $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m; - $block =~ s#versionMajorMinor\s*=\s*"([^"]+)".+$#versionMajorMinor = "$versionMajorMinor"; /* updated by script */#m; - $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m; - } - } else { - warn "unknown update-channel $channel"; - } - } - return $block; -} - -my $nix = read_file 'default.nix'; -$nix =~ s/(= build\w+ rec \{.+?\n \};\n)/update_nix_block($1)/gse; -write_file 'default.nix', $nix; diff --git a/pkgs/applications/editors/jetbrains/update.py b/pkgs/applications/editors/jetbrains/update.py new file mode 100755 index 00000000000..5301a85ba9a --- /dev/null +++ b/pkgs/applications/editors/jetbrains/update.py @@ -0,0 +1,97 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests python3.pkgs.xmltodict +import hashlib +import json +import pathlib +import logging +import requests +import sys +import xmltodict +from packaging import version + +updates_url = "https://www.jetbrains.com/updates/updates.xml" +versions_file_path = pathlib.Path(__file__).parent.joinpath("versions.json").resolve() + +logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) + + +def one_or_more(x): + return x if isinstance(x, list) else [x] + + +def download_channels(): + logging.info("Checking for updates from %s", updates_url) + updates_response = requests.get(updates_url) + updates_response.raise_for_status() + root = xmltodict.parse(updates_response.text) + products = root["products"]["product"] + return { + channel["@name"]: channel + for product in products + for channel in one_or_more(product["channel"]) + } + + +def build_version(build): + return version.parse(build["@version"]) + + +def latest_build(channel): + builds = one_or_more(channel["build"]) + latest = max(builds, key=build_version) + return latest + + +def download_sha256(url): + download_response = requests.get(url) + download_response.raise_for_status() + h = hashlib.sha256() + h.update(download_response.content) + return h.hexdigest() + + +channels = download_channels() + + +def update_product(name, product): + update_channel = product["update-channel"] + logging.info("Updating %s", name) + channel = channels.get(update_channel) + if channel is None: + logging.error("Failed to find channel %s.", update_channel) + logging.error("Check that the update-channel in %s matches the name in %s", versions_file_path, updates_url) + else: + try: + build = latest_build(channel) + version = build["@version"] + parsed_version = build_version(build) + version_major_minor = f"{parsed_version.major}.{parsed_version.minor}" + download_url = product["url-template"].format(version = version, versionMajorMinor = version_major_minor) + product["url"] = download_url + product["version-major-minor"] = version_major_minor + if "sha256" not in product or product.get("version") != version: + logging.info("Found a newer version %s.", version) + product["version"] = version + product["sha256"] = download_sha256(download_url) + else: + logging.info("Already at the latest version %s.", version) + except Exception as e: + logging.exception("Update failed:", exc_info=e) + logging.warning("Skipping %s due to the above error.", name) + logging.warning("It may be out-of-date. Fix the error and rerun.") + + +def update_products(products): + for name, product in products.items(): + update_product(name, product) + + +with open(versions_file_path, "r") as versions_file: + versions = json.load(versions_file) + +for products in versions.values(): + update_products(products) + +with open(versions_file_path, "w") as versions_file: + json.dump(versions, versions_file, indent=2) + versions_file.write("\n") diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json new file mode 100644 index 00000000000..83f486edfcf --- /dev/null +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -0,0 +1,296 @@ +{ + "linux": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", + "version": "2021.3.4", + "sha256": "a34670f1a6c77e00237302a70f22fb5bf089dfe128341fd89b2f25bb8becb325", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.tar.gz", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "9d2b709703516eddeb7f4d6568a7de2e268de4258c7bc7787baee806fbaee4a3", + "url": "https://download.jetbrains.com/go/goland-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "99e2225846d118e3190023abc65c8b2c62a1d1463f601c79a20b9494c54a08c9", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", + "version": "2021.3.2", + "sha256": "face5d154a2c9244b278bfc6dca37218ae3344090526a0679086eff9b0c56670", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2-no-jbr.tar.gz", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", + "version": "2021.3", + "sha256": "e9aeb62f0d667dd285f808e3ba308f572797dbf11d51e9aa06cf49481bee857f", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3.tar.gz", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "761b347142035e8b74cc5a9939100af9d45f1f6ee29de1e78cd6b1ff06fe20e2", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "f1ae01f471d01c6f09aab0a761c6dea9834ef584f2aaf6d6ebecdce6b55a66e8", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "6bd9573a84c1f2ae6b9b6612f0859aee21133f479ace43602dc0af879f9d9e67", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "1dc57d5d7932d4a8dea51fc5cbdaa52f9626490092978f02fa15bb41cb84068f", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "697510ee2401bb7cbe75193f015d8c2dd1677117defbc2a6f5f3c1443f20dea2", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "18a53c1b1b92e9b7e516b425a390f23f46b880a704d1cb223d1ba64410b15060", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + } + }, + "x86_64-darwin": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", + "version": "2021.3.3", + "sha256": "342a4d8549ae4623a5edfa7f9737887cf0a25c1a61bb414b54b742b1c5a1a84d", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", + "version": "2021.3.4", + "sha256": "27e709d2ced66d37a615d8c56885828e49a08962708e28df1a20f324c626bf52", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.dmg", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", + "version": "2021.3.3", + "sha256": "4b245b6fe0cf588adbf36e68f12397d5fd311b0b6d49f17ba374ebaa10d207c9", + "url": "https://download.jetbrains.com/go/goland-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", + "version": "2021.3.2", + "sha256": "20d8cee2bbedaeb0ea388f795e13d08eca5b59e59d4e980ac2d8bc07c9fed3e9", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", + "version": "2021.3.2", + "sha256": "9f574562b866e6ccc3d2f9b4c245c45844d1d0fd54be3dbdcc893d40ba1cf54a", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", + "version": "2021.3", + "sha256": "2c5517518fec31ac960e4309fa848ad831f9048ef15df1b362e12aa8f41d9dbd", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos.dmg", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", + "version": "2021.3.2", + "sha256": "596a9d5fdc30d5fba65ddd482da90f9d555fed748b930587562022bfe7df4e14", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", + "version": "2021.3.2", + "sha256": "b8f41f5dddeda0ed5f5c81ba57d2560ccc6e227987882fb6bf305b5d1d8c6909", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", + "version": "2021.3.2", + "sha256": "188b998660e7cfb7ac1364c818c008a5608ab2aeb17c6cc19d1d9dda547d3775", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", + "version": "2021.3.3", + "sha256": "41a0939cb6258a0fb303268c5a466a663cf3588af14bcbb351be4c3a1d158094", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", + "version": "2021.3.2", + "sha256": "ba27c14b21d66ca96a64ceb7dc5d9f0952254a5f405b3201f51d2ad3cc749a96", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", + "version": "2021.3.2", + "sha256": "932d4920f831d1ceae68a474444c37d986277d8d3288d3aab93dd43d99336a36", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.dmg", + "version-major-minor": "2021.3" + } + }, + "aarch64-darwin": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "fbf651fa4a5925fe729be30ca8a6fa3be84dc4d7827dbcf74f4d28c52b903cc2", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", + "version": "2021.3.4", + "sha256": "7a77ba9fce56c781ae6a4fc65eaab4bcc10780b6bd679b04d74146719e42890a", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "54397d48e20fb534206e13f84b35868b1eaea13175176487b1239b23db4e13db", + "url": "https://download.jetbrains.com/go/goland-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "79e540fb0cd480837b3a954e4802f4f252073955393e8927c9c1b28c37112d51", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "511c6aed9c5cd4c7665a9bac9ba94582977013244cbe88b820eb5464fce91a1c", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", + "version": "2021.3", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos-aarch64.dmg", + "sha256": "3ace6d45db718dffd80bf126a76735fb65099de292112a01cc078aa61c475a70", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "ba15c3f843c85141a9adaec1c4611224a853bd98649148751e34ac304591a314", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "407bf395cfb6d61f1c0861c7679b197238780e82a019e10162b8cd7130edb15a", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "12fa34d1e60a555bac230acea9cd46c7adfe9ca42ff3e458c79d33e5b88eb8db", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "65603860d1fd3134c5659f5a06de7cac17f3183a01056b79cfe72242b99adb37", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "33773222b2fa14300de5ed12ca96c3442b933f66cef67cebc9610e5cef51c75e", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "f4788ec0c55123b1f4e14934792f65bf8040e2a2ee673e985b50b8feded60408", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + } + } +} diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index 9f5f64f9e5b..dd8765db28a 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -15,7 +15,7 @@ from typing import List, Tuple from pathlib import Path # Import plugin update library from maintainers/scripts/pluginupdate.py -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore sys.path.insert( 0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts") ) @@ -42,7 +42,7 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/ class KakouneEditor(pluginupdate.Editor): - def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): + def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) with open(outfile, "w+") as f: diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix new file mode 100644 index 00000000000..2653806a14f --- /dev/null +++ b/pkgs/applications/editors/lapce/default.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, cmake +, pkg-config +, python3 +, perl +, freetype +, fontconfig +, libxkbcommon +, xcbutil +, libX11 +, libXcursor +, libXrandr +, libXi +, vulkan-loader +, copyDesktopItems +, makeDesktopItem +}: + +rustPlatform.buildRustPackage rec { + pname = "lapce"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "lapce"; + repo = pname; + rev = "v${version}"; + sha256 = "tOVFm4DFQurFU4DtpPwxXQLbTGCZnrV1FfYKtvkRxRE="; + }; + + cargoPatches = [ ./fix-version.patch ]; + + cargoSha256 = "BwB3KgmI5XnZ5uHv6f+kGKBzpyxPWcoKvF7qw90eorI="; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + perl + copyDesktopItems + ]; + + buildInputs = [ + freetype + fontconfig + libxkbcommon + xcbutil + libX11 + libXcursor + libXrandr + libXi + vulkan-loader + ]; + + # Add missing vulkan dependency to rpath + preFixup = '' + patchelf --add-needed ${vulkan-loader}/lib/libvulkan.so.1 $out/bin/lapce + ''; + + postInstall = '' + install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/lapce.svg + ''; + + desktopItems = [ (makeDesktopItem { + name = "lapce"; + exec = "lapce %F"; + icon = "lapce"; + desktopName = "Lapce"; + comment = meta.description; + genericName = "Code Editor"; + categories = [ "Development" "Utility" "TextEditor" ]; + }) ]; + + meta = with lib; { + description = "Lightning-fast and Powerful Code Editor written in Rust"; + homepage = "https://github.com/lapce/lapce"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ elliot ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/editors/lapce/fix-version.patch b/pkgs/applications/editors/lapce/fix-version.patch new file mode 100644 index 00000000000..2a8d96be169 --- /dev/null +++ b/pkgs/applications/editors/lapce/fix-version.patch @@ -0,0 +1,31 @@ +diff --git a/Cargo.lock b/Cargo.lock +index bc9a0f8..45a74ad 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2165,7 +2165,7 @@ dependencies = [ + + [[package]] + name = "lapce" +-version = "0.0.9" ++version = "0.0.10" + dependencies = [ + "lapce-core", + "lapce-proxy", +@@ -2173,7 +2173,7 @@ dependencies = [ + + [[package]] + name = "lapce-core" +-version = "0.0.9" ++version = "0.0.10" + dependencies = [ + "Inflector", + "alacritty_terminal 0.15.0", +@@ -2233,7 +2233,7 @@ dependencies = [ + + [[package]] + name = "lapce-proxy" +-version = "0.0.9" ++version = "0.0.10" + dependencies = [ + "alacritty_terminal 0.16.0-rc2", + "anyhow", diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 4a5f464f4bc..efe431c3396 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.5"; + version = "6.6-b2"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-f237oXhnu6OtGVhIFDswFwfjcLgYWvLNRtVW4SChFzU="; + sha256 = "sha256-oUOsAYcxknG+bao76bzPhStO1m08pMWTEEiG2rLkklA="; }; dontBuild = true; diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index b76e4fa0a7b..3605f6c6e4e 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -2,11 +2,11 @@ let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then - { arch = "x86"; sha256 = "afa4b1116aee18e3ddd93132467809d0bcf03715cf9ad55b895f021a13e1cb8a"; } + { arch = "x86"; sha256 = "sha256-k4FQrt72VNb5FdYMzxskcVhKlvx8MZelUlLCItxDB7c="; } else - { arch = "x86_64"; sha256 = "55ab653c601727a2077080e7ea4d76fe7a897379934ed9a5b544e20d490f53f9"; }; + { arch = "x86_64"; sha256 = "sha256-mj5wVQlY2xFzdulvMdb5Qb5HGwr7RElzIkpOLjaAfGA="; }; in stdenv.mkDerivation rec { - version = "1.5.4"; + version = "1.5.5"; pname = "tuxguitar"; src = fetchurl { diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index a00646437f7..2282e583683 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "12.6"; + version = "13"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha512-K0HjEO/yw9h+2+Y5CvxyYG1+kx+KH9NSn+QsKCsvh/rG/ilYLYyy93iZfx+wzwrgEfRtfMpZGtDAxd6nyUSnCA=="; + hash = "sha512-Xnh2OhnHOo++gGPx1o/WmcTHV7KNVeeT6ut9xH2Zo0EFtt43GFi2+HLOXm3u/IcjAzWlbGvIp9+TVUnwDusDoA=="; }; buildCommand = '' diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 8ddd0d6a283..3b694e4b151 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "pinegrow"; - version = "6.3"; + version = "6.4"; src = fetchurl { url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; - sha256 = "0wldj633p67da077nfc67gr9xhq580rkfd0r3904sjq7x01r0kaz"; + sha256 = "0i8sg4criimrqmz0g68b8xcwcrb362ssid5jazswpa6hhwj6s5n4"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 894b7a43c01..3cfc37b36a0 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-rfk/csJJATXI1JvAHn2K/+fVLsqmkKxIbNWlcu1EhYY="; + hash = "sha256-y39u1eSX7vzcIJzoykU7Y7FTmeZnBW/IlvJLzKHfz8Y="; }; format = "other"; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index cd776fb6bfc..b93fbd6110f 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-3rECGnb0kkQwzsMxLxgAp0QEoHFHv+qCjiCgzCZeUJw="; + sha256 = "sha256-LfP3qUzoHuYSpkTz1queVGTWOP9v9kbgbgvvtiMK6Eo="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 0cb09814c0f..13c5c49db48 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4227"; + version = "8.2.4350"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-Xj4ymkrWY5GWpQhEDYtPtaRovBa6j19dW9GWg9WSdig="; + sha256 = "sha256-+fCyLZi9+9r7tYoRQsVESkcoHHtM7vrVuOGdJi/9iF0="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index c71f057fe0f..806e2f9d4fd 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation { pname = "macvim"; - version = "8.2.1719"; + version = "8.2.3455"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-166"; - sha256 = "1p51q59l1dl5lnf1ms960lm8zfg39p8xq0pdjw6wdyypjj3r8v3v"; + rev = "snapshot-172"; + sha256 = "sha256-LLLQ/V1vyKTuSXzHW3SOlOejZD5AV16NthEdMoTnfko="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 49354aa9a8d..6af3e384a63 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,10 +1,10 @@ diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index af43549..dfb10fe 100644 +index 32c89b387..c2af70127 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc -@@ -14,35 +14,5 @@ set backspace+=indent,eol,start - " translated to English). - set langmenu=none +@@ -9,35 +9,5 @@ set nocompatible + " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it. + set backspace+=indent,eol,start -" Python2 -" MacVim is configured by default to use the pre-installed System python2 @@ -29,22 +29,22 @@ index af43549..dfb10fe 100644 -" or an installation from python.org: -if exists("&pythonthreedll") && exists("&pythonthreehome") && - \ !filereadable(&pythonthreedll) -- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python") -- " MacPorts python 3.8 -- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python -- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.8/Python") +- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python") +- " MacPorts python 3.9 +- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python") - " https://www.python.org/downloads/mac-osx/ -- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.8/Python +- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python - endif -endif - +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ diff --git a/src/Makefile b/src/Makefile -index fd2d5e1..37a6d6a 100644 +index c4a3ada37..06ee3de44 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1397,7 +1397,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1402,7 +1402,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -52,12 +52,12 @@ index fd2d5e1..37a6d6a 100644 +MACVIMGUI_DEFS = -DMACOS_X_DARWIN -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe MACVIMGUI_IPATH = MACVIMGUI_LIBS_DIR = - MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon + MACVIMGUI_LIBS1 = diff --git a/src/auto/configure b/src/auto/configure -index 06257a5..68437df 100755 +index 39ef81449..d8fa7ec2f 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5872,10 +5872,7 @@ $as_echo "not found" >&6; } +@@ -5896,10 +5896,7 @@ $as_echo "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -69,7 +69,7 @@ index 06257a5..68437df 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6260,23 +6257,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6287,23 +6284,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -93,7 +93,7 @@ index 06257a5..68437df 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6499,13 +6479,7 @@ __: +@@ -6526,13 +6506,6 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -104,11 +104,10 @@ index 06257a5..68437df 100755 - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - fi - else -+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6520,7 +6494,6 @@ eof +@@ -6547,7 +6520,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -116,7 +115,7 @@ index 06257a5..68437df 100755 fi -@@ -6599,13 +6572,6 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -6626,13 +6598,6 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "no" >&6; } fi @@ -130,7 +129,7 @@ index 06257a5..68437df 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7499,11 +7465,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -7557,11 +7522,7 @@ $as_echo "$tclver - OK" >&6; }; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 $as_echo_n "checking for location of Tcl include... " >&6; } @@ -142,7 +141,7 @@ index 06257a5..68437df 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7521,13 +7483,8 @@ $as_echo "<not found>" >&6; } +@@ -7579,13 +7540,8 @@ $as_echo "<not found>" >&6; } if test -z "$SKIP_TCL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } @@ -156,9 +155,9 @@ index 06257a5..68437df 100755 for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7717,10 +7674,6 @@ $as_echo "$rubyhdrdir" >&6; } - if test -f "$rubylibdir/$librubya"; then - librubyarg="$librubyarg" +@@ -7774,10 +7730,6 @@ $as_echo "$rubyhdrdir" >&6; } + rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` + if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" - elif test "$vi_cv_path_ruby" = "/usr/bin/ruby" -a -d "/System/Library/Frameworks/Ruby.framework"; then - RUBY_LIBS="-framework Ruby" @@ -168,7 +167,7 @@ index 06257a5..68437df 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index bbc01ee..5a93591 100644 +index 4ff59f201..f91cb9836 100644 --- a/src/vim.h +++ b/src/vim.h @@ -244,17 +244,6 @@ @@ -190,15 +189,14 @@ index bbc01ee..5a93591 100644 # include "os_amiga.h" #endif diff --git a/src/vimtutor b/src/vimtutor -index 1e8769b..47078b0 100755 +index 3b154f288..e89f26060 100755 --- a/src/vimtutor +++ b/src/vimtutor -@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" - if test "$1" = "-g"; then - # Try to use the GUI version of Vim if possible, it will fall back - # on Vim if Gvim is not installed. -- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" -+ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" - shift +@@ -16,6 +16,6 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" + if test "$1" = "-g"; then + # Try to use the GUI version of Vim if possible, it will fall back + # on Vim if Gvim is not installed. +- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" ++ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" + shift fi - diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3651c6ac5e1..b15195bd015 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-02-25"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "0a229de4633a51548cb7257a116ea48dd4dd38c2"; - sha256 = "19w0lkdak24m94hn4sp37h4q30i4893b7dwdvr7kz29na6x254rr"; + rev = "d864b463bca824ebbdf2b17a0ac046955c007b2b"; + sha256 = "173r0vj0g893c4mkd4if16xqsckx55jfsgwz7fg6rrnbazjs75h0"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-02-19"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "5b1044e2ade71fee4a59f94faa108d99b4e61fb2"; - sha256 = "02np6iarx5yp8m5lvp4rmgl6zlxy7m64sp3fix7hh9dy51h58xs5"; + rev = "560e6340ce10ce90fac587096fb147eea43e624d"; + sha256 = "08gcy6anp648kpk1sir6nwk0dxy55a6gj9w1whp28lchjc5yrd8y"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -197,12 +197,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-02-19"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "6942fc4fcb2058fe1401761e97641f42aadb7758"; - sha256 = "12q9im1rd7zmdfw6bax7x7pjnlf6204ar70z77fv3cpi09r2s3sz"; + rev = "9f8e50033cb724d8856907a5fbf4685eb3efda24"; + sha256 = "00j0fp57lqcn3qvkb392shj1mqfv9vmn5wjcsibf0y6vbcq17xxh"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -461,12 +461,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-02-24"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "871495d9e2dbe3314a421fd2d5e46f47de7ee537"; - sha256 = "1xw13g6l16i6k32f3mdzmihz0m0n9y586ykiynjwkil69wxpjd1l"; + rev = "d5904e8a3434acb151a4948b1b3d4760a2a12bb1"; + sha256 = "1rr048xsf4q5rpi1b2fkgqh23khrmjpd6420p240m3b3rj027brw"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -509,12 +509,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-02-16"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "5169cd99bd4bc5f0c2d505e91190383c3c323680"; - sha256 = "1q5bz37yfzbnm6h9n0c3y8nn69zphsxjsjykly28xg6q87il9di5"; + rev = "24aba3962926330266e8a722c62d7c7fcfb1961e"; + sha256 = "1h3jnfjwn16a2by95vh9l7jc79ab5jc6w6ksh56r5maxf9v49x94"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -533,12 +533,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-02-25"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "f932760f16368c5feeb079a878ed0ff8588aed29"; - sha256 = "18bpfbb8aj2pmh84mq6w3435nyha0xiqpralx8daxb89vl0drvn4"; + rev = "f5fc1c613783a488e01be692c2ca3b1e9d46e8e4"; + sha256 = "0avdzzppjw59jlkjicl749kbs602dlfjmc4z7770c8ga2hzslzzd"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -581,12 +581,12 @@ final: prev: ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2022-01-26"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "6d0254b845e1cf42ee778763190f852b6d013dc3"; - sha256 = "15z2mfjgpr36bqady1ijvaha41d1rfw5prcwr9czcmh2iaphp2j8"; + rev = "b21e4e725dfe7aaec02d88923f45193928fe5a55"; + sha256 = "1c5gdd3j1sg0bk92iaanw855d05ximdm7y0s2z1ph4lawfn3bk37"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -929,12 +929,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-02-22"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "4f73c9dd68fdd9493e34020e3e626e788b95fd9a"; - sha256 = "0igsr25shrjl9fj8is6lpyff9l2by7jkjmck5n56wdn97cxav719"; + rev = "5581530535bc10c42f84c16665d79fbaf7d49806"; + sha256 = "1qf8gihw8bdn6253qly2d9d60ng95r20fy8v8l2vv5lfmzdaaz27"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -965,12 +965,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-02-24"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "1bdaaefc15baea37f4de1f8bedb5b3dd7c0efd32"; - sha256 = "1vjwgbw9r4jd41nkxmkn3yxdmds1alf9gf96kv0jdxjdxryy23dc"; + rev = "c13c51019ca922279b291f82ddeecefb26fecdac"; + sha256 = "0g2sm6f8h5si901l2nzbphin7qh66517636xv9f5821jaixwyx6m"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -989,12 +989,12 @@ final: prev: colorbuddy-nvim = buildVimPluginFrom2Nix { pname = "colorbuddy.nvim"; - version = "2022-02-22"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "tjdevries"; repo = "colorbuddy.nvim"; - rev = "e0f5fafb4ee06cb29a915f8128282fc1f99b128f"; - sha256 = "1lfb6ynhjyxzsm6id720f07cc1f52g38mzfc1i0hi4mysjnrkfh3"; + rev = "cdb5b0654d3cafe61d2a845e15b2b4b0e78e752a"; + sha256 = "1gjwgh77xgpdpzlz51c7gxnbpqyzm4hy9baspgjf9j5ny4yisn03"; }; meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; @@ -1025,12 +1025,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2021-06-07"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "6a00a2cabfb5ee3f49ff556ceea56892825c0397"; - sha256 = "0z2zr2mfc5m4xn8b0j0br7q96hs42md5wd53viv0zmw67i2pnbcs"; + rev = "c797e8b76155e24ebdf180cef28e1a409604492e"; + sha256 = "0903l7q223id6b91sji8cxk22fmpj1shv3dgxjka8av0wgz7v93w"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -1038,12 +1038,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-02-16"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "18a8dc0bbdfc089d5f5a850e4640d8e75381c598"; - sha256 = "00yvac1iks83jy7cbkalx0hy3sg0d14hn4zd3jk5wc25c7f1jzmq"; + rev = "026ec9530b6691db8c68a3ae4fc44c56aa281f52"; + sha256 = "14qfx8722mzb62a60l3m7ddy2g241gp06f7k5ncdfy49353qv7v8"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1230,24 +1230,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-02-25"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "1792fee68dfba89632022e9524c2dcef10d399cd"; - sha256 = "1y0ycmv1394mnxqzmrxx7ac846sy24cw7hgdxvp2w08cicysb38a"; + rev = "3172e9802f8cd0d6fa64c7cfa377410369786040"; + sha256 = "0zj6j1ih6knj5bhs3d7g1yr8i2pnhf6pgdh7gbj7l28j62idx9dy"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-02-22"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "3526cb195cb381cef5d4fc25c532f00942562874"; - sha256 = "0jxbdcjkmfwi05g1xdibr0i24hq23ihslmhpbj4yy0hj1x7afdk2"; + rev = "074b3f1758d4e743e2d0bed0fc24ef6386387036"; + sha256 = "1qbxrl36zawvbf4x2h9za4s300b8s7yvzfp7klcy30nd9a9xfwpr"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1278,12 +1278,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-02-03"; + version = "2022-02-27"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "afa44bb9ccebbcde56bf66d498f2277206f7895c"; - sha256 = "064is1nhdldkglj03f4832qagnbbwrf4sd1bnjx9iadq9wx84lp5"; + rev = "6f0837b598d9bf0a30bc30dff39114b2e0cb79f3"; + sha256 = "1vr3p2yqdhf9515y4203h5vjgrc8gnjk1yl9lb4d83ywbbpgcxi0"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1410,12 +1410,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2022-01-30"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "c3417f30029c384c73aeccb1084f21c14b4bae45"; - sha256 = "0dc0w8j4fhbh86vmibi9wx146r79sv2yvsqczp28hqinwss6j68b"; + rev = "6d97ad7fae49f7c00644dd96da64e14c3e23c835"; + sha256 = "0vyahlli5jg1a8m3dnln16n93jlzyimj0jx76dlbg7x906hkjd91"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1760,12 +1760,12 @@ final: prev: direnv-vim = buildVimPluginFrom2Nix { pname = "direnv.vim"; - version = "2020-11-20"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "ff37d76da391e1ef299d2f5eb84006cb27a67799"; - sha256 = "136z8axjd66l4yy6rkjr6gqm86zxnqpbw9pzkvii0lsaz11w9wak"; + rev = "451e3637a15af7d4a206ac761af7a2247f139e0e"; + sha256 = "0bynm225is7xkzkllx7d95cjarpxaj2yq1p0g2svgwxgqjhb6yhx"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; @@ -1808,12 +1808,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-02-02"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "8e8f7e525941ee2080a39b98c1b1f5466a6ea187"; - sha256 = "0i2wsjzy881g80rf94zmggkk1mj1jnb582dwzl6wlw3bi9vvsbg0"; + rev = "b36b69c6a5d6b30b16782be22674d6d037dc87e3"; + sha256 = "1inb7x7lcf5vrxhbcxcmdldvbldq8asn21wvp3awf9wk8zn6572i"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -1832,12 +1832,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-02-24"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "032c406c7f63874c459234beedf8452d2fa38ee4"; - sha256 = "1qjv2zs07svnw5whs2lsznxpbffr03i95n8q6xipqndzya7g23ym"; + rev = "ba27cebaa7cc51f60f5f8dbeae0ab94c6ccca8e5"; + sha256 = "1fd32qwvqsdb2ndpsnxlaw5940f31p3vlk9j79pxykizl4zi4w39"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1928,6 +1928,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/emodeline/"; }; + everforest = buildVimPluginFrom2Nix { + pname = "everforest"; + version = "2022-03-10"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "everforest"; + rev = "e6628a1ff5028086b42e90061c78c8d3bd15a7c8"; + sha256 = "0sb0vhnlfm0830w5kpy3jd1ihxpx1ban0mg0lvgg1fqxn8a0kzkx"; + }; + meta.homepage = "https://github.com/sainnhe/everforest/"; + }; + falcon = buildVimPluginFrom2Nix { pname = "falcon"; version = "2021-12-19"; @@ -2002,12 +2014,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-02-13"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "d2ceaeb0c16ff0ea38def9442d6062371cec1548"; - sha256 = "0p3r2xff2lkmvqc390nwn6qrgif5niclbqvs4hx0fypq5b86i33y"; + rev = "6a0763f917e05c3a22cfa85cbb65e6a9234da122"; + sha256 = "1yl9l3hily2548v5h848f9vg15fblnrb8imlhnv9v31w0233h9xp"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2111,12 +2123,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-02-11"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "c879f29c592afc9b9a15e4daa5fd7e78c56af89c"; - sha256 = "1669jww7cv9sv8v4z1sscilixmx2945h2rvz9afc384i1pfidips"; + rev = "2e82574f2cb6686849fb8e7a0231537734161fd4"; + sha256 = "08c9asrkmr57v83n3a6r28a0rxwna9xp227p8jr3rj3fn9ykahxw"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2135,12 +2147,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-02-02"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "2e575549910571ff5abb6b02178c69ad760a4e00"; - sha256 = "06cbqxnpi5gzq9cggwixkgmw9kw5sdlw311xsczk7vn720bay26f"; + rev = "ad07b2844021b20797adda5b483265802559a693"; + sha256 = "1gar4pcdh4waxsjr423s4s1bdxplg01bgalp414pwbc4zwzrdh3b"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2231,12 +2243,12 @@ final: prev: fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-02-01"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "1f7bfa4007043c30027b2cd79625e8aac5cff1f9"; - sha256 = "0f6i6g9qvh9zyh56g51b1jf0bm4chsgkmqsy62fjh5yrlbkcwkai"; + rev = "b23e4bb8f853cb9641a609c5c8545751276958b0"; + sha256 = "02gz5j1pa8d7sgksjfikv8vf3gz41r6z33qwhiy9nvgnrwwmckwf"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -2279,12 +2291,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-02-19"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "5957897f76b1f5fe3abbdd612d19be2c69452b0e"; - sha256 = "1d05nh2plyha3h8kr9pzys2730kbfxhb0lb2k2fg08bcxcnz144k"; + rev = "b6a426bc8224865c70244365f5c7599765d8df95"; + sha256 = "1l1485fnsf9y529snqh68kwksc5xcxg7fh7ikscisqdia2j75vg9"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -2315,12 +2327,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-02-05"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "fdd38cf969af53acfaebde75ce74bb9bdc44daca"; - sha256 = "0pl60wgsc8pfhbzi6rgxa8kd4pbw7qdk2xc161i1qxykjjkczgwa"; + rev = "e60bfbc314476777a5ce200e533699691a5cdfa5"; + sha256 = "1nh54hfc0cvz3a9znrp32ialpbqqwlgbyw45m9b489g9kndf3y2k"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2375,12 +2387,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-02-15"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "1d1f043acf025f919b8dd12bb672569109c7f099"; - sha256 = "1wcinz5r81mcx246vxwqqs3dfc7j61x81bp9zf02p3hflhf66s7h"; + rev = "5c487a804e462c284c159c800a803b8e0294d0a4"; + sha256 = "13i2c5r021h9jbsiap31f42y67z0pqjwfgmx6z64r35n3gmz5azz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2495,12 +2507,12 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2022-02-03"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "9395ee71627d7202343c606a2e1d3c7967bfb256"; - sha256 = "06v6kdsqhy59zd4il9qxcli68cmx4g1pxv5zfpaglayghvnxdn9n"; + rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0"; + sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -2519,12 +2531,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-02-20"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "fde5af0921d4ac5e0b108417f3b57595ca5c7e7f"; - sha256 = "0sd106rkcsmypha79jwkangsh0i4dx4viiqgdqbk3hi05fsnwngm"; + rev = "256cd9d2bb414942eb2300d41ead84ed0f52edfd"; + sha256 = "1v7d4pfp1m9027x3spqikjhgv03fsjpmmgl6hzf2nzlxqiavh07v"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2771,12 +2783,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-01-22"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "2e35f7dcdc72f39b37c21e43cdb538d7a41c7e07"; - sha256 = "1hgj7k3ml7n11nqn7cmn7bpls0rm6xh5z4sgrsgjyvrdnw6wckla"; + rev = "9915d46ba9361784c70036bb7259c436249e5b0c"; + sha256 = "0gcfm7hppgm2f909q6y8gs369mrh8flhbriyv5waq0ir15752cv4"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2952,24 +2964,24 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2022-02-21"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "d752c2eebda44f4ba96768ffc2d61ebe41a914b3"; - sha256 = "0qqav23q85yad6i0vlq5fx74cvb97gmvb7ncnhkrh0qy3z63b0hk"; + rev = "a4b2830cedfc57152bd4e6b27050a41f02229295"; + sha256 = "0kmc6cgnsdim5yhjcy1hxcfp17a6pslj2zbray8jsfl9xkc2jl74"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-02-17"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "95462e91b82542a3d602bec5a2a54a35abe29728"; - sha256 = "1vl4p6nlp7y3vd98qgxl43c0yrcpllbyjlzqa3ajjsgkgxdjn73f"; + rev = "63cb5cc1a80def7da4bb375adee1587866250a17"; + sha256 = "08iwz314c0k63mwv3yka8n79lb2627nbx9n81l9crz1f3nplaasd"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3060,36 +3072,36 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2022-02-21"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "9bceeab97668935cc6b91ab5190167d9771b5210"; - sha256 = "1s2jyfssj1xvp2ym8a77pynjxw28722jj75i3lqln5i7v57dsjd9"; + rev = "ca8ea75e5a1d838635fd2fcc5c3467a5bb33c4ec"; + sha256 = "1h09yp9kmzbcraw88gdkzlv834p0yi5xacpmx4ksmp4yh4an6h5d"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-01-26"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "18dc0d630250c3d3b8cb4139bed53327aa4fed50"; - sha256 = "0cxvhinwd7afsy8jxy9c6ql9ybv1w0m8xv4dh5sl1bpybf8dsg96"; + rev = "58ef474453717efa9b700a22fc004756bf2ea5b9"; + sha256 = "1gwk1p7djny7wgy2bb1m5g230z2rr6jy2bjjfwrnbddhvhvi32q8"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-02-20"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "585503ef238726bc51bc3ce724afc0e8b64bf43b"; - sha256 = "0f6r16rhbc1k12d85a278cicqpbl3mj30pfra66s7kfv531lvw00"; + rev = "d3fef426356b6d33248c3e919cbd9b90d3742a70"; + sha256 = "0wr06w8bbsalfs188gg055wc0p4f6x7l8bqci96bjdn9f1pa1xpj"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3240,12 +3252,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-02-25"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "e53a14b2b279e92fbca9646ec14188ab76dd009a"; - sha256 = "13lr7kz2jny0slwshk85hv4ccnh3ywwmxy1wwq3a552cbk1p69j2"; + rev = "58c9e321b188e040703b01f16922623911f11117"; + sha256 = "1x9w6nk69a6xzhr9jpcvnw3jby09k49y7gikasxyq5gpq6rp9dfs"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3276,12 +3288,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-02-18"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "eaa706a38bdf889103806d10ccbe0be1983ca746"; - sha256 = "0j8rlkyq8snsyhjw6swr35ldznz9w64hhpcbyl7qzsgcjsn62kly"; + rev = "8447cf6de2bee95a23c6e43d7cfc291a713e401e"; + sha256 = "0zr9bk6glf97g6w7wsk9s5zi6g3gbpk104b5aq0wl2dmcccxy09m"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3300,24 +3312,24 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-02-22"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "65bf5c03cd0b2a3c5c67a7600833092f89541344"; - sha256 = "1fayv5ldhvspjvlwpvpwzcggc0ih1va20hyd1krfhyj91842prz0"; + rev = "86fa6872ba2195f4dc569073c46192041f153654"; + sha256 = "0faqi0rwjdd09bv9h3j8jpyv8hmak91aymysi9rc99zwd84nvy59"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-02-24"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "f044fa4b465a102375d8d977e10e6427ec81ff63"; - sha256 = "0blsnmdcyfm5phcwb6lh0ngynlj3i35nvlyvspr63v1vfxjms4x9"; + rev = "4f54ff9708c59385dd2f08aad1ba7df879e638fc"; + sha256 = "076wyp90mr43xniv0zc7wh6rfk1wr50cpfw5lvaj6ai7dyys466n"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; @@ -3336,12 +3348,12 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-02-24"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "7745d713e067b5faa44cffba85278ac820c3fe2c"; - sha256 = "1y8lxrzvcs55chggrbg3h0vpg2ll5fschcp78ivb3cdq9cbs8jfh"; + rev = "c9fd775aebf702c81e2077693336584a0027d496"; + sha256 = "1zbxn3hzss41zwp0b1cwhh31zj0443xfpxjkchml9sq4f0hklkvd"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3407,12 +3419,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-02-15"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "f7c308e99697317ea572c6d6bafe6d4be91ee164"; - sha256 = "0s48bamqwhixlzlyn431z7k3bhp0y2mx16d36g66c9ccgrs5ifmm"; + rev = "e4f7dad45a1a3bb390977b4e69a528993bcefeac"; + sha256 = "0smxcvgyc575kmz9aw20k47awh5j11ywnc1lpq1hdgkppxm7lnm2"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3431,12 +3443,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-02-21"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "65e9ca7fb147668ce3f7321f8d734ae9b754241c"; - sha256 = "1rjmgq4jm7a785qy7xzsxy9hb5x2c3rjiqmhdqmqn3kw1d01wrxl"; + rev = "f3cdb7b3a99c548b56fe39078a69d0c594422e18"; + sha256 = "11l7iyykbd1hh673srpafggg3hlnf6a8jissmsx303gpnsml4bhv"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; @@ -3467,24 +3479,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-02-21"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "016a20711ee595a11426f9c1f4ab3e04967df553"; - sha256 = "0y3rfamhl04hx3cjh6p9spr11flxr3l195a5h9h06k9hhj5rqppc"; + rev = "88a44ade818f9ee7ba730aa4096250e22b243808"; + sha256 = "0wjqpy7gvkzim27dnanzydphb44kdm345zm9yrngysrdpmbpkd0p"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-02-24"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "5addafcc2460c7b805f14f8a257b804527bb85d7"; - sha256 = "0whp6gcg059wygpww8mw1gapjd8qgx20xzy5r3g173x0c05kx3a1"; + rev = "35c7e1c1a1beec3dda228c7f3c2fba5c543c77a2"; + sha256 = "10a6p7cwa0r3zpf3az4a7i5hi4lza0d7maxywnk0wb4x039bpq9x"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3539,12 +3551,12 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2021-12-28"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "chentau"; repo = "marks.nvim"; - rev = "4b0aad42e72a653ca1afe31d2942f8aa5ab633e1"; - sha256 = "1qvgaf353aaq3aw8q251vx8llvm30c4yj1lyvnh43r5h8kxawc6x"; + rev = "74885b10abf792f61a612f5724030678b9704dab"; + sha256 = "12653fd7h1s0hf55399vdk2w3aqyx8n8v62kgpvb62mywbg37bam"; }; meta.homepage = "https://github.com/chentau/marks.nvim/"; }; @@ -3575,12 +3587,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-02-07"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "a7c9069a55d136e6dc62fc107cb996df2eaebb55"; - sha256 = "1qblxq744ldzihb57b62ykjci19fa2v918610g8jb36gjrlmxdkd"; + rev = "596270a53ac5e19a3b9f9f1777d7e99dcf67f71e"; + sha256 = "0zzdks5dgfz19srflvxa4jj9gxzbany6a697p000vaq5zb59k9v2"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -3611,12 +3623,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-02-17"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e36464080b7a62fe318f659cca3adb57e6712511"; - sha256 = "09l5dz6ihnzgw7hg87jckmx8ycppsbpls5lcqvamnfiy2j21rhjq"; + rev = "68f2bda2ce9ea9ecd51a133d9909c9ec07d44666"; + sha256 = "0klsy5pq3fvj2v6199aikpa6br4q6l30ig5nqnh6jm8c48bw6nqg"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -3647,24 +3659,24 @@ final: prev: mkdir-nvim = buildVimPluginFrom2Nix { pname = "mkdir.nvim"; - version = "2021-06-20"; + version = "2022-02-26"; src = fetchFromGitHub { owner = "jghauser"; repo = "mkdir.nvim"; - rev = "caa4178dae081850230f2f05699fef8e83b59ded"; - sha256 = "0s87hmna6bl9zy12ni2ih4i7aml009slmsk1pkpr93lmh2mspms7"; + rev = "ed2da69babf365395be5dde420d7ee6482564938"; + sha256 = "05zavlylgadhwrv3andvr0briqblj0kr5m148s7bwczqi15y0ljy"; }; meta.homepage = "https://github.com/jghauser/mkdir.nvim/"; }; mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-02-23"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "ca5b89e28cecc7993f769fc35b0ae794fd73af06"; - sha256 = "0b9j55gjk641rnkbl8b4vmfb8pkz7jml15yf3y65lzb09fchx2dv"; + rev = "1f33d22f61db59faa24aaa69f2452668c37eef32"; + sha256 = "0ybi76l3f2r19d2f2ca5jjbn2gcvwdh9mxbh3xly8jin7f8anp36"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -3695,24 +3707,24 @@ final: prev: mru = buildVimPluginFrom2Nix { pname = "mru"; - version = "2022-01-22"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "yegappan"; repo = "mru"; - rev = "30315ad4c07f0045c203a443291ad0c8d2fe7279"; - sha256 = "1k3x8v9c9c3mn2nakcsr5f9wqckxlx3b86smml4d985q90372fqn"; + rev = "148f71bd47bdb2af8c639694863910b6e551aaa4"; + sha256 = "1cijxc0srzbl2bycx7ccmwhgzz89frvyyim808rcy7bk7i56ccda"; }; meta.homepage = "https://github.com/yegappan/mru/"; }; Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2021-11-18"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "f7b689d72649e1d5132116c76ac2ad8b97c210d4"; - sha256 = "17yfc7ss9yslf8dvwl0vi3mdpcxp5j1g6dc8qrz20v2dx8hjxd1q"; + rev = "6bfcf7da965a03fd1e170aa6870b92b16bf739ee"; + sha256 = "1vx3ibxsn4gdq44pqhykygmim1cq1pj6qrd8cs9lpkm1vq1gz35w"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -3995,12 +4007,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-02-25"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "3bba2b63417cb679313e0ed0b7d9b7539c7f02b0"; - sha256 = "1pr9hxy36xm8gbl4kkq0sa7qn6ki8k5mkdlz07vizk44yzq1pk95"; + rev = "f30879799f7c19d0047c6f3d3a86b818eaf0f201"; + sha256 = "1bfm5zfc97kna9hkb8asknbx1b7pznv88n3128a7d11ysasziz98"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4055,12 +4067,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-02-22"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "25dcc8d87cea1fc18280f4f1149c7dfc5b4a10bf"; - sha256 = "0x5lhr18fw1zqf68r1hmnk0zh2wivdcqk7rpr5x41vq02hqy0ia2"; + rev = "ed9fb80e846042a46521494a980df83bc4e075fd"; + sha256 = "1f85yr0kvncxhqp9l4diwk9l3g2sg8ca3xbvp95qh957jfp03n9k"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4211,12 +4223,12 @@ final: prev: neuron-nvim = buildVimPluginFrom2Nix { pname = "neuron.nvim"; - version = "2021-12-04"; + version = "2022-02-27"; src = fetchFromGitHub { owner = "oberblastmeister"; repo = "neuron.nvim"; - rev = "d89a2f701eceae882dca1f9bbb754d2a89b0beda"; - sha256 = "0xjf5wiwy57g1rpq08lw32xyk0yx27p6z1m1bycq4wnxd1faqm8s"; + rev = "c44032ece3cb71a9ce45043d246828cd1cef002c"; + sha256 = "0r8qybg1pikp49v9v0zh79q7fxx8kh8rwafvyqghf5yb0ixcjiis"; }; meta.homepage = "https://github.com/oberblastmeister/neuron.nvim/"; }; @@ -4247,12 +4259,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-02-22"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "6b6cf94c588c9aba2f0bf65c175f54ddceb3aa85"; - sha256 = "09maybpfclp3kj9diq98y8izwvgwn7h7phmj439c1ppjn8phgy04"; + rev = "2208bcb7fe17a76d8b88f296fe632860bf62d948"; + sha256 = "0pq5r5kdq858k5cxd9ix3xqwvikllq63b86ba42jpkq1z39bdk2v"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4319,12 +4331,12 @@ final: prev: nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-02-16"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "35b910263c614257dadc76813c9a02659912ad62"; - sha256 = "1mbxdxk637x506xdhmbybvzl2ilmy25wdd1911119s257zjq41w0"; + rev = "419542972605b808607d9339cbda0a216b6e8be6"; + sha256 = "10w85n2i7hl0whnv3pb3zva6iws61ca2a8xcrlwh1si2vjywby6i"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -4355,24 +4367,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-01-30"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "6f803e88093573f73d4ee6c0dfe0575df3f97a9f"; - sha256 = "05napd3gqhdpb2x07affs50bm8prb3rzz0w5a39iyr40y96bpjix"; + rev = "513ff9bbdde7da53e209232d4328e734ea2bd96a"; + sha256 = "08r2ifkj9zj8c771ahl2i0b8crp3cw2cdshkpq26ci14ypdq0304"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-02-25"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "4dd4df18d415d59310ce8e7a42f707edf6e6d270"; - sha256 = "08m6mxanf31269ray76fzfb4il9cixnf78qq9p19i330k2hydqap"; + rev = "2d98a1dac0a6ffc915e78738f87ad80c9c6a8d18"; + sha256 = "0wnxbfyr9q4rqbivff0lnyv1b6h9i0dkrg67qxnkqmh3zx34pq9z"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4415,12 +4427,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-02-14"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "784398a8f184431fd4329f20b0e4f52e87707bbd"; - sha256 = "14cd1aq5kyi82akkmk3pf2as0pg9kmyavggpcpkp8cl1api01xl8"; + rev = "d2cde7c5802b34d6391a8a3555a3b7b56482f2aa"; + sha256 = "1cbijlqblxf5chc35lq8jl8pzfkx0a72bbf6bzz90nvrcn4xc6m3"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4439,12 +4451,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-02-21"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "2558ee1d3a0c518301bd9bee97ddd61eb21b629c"; - sha256 = "1kjn0fvmbk5ii47vjmw8p3w7h6gdhmxr10x84x48spaz428vw5wd"; + rev = "dcb8a8762d9c93ddf7dc8f06009299c0bf11a14c"; + sha256 = "146bwcfywazl2ygs5r0yd56prdmrr1lbhlqcbrvs7l4pkh58w4fw"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4475,24 +4487,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-02-15"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "13d64460cba64950aff41e230cc801225bd9a3e2"; - sha256 = "091argbivsnjp3ibsnci2qj5jrr2b39gicrlz2ky41kmb4pmw36b"; + rev = "1001683bee3a52a7b7e07ba9d391472961739c7b"; + sha256 = "1z2dy0mgzrpkxirkhximc5ibhgqf2hqa7d8xxmw6icpn3mxwb7xq"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2022-02-21"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "b3671ef7a74912575d84b4dbc848fd3b6195b27e"; - sha256 = "0p6959z8im5r1mvr0fmx1ig24kav9wndnr50r1pvq117ch9kr59z"; + rev = "3f7fc82977e843e14bb3b16bad4cbd5d363d8694"; + sha256 = "1x9cpy79fxq5nwpbfwi2xcw5xhk6nw16rribdns2n2qy4my4ajpa"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4559,24 +4571,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-02-16"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "9fcff6e02e1a549d47a2c559a4b833798537c0bc"; - sha256 = "1ai71s38dcny22wmhw5b5b82hj2mf16g60rbzi7llg54fdlfp92k"; + rev = "bc7ac4864188079a6122032a75ea914c95461c1f"; + sha256 = "05wv0cq7w0adkq78fz47vwm65ws6ckysm9bxg3yaxlkiarc59vw0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-02-24"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "22e94f2303c8d8d72b541799d7733c5ded0733c5"; - sha256 = "1761vih6pi2gs3z7bh5515nmr4hkbif82q33gghsvgzjri6a0c3q"; + rev = "b4a596f149f87a6e93ae11c46a2121ff7c265170"; + sha256 = "12ljh9mnfvpw538lq8ggmxvsq7f1phjvp4xsnflrl7vkhdy32zsr"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -4643,36 +4655,36 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-02-09"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "6afd8f7a69e7008dabe048d4fb1ee8e467a72fdf"; - sha256 = "13pgq09sxhfxxmrrqzc1f8b119f6d7yyx30lzbgr2vx59bh69ph2"; + rev = "08134573e3d5fef75c52c39f3e7097dbbdf6255c"; + sha256 = "1rs1y3ywrrcz03ad847903wrl4rmg1kzhvm9dkq33pz5m0myf75j"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-02-18"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "0f20213a9d55ac7ff19b4f9a9f8812303ec4200b"; - sha256 = "0fvmnwraxzfwm9rc4b279bg40ycmpkxjgx6yqkwg7aznzmmqlc22"; + rev = "925167117f5de9702781af9e43a9d86318a20329"; + sha256 = "1a87ry1rl86xbqhd76bgqxxavq7qmsh9ds2crmlgd9f3wgsk4bxn"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-02-23"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "2a883d68b93570a66baca5984e416d4c4d079c3f"; - sha256 = "19i442k58jl0rrnxbbmxg0w0nghi1x3vpxy0id7bb10bg5aafwjm"; + rev = "6c6dcf5c461355392487d8c0e5b00223de933948"; + sha256 = "1rqk7n0cbrv25dzlz28xajw6fsqw9lrflicd9x830yq809mvfql0"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4739,36 +4751,36 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-02-23"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "f3215fa06782829a9705031fab2ec1f6ad514fd8"; - sha256 = "05vsi9vgd2y6y8yv5mjc2lv4z1bdh7h4lq1cx4l2hy9p9z59kdzj"; + rev = "8cc31931859dc3cc187fd68509f8649599f72cba"; + sha256 = "006d9l0p86s08vhr5jjm6gi2j27wjbk3c3vfdbq9yi3bz974hgf1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-02-24"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "f769dc92a364f428f9a48726e4c7a0ebfdbf6f66"; - sha256 = "0nl81px6lj0sz0vrpvc4hhd6ccn4am9hd8kxcqzhdz0m37zzp8cr"; + rev = "c68bf8e382eb737d98ec77b2f87ce5c07ea09b46"; + sha256 = "10jj3qdxcsyfv260zp5sd2ys93r7y4584865iv1bvgxa98g7y8ps"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-02-24"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "470569379d708e6c8f33f082497e0374067c6fee"; - sha256 = "1rp9ymbss8jjm1k20q9vp3ayd7lv2cbdiz5ylhx9p1v1glqimigw"; + rev = "096398a07c2dc08d785266f9f55ddcb462ba0749"; + sha256 = "05gb0nd9iv06hr6zfa8yc2n4nd3p98mvcsdbyxm504bpfy3z8c81"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4787,12 +4799,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-02-21"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "e9553362f1bff508fa947fce09bba297cfac0f79"; - sha256 = "1k3bprxzn3qqm4a7rz2l7pld2am9aggcmvrrr6ak7aafd14v5fs9"; + rev = "32a37ce2f2cdafd0f1c5a44bcf748dae6867c982"; + sha256 = "1n3x2i0jd7lrxa66v7fw0rffy3mv5rajqv9qh1r38x45mig8vi40"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -4823,12 +4835,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-02-20"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "57093e9f3749c57f20f49d7e10be9c7d15018c86"; - sha256 = "03slk1lbgn2r66hw2gh34ja1l8kjx6qwc6p0g18bd7w1aazb3g9i"; + rev = "f81b48d298c0ff7479b66568d9cc1a4794c196d0"; + sha256 = "024zzjvdkj1bklhic3yh69jibvnjw0416wvm3lnfw7gjxshglrsy"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4847,12 +4859,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-02-11"; + version = "2022-02-27"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "b6d26e21573c25e9c5faca69a1f905abe66fa294"; - sha256 = "1qsqkgs22r128jb4lvadzv15dzn586x300fwgimkl1q464cdawmx"; + rev = "0090dfbf449d7ad49f6bdaedf51b949e84affc72"; + sha256 = "194pgvs9d11aihddc2c55r8vrz05154lr751w72vii3zvnik9xhd"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4895,24 +4907,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-02-22"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "48e76bc0317de95ac154ae3a26193bf8881340a1"; - sha256 = "06z7c5kcyxdcx7wi5yaw1d1mv3wah5y0kkjn7z5py9x82snk4rwm"; + rev = "2457e141ae5c2e9c5d94a9550b37b421d25cfff1"; + sha256 = "0cw0bgp6q2sa8v88dsvncxmwmglxywbdhiws2klcm6ij9kdk1gy9"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-02-25"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "18c558fd92b5ec800f976c447452ede4e96e9de9"; - sha256 = "1f61237najb65r48j1hsrs6l5yvz9101s0fzi0jpzy40xs0gqb7n"; + rev = "f448a78057290cca9c70c4065819da96103f3dee"; + sha256 = "0yq2lkjch42s02wr93c4xv7sqksiklwspx5pg8d4cia7ghaadj8q"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4955,24 +4967,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-02-23"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e23fc8ac796b722dd30f40467d59581d4854c692"; - sha256 = "15fa27dbyrmbsiysmy3rm3ih9jnxrlvvzlf966jcm29ph225zxmn"; + rev = "7c6b5fe0926f52854f193d058cd98d2e74c3d483"; + sha256 = "1zrgiazmqbn6664ji9gxvn36dsmp9v11nk99yl12c7fxdjlvfpql"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2022-02-24"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "178e40a213eeea4810cad440b6be56ceeb6af434"; - sha256 = "00zlgc7bnryw3ys1ihsf2pyf7f9wzlgmqrkp8bs99nv5qji6bym4"; + rev = "57035b5814f343bc6110676c9ae2eacfcd5340c2"; + sha256 = "06fj3bpfakbzbb4saqa2dss0wz6z98farljv3xmih162qbybr2c1"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -4991,12 +5003,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-02-24"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "35bef9212441ef3f4b69c8ead0fbde123357bb4d"; - sha256 = "0dnr3dilcsyfrgwv497aypvn6jk5rzwdqjs09gn5fwfg354nhsbk"; + rev = "0594067ae677a192a94e383c25a93ac1c3a844d1"; + sha256 = "1pafxnzcwrxbbkqpf9psdglqksl97m8vb6180fwcrgdicbnyp793"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -5039,24 +5051,24 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-02-18"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "bcc89cabb4841134c9aec66480499ccfac0331d6"; - sha256 = "1h350dwl73qdkyyc9nzc92grg858nardspisc49zv1dc3b9f34bj"; + rev = "3fa6223a21528f0f5528469f33f7f0e237ca9e8b"; + sha256 = "0j7m976iyw0rw7hry0sb86jc2vyrsmnpiyj7nn353hbkwazxi2lh"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-02-24"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "9b819574b63bbf8883e32602915da22ead08bf9a"; - sha256 = "084wnwmf67bs9ky1sj23fd6sqp27svfxg8gcf1fng8xjf5yk6pdw"; + rev = "6562c96cfc9c71b139807a975ada6aa8528511dc"; + sha256 = "1x4qjkq67wlhzwbhcjabqc0z8hz4racfdg7pssbig3cmj27y57ik"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -5087,12 +5099,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-02-21"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "3a393b404e7066a86afd1652f5be7c8074ed4030"; - sha256 = "02ldc51k5agn9pjqzjbycdjyilz3v04c534wf0x2nsdi97ikf5vl"; + rev = "5e461b944fbf9b6207cf06102ca09fd7778854f7"; + sha256 = "0s04m3xg98sj74fhhvdmafijmjhpa70hgcylg43yxlgdcscqbd72"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5123,24 +5135,24 @@ final: prev: onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2021-10-15"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "e86ce939d85576fb7ce6c1c45fd49c8a570c24cc"; - sha256 = "19wq5xg1yvk5153c1b0zbhdzaga0ja45m3zm6a1wqb437wcqdqlx"; + rev = "d472198ec6d6a0d148dd0b4cdcf1b60e845311af"; + sha256 = "00sjcihagbdka2mcld584ba2s5g99qbbjh6wgga7n90pkqcqmlw4"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-02-24"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "fda3b36be8613f6ba303082fed7a7e20fdf52205"; - sha256 = "14i3lqz1l9k8ai9lskrgz511srvf2wwfjd8zlbkmx55ws085ifca"; + rev = "f0562da89fecbce7ef335875c70baedfdd34c7d8"; + sha256 = "1f21m3ddmqpcxv2sv80k1zn9kvnx6m8h88mxv9nk8q422r4vrh21"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5183,12 +5195,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-02-21"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "6c8ec4e95755c0375c912c1f9cd1171e5fe23dec"; - sha256 = "0s4j6j6v6fy7zn1b5zm3di7yxcpj1hm352379hsmah02a3h9jv1d"; + rev = "2adb21effcedd6f2c501797a9973d49ca4862544"; + sha256 = "1z5rph5l7m50fh0lv6w56c723ajnr0fz3f4l59acci2p5158hbz0"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -5207,12 +5219,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-02-16"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "963cb58c3dd15699c801baf3e64393c6795b62e9"; - sha256 = "0pq9c2xdhw7pshv8xsmrdachsfc4kr3n705jxhiqm95ml6c7fm5b"; + rev = "c576ab3f1488ee86d60fd340d01ade08dcabd256"; + sha256 = "0g2h6wq2v315s1g5wh2qfvslly00iglx9sixqrq9xncrs34n4w25"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5327,12 +5339,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-02-19"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "2a278c8a12a399e25b78a43ebcd4f3996cd4e4b6"; - sha256 = "1z4mzm1bykyp82598cdxps3i8g68bzkfnc8ffr3ajmlcf0ylj6aq"; + rev = "14dfb4071022b22e08384ee125a5607464b6d397"; + sha256 = "06c3r97kki2g3jha45nrm6i8dljrqak38iy1248ml8ri3ldpj44z"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5629,24 +5641,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-02-24"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "85e3474449967d2ee4377fbb9633f21093a80187"; - sha256 = "05scspf4jxhgbrfnnm363mb8g633rn83zmlxmwsqs1zzvpzgjxvp"; + rev = "7b0c1354bfdc90e9c9085d206b2611ad5d77142a"; + sha256 = "1z03xfqsrr7h7wy9lrsy1bxigyia4i102li5ndki3d2yi7pi9l61"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-02-12"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "dd2bfa41b2c43d65f1f715e07acf1f1d34b37de8"; - sha256 = "19w9v3blnr6x8sp2v362s7yq9yrcgdhkh5r18zkf75fhinaaivra"; + rev = "c66458fe5f83b57d40b678058a8eeb6340f9275c"; + sha256 = "0zf4w1ahg9dfvrw6b394asy8pyc0yjjffs73nf1mwp0bkk3hdvzh"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -5773,12 +5785,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-02-22"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "9e28459c1f92de3341d70d6e9bc3ad76990e90ad"; - sha256 = "0p5w2sy2393k3d9phr8g1nafjccg1183gxkwqsibk6pr0qqsy2wd"; + rev = "9aa2d2da7f485336c5d97aa47c0acb0544ace768"; + sha256 = "1ffwvx17pl36wxfdi0v8rgh20mb2ww9b5ghrj81n3125ffvl03sk"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5821,12 +5833,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-02-24"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "7cb75a0e0262244728079a5482f2208b742245f9"; - sha256 = "1ik61x58raln6wailp07w4c34bdzjchsrs4vwdi3pa6xlflw4sih"; + rev = "4926d66c99fd35cf41bf497fa4f8912acb5d6e8d"; + sha256 = "0h6ncs2ac8i2rnal62blbgivykhlhspsd2nda8lwd68ri8pxn4w1"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -6038,12 +6050,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-02-20"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "5f9654ddbd828312af7f55202e5ecdc0ff4d6a8e"; - sha256 = "1lgn7jb0dq5ri9izwwzsgwkldq71a43j3c6imyz562q51xcb4mgq"; + rev = "d92364f07a5b0a8279bfd3c97263bbae4b3ad958"; + sha256 = "090d6s64j6w16l4ww0nm87686k3j4nwh1dl3ydd42mqqi3k95lkf"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6110,12 +6122,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-02-20"; + version = "2022-02-26"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "6975374b3be303b820c61c2fa33a43fe157265ec"; - sha256 = "1lqsk7cpf9nb7h3wnmv4df6047iyck0p662m3gqy57xrhl33j33n"; + rev = "e1d68de4c28ec1d71e092c1b4d7cc70e5bec6aa4"; + sha256 = "1zjj510vmvjqb248g0jssh689zsmx3xcwrclkgk3s3y84ylxmh1n"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -6183,24 +6195,24 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2021-12-20"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "3855b4ae6f20b73f8694f48b82ccc73a99d45b39"; - sha256 = "1ymzmlkh0hhhvsgbzim91yr9ga8j1dgmfi2mmwpnhvvmf2ycr5xz"; + rev = "9ccd2a6538d8a201d1ea08784bd866950e1b4130"; + sha256 = "16yq3zi8zvr39ihpw8zik7frplpmgcc3a6xf424rsxfzshn92k9f"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2022-02-04"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "2f0fd5fe6e47e7fe2a6de19a4b56ea4f86947780"; - sha256 = "1fcrn6f05dabk6h4c5xhfczcr7mdg1hqnraas0021cr03lgnf63w"; + rev = "15bada8f887d69ed3a3d10330b4ff7f089596464"; + sha256 = "0qix7c1z8r0gkf9g0cffymw5qk2h1bil063ddxf36bwdhpjx433s"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -6315,12 +6327,12 @@ final: prev: swift-vim = buildVimPluginFrom2Nix { pname = "swift.vim"; - version = "2022-01-28"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "478e11812f3ddb1778918bd243d8b27c9984ab26"; - sha256 = "15kqlbp1spkbkrgaa9dwp7dbdppncq059cps1qljpqp49qmgay2l"; + rev = "64256d0f2c410d35ac1752aa2a2f7ade3a04695e"; + sha256 = "0nljkn8wg515kdh4yrs5nss0c8jmqcdnhi3hwjd1jgkxd6wsh2al"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -6340,12 +6352,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2022-02-22"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "758944ebc6919c50557b6eb3a52bc41187041fe2"; - sha256 = "1qsa1i72h1vq7mxk8dd75786a1gjncc3jafc8gv5lajk7xyqc64j"; + rev = "1361738c47892c3cee0d0b7a3b3bc7a8b48139c2"; + sha256 = "00a1x5dlns2n1wpf8hnh8brf6bwhbifsg4dlzjq51v4kj35hzjmd"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -6388,12 +6400,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2022-02-09"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "bcb474cafade81a7fc1ecab4bd2ceda6fe359e66"; - sha256 = "0mpawhqhnva3xqpxq27amd6hr0nls3zsxxwzb7bsrkzk4lc2p1kj"; + rev = "e27face391a4d9a3e43ff251010f77deddf0c88d"; + sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -6557,12 +6569,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-02-18"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "d06fe1d4ade68ba17739025e55e941f9e977d37c"; - sha256 = "1rvcbbr3bw1i3xykk519m67kw4qkr5x6j7nml5b7camlcdva6lih"; + rev = "84efd93ec772696c1cce2aada4d39f2756953964"; + sha256 = "1n23d24nr9q857pgmzkcl6v49c1gs4bqabfdwjik18nxkjxq2zhk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -6700,14 +6712,26 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; + telescope-zoxide = buildVimPluginFrom2Nix { + pname = "telescope-zoxide"; + version = "2021-10-21"; + src = fetchFromGitHub { + owner = "jvgrootveld"; + repo = "telescope-zoxide"; + rev = "b51b7f4ba0e2a08bc764fb2ee39e0bc68eec79b5"; + sha256 = "0dm7h00hz2qh73gfzypv1lm2vzk7nawp7wz1y1ar5nh6gg4zf2rl"; + }; + meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; + }; + telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-02-23"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "567ec85b157f1606b500a0f755181f284810a28e"; - sha256 = "1pzdn12zg9g3y03grw2xha2h5qia6bbi8058n3z5g2ail58hnw2n"; + rev = "a7517b4b2df8a066927f0a9d1f226c89bb69f06f"; + sha256 = "1vsmhra3aj1q9r7g12iszgw2mlamcv4prz6s1sx0bvmj7ahfzwkq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6883,12 +6907,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-02-21"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "981e207e17ecd8bf065b5b9201c1d6d2395e9338"; - sha256 = "1dki7g3q7qp9fmp48h1zi5pyhvn9i6ypqnqhn7n721wsf01mzcrv"; + rev = "e97d0c1046512e975a9f3fa95afe98f312752b1c"; + sha256 = "00j1q6g7js9ais6s1vi18x165k1zrx988zbp0yr1gcd5n2xnknbi"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -7123,12 +7147,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-02-07"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "cc6a3d9ac374078c16a49ace984d9130b307b5e6"; - sha256 = "15yl6pk9c9dal23jlfc356z4v26a84jhflw5v04y33wv57b1kdfa"; + rev = "b7da086d9f370b65ffeec6af76c8a37cf5e43336"; + sha256 = "1ln0icwhmcrzkmn0ln75xn1inik5hyn6938i479128ysznplz8fm"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7387,12 +7411,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-02-06"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "d0c67776f27eb49cccbd58008724bd6caa00ed8f"; - sha256 = "1nnwq2csz1nvj4si3y4b85sv8rihnbzxhwcm35dawki57qnvxkpw"; + rev = "e2498d72dcc123115ed1d0fe1449beba6dadecc2"; + sha256 = "0zr7ldn3kwx45qyi27bzbgy63va7hwvp9n2awrvgd3zsk1nq9kbq"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7759,12 +7783,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-02-24"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "73fe68b6bfbd9201fb0facf2a13cb819f79b3d82"; - sha256 = "0zs9rg21p0aws6shzvqi5khc3kipqh4yvcx5jpf8f3xcdlv13mrk"; + rev = "1b776663b029f00ed20cc87b871726fa0a2f394d"; + sha256 = "1vgm6wh7nsdx7737vl97c8c2x8l1gdkdjbc1zd2a468ij9qhcg00"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7884,7 +7908,7 @@ final: prev: owner = "flazz"; repo = "vim-colorschemes"; rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; - sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; + sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -8035,36 +8059,36 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-09-20"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "8fcde4c500440757f04e38c039005319476d1471"; - sha256 = "1b6759y9s8sl6d96xzc2lx5qqh0x5sabls12hz0zj6s1736hs3sk"; + rev = "23514a579ce6df28fd956070d9e2ac1051855115"; + sha256 = "0pabwgszd6s03y1mykxxvipn4cwkzch4jgb18iqcnpbpgbsyghl6"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2022-02-13"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "db100d536885fb920925eb0bcaf00bac3d0112dc"; - sha256 = "0g0zp9j0gaww1w8w7pdfz71dvs2fww9qwsyafbqljn9img0qdmpk"; + rev = "1c60988abf17f426b87a1ce2de6b6eabfd5d6b2b"; + sha256 = "0b6mgmaak6vh2adkzdh9s5b5js362hv2hg14zwrb5846cjpbs21i"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-01-03"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "a4a9051044876656fe4f22a188b084258727997d"; - sha256 = "1z16csn6ql0vnmy9646006ri9d1gxw2r7wqi9bh8sgfl2il388lp"; + rev = "d9db8d8ae99500e4df6b22a73e30a411936dca37"; + sha256 = "1gpsnx2s6wk473547h7fjf21cgzkfx2b2d3hwk1q2m7gjpsg0j3q"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -8083,12 +8107,12 @@ final: prev: vim-DetectSpellLang = buildVimPluginFrom2Nix { pname = "vim-DetectSpellLang"; - version = "2020-01-13"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "konfekt"; repo = "vim-DetectSpellLang"; - rev = "d8b545ef138a9ff013f8243f85c79b277b26f5e1"; - sha256 = "0c1bxryw4rg4cyql7vfp2gwhkl2d0b8inc6shmgfy7jg4svhzs0w"; + rev = "65c3e44b125913d40692a6bd1e5c65b4c42bddf3"; + sha256 = "0mz6hyf9il6l0gk8qn3hfazlkavjrw6w2nbhmqmxk2dnwp8h051c"; }; meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; @@ -8515,12 +8539,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2022-01-02"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "2358b199117900d3e36eada1de1f2a12556a5506"; - sha256 = "1q5ralkkgl81cnnxvz4sm06xzh85zj0pixfl9zirfz4djjab3h82"; + rev = "47123282f501fc77965e1d3c08357209d991c7f4"; + sha256 = "18fs6pgadffdxl6r03daqnz6v65m7jap3yanx7rzp5g25c0461ps"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -8575,12 +8599,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-02-11"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "c29ef11cd6478da675678265e76f9e527843876f"; - sha256 = "1mfskzmpkb7nk1y7szld46npp0r686whrw08iqih7saxbrhhkdra"; + rev = "46652a304f0b89f36d70cee954d77e467ec0f6de"; + sha256 = "174qmalqmg8miq7ixc0c3w66qpc46c9rxvpw6sn8qalyifb0z7fj"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8851,12 +8875,12 @@ final: prev: vim-hcl = buildVimPluginFrom2Nix { pname = "vim-hcl"; - version = "2022-01-12"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "jvirtanen"; repo = "vim-hcl"; - rev = "80a497d14d8ca72ae5ee4b9cc6b17fc57b46a407"; - sha256 = "18gw4iq84lkzmczfqr2yn31lh7kfnbm085h0vvq079c4fc2qa454"; + rev = "1e1116c17a5774851360ea8077f349e36fc733c1"; + sha256 = "07kwrkxpgjfi2cih31cxnjaiypxy2ddwan2sr66gvamixfrpixav"; }; meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; }; @@ -9128,12 +9152,12 @@ final: prev: vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-11-15"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "b5c8d305df52e0cb85b3436ca1e958c22c6e2d79"; - sha256 = "1zv6k8ld938zg000svi9q6c5jkbmvlyllxzkl41jcsx2zhqkwdiw"; + rev = "8c59fc67c6a935723be0efacfe7af66866ce8570"; + sha256 = "0vg4nzykdllwwgmnbmbd9i60gd0kml8q58mqpnnc4qmzvm6krgl5"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -9393,24 +9417,24 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2021-11-01"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "f09bf7c61e4aa03293622792eaeadb315b91e77f"; - sha256 = "0rskyxi507b339ipgam3kbf4ymj6bcbw75xpc2cf32xzdlpairln"; + rev = "4c768d215a0654d61ea72eeec423716bd971948e"; + sha256 = "0q2c8n1kbqsx005cn0p1f5334qgslkla2zag03q0vy57g3yhydv4"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; vim-logreview = buildVimPluginFrom2Nix { pname = "vim-logreview"; - version = "2017-07-08"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "andreshazard"; repo = "vim-logreview"; - rev = "b7b66ab338e904127d796af49235b8c29742f18f"; - sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; + rev = "de67c14943219c12b727dfef5687d938597af31b"; + sha256 = "0c50m5x6mds4bryaphf770qmxqdm12kcrrm92l4ph86zi0v8ik4w"; }; meta.homepage = "https://github.com/andreshazard/vim-logreview/"; }; @@ -9441,12 +9465,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-02-12"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "3d0fc4072bef08b578d4a4aa4a6f91de571e99e4"; - sha256 = "16cpi5x2z1gqfzxgvdnqh47g6p0b6dmhrrfqprmc45c6cfwj6plh"; + rev = "bfb7541eb88eb9804287af39aca70102e60d2bf0"; + sha256 = "1kaa92ylw5i8ysb2yxyqf666194wwcixgagi7gq3apkddr35a6g0"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -10210,12 +10234,12 @@ final: prev: vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2022-02-10"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "9ce73e992d4481de6235222b75e42f64d2b307ef"; - sha256 = "09w41jkidlyab67ishjpibbyrpa9qqmcrpb9y91ssyv3mzir5d3w"; + rev = "68d7c1682b1ec787905294cd980dc86c0398b7c8"; + sha256 = "0w5x4p7267yi2fs653pyw56jy8az0xd3jyyq5yw8xwk4gjr0131m"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -10258,12 +10282,12 @@ final: prev: vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2021-08-04"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "980147f64d708652aad1e67d8b39c17b2dd07702"; - sha256 = "0851b22an00p6i2xbc18zx3z5ik5k8nfr6is2fcbsqhlks0g7cgf"; + rev = "0385ccda67fe8bdd1fc12cd62a88ec38af303520"; + sha256 = "1vvx1n3fkqkz7zd5b9n8q82m7ar3fskxlhgavg3qycvvnbrniff8"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -10642,12 +10666,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-01-30"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "27156fb69450ddef8e1bbec6afa71896681ad38a"; - sha256 = "073bc4pbsx7s5is6658q5pk0l69ip1bx4dhlz2bcvzhkslzp2ik0"; + rev = "f07ab590e5dc91ded9ef8988b93e686965001dfa"; + sha256 = "0gss50z473cqvpasj9nihvcb2yl43vwb2911v9d6kd5yxvs75hzz"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10702,12 +10726,12 @@ final: prev: vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2021-09-25"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "66d206292bd2e556bbf729ef808f0fffbab92c88"; - sha256 = "1431dk1ffcvgjj0zm4sj7z6csmw8hvmf05pxl5p45jj15xbqikzh"; + rev = "b9e4cbb85e880cd32f90c2dd9853ee7c592b3528"; + sha256 = "12g2ia7yqsh98nlr4z0ij67x0xamgizv0gbmg221if7ycn222xlm"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -10738,12 +10762,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-02-05"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "851c39c38f48c47f9aa937f83cda314ab1c8dd44"; - sha256 = "04ni3fnci1h9sqrmchwad9bsqmnq9ix0lvh6mssy4s38pkl677l8"; + rev = "4e1d1456fd7d1d5d6cff256578a3e3bbeeb24e62"; + sha256 = "1pwqwbiwgnfxwilazdzgd1yzpkh642wzlpwlvn6jx1n0fywmb60j"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10822,12 +10846,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-02-19"; + version = "2022-02-27"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "d6098f5603066c438a7bde3cc4acc32fbe6972e8"; - sha256 = "0ycr5h9zng612ia6sx67mrw266wmy6xdbkrc9rrd53lzd1akh0f3"; + rev = "63967c60feb2034158bdbcf061c171e3bb4d8b99"; + sha256 = "1vqlmx16n9b53qv6kx2dqaq54k5jw8c15zgdvr69ddljksw80mjk"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -10918,12 +10942,12 @@ final: prev: vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2022-01-21"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "9191af46b6bee8d3e3474c7f8ea134c800e55985"; - sha256 = "0szp8n82qmjwpm8skq3zqbmk0j9b269h86v7p6qlwdjnvr39hnis"; + rev = "698ff3074c45d4292ed6a2f629e6114fdaf4420b"; + sha256 = "0a8lzjp0mj2ml82sql44qbq1dwxmrxjp5h3snzclw4y64919yf21"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -10979,12 +11003,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-02-12"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "0422b7fa087eb7dd1270dfcb1f3d634b57829b6e"; - sha256 = "060nvhxj219phx4rxi3igg2lvk39ll8g3jp762nigc242hha6wzf"; + rev = "16a3b6da1bab42473d42d7e02d89d549d7a5e138"; + sha256 = "1hlw3268x3i0pbmyj5b56kng6a9348rmh3dg8jrhq1jyy75r6m09"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -11159,12 +11183,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-02-01"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "3758476a99644e8071b240184af3c74bc00373f1"; - sha256 = "0ilhyam3av9hd685938abz3h4qfpgxcv81qhr71fr8fwbfb8k2w5"; + rev = "d601fd8c4635cc127d48d6219881215782bf0b2a"; + sha256 = "1rniy8sl4pr0k2j49yvkbsj4lax6qb6lmyay7svksqyzjy3rndcl"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -11219,12 +11243,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-02-19"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "3792283722949045c5218abc3cab151441828afb"; - sha256 = "1fb71npvzdgrwfdgi8m7fzn5an027fcn6s85g0vywjr89l2dqyyx"; + rev = "5b3d26c0850e3347ebb39b90c3d4e04e883edd36"; + sha256 = "1r63pn6gj2nnjayhxyxm9jhxlsqzrcn847pfmfp3ndh0fradhlzz"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11315,12 +11339,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-01-06"; + version = "2022-02-26"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "7fde9c0b6878a62bcc6d2d29f9a85a6616032f02"; - sha256 = "1f0p9pk2a2fxcdf4p35vm0jyrxkkxkqgn1v8fyd622vmcrbrj860"; + rev = "70a1131d64d75150ece513b983b0f42939bcb03c"; + sha256 = "042cnznm1p5x3ky7m81q62n3nlgab9fq734hlfwsbwrcdqa849l2"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -11663,12 +11687,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-02-24"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "d044dea0c2669c740052a47900e6e16f64444b63"; - sha256 = "1sv1r4pcz1fx99qi566nncs116vw3wsny344lcnsh0r6b2sc0bz0"; + rev = "9bec3b99f6303bdcbfba669b21e4260df4f8a02b"; + sha256 = "1ynkcklpdlc5kdfcppz8vk1x4qjc2p8dwnxzigzc78hnrrgb76pz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11676,12 +11700,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-02-19"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c8c9ac5377045f3e2881d13cbb60ff1750497b15"; - sha256 = "14bl67020mswbbz63jzq25nl6sqg9qzryw12x1s802xnc2f65g9r"; + rev = "dad71b9053e50d7210cdf4e51e0aced1acd296e0"; + sha256 = "0dkkf4sz9cj768q41a1sijiah0fpc290wfm3agvdlmlbpp3l78vx"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11700,12 +11724,12 @@ final: prev: vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2020-05-26"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "619f04f89861c58e5a6415a4f83847752928252d"; - sha256 = "03dic4vjl3bwd7s6jj3vrz6xicf3a3bccaqgx635hn01ha6vw1jw"; + rev = "63af6e72dd3fa840bffb3ebcb8c96970c02e0913"; + sha256 = "1cvi3bb9kqfwjh3d4biwxgavankj2ljiyss36q8z96czzaz2w40v"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -12002,12 +12026,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-02-11"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "10ff26328cf8e5ed2938b96da6f8c20737eb444a"; - sha256 = "1r50jrap0pb2mah4b7mx9scg2gz03l02bkqsfqw1a0r7rwv6alxs"; + rev = "118d9b74970899cae309823b75ddee3af999a74c"; + sha256 = "1q9gbzyrx5j95jwly0qc41lyaqpsk6wq82w2h8d0q3abfxwisy11"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -12024,4 +12048,16 @@ final: prev: meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; + zoxide-vim = buildVimPluginFrom2Nix { + pname = "zoxide.vim"; + version = "2021-12-10"; + src = fetchFromGitHub { + owner = "nanotee"; + repo = "zoxide.vim"; + rev = "c4e96f34b1b3160d6b6a6519588024412df27cd7"; + sha256 = "0zisr1r1z9ys0jkab1lvwy4klwkay07p0095f03r9qydnig8jgsm"; + }; + meta.homepage = "https://github.com/nanotee/zoxide.vim/"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 05962249573..9219e685c33 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -39,6 +39,7 @@ , which , xkb-switch , ycmd +, zoxide , nodejs # test dependencies @@ -693,6 +694,17 @@ self: super: { dependencies = with self; [ telescope-nvim ]; }); + telescope-zoxide = super.telescope-zoxide.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + + buildInputs = [ zoxide ]; + + postPatch = '' + substituteInPlace lua/telescope/_extensions/zoxide/config.lua \ + --replace "zoxide query -ls" "${zoxide}/bin/zoxide query -ls" + ''; + }); + tup = let # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim @@ -820,7 +832,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-JKi51kzCHMctUX6tT8K2Rq1slV3Ek67dCgbPjBkwPTE="; + cargoSha256 = "12xaxpg4ws09rnp9prrqcac8581ggr36mpy39xyfngjy5xvcalaq"; }; in '' @@ -1076,6 +1088,15 @@ self: super: { }; }); + zoxide-vim = super.zoxide-vim.overrideAttrs (old: { + buildInputs = [ zoxide ]; + + postPatch = '' + substituteInPlace autoload/zoxide.vim \ + --replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" + ''; + }); + } // ( let nodePackageNames = [ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 48e1b99d1d0..7426fe82b2e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -347,6 +347,7 @@ justincampbell/vim-eighties justinj/vim-pico8-syntax justinmk/vim-dirvish justinmk/vim-sneak +jvgrootveld/telescope-zoxide jvirtanen/vim-hcl jvoorhis/coq.vim KabbAmine/vCoolor.vim @@ -520,6 +521,7 @@ mzlogin/vim-markdown-toc mzlogin/vim-smali nacro90/numb.nvim nanotech/jellybeans.vim +nanotee/zoxide.vim natebosch/vim-lsc nathanaelkane/vim-indent-guides nathangrigg/vim-beancount @@ -720,6 +722,7 @@ ryvnf/readline.vim saadparwaiz1/cmp_luasnip saecki/crates.nvim sainnhe/edge +sainnhe/everforest sainnhe/gruvbox-material sainnhe/sonokai sakhnik/nvim-gdb diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix index 077c3807eca..cc935876ded 100644 --- a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix @@ -47,15 +47,27 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "1.7.1"; + version = "1.9.1"; }; vsix = fetchurl { - name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; - url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix"; - sha256 = "sha256-LqndG/vv8LgVPEX6dGkikDB6M6ISneo2UJ78izXVFbk="; + name = "${mktplcRef.publisher}-${mktplcRef.name}.gz"; + url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${mktplcRef.publisher}/vsextensions/${mktplcRef.name}/${mktplcRef.version}/vspackage?targetPlatform=linux-x64"; + sha256 = "sha256-BtTl9DR8hnwNpO5k99M4dtqcTQ2hTzVbjR8VZh+tdDI="; }; + unpackPhase = '' + runHook preUnpack + + gzip -d $src --stdout &> temporary.zip + unzip temporary.zip + rm temporary.zip + + cd extension/ + + runHook postUnpack + ''; + buildInputs = [ jq ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index fe3515aa37d..d157c1e2ee9 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -349,6 +349,42 @@ let }; }; + bierner.emojisense = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "emojisense"; + publisher = "bierner"; + version = "0.9.0"; + sha256 = "0gpcpwh57lqlynsrkv3smykndb46xjh7r85lb291wdklq5ahmb2j"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + bierner.markdown-checkbox = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-checkbox"; + publisher = "bierner"; + version = "0.3.1"; + sha256 = "0x57dnr6ksqxi28g1c392k04vxy0vdni9nl4xps3i5zh0pyxizhw"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + bierner.markdown-emoji = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-emoji"; + publisher = "bierner"; + version = "0.2.1"; + sha256 = "1lcg2b39jydl40wcfrbgshl2i1r58k92c7dipz0hl1fa1v23vj4v"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; @@ -500,6 +536,19 @@ let }; }; + daohong-emilio.yash = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "daohong-emilio"; + name = "yash"; + version = "0.2.8"; + sha256 = "ummOEBSXUI78hBb1AUh+x339T7ocB/evOVaz79geHRM="; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-markdownlint"; @@ -648,8 +697,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "11.7.0"; - sha256 = "0apjjlfdwljqih394ggz2d8m599pyyjrb0b4cfcz83601b7hk3x6"; + version = "12.0.3"; + sha256 = "sha256-PHQXfk0JggkEBRflHp+OAUOCVuymCubaszfDCYbpfG0="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -740,8 +789,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.2.0"; - sha256 = "sha256-ROI312MPMUY1q6IV4qVCW8DD0MQPA/hVW7rfamo/IbI="; + version = "9.3.0"; + sha256 = "sha256-hJgPjWf7a8+ltjmXTK8U/MwqgIZqBjmcCfHsAk2G3PA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -838,8 +887,8 @@ let mktplcRef = { name = "auto-close-tag"; publisher = "formulahendry"; - version = "0.5.13"; - sha256 = "0swyxhcibv6cl54gmfpnbz6bqidjzc77nx369wndhlq264idnwkw"; + version = "0.5.14"; + sha256 = "sha256-XYYHS2QTy8WYjtUYYWsIESzmH4dRQLlXQpJq78BolMw="; }; meta = { license = lib.licenses.mit; @@ -850,8 +899,8 @@ let mktplcRef = { name = "auto-rename-tag"; publisher = "formulahendry"; - version = "0.1.9"; - sha256 = "1xk8rzda16qgdxhq8bz6f8w09fd9044qczx1wfhszd6w3r4q9262"; + version = "0.1.10"; + sha256 = "sha256-uXqWebxnDwaUVLFG6MUh4bZ7jw5d2rTHRm5NoR2n0Vs="; }; meta = { license = lib.licenses.mit; @@ -971,8 +1020,8 @@ let mktplcRef = { name = "vscode-pull-request-github"; publisher = "github"; - version = "0.35.2022010609"; - sha256 = "06ryx8b605fd1q2zz8jps7j8r506qwym93x1ra1kc0h9g8a8r7sa"; + version = "0.37.2022030309"; + sha256 = "1icmg2ssdkxvwp8mn8zzakwn42hrdglsdgfnaf8va4vd9mqixl1v"; }; meta = { license = lib.licenses.mit; }; }; @@ -1131,10 +1180,14 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "8.2.0"; - sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2"; + version = "8.23.0"; + sha256 = "sha256-IHLsAuTi+GBZViL2KozudebNY745RiOYNATzabQfnOY="; }; meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; + description = "LaTeX Workshop Extension"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop"; + homepage = "https://github.com/James-Yu/LaTeX-Workshop"; license = licenses.mit; }; }; @@ -1176,8 +1229,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.15"; - sha256 = "0a5w6qxvsdzcmgc0yfiagpmz25y90pmzgrxz9899na5qy3pjcbmz"; + version = "1.4.17"; + sha256 = "sha256-CDxh/YRyDGocxG4qOcyLXA0zHCg0YJ7XUu3OjFFjleI="; }; meta = with lib; { license = licenses.mit; @@ -1321,6 +1374,18 @@ let }; }; + marp-team.marp-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "marp-vscode"; + publisher = "marp-team"; + version = "1.5.0"; + sha256 = "0wqsj8rp58vl3nafkjvyw394h5j4jd7d24ra6hkvfpnlzrgv4yhs"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + mikestead.dotenv = buildVscodeMarketplaceExtension { mktplcRef = { name = "dotenv"; @@ -1373,8 +1438,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.19.0"; - sha256 = "sha256-buIAbsyKUvX3blO1AbCq/tJ1KAcqaFpciqQovmOZ5GE="; + version = "1.20.0"; + sha256 = "sha256-i3gYTP76YEDItG2oXR9pEXuGv0qmyf1Xv6HQvDBEOyg="; }; meta = { license = lib.licenses.mit; @@ -1537,8 +1602,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.3.0"; - sha256 = "sha256-Y5hP/Rq9BsFwbCRQWOfiLHKoYkKBpZx8blg9o74obfk="; + version = "1.4.0"; + sha256 = "sha256-9q3ilNukx3sQ6Fr1LhuQdjHHS251SDoHxC33w+qrfAI="; }; buildInputs = [ jdk ]; meta = { @@ -1551,8 +1616,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.3.0"; - sha256 = "sha256-Tz6bLcBUATn8cYIzGoLJwgaJZGbBVr1CISmJHz+iM60="; + version = "1.5.1"; + sha256 = "sha256-JXhmgBFZdKNjgX6K7U+M/T7HEmIOBQOzQEJ5957TUuM="; }; meta = { license = lib.licenses.mit; @@ -1606,8 +1671,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.12.1"; - sha256 = "sha256-pmWnnZrdk6zb8YFG5ESgK4k875hgeseWyzkA9YUjg7A="; + version = "4.14.1"; + sha256 = "sha256-OHXi0EfeyKMeFiMU5yg0aDoWds4ED0lb+l6T12XZ3LQ="; }; meta = { license = lib.licenses.mit; @@ -1626,6 +1691,18 @@ let }; }; + richie5um2.snake-trail = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "snake-trail"; + publisher = "richie5um2"; + version = "0.6.0"; + sha256 = "0wkpq9f48hplrgabb0v1ij6fc4sb8h4a93dagw4biprhnnm3qx49"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + ritwickdey.liveserver = buildVscodeMarketplaceExtension { mktplcRef = { name = "liveserver"; @@ -1747,6 +1824,23 @@ let }; }; + skellock.just = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "just"; + publisher = "skellock"; + version = "2.0.0"; + sha256 = "sha256-FOp/dcW0+07rADEpUMzx+SGYjhvE4IhcCOqUQ38yCN4="; + }; + meta = with lib; { + changelog = "https://github.com/skellock/vscode-just/blob/master/CHANGELOG.md"; + description = "Provides syntax and recipe launcher for Just scripts"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=skellock.just"; + homepage = "https://github.com/skellock/vscode-just"; + license = licenses.mit; + maintainers = with maintainers; [ maximsmol ]; + }; + }; + skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "fish-vscode"; @@ -1821,8 +1915,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.1.5"; - sha256 = "sha256-nIR3PtbtnSbAU0rS+qVtPsj++Dbfp/k86dWkx4xYcno="; + version = "2.1.7"; + sha256 = "sha256-C0jYDIDBK1JH8eFaFmCUilBXCbU5y2TRF3OZAw9ijoY="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -2031,11 +2125,12 @@ let mktplcRef = { name = "vscode-pitch-black-theme"; publisher = "ViktorQvarfordt"; - version = "1.2.4"; - sha256 = "sha256-HTXToZv0WWFjuQiofEJuaZNSDTmCUcZ0B3KOn+CVALw="; + version = "1.3.0"; + sha256 = "sha256-1JDm/cWNWwxa1gNsHIM/DIvqjXsO++hAf0mkjvKyi4g="; }; - meta = { - license = lib.licenses.mit; + meta = with lib; { + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; }; }; diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix index 09c5c02aee9..8d6834dceeb 100644 --- a/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -59,13 +59,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2021.11.1422169775"; + version = "2022.0.1814523869"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "sha256-Y8Wbpuieca/edIWqgq+lGSUMABOGvO/GuujGlEGmoKs="; + sha256 = "sha256-JDaimcOUDo9GuFA3mhbbGLwqZE9ejk8pWYc+9PrRhVk="; }; buildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/wakatime/default.nix index 9832b16f747..554b2bddb6c 100644 --- a/pkgs/applications/editors/vscode/extensions/wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "17.1.0"; - sha256 = "177q8angrn702pxrrpk1fzggzlnnaymq32v55qpjgjb74rhg4dzw"; + version = "18.0.5"; + sha256 = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; }; meta = with lib; { diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 496dbe2496d..370647de1fc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0gv71l9cidkbbv7b1dsfyn7lnlwcmjds9qx6nrh7alymdm1xa2xr"; - x86_64-darwin = "1is795040xb3l23crblwf056wsvsi4dip3lkwhlblhkpsl0048f1"; - aarch64-linux = "186dy6h3krc6fqvmh1nay1dk5109kl9p25kx37jkbzf2qhnpibm8"; - aarch64-darwin = "04xc5fy4wcplfrigbm624dpzxd2m4rkq979xr1i57p3d20i96s6g"; - armv7l-linux = "1k7bfmrfw16zpn33p7ycxpp6g9xh8aypmf61nrkx2jn99nxy5d3s"; + x86_64-linux = "0x8vc6gj83mn767wi285k0hxhlh5gh1lcvq63na89vglja4ipna4"; + x86_64-darwin = "1x47xfq0fgd10wq6aa8gq55aqrl1ir1f6v1mm6324yny16pf20k2"; + aarch64-linux = "1ibg2qvpnwfwwzgby2xva9xz138b13x9q8vf1xf6plazv0arla1l"; + aarch64-darwin = "100834mqix7b46frlqf0jz4qs673lavxm8sizfjm7c9y0xxy4ld3"; + armv7l-linux = "100yfkzvnjccp1g3p353jr2vicvkjc0skiwmmzgad6i8j1m9js62"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.64.2"; + version = "1.65.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index b1ab8c57ee8..a91227d9db4 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0ldfp4r7nb9npvjadgj63sd369nqmbgf5y4kpp93slsy1lbs0bk8"; - x86_64-darwin = "05z0jx2cc1askzzdxa8vxj8gp0v9rm1jw6005bpmijvyb8s2d30w"; - aarch64-linux = "1a5fyxzz51rb0af0wv3xh2h87yq00y5k501p7idqhj0zvd5mpqh6"; - armv7l-linux = "05byi0aba516whzry5qkxfkm82sy2dgv1m0hyycmnkb2dwmb552m"; + x86_64-linux = "1sh2f7hwhilwmlgy11kl0s2n3phpcir15wyl2fkyhsr2kdj4jz9r"; + x86_64-darwin = "1s04d91f08982wi8hb4dw0j57d6zqrdgns16ihrgsvahrzksgq4b"; + aarch64-linux = "1a97lk1qz2lz0lk5lpja32zy07iwdbskp6baf429iz7fz232rshm"; + armv7l-linux = "0vjqxqcr7fq3ncx1nl6ny7qcqm4vlsn33c074hhcg5292blg2a0p"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.64.2"; + version = "1.65.2"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index aeadcf5c1c1..40792c81ac1 100644 --- a/pkgs/applications/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-csWowcRSgF5M74yv787MLSXOGXrkxnODCCgC5a3Nd7Y="; }; - makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; nativeBuildInputs = kernel.moduleBuildDependencies; meta = with lib; { diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 56e107300b5..be3e7f555f8 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-15993"; + version = "5.0-16101"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "5e595616379a694789fe749e40a27ef069f0090e"; - sha256 = "1kid8qjn8r7dxh2yc1y6yal6qkfxij0ymi3zryxsnym3rjh1jds9"; + rev = "8ecfa537a242de74d2e372e30d9d79b14584b2fb"; + sha256 = "3jLGVzTDzEtHWvIb9DFTbJiA9dE9Pm14vYER998Zln0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix index 9289fb081f0..0247a10f0e5 100644 --- a/pkgs/applications/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fceux"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "TASEmulators"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-yQX58m/sMW/8Jr5cm2SrVXTiF7qyZOgOZg1v0qEyiLw="; + sha256 = "sha256-jNR9AB8s2S9ehYsompkV2GOLsaXIQzldeQ1WRCxdDG0="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 3e30be8c2a3..6e389b8daf6 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "melonDS"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "1v8a060gbpx7rdkk2w4hym361l2wip7yjjn8wny1gfsa273k3zy5"; + sha256 = "sha256-FSacau7DixU6R4eKNIYVRZiMb/GhijTzHbcGlZ6WG/I="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 0ea56d3a72d..6f58990e473 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "13222-8c2fd5095"; - rpcs3Version = "0.0.20-13222-8c2fd5095"; - rpcs3Revision = "8c2fd50957be3af05c04a9bb782dce8505fb6400"; - rpcs3Sha256 = "1cf62vpqdc9i4masgv9zz24h7zdc7gcymx6n1hbh7wp5gg1dw4qi"; + rpcs3GitVersion = "13327-6c096b72b"; + rpcs3Version = "0.0.21-13327-6c096b72b"; + rpcs3Revision = "6c096b72b5294758067a002f981563bbd618d30d"; + rpcs3Sha256 = "0xmdhjskqbv02jvl43bvw0clsgh9gnahl50fr3q8lmpwpy13ldr4"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/emulators/ryujinx/appdir.patch b/pkgs/applications/emulators/ryujinx/appdir.patch new file mode 100644 index 00000000000..696077d29de --- /dev/null +++ b/pkgs/applications/emulators/ryujinx/appdir.patch @@ -0,0 +1,23 @@ +diff --git a/Ryujinx.Common/ReleaseInformations.cs b/Ryujinx.Common/ReleaseInformations.cs +index 35890406..cca77163 100644 +--- a/Ryujinx.Common/ReleaseInformations.cs ++++ b/Ryujinx.Common/ReleaseInformations.cs +@@ -42,12 +42,14 @@ namespace Ryujinx.Common + + public static string GetBaseApplicationDirectory() + { +- if (IsFlatHubBuild()) +- { ++ //if (IsFlatHubBuild()) ++ //{ ++ // This needs to be a mutable path, while CurrentDomain.BaseDirectory refers to the nix store. ++ // AppDataManager.BaseDirPath refers to ".config/Ryujinx" on Linux. + return AppDataManager.BaseDirPath; +- } ++ //} + +- return AppDomain.CurrentDomain.BaseDirectory; ++ //return AppDomain.CurrentDomain.BaseDirectory; + } + } + } diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 6dbd356f24c..2ac16662b88 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -1,18 +1,29 @@ -{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem, copyDesktopItems -, dotnetCorePackages, libX11, libgdiplus, ffmpeg -, SDL2_mixer, openal, libsoundio, sndio, pulseaudio -, gtk3, gdk-pixbuf, wrapGAppsHook +{ lib +, buildDotnetModule +, fetchFromGitHub +, dotnetCorePackages +, libX11 +, libgdiplus +, ffmpeg +, SDL2_mixer +, openal +, libsoundio +, sndio +, pulseaudio +, gtk3 +, gdk-pixbuf +, wrapGAppsHook }: buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7168"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.1.64"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "6e0799580f0d1b473a79471c5d365c6524d97a86"; - sha256 = "145sn9xkjxj79292faypcdmpmbxm1w70q0iprg6pfymf9920gvfv"; + rev = "54bfaa125d9b6ae1be53ec431d40326fba51d0de"; + sha256 = "0p8wmnm8sjx7wqb5z62mp8c3cwrv241ji3fawj2qgqx3k9jlb31i"; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; @@ -28,7 +39,6 @@ buildDotnetModule rec { executables = [ "Ryujinx" ]; nativeBuildInputs = [ - copyDesktopItems wrapGAppsHook ]; @@ -41,7 +51,6 @@ buildDotnetModule rec { gtk3 libX11 libgdiplus - ffmpeg SDL2_mixer openal libsoundio @@ -50,41 +59,46 @@ buildDotnetModule rec { ]; patches = [ - ./log.patch # Without this, Ryujinx attempts to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. + ./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux. ]; preInstall = '' - # TODO: fix this hack https://github.com/Ryujinx/Ryujinx/issues/2349 - mkdir -p $out/lib/sndio-6 - ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6 - + # Ryujinx tries to use ffmpeg from PATH makeWrapperArgs+=( - --suffix LD_LIBRARY_PATH : "$out/lib/sndio-6" + --suffix PATH : ${lib.makeBinPath [ ffmpeg ]} ) + ''; + + preFixup = '' + mkdir -p $out/share/{applications,icons/hicolor/scalable/apps,mime/packages} + pushd ${src}/distribution/linux - for i in 16 32 48 64 96 128 256 512 1024; do - install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png - done + install -D ./ryujinx.desktop $out/share/applications/ryujinx.desktop + install -D ./ryujinx-mime.xml $out/share/mime/packages/ryujinx-mime.xml + install -D ./ryujinx-logo.svg $out/share/icons/hicolor/scalable/apps/ryujinx.svg + + substituteInPlace $out/share/applications/ryujinx.desktop --replace \ + "Exec=Ryujinx" "Exec=$out/bin/Ryujinx" + + popd ''; - desktopItems = [(makeDesktopItem { - desktopName = "Ryujinx"; - name = "ryujinx"; - exec = "Ryujinx"; - icon = "ryujinx"; - comment = meta.description; - type = "Application"; - categories = [ "Game" ]; - })]; + passthru.updateScript = ./updater.sh; meta = with lib; { - description = "Experimental Nintendo Switch Emulator written in C#"; homepage = "https://ryujinx.org/"; - license = licenses.mit; changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog"; - maintainers = [ maintainers.ivar ]; + description = "Experimental Nintendo Switch Emulator written in C#"; + longDescription = '' + Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan, + written in C#. This emulator aims at providing excellent accuracy and + performance, a user-friendly interface and consistent builds. It was + written from scratch and development on the project began in September + 2017. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ivar jk ]; platforms = [ "x86_64-linux" ]; mainProgram = "Ryujinx"; }; - passthru.updateScript = ./updater.sh; } diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 991d00a5a4b..804b17d8946 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -10,8 +10,8 @@ (fetchNuGet { pname = "GioSharp"; version = "3.22.25.128"; sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; }) (fetchNuGet { pname = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) - (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) - (fetchNuGet { pname = "LibHac"; version = "0.14.3"; sha256 = "13pv5dwffj8c2mfibra3hkd1pgg5cj075sf48kgp82y501l25q5m"; }) + (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) + (fetchNuGet { pname = "LibHac"; version = "0.16.0"; sha256 = "1kivnf4c4km1a8y0sl34z9gfazlivna0x31q0065n0sz13g82spi"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }) diff --git a/pkgs/applications/emulators/ryujinx/log.patch b/pkgs/applications/emulators/ryujinx/log.patch deleted file mode 100644 index 57e96e5c25c..00000000000 --- a/pkgs/applications/emulators/ryujinx/log.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Ryujinx/Configuration/LoggerModule.cs b/Ryujinx/Configuration/LoggerModule.cs -index 44631ea0..534576bc 100644 ---- a/Ryujinx/Configuration/LoggerModule.cs -+++ b/Ryujinx/Configuration/LoggerModule.cs -@@ -1,6 +1,7 @@ - using Ryujinx.Common; - using Ryujinx.Common.Logging; - using System; -+using System.IO; - - namespace Ryujinx.Configuration - { -@@ -74,7 +75,7 @@ namespace Ryujinx.Configuration - if (e.NewValue) - { - Logger.AddTarget(new AsyncLogTargetWrapper( -- new FileLogTarget(AppDomain.CurrentDomain.BaseDirectory, "file"), -+ new FileLogTarget(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"), "file"), - 1000, - AsyncLogTargetOverflowAction.Block - )); diff --git a/pkgs/applications/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh index 0861414f0bf..9c2f69e606c 100755 --- a/pkgs/applications/emulators/ryujinx/updater.sh +++ b/pkgs/applications/emulators/ryujinx/updater.sh @@ -1,40 +1,59 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6 -set -eo pipefail +set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" - -nix-prefetch-git https://github.com/ryujinx/ryujinx --quiet > repo_info -new_hash="$(jq -r ".sha256" < repo_info)" -new_rev="$(jq -r ".rev" < repo_info)" -rm repo_info - -new_version="$( - curl -s https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master \ - | grep -Po '"version":.*?[^\\]",' \ - | sed 's/"version":"\(.*\)",/\1/' - )" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" - -if [[ "$new_version" == "$old_version" ]]; then - echo "Already up to date! Doing nothing" - exit 0 +DEPS_FILE="$(realpath "./deps.nix")" + +RELEASE_JOB_DATA=$( + curl -s -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows | + jq -r '.workflows[] | select(.name == "Release job") | { id, path }' +) +RELEASE_JOB_ID=$(echo "$RELEASE_JOB_DATA" | jq -r '.id') +RELEASE_JOB_FILE=$(echo "$RELEASE_JOB_DATA" | jq -r '.path') + +BASE_VERSION=$( + curl -s "https://raw.githubusercontent.com/Ryujinx/Ryujinx/master/${RELEASE_JOB_FILE}" | + grep -Po 'RYUJINX_BASE_VERSION:.*?".*"' | + sed 's/RYUJINX_BASE_VERSION: "\(.*\)"/\1/' +) + +LATEST_RELEASE_JOB_DATA=$( + curl -s -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows/${RELEASE_JOB_ID}/runs" | + jq -r '.workflow_runs[0] | { head_sha, run_number }' +) +COMMIT=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.head_sha') +PATCH_VERSION=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.run_number') + +NEW_VERSION="${BASE_VERSION}.${PATCH_VERSION}" + +OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +echo "comparing versions $OLD_VERSION -> $NEW_VERSION" +if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "Already up to date! Doing nothing" + exit 0 fi +SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')" + cd ../../../.. -update-source-version ryujinx "$new_version" "$new_hash" --rev="$new_rev" +update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT" + +echo "building Nuget lockfile" -store_src="$(nix-build . -A ryujinx.src --no-out-link)" -src="$(mktemp -d /tmp/ryujinx-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" -pushd "$src" +STORE_SRC="$(nix-build . -A ryujinx.src --no-out-link)" +SRC="$(mktemp -d /tmp/ryujinx-src.XXX)" +cp -rT "$STORE_SRC" "$SRC" +chmod -R +w "$SRC" +pushd "$SRC" mkdir nuget_tmp.packages -dotnet restore Ryujinx.sln --packages nuget_tmp.packages +DOTNET_CLI_TELEMETRY_OPTOUT=1 dotnet restore Ryujinx.sln --packages nuget_tmp.packages -nuget-to-nix ./nuget_tmp.packages > "$deps_file" +nuget-to-nix ./nuget_tmp.packages >"$DEPS_FILE" popd -rm -r "$src" +rm -r "$SRC" diff --git a/pkgs/applications/emulators/snes9x-gtk/default.nix b/pkgs/applications/emulators/snes9x-gtk/default.nix index 27f3400cc0b..ff7df4b0944 100644 --- a/pkgs/applications/emulators/snes9x-gtk/default.nix +++ b/pkgs/applications/emulators/snes9x-gtk/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook -, SDL2, zlib, gtk3, libxml2, libXv, libepoxy, minizip, pulseaudio, portaudio }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook, alsa-lib +, SDL2, zlib, gtkmm3, libXv, libepoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { pname = "snes9x-gtk"; - version = "1.60"; + version = "1.61"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "12hpn7zcdvp30ldpw2zf115yjqv55n1ldjbids7vx0lvbpr06dm1"; + fetchSubmodules = true; + sha256 = "1kay7aj30x0vn8rkylspdycydrzsc0aidjbs0dd238hr5hid723b"; }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ SDL2 zlib gtk3 libxml2 libXv libepoxy minizip pulseaudio portaudio ]; + buildInputs = [ alsa-lib SDL2 zlib gtkmm3 libXv libepoxy minizip pulseaudio portaudio ]; preConfigure = "cd gtk"; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { # see https://github.com/snes9xgit/snes9x/blob/master/LICENSE for exact details license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ qknight ]; + maintainers = with maintainers; [ qknight xfix ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix new file mode 100644 index 00000000000..e7ac78da18e --- /dev/null +++ b/pkgs/applications/finance/irpf/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenvNoCC +, fetchzip +, copyDesktopItems +, jdk11 +, makeDesktopItem +, makeWrapper +, unzip +}: + +stdenvNoCC.mkDerivation rec { + pname = "irpf"; + version = "2022-1.0"; + + src = let + year = lib.head (lib.splitVersion version); + in fetchzip { + url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; + sha256 = "0h8f51ilvg7m6hlx0y5mpxhac90p32ksbrffw0hxdqbilgjz1s68"; + }; + + nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem rec { + name = pname; + exec = pname; + icon = "rfb64"; + desktopName = "Imposto de Renda Pessoa Física"; + comment = "Programa Oficial da Receita para elaboração do IRPF"; + categories = [ "Office" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + BASEDIR="$out/share/${pname}" + mkdir -p "$BASEDIR" + + cp -r help lib lib-modulos "$BASEDIR" + + install -Dm755 irpf.jar "$BASEDIR/${pname}.jar" + install -Dm644 Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR" + + makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ + --add-flags "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-Dswing.aatext=true" \ + --add-flags "-jar $BASEDIR/${pname}.jar" \ + --set _JAVA_AWT_WM_NONREPARENTING 1 \ + --set AWT_TOOLKIT MToolkit + + mkdir -p $out/share/pixmaps + unzip -j lib/ppgd-icones-4.0.jar icones/rfb64.png -d $out/share/pixmaps + + runHook postInstall + ''; + + meta = with lib; { + description = "Programa Oficial da Receita para elaboração do IRPF"; + homepage = "https://www.gov.br/receitafederal/pt-br"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 55080f333c2..4d2db993b8d 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.15.5"; + version = "4.15.6"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-vPS2hTaWjundVjtguy/1eH1qBaipN2Ij8PQODka+IGg="; + sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0="; }; libPath = lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index cd4972de455..39fb78b317f 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "foxotron"; - version = "2021-08-13"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; rev = version; fetchSubmodules = true; - sha256 = "sha256-0cnLHTZMeh8ilP0iXaMpFgKQAkizy/FimxXFDbH0b2w="; + sha256 = "sha256-w66wi+aMwQa9akfNA/1cS6UmDXPWC4OPK9BIa9Kt47A="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix new file mode 100644 index 00000000000..8cb4208e267 --- /dev/null +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitLab + +, gettext +, meson +, ninja +, pkg-config +, python3 +, rustPlatform +, wrapGAppsHook + +, appstream-glib +, desktop-file-utils +, glib +, gtk4 +, libadwaita +}: + +stdenv.mkDerivation rec { + pname = "gnome-obfuscate"; + version = "0.0.4"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Obfuscate"; + rev = version; + sha256 = "sha256-P8Y2Eizn1BMZXuFjGMXF/3oAUzI8ZNTrnbLyU+V6uk4="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "sha256-5MzWz5NH2sViIfaP8xOQLreEal5TYkji11VaUgieT3U="; + }; + + nativeBuildInputs = [ + gettext + glib + meson + ninja + pkg-config + python3 + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wrapGAppsHook + ]; + + buildInputs = [ + appstream-glib + desktop-file-utils + glib + gtk4 + libadwaita + ]; + + postPatch = '' + patchShebangs build-aux/meson_post_install.py + ''; + + meta = with lib; { + description = "Censor private information"; + homepage = "https://gitlab.gnome.org/World/obfuscate"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix new file mode 100644 index 00000000000..b0e346331bc --- /dev/null +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -0,0 +1,76 @@ +{ lib +, mkDerivation +, fetchpatch +, fetchFromGitHub +, cmake +, extra-cmake-modules +, qtbase +, wrapQtAppsHook +, libraw +, exiv2 +, zlib +, alglib +, pkg-config +, makeDesktopItem +, copyDesktopItems +}: + +mkDerivation rec { + pname = "hdrmerge"; + version = "unstable-2020-11-12"; + src = fetchFromGitHub { + owner = "jcelaya"; + repo = "hdrmerge"; + rev = "f5a2538cffe3e27bd9bea5d6a199fa211d05e6da"; + sha256 = "1bzf9wawbdvdbv57hnrmh0gpjfi5hamgf2nwh2yzd4sh1ssfa8jz"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + copyDesktopItems + ]; + + buildInputs = [ qtbase libraw exiv2 zlib alglib ]; + + cmakeFlags = [ + "-DALGLIB_DIR:PATH=${alglib}" + ]; + + patches = [ + (fetchpatch { + # patch FindAlglib.cmake to respect ALGLIB_DIR + # see https://github.com/jcelaya/hdrmerge/pull/213 + name = "patch-hdrmerge-CMake.patch"; + url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch"; + sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi"; + }) + ]; + + desktopItems = [ + (makeDesktopItem { + name = "HDRMerge"; + genericName = "HDR raw image merge"; + desktopName = "HDRMerge"; + comment = meta.description; + icon = "hdrmerge"; + exec = "hdrmerge %F"; + categories = [ "Graphics" ]; + mimeTypes = [ "image/x-dcraw" "image/x-adobe-dng" ]; + terminal = false; + }) + ]; + + postInstall = '' + install -Dm444 ../data/images/icon.png $out/share/icons/hicolor/128x128/apps/hdrmerge.png + ''; + + meta = with lib; { + homepage = "https://github.com/jcelaya/hdrmerge"; + description = "Combines two or more raw images into an HDR"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.paperdigits ]; + }; +} diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index ec2ac709f86..3e68a4b9467 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -5,7 +5,6 @@ , gnumake , makeWrapper , pkg-config -, fetchpatch , autopanosiftc , boost , cairo @@ -37,21 +36,13 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2019.0.0"; + version = "2021.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr"; + sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk="; }; - patches = [ - # Fixes build with exiv2 0.27.1 - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0467d8ba362b9c196e4c1dc4be7de0c1b336335b/hugin/trunk/hugin-exiv2-0.27.1.patch"; - sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r"; - }) - ]; - buildInputs = [ boost cairo diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 276ccb51274..4dd97d92217 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -1,25 +1,21 @@ { lib, stdenv, fetchurl, wrapGAppsHook -, cargo, desktop-file-utils, meson, ninja, pkg-config, python3, rustc -, dbus, gdk-pixbuf, glib, gtk3, gtksourceview4, libhandy +, cargo, desktop-file-utils, meson, ninja, pkg-config, rustc +, gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita }: stdenv.mkDerivation rec { pname = "icon-library"; - version = "0.0.8"; + version = "0.0.11"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/icon-library/uploads/fdf890706e0eef2458a5285e3bf65dd5/icon-library-${version}.tar.xz"; - sha256 = "0807b56bgm8j1gpq4nf8x31gq9wqhcmpzpkqw6s4wissw3cb7q96"; + url = "https://gitlab.gnome.org/World/design/icon-library/uploads/93d183b17d216bbed7b03b2f3698059c/icon-library-${version}.tar.xz"; + sha256 = "1zrcnc5dn5fgcl3vklfpbp3m0qzi2n2viw59vw5fhwkysvp670y7"; }; nativeBuildInputs = [ - cargo desktop-file-utils meson ninja pkg-config python3 rustc wrapGAppsHook + cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook ]; - buildInputs = [ dbus gdk-pixbuf glib gtk3 gtksourceview4 libhandy ]; - - postPatch = '' - patchShebangs build-aux/meson_post_install.py - ''; + buildInputs = [ gdk-pixbuf glib gtk4 gtksourceview5 libadwaita ]; meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/icon-library"; diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 4dc5506aed6..05a99527e5f 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.0.06"; + version = "1.1.03"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-2Wlyt9Xw/FNaFkN1Q6utXdGzp42piebESQARhfpvRhM="; + sha256 = "sha256-X7hAkzVqIABpyFokiYaMGZqSda69cKhKghFDWDEVOow="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/nsxiv/default.nix b/pkgs/applications/graphics/nsxiv/default.nix index 8c414c37247..c1ebbd57c0d 100644 --- a/pkgs/applications/graphics/nsxiv/default.nix +++ b/pkgs/applications/graphics/nsxiv/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "nsxiv"; - version = "28"; + version = "29"; src = fetchFromGitHub { owner = "nsxiv"; repo = pname; rev = "v${version}"; - hash = "sha256-12RmEAzZdeanrRtnan96loXT7qSjIMjcWf296XmNE+A="; + hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index cf16ecc03cb..084787d6315 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler , ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: @@ -32,6 +32,15 @@ in mkDerivation rec { sha256 = "sha256-OlGXGIMghil/GG6eso20+CWo/hCjarXGs6edXX9pc/M="; }; + patches = [ + # Poppler requires at least C++17 + (fetchpatch { + name = "use-c-17-for-pdf-on-linux-builds"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/use-c-17-for-pdf-on-linux-builds.patch?h=openboard"; + sha256 = "sha256-M6HigpOo8ul7qaub4cd7/ATUc85HezEyKyDuzsrZvC8="; + }) + ]; + postPatch = '' substituteInPlace OpenBoard.pro \ --replace '/usr/include/quazip' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 1a761de6ec0..cd16fe1de08 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ }: let - version = "5.9.1"; + version = "5.10.0"; docFiles = [ (fetchurl { @@ -35,7 +35,7 @@ in mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - sha256 = "0pzic95br0vr785jnpxqmfxcljw3wk7bhm2xy0jfmwm1dh2b7xac"; + sha256 = "0ipx6zq44hpic7gvv0s2jvjncak6vlmrz5sp9ypc15b15bna0gs2"; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/skanpage/default.nix b/pkgs/applications/graphics/skanpage/default.nix new file mode 100644 index 00000000000..17a22880897 --- /dev/null +++ b/pkgs/applications/graphics/skanpage/default.nix @@ -0,0 +1,36 @@ +{ lib +, mkDerivation +, fetchurl +, extra-cmake-modules +, kirigami2 +, ktextwidgets +, libksane +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "skanpage"; + version = "1.0.0"; + + src = fetchurl { + url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA="; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ + kirigami2 + ktextwidgets + libksane + qtquickcontrols2 + ]; + + meta = with lib; { + description = "KDE utility to scan images and multi-page documents"; + homepage = "https://apps.kde.org/skanpage"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samuelgrf ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 092366652d4..7965f824125 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -1,64 +1,80 @@ { lib -, dbus , stdenv +, rustPlatform +, fetchFromGitHub +, dbus +, ffmpeg +, x264 +, libva , gst_all_1 , xorg , libdrm -, libva -, fetchzip -, copyDesktopItems -, fontconfig -, libpng -, pipewire -, makeWrapper -, autoPatchelfHook +, pkg-config +, pango +, cmake +, autoconf +, libtool +, nodePackages +, ApplicationServices +, Carbon +, Cocoa +, VideoToolbox }: -stdenv.mkDerivation rec { +rustPlatform.buildRustPackage rec { pname = "weylus"; version = "0.11.4"; - src = fetchzip { - url = "https://github.com/H-M-H/Weylus/releases/download/v${version}/linux.zip"; - sha256 = "sha256-EW3TdI4F4d4X/BeSqI05QtS77ym1U5jdswFfNtSFyFk="; - stripRoot = false; + src = fetchFromGitHub { + owner = "H-M-H"; + repo = pname; + rev = "v${version}"; + sha256 = "0gq2czxvahww97j4i3k18np29zl6wx85f8253wn3ibqrpfnklz6l"; }; - installPhase = '' - runHook preInstall - - install -Dm755 ./weylus $out/bin/weylus - copyDesktopItems ./weylus.desktop - - runHook postInstall - ''; - buildInputs = [ - libpng + ffmpeg + x264 + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Carbon + Cocoa + VideoToolbox + ] ++ lib.optionals stdenv.isLinux [ dbus - libdrm - fontconfig libva gst_all_1.gst-plugins-base - pipewire - # autoPatchelfHook complains if these are missing, even on wayland + xorg.libXext xorg.libXft xorg.libXinerama xorg.libXcursor + xorg.libXrender + xorg.libXfixes + xorg.libXtst xorg.libXrandr xorg.libXcomposite - xorg.libXtst + xorg.libXi + xorg.libXv + pango + libdrm ]; - nativeBuildInputs = [ copyDesktopItems autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ + cmake + nodePackages.typescript + ] ++ lib.optionals stdenv.isLinux [ + pkg-config + autoconf + libtool + ]; + + cargoSha256 = "1pigmch0sy9ipsafd83b8q54xwqjxdaif363n1q8n46arq4v81j0"; + + cargoBuildFlags = [ "--features=ffmpeg-system" ]; + cargoTestFlags = [ "--features=ffmpeg-system" ]; - postFixup = let - GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ - gst_all_1.gst-plugins-base - pipewire - ]; - in '' - wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH} + postInstall = '' + install -vDm755 weylus.desktop $out/share/applications/weylus.desktop ''; meta = with lib; { @@ -66,6 +82,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/H-M-H/Weylus"; license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ lom ]; - platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 4d39d25222c..d8838587d76 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -221,6 +221,7 @@ let skanlite = callPackage ./skanlite.nix {}; spectacle = callPackage ./spectacle.nix {}; yakuake = callPackage ./yakuake.nix {}; + zanshin = callPackage ./zanshin.nix {}; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/kde/zanshin.nix b/pkgs/applications/kde/zanshin.nix new file mode 100644 index 00000000000..a43632ce362 --- /dev/null +++ b/pkgs/applications/kde/zanshin.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + akonadi-calendar, boost, kontactinterface, krunner +}: + +mkDerivation { + pname = "zanshin"; + meta = with lib; { + description = "A powerful yet simple application to manage your day to day actions, getting your mind like water"; + homepage = "https://zanshin.kde.org/"; + maintainers = with maintainers; [ zraexy ]; + license = licenses.gpl2Plus; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ akonadi-calendar boost kontactinterface krunner ]; +} diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 29a932f40d5..d82658f529e 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,7 +1,9 @@ { config , lib , stdenv -, fetchurl +, fetchzip +, autoreconfHook +, autoconf-archive , pkg-config , CoreAudio , enableAlsa ? true @@ -35,15 +37,20 @@ stdenv.mkDerivation rec { pname = "sox"; - version = "14.4.2"; + version = "unstable-2021-05-09"; - src = fetchurl { - url = "mirror://sourceforge/sox/sox-${version}.tar.gz"; - sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; + src = fetchzip { + url = "https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/sox-code-42b3557e13e0fe01a83465b672d89faddbe65f49.zip"; + hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c="; }; - # configure.ac uses pkg-config only to locate libopusfile - nativeBuildInputs = lib.optional enableOpusfile pkg-config; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + ] ++ lib.optional enableOpusfile [ + # configure.ac uses pkg-config only to locate libopusfile + pkg-config + ]; patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix index 7325e29f682..d4808829586 100644 --- a/pkgs/applications/misc/avizo/default.nix +++ b/pkgs/applications/misc/avizo/default.nix @@ -7,26 +7,19 @@ stdenv.mkDerivation rec { pname = "avizo"; - # Note: remove the 'use-sysconfig' patch on the next update - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "misterdanb"; repo = "avizo"; rev = version; - sha256 = "sha256-0BJodJ6WaHhuSph2D1AC+DMafctgiSCyaZ8MFn89AA8="; + sha256 = "sha256-BRtdCOBFsKkJif/AlnF7N9ZDcmA+878M9lDQld+SAgo="; }; nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ]; - patches = [ - # Remove on next update - # See https://github.com/misterdanb/avizo/pull/30 - ./use-sysconfdir-instead-of-etc.patch - ]; - postInstall = '' substituteInPlace "$out"/bin/volumectl \ --replace 'avizo-client' "$out/bin/avizo-client" diff --git a/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch b/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch deleted file mode 100644 index 947559760cb..00000000000 --- a/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/meson.build b/meson.build -index 1c789be..cd4b07a 100644 ---- a/meson.build -+++ b/meson.build -@@ -12,7 +12,9 @@ app_resources_service = gnome.compile_resources( - source_dir : '.', - c_name : 'avizo_resources') - --install_data('config.ini', install_dir: '/etc/xdg/avizo') -+sysconfdir = get_option('sysconfdir') -+ -+install_data('config.ini', install_dir: join_paths(sysconfdir, 'xdg/avizo')) - install_data('volumectl', install_dir: 'bin') - install_data('lightctl', install_dir: 'bin') - diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index bec3164a008..c998309bdd3 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-B2HAEJj8TX44YagJ993d7js/wi1D39/Hi85rxJoKa3U="; + sha256 = "sha256-bBa3eKBT43G/Q8gYluW2gH5qcmp/SsrF06onyGlg+UI="; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 22d7560c689..865e3a849a1 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -20,8 +20,8 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.2.14-trento"; - sha256 = "GtVC3JfVoooJ+MuF9r1W3J8RfXNKalaIgecv1ner7GA="; + version = "2022.2.28-trento-1"; + sha256 = "tE6YuuZZcs3RKxs1S6OoGt0CXz3oHUi/sopFN0iywds="; src = fetchFromGitHub { owner = "bottlesdevs"; @@ -99,6 +99,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "An easy-to-use wineprefix manager"; homepage = "https://usebottles.com/"; + downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; license = licenses.gpl3Only; maintainers = with maintainers; [ bloomvdomino psydvl shamilton ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 5b323185648..b3754fed179 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -96,7 +96,6 @@ mkDerivation rec { feedparser html2text html5-parser - jeepney lxml markdown mechanize diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 5f0c09303ff..907bc7a53e0 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.9.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-5WNkD+YfmQHGAWWfD9/ZEHnHPT0Ejm9Nz+/mn8xvU4U="; + sha256 = "sha256-7WdSIpmpN8Zz2k5PveYZoCueQo5sLxLLZvZdzxRlkaE="; }; - vendorSha256 = "sha256-r0mYrtWllKOvKQJmW0ie4l+1nsCwU8O+CV6ESXNoETk="; + vendorSha256 = "sha256-5cqZxh2uvmJV7DtAGzQwt//heF3kF9mjyB0KAs8nWZY="; doCheck = false; diff --git a/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch b/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch new file mode 100644 index 00000000000..d3c32cf9640 --- /dev/null +++ b/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch @@ -0,0 +1,31 @@ +From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" <d.ol.rod@tutanota.com> +Date: Fri, 4 Mar 2022 07:03:17 -0600 +Subject: [PATCH] Pillow update + +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 5dc25e0..b3ba397 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -11,7 +11,7 @@ readme = "README.rst" + [tool.poetry.dependencies] + python = "^3.7" + logbook = "^1.5.3" +-Pillow = "^8.2.0" ++Pillow = "^9.0.0" + requests = "^2.24.0" + kiss-headers = "^2.2.3" + single-version = "^1.5.1" +@@ -33,4 +33,4 @@ skip-string-normalization = true + + [build-system] + requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++build-backend = "poetry.core.masonry.api" +-- +2.35.1 + diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix new file mode 100644 index 00000000000..1401a7a8df2 --- /dev/null +++ b/pkgs/applications/misc/cobang/default.nix @@ -0,0 +1,102 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, wrapGAppsHook +, atk +, gdk-pixbuf +, gobject-introspection +, gtk3 +, gst-plugins-good +, libhandy +, librsvg +, networkmanager +, pango +, gst-python +, kiss-headers +, Logbook +, pillow +, poetry-core +, pygobject3 +, python +, python-zbar +, requests +, single-version +, pytestCheckHook }: + +buildPythonApplication rec { + pname = "cobang"; + version = "0.9.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hongquan"; + repo = "CoBang"; + rev = "v${version}"; + sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw="; + }; + + patches = [ + ./0001-Poetry-core-and-pillow-9.patch + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + gst-python + kiss-headers + Logbook + pillow + poetry-core + pygobject3 + python-zbar + requests + single-version + ]; + + buildInputs = [ + atk + gdk-pixbuf + # Needed to detect namespaces + gobject-introspection + gst-plugins-good + libhandy + networkmanager + pango + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Wrapping this manually for SVG recognition + dontWrapGApps = true; + + postInstall = '' + # Needed by the application + cp -R data $out/${python.sitePackages}/ + + # Icons and applications + install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/ + install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/vn.hoabinh.quan.CoBang.desktop \ + --replace "Exec=" "Exec=$out/bin/" + ''; + + preFixup = '' + wrapProgram $out/bin/cobang \ + ''${gappsWrapperArgs[@]} \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + ''; + + meta = with lib; { + description = "A QR code scanner desktop app for Linux"; + homepage = "https://github.com/hongquan/CoBang"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 71142727a83..8505c97e1bc 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -34,8 +34,8 @@ let qonlinetranslator = fetchFromGitHub { owner = "crow-translate"; repo = "QOnlineTranslator"; - rev = "1.5.2"; - sha256 = "sha256-iGi25aKwff2hNNx6o4kHZV8gVbEQcMgpTTvop3CoLjM="; + rev = "1.5.3"; + sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM="; }; circleflags = fetchFromGitHub { owner = "HatScripts"; @@ -52,13 +52,13 @@ let in mkDerivation rec { pname = "crow-translate"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "crow-translate"; repo = pname; rev = version; - sha256 = "sha256-7Zb6PZO8eLeGPEZD37ja+LZydIQdsgy5gMAMtlS4k5Y="; + sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw="; }; patches = [ diff --git a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch index 1eb1f464e55..0bfdc9ef2f7 100644 --- a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch +++ b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch @@ -46,7 +46,7 @@ index c92e745..f265f03 100644 FetchContent_Declare(QOnlineTranslator - GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator -- GIT_TAG 1.5.2 +- GIT_TAG 1.5.3 + SOURCE_DIR @qonlinetranslator@ ) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 777c4b97d2b..18b61bc8a9b 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "1.12.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-F0c6gMQKu35iBNRw+wpoxSUOhRUbPRKIXSNDDNZsfPE="; + sha256 = "sha256-6XPgSreWcRXN8ymP7zS5a7Cfl9wSLMxjmiugJPp6l+g="; fetchSubmodules = true; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { cp cubiomes-viewer $out/bin mkdir -p $out/share/pixmaps - cp icons/map.png $out/share/pixmaps/cubiomes-viewer.png + cp rc/icons/map.png $out/share/pixmaps/cubiomes-viewer.png runHook postInstall ''; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 1741e908669..eb17bf5c194 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "091s3hyz9p892garanm9zmkbsn6hn3bnnrz7h3dqsyi58806d5yr"; + sha256 = "sha256-MUF57begai6yMYLPC5dnyO9S39uHogB+Ie3qDA46Cn8="; }; - vendorSha256 = "1y0k03lg9dh3bpi10xzv03h7gq7h0hgggs304p78p3jkr8pmkqss"; + vendorSha256 = "sha256-NP+Is7Dxz4LGzx5vpv8pJOJhodAYHia1JXYfhJD54as="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index ba1682f02dd..61dd6e4a6d6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.3.5"; # When updating also update fetchedMavenDeps.sha256 + version = "22.0.0"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-xJYC+p8HeY4XOzArZMKRvOafW82npMMfwlqlxsH6Ycg="; + sha256 = "sha256-LSEsaCEUoKViKC+IjJrV/w1VzOGi4EOr4LnAutOIyJU="; }; fetchedMavenDeps = stdenv.mkDerivation { diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index 850bca3320e..dee6f5c663f 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "1.9"; + version = "2.0"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "0qbdq7k0mmvkjp6qzz88n7vf29liqn6y5w4y39ldqdc8hzw5sld7"; + sha256 = "sha256-otfa2t/tfpYKqQu+VQxRKryUsIxM3JKILc3zseTC2KM="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 17ce1d562b5..116d5430c2a 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dunst"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "sha256-bSlSOAxIcFS5B5o3pWmXFsKthAXzbCltnbLAV/bIHLw="; + sha256 = "sha256-aMla5mzQpN9CNDc4QSxjcKR+Ufej+8WLBYxCntApcKU="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; diff --git a/pkgs/applications/misc/electrum-grs/default.nix b/pkgs/applications/misc/electrum-grs/default.nix index 412aec97ae5..c8fb9f84ad1 100644 --- a/pkgs/applications/misc/electrum-grs/default.nix +++ b/pkgs/applications/misc/electrum-grs/default.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "Groestlcoin"; repo = "electrum-grs"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "0wvbjj80r1zxpz24adkicxsdjnv3nciga6rl1wfmky463w03rca2"; }; diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/applications/misc/eos-installer/default.nix new file mode 100644 index 00000000000..02d629412a3 --- /dev/null +++ b/pkgs/applications/misc/eos-installer/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub +, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config +, gnome, gnupg, gtk3, udisks +}: + +stdenv.mkDerivation rec { + pname = "eos-installer"; + version = "4.0.3"; + + src = fetchFromGitHub { + owner = "endlessm"; + repo = "eos-installer"; + rev = "Release_${version}"; + sha256 = "1nl6vim5dd83kvskmf13xp9d6zx39fayz4z0wqwf7xf4nwl07gwz"; + fetchSubmodules = true; + }; + + strictDeps = true; + nativeBuildInputs = [ + autoconf autoconf-archive automake glib intltool libtool pkg-config + ]; + buildInputs = [ gnome.gnome-desktop gtk3 udisks ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ + "--libexecdir=${placeholder "out"}/bin" + "--localstatedir=/var" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ]; + + # These are for runtime, so can't be discovered from PATH, which + # is constructed from nativeBuildInputs. + GPG_PATH = "${gnupg}/bin/gpg"; + GPGCONF_PATH = "${gnupg}/bin/gpgconf"; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/endlessm/eos-installer"; + description = "Installer UI which writes images to disk"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index eee466650e3..766b05b2e14 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.16.2"; + version = "1.17.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "1qwj25xvvxvm1fxx216nn2gp7js4d682mm3l4s7ns90fc5ygvc8i"; + sha256 = "sha256-F4hAFLsZmRg/zeTHo9eYoT0BasorynGaSzNSbKr2/JE="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 44e4bd2a0b3..ebed42852b7 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "genact"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "1hc4jwk5rr1yw3pfvriash7b03j181k8c9y7m3sglkk8xnff219c"; + sha256 = "sha256-ouDaOs72vivJBZVwcJhv4YoPKQOEBctUTqubvrpoBtI="; }; - cargoSha256 = "0a5ic6c7fvmg2kh3qprzffnpw40cmrgbscrlhxxs3m7nxfjdh7bc"; + cargoSha256 = "sha256-csubycZaBUHPp8XJ1C+nWw7DzVGVJm38/Dgw41qUMYQ="; meta = with lib; { description = "A nonsense activity generator"; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 531ce423737..7365d297e3b 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -55,6 +55,10 @@ in buildPythonApplication rec { runHook postInstall ''; + # https://github.com/NixOS/nixpkgs/issues/149812 + # https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-hooks-gobject-introspection + strictDeps = false; + meta = with lib; { description = "Genealogy software"; homepage = "https://gramps-project.org"; diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix new file mode 100644 index 00000000000..236af7c446d --- /dev/null +++ b/pkgs/applications/misc/hcl2json/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "hcl2json"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "tmccombs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Xr94Bq3w2j+hUoGy1mSLy3WCQiwrfS/5IL6i6CwKiPs="; + }; + + vendorSha256 = "sha256-Mz97GBxx/7oFjW6u5DG6JhvPRzn+hqtfqHdYv47L898="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Convert hcl2 to json"; + homepage = "https://github.com/tmccombs/hcl2json"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 5110815023a..a164654b1a6 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.4-6681f81d/Hubstaff-1.6.4-6681f81d.sh"; - version = "1.6.4-6681f81d"; - sha256 = "1j0rzyqm9zm2w44zwxq61fy19m27ghlv11mbfl7yzh2ccmxljxjm"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.5-31be26f1/Hubstaff-1.6.5-31be26f1.sh"; + version = "1.6.5-31be26f1"; + sha256 = "1z1binnqppyxavmjg0l1cvy64ylzy2v454sws2x1am2qhhbnycjm"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 2003e0d7e76..42d87b41fc9 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.6.10"; + version = "2.7.13"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-2/QYEzQjB9n/4k5I/fry3ol8Fpsb5+tc1ttVdf2ID+4="; - x86_64-darwin = "sha256-BwBpq78hYJVUItUgs9lonBTV4YWJ+qvML6VTj5M4BQ4="; + x86_64-linux = "sha256-ObuBcFV5fq2sryC+ETTAH+S19EW+nVlxdVOtOpiBeDs="; + x86_64-darwin = "sha256-f0+/kUukP+zIzTSSGO1ctUBd/uCSrAKz+uBnrzpPy5k="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index d1a8bd1077a..cc6d4e33fb2 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18360"; + version = "18387"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-1OMEPMtUGkxQCgpmyVP1h25gSDa2MKF7l1rodr61O5s="; + sha256 = "sha256-zkEWZjjSy0ajG5X1/dIgLPZ7zr0BiaJJcHaN8sv/3yc="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-ZCybgaLwPfQVG2gJ+dtElIY7bGZUe9R8a/0B6QK8yK8="; + sha256 = "sha256-xOVnnQ+eUkboT8Tq5F4QJEou1wAaHwiEdyiEKDR/fUk="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/kchmviewer/default.nix b/pkgs/applications/misc/kchmviewer/default.nix new file mode 100644 index 00000000000..4d703bff0c2 --- /dev/null +++ b/pkgs/applications/misc/kchmviewer/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, wrapQtAppsHook, chmlib, libzip, qtwebengine }: + +stdenv.mkDerivation rec { + pname = "kchmviewer"; + version = "8.0"; + + src = fetchFromGitHub { + owner = "gyunaev"; + repo = pname; + rev = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw="; + }; + + patches = [ + # remove unused webkit + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch"; + sha256 = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28="; + }) + # QtWebengine fixes + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch"; + sha256 = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY="; + }) + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch"; + sha256 = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY="; + }) + ]; + + buildInputs = [ chmlib libzip qtwebengine ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + postInstall = '' + install -Dm755 bin/kchmviewer -t $out/bin + install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps + install -Dm644 packages/kchmviewer.desktop -t $out/share/applications + ''; + + meta = with lib; { + description = "CHM (Winhelp) files viewer"; + homepage = "http://www.ulduzsoft.com/linux/kchmviewer/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 2d75a9da818..9ed67817347 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,17 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch +{ lib, mkDerivation, fetchFromGitHub , python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl, makeWrapper +, which, perl }: mkDerivation rec { pname = "klayout"; - version = "0.27.3"; + version = "0.27.8"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "sha256-6g/QoR16rhUfxhH4JxL6EERcoPVG/6MOxUlo6K/WoE0="; + hash = "sha256-t/nd7m8XpB026q/kyH16rKkw3qza19ISalB0Juzx4NU="; }; postPatch = '' @@ -21,6 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ which + perl python3 ruby ]; @@ -35,7 +36,7 @@ mkDerivation rec { buildPhase = '' runHook preBuild mkdir -p $out/lib - ./build.sh -qt5 -prefix $out/lib -j$NIX_BUILD_CORES + ./build.sh -qt5 -prefix $out/lib -option -j$NIX_BUILD_CORES runHook postBuild ''; @@ -54,8 +55,9 @@ mkDerivation rec { meta = with lib; { description = "High performance layout viewer and editor with support for GDS and OASIS"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl2Plus ]; homepage = "https://www.klayout.de/"; + changelog = "https://www.klayout.de/development.html#${version}"; platforms = platforms.linux; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 38ad131bc14..2e6318f9880 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2022.01"; + version = "2022.02"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-XuIYNvGhzJ649LxVPit2AOmb+YOHtZA4AhDyxjaB5OE="; + sha256 = "sha256-gR81ZN0N3bmvLVqwUanXTrpBnzhPZT0bo4J8VOfaJh8="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index a0b67042eca..043f607c010 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "0.8.0-alpha.3"; + version = "0.8.3-alpha.1.pre.0"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - sha256 = "0ihq2kxjackicxg0hrpmx6bsgz056xbaq3j8py37z2w6mwszarcg"; + sha256 = "1225paf0x6lb6cb3q5f4lyz0r426ifx4x8145q7nsc6v64srck2y"; }; - vendorSha256 = "175pckj30cm5xkbvsdvwzarvwapsylyjgj4ss8v5r1sa0fjpj008"; + vendorSha256 = "10zhxbccjsp6hbmk2lnvbag6c92hz703mcaigaj4wvlf7glpldm6"; subPackages = [ "." ]; @@ -25,7 +25,7 @@ buildGoModule rec { test/e2e/run.sh script/testenv.sh script/test-envs.sh - persistence/sql/migratest/update_fixtures.sh + script/debug-entrypoint.sh ) patchShebangs "''${files[@]}" diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index eadd6c8db55..73c8abaa13f 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E6LwNiCykBqjkifUSi6oBWqCEhkRO+03HSKn4p45kh0="; + sha256 = "sha256-52Tq6gKozM/IFUyAy8N+YDqlbcFNQw6b2tc268Zco6g="; }; - vendorSha256 = "sha256-SzgiWqPuDZuSH8I9im8r+06E085PWyHwLjwxcaoJgQo="; + vendorSha256 = "sha256-7QEb5J5IaxisKjbulyHq5PGVeKAX022Pz+5OV5qD7Uo="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 09e31cd3409..81c9e9d5515 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, curl, expat, gcc, openssl, zlib }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.6.0"; + version = "0.6.3"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "9u2KdrNVAx+sy/8s2VP0DIzSMTvBK56pUGQaj7wulz0="; + sha256 = "o3tBHk7bauNczz6lPS3lV0mpYEaBa0lh/mAJKJM2eWU="; name = "${pname}-${version}.AppImage"; }; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc curl expat openssl zlib ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index 0688c189e45..16886390837 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -2,12 +2,12 @@ let pname = "marktext"; - version = "v0.16.3"; + version = "v0.17.1"; name = "${pname}-${version}-binary"; src = fetchurl { url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage"; - sha256 = "0s93c79vy2vsi7b6xq4hvsvjjad8bdkhl1q135vp98zmbf7bvm9b"; + sha256 = "2e2555113e37df830ba3958efcccce7020907b12fd4162368cfd906aeda630b7"; }; appimageContents = appimageTools.extractType2 { @@ -48,7 +48,7 @@ appimageTools.wrapType2 rec { description = "A simple and elegant markdown editor, available for Linux, macOS and Windows"; homepage = "https://marktext.app"; license = licenses.mit; - maintainers = with maintainers; [ nh2 ]; + maintainers = with maintainers; [ nh2 eduarrrd ]; platforms = [ "x86_64-linux" ]; mainProgram = "marktext"; }; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 7cfe873a44e..2381e89640a 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "mediaelch"; - version = "2.8.14"; + version = "2.8.16"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "sha256-yHThX5Xs+8SijNKgmg+4Mawbwi3zHA/DJQoIBy0Wchs="; + sha256 = "sha256-83bHfIRVAC+3RkCYmV+TBjjQxaFMHfVyxt5Jq44dzeI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 4412af583b3..9602fee5b5c 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.1.4"; + version = "2.1.5"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - hash = "sha256-46J0iLXzZX5tww4CK8WhrADql023rauO0fpW7Asn5ZY="; + hash = "sha256-G7Azeh8+OQILoYEmlIeacoDzN0NRt5NTGavYM9CH8WA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index 6a1f14cbd44..2786492d47a 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -8,7 +8,7 @@ , gtk3 , python3 , python3Packages -, steam-run-native +, steam-run , unzip , webkitgtk , wrapGAppsHook @@ -54,14 +54,14 @@ python3Packages.buildPythonApplication rec { python3.pkgs.requests python3.pkgs.setuptools python3.pkgs.simplejson - steam-run-native + steam-run unzip webkitgtk ]; # Run Linux games using the Steam Runtime by using steam-run in the wrapper postFixup = '' - sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run-native}/bin/steam-run#' -i $out/bin/minigalaxy + sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy ''; meta = with lib; { diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 144e6298207..976c3c7978a 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4895"; + version = "4897"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "jGSDH90ze0hHa9nAaeEkj1sfADEk7EatGrePM3+/SDk="; + sha256 = "RR8o8stOnL6nnEkCtRT9tgo8foSxd6ASTsRcGDgbQRk="; }; patches = [ diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index db89e538d51..97f74becede 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "645"; + version = "647"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; - sha256 = "Y9feRNDjmwUbSOwxfMIaYIycCvOBMihq5LkuKbALVDY="; + sha256 = "j9TJ+9WuItueztWjYoD9s9x8wfsga2QCIY5X2+s3Z1c="; }; patches = [ diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 4cd7692f67f..2b9c847bac8 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -1,21 +1,21 @@ { lib , buildGoPackage , fetchFromGitHub - -, withSpeech ? true +, stdenv +, withSpeech ? !stdenv.isDarwin , makeWrapper , espeak-ng }: buildGoPackage rec { pname = "mob"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-NXctu5gg0QfiTZ7osQ0yzETabGDuEeTVZBPFyLeNq8k="; + sha256 = "sha256-GJ4V4GQRUoXelk0ksHPoFL4iB1W7pe2UydK2AhYjysg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/neo/default.nix b/pkgs/applications/misc/neo/default.nix index fda086c49d5..e091a572c27 100644 --- a/pkgs/applications/misc/neo/default.nix +++ b/pkgs/applications/misc/neo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "neo"; - version = "0.6"; + version = "0.6.1"; src = fetchurl { url = "https://github.com/st3w/neo/releases/download/v${version}/neo-${version}.tar.gz"; - sha256 = "sha256-skXLT1td4dGdsu+wbX44Z2u5sDEOKXYVVys4Q6RayIk="; + sha256 = "sha256-pV5O1e/QpK8kjRYBinqq07YX7x06wF0pKiWKOKr0ank="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index b822a7ed117..1aa4a3660c2 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -1,29 +1,43 @@ { lib , buildGoModule , fetchFromGitHub -, pkg-config , cairo , gobject-introspection , gtk3 , gtk-layer-shell -}: +, pkg-config +, wrapGAppsHook +, xdg-utils }: buildGoModule rec { pname = "nwg-drawer"; - version = "0.1.11"; + version = "0.2.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aUn9zvlNUuvm7Uo0wyzbkSLXfUDcKn1uxAu3pVwq0FA="; + sha256 = "sha256-YhCMOktfsSb7GrKA8reZb+QHcNS/Lpd0hCaPqnWvL7w="; }; - vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; - - nativeBuildInputs = [ pkg-config ]; + vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14="; buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + + doCheck = false; + + preInstall = '' + mkdir -p $out/share/nwg-drawer + cp -r desktop-directories drawer.css $out/share/nwg-drawer + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${xdg-utils}/bin + --prefix XDG_DATA_DIRS : $out/share + ) + ''; meta = with lib; { description = "Application drawer for sway Wayland compositor"; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 5e71f7d0d10..67a0939ddab 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -1,75 +1,99 @@ -{ stdenv, fetchurl, lib, makeWrapper, electron_13, makeDesktopItem, graphicsmagick -, writeScript }: - +{ stdenv +, fetchurl +, lib +, makeWrapper +, electron_16 +, makeDesktopItem +, graphicsmagick +, writeScript +, undmg +, unzip +}: let - electron = electron_13; - icon = fetchurl { - url = - "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; - sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; - }; - - desktopItem = makeDesktopItem { - name = "obsidian"; - desktopName = "Obsidian"; - comment = "Knowledge base"; - icon = "obsidian"; - exec = "obsidian"; - categories = [ "Office" ]; - }; - - updateScript = writeScript "obsidian-updater" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - - set -eu -o pipefail - - latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')" - - update-source-version obsidian "$latestVersion" - ''; - -in stdenv.mkDerivation rec { + inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.13.23"; + version = "0.13.31"; + meta = with lib; { + description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; + homepage = "https://obsidian.md"; + downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; + license = licenses.obsidian; + maintainers = with maintainers; [ conradmearns zaninime opeik ]; + }; src = fetchurl { - url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "1chxf6vrybjvc64k66a3l5xvv6iv6w8b03pdcrc0pr0nnlwkcf8c"; + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}${extension}"; + inherit sha256; }; - nativeBuildInputs = [ makeWrapper graphicsmagick ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - makeWrapper ${electron}/bin/electron $out/bin/obsidian \ - --add-flags $out/share/obsidian/app.asar - - install -m 444 -D resources/app.asar $out/share/obsidian/app.asar - install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar - - install -m 444 -D "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - - for size in 16 24 32 48 64 128 256 512; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png - done - - runHook postInstall - ''; - - passthru.updateScript = updateScript; + sha256 = rec { + x86_64-linux = "v3Zm5y8V1KyWDQeJxhryBojz56OTT7gfT+pLGDUD4zs="; + x86_64-darwin = "m/81uuDhMJJ1tHTUPww+xNdwsaYCOmeNtbjdwMAwhBU="; + aarch64-darwin = x86_64-darwin; + }.${system}; + + extension = rec { + x86_64-linux = ".tar.gz"; + x86_64-darwin = "-universal.dmg"; + aarch64-darwin = x86_64-darwin; + }.${system}; + + linux = stdenv.mkDerivation rec { + icon = fetchurl { + url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; + sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; + }; + + desktopItem = makeDesktopItem { + name = "obsidian"; + desktopName = "Obsidian"; + comment = "Knowledge base"; + icon = "obsidian"; + exec = "obsidian"; + categories = [ "Office" ]; + }; + + inherit pname version src; + meta.platforms = [ "x86_64-linux" ]; + nativeBuildInputs = [ makeWrapper graphicsmagick ]; + installPhase = '' + runHook preInstall + mkdir -p $out/bin + makeWrapper ${electron_16}/bin/electron $out/bin/obsidian \ + --add-flags $out/share/obsidian/app.asar + install -m 444 -D resources/app.asar $out/share/obsidian/app.asar + install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar + install -m 444 -D "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + for size in 16 24 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png + done + runHook postInstall + ''; + + passthru.updateScript = writeScript "updater" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + set -eu -o pipefail + latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')" + update-source-version obsidian "$latestVersion" + ''; + }; - meta = with lib; { - description = - "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; - homepage = "https://obsidian.md"; - license = licenses.obsidian; - maintainers = with maintainers; [ conradmearns zaninime ]; - platforms = [ "x86_64-linux" ]; + darwin = stdenv.mkDerivation rec { + appname = "Obsidian"; + inherit pname version src; + meta.platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + sourceRoot = "${appname}.app"; + nativeBuildInputs = [ makeWrapper undmg unzip ]; + installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/${appname}.app,bin} + cp -R . $out/Applications/${appname}.app + makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} + runHook postInstall + ''; }; -} +in +if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/misc/oil/default.nix b/pkgs/applications/misc/oil-buku/default.nix index 173cea2ee1c..e0c05488288 100644 --- a/pkgs/applications/misc/oil/default.nix +++ b/pkgs/applications/misc/oil-buku/default.nix @@ -15,12 +15,6 @@ stdenvNoCC.mkDerivation rec { substituteInPlace src/oil --replace \ "LIBDIR=/usr/local/lib/oil" "LIBDIR=${placeholder "out"}/lib" - substituteInPlace Makefile --replace \ - "LIBDIR ?= /usr/local/lib/oil" "LIBDIR ?= ${placeholder "out"}/lib" \ - - substituteInPlace Makefile --replace \ - "BINDIR ?= /usr/local/bin" "BINDIR ?= ${placeholder "out"}/bin" - substituteInPlace src/json-to-line.jq --replace \ "/usr/bin/env -S jq" "${jq}/bin/jq" @@ -28,6 +22,11 @@ stdenvNoCC.mkDerivation rec { "/usr/bin/env -S awk" "${gawk}/bin/awk" ''; + makeFlags = [ + "BINDIR=${placeholder "out"}/bin" + "LIBDIR=${placeholder "out"}/lib" + ]; + nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index afc0ac71d5d..1f5f3d18729 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.4.8"; + version = "2.4.9.1"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2exqMYcxg0UxlH+ZANQv2MFii9dZ6nizB4vxGR9cAwk="; + sha256 = "sha256-QcdPyuwbGK12Kul+gGTfRGmXfghr0qugpBEcrgATOT4="; }; buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 230ec3182b7..f888d162fc4 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-ohfC10U7srs5IrFWPF5AKPwXPHaRxlYRK4ZZ0pE8tEs="; + sha256 = "sha256-cQd3dtih7C+pEmkvlrsYTJtQWBVVMiFbtNQUM0Ck3tg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 320d771bc67..58d45d19bee 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -22,9 +22,12 @@ , jq , xorg , libGL -, steam-run-native +, steam-run # needed for avoiding crash on file selector , gsettings-desktop-schemas +, glib +, wrapGAppsHook +, hicolor-icon-theme }: let @@ -76,16 +79,19 @@ in stdenv.mkDerivation { ./0001-fix-locale.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; preBuild = '' makeFlagsArray+=(PYTHON="python -m py_compile") ''; buildInputs = [ + glib xorg.libX11 libGL python + gsettings-desktop-schemas + hicolor-icon-theme ]; postPatch = '' @@ -107,7 +113,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/playonlinux <<EOF #!${stdenv.shell} -e - exec ${steam-run-native}/bin/steam-run $out/share/playonlinux/playonlinux-wrapper "\$@" + exec ${steam-run}/bin/steam-run $out/share/playonlinux/playonlinux-wrapper "\$@" EOF chmod a+x $out/bin/playonlinux @@ -124,6 +130,15 @@ in stdenv.mkDerivation { done ''; + dontWrapGApps = true; + postFixup = '' + makeWrapper $out/share/playonlinux/playonlinux{,-wrapped} \ + --prefix PATH : ${binpath} \ + ''${gappsWrapperArgs[@]} + makeWrapper ${steam-run}/bin/steam-run $out/bin/playonlinux \ + --add-flags $out/share/playonlinux/playonlinux-wrapped + ''; + meta = with lib; { description = "GUI for managing Windows programs under linux"; homepage = "https://www.playonlinux.com/"; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index d72d605f021..6ae7f422f02 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = "PrusaSlicer"; + name = "prusa-slicer"; exec = "prusa-slicer"; icon = "PrusaSlicer"; comment = "G-code generator for 3D printers"; @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { categories = [ "Development" ]; }) (makeDesktopItem { - name = "PrusaSlicer G-code Viewer"; + name = "prusa-gcodeviewer"; exec = "prusa-gcodeviewer"; icon = "PrusaSlicer-gcodeviewer"; comment = "G-code viewer for 3D printers"; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index de00c1174b9..7a4d2ee1d25 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -33,7 +33,7 @@ let desktopItems = [ (makeDesktopItem { - name = appname; + name = "superslicer"; exec = "superslicer"; icon = appname; comment = description; diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index 731608db7da..674432e7a02 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -2,25 +2,30 @@ rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.0.0"; + version = "3.0.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1xZMj6NjwA9pVOEL4CDv4XHC3usu3WdjsLJuW3vgxc8="; + sha256 = "sha256-N+8DdokiYW5mHIQJisdTja8xMVGip37X6c/xBYnQaRU="; }; nativeBuildInputs = [ installShellFiles ]; + # As part of its tests, sigi hard-codes a location to BATS based on git + # submodules. The tests are recommeded to skip for Linux packaging. They'll + # move to Rust after this issue: https://github.com/hiljusti/sigi/issues/19 + checkFlags = [ "SKIP_BATS_TESTS=1" ]; + postInstall = '' installManPage sigi.1 ''; - cargoSha256 = "sha256-NUWm2GkK7bASo6bAOgQgHate45iDG5l3G/KhtLrjzQ8="; + cargoSha256 = "sha256-vO9ocTDcGt/T/sLCP+tCHXihV1H2liFDjI7OhhmPd3I="; passthru.tests.version = testVersion { package = sigi; }; meta = with lib; { - description = "CLI tool for organization and planning"; + description = "Organizing CLI for people who don't love organizing."; homepage = "https://github.com/hiljusti/sigi"; license = licenses.gpl2; maintainers = with maintainers; [ hiljusti ]; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 531bc489354..85f4ffec5f1 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , rpmextract , patchelf @@ -9,11 +10,11 @@ stdenv.mkDerivation rec { pname = "snowsql"; majorVersion = "1.2"; - version = "${majorVersion}.9"; + version = "${majorVersion}.21"; src = fetchurl { url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm"; - sha256 = "1k9dyr4vyqivpg054kbvs0jdwhbqbmlp9lsyxgazdsviw8ch70c8"; + sha256 = "10pzxqk71amvaz951jl666ia6v0z22bgpvr108l3q62950hhhwmn"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 7617984ac91..08a54f49584 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rs70LmJ/+pbISQpPuEYV2URFv7uf+jdTVQopUSKExSY="; + sha256 = "sha256-r6xm0Gq2QXWQEcYEu1n0y6S4r4odzYP8Srr0U+jZr6U="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 11face45145..48e2859fa84 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-9fylJcUuModemkBRnXeFfB1b+CD9IvTxW+CnlqaUb60="; + sha256 = "sha256-aBsxRLUufVUauySCxZKk/ZfcU/5KR7jOHmnx6mHmsFs="; }; - cargoSha256 = "sha256-j7OXl66xuTuP6hWJs+xHrwtaBGAYt02OESCN6FH3KX0="; + cargoSha256 = "sha256-oNoWGdXYfp47IpqU1twbORPOYrHjArNf43Zyeyat4Xs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix new file mode 100644 index 00000000000..fdae9753edb --- /dev/null +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, pkgs, fzf, gawk, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "sway-launcher-desktop"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "Biont"; + repo = "sway-launcher-desktop"; + rev = "v${version}"; + sha256 = "0i19igj30jyszqb63ibq0b0zxzvjw3z1zikn9pbk44ig1c0v61aa"; + }; + + postPatch = '' + patchShebangs ${pname}.sh + ''; + + buildInputs = [ fzf gawk ]; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -d $out/bin + install ${pname}.sh $out/bin/${pname} + wrapProgram $out/bin/${pname} \ + --prefix PATH : ${lib.makeBinPath [ gawk fzf ]} + ''; + + meta = with lib; { + description = "TUI Application launcher with Desktop Entry support."; + longDescription = '' + This is a TUI-based launcher menu made with bash and the amazing fzf. + Despite its name, it does not (read: no longer) depend on the Sway window manager + in any way and can be used with just about any WM. + ''; + homepage = "https://github.com/Biont/sway-launcher-desktop"; + changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.mrhedgehog ]; + mainProgram = "${pname}"; + }; +} diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix index 6e5405ce988..770cd858401 100644 --- a/pkgs/applications/misc/systembus-notify/default.nix +++ b/pkgs/applications/misc/systembus-notify/default.nix @@ -1,5 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, systemd }: +{ lib +, stdenv +, fetchFromGitHub +, formats +, systemd +}: +let + ini = formats.ini { }; + + unit = ini.generate "systembus-notify.service" { + Unit = { + Description = "system bus notification daemon"; + }; + + Service = { + Type = "exec"; + ExecStart = "@out@/bin/systembus-notify"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "strict"; + Restart = "on-failure"; + Slice = "background.slice"; + }; + }; + +in stdenv.mkDerivation rec { pname = "systembus-notify"; version = "1.1"; @@ -8,23 +33,32 @@ stdenv.mkDerivation rec { owner = "rfjakob"; repo = "systembus-notify"; rev = "v${version}"; - sha256 = "1pdn45rfpwhrf20hs87qmk2j8sr7ab8161f81019wnypnb1q2fsv"; + sha256 = "sha256-WzuBw7LXW54CCMgFE9BSJ2skxaz4IA2BcBny63Ihtt0="; }; buildInputs = [ systemd ]; installPhase = '' runHook preInstall - install -Dm755 systembus-notify -t $out/bin - install -Dm644 systembus-notify.desktop -t $out/etc/xdg/autostart + + install -Dm555 -t $out/bin systembus-notify + install -Dm444 -t $out/share/systembus-notify systembus-notify.desktop + + install -d $out/lib/systemd/user + substitute ${unit} $out/lib/systemd/user/${unit.name} \ + --subst-var out + runHook postInstall ''; + # requires a running dbus instance + doCheck = false; + meta = with lib; { description = "System bus notification daemon"; homepage = "https://github.com/rfjakob/systembus-notify"; license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; - maintainers = with maintainers; []; }; } diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index c65f9b5b84b..7b58ede3834 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.18.5"; + version = "0.20.1"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-Rztz/qye+VsZ0czPt6xk4PwK0e6Aq1GC404+843W55Y="; + sha256 = "sha256-NE0GKQ3ROD+AF5FCuaKJ+8g+wiYobVK8swK0F9jo2Lk="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-H2A78ACz4TxHxCCtcOuzrfAk4awU6/HC/TlHLNtb/bk="; + cargoSha256 = "sha256-hO5rff3bm8g3JYh5vFhj2L3f/hOgP0ZA0EhO3YF5DFw="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index ebc9b499668..2b4db0a7a30 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ticker"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-THVzurv1LB2lxGsCw0ZPUF5QLgtUfN4ZNp8ak05I2Es="; + sha256 = "sha256-LY9js3ckkSTsE5td3VV4DPXeoxhw9MjOa35SdxMlUqk="; }; vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index 7e76d4a4e0b..a1adc152349 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -1,7 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -# Upstream has a `./vendor` directory with all deps which we rely upon. -buildGoPackage rec { +buildGoModule rec { pname = "tty-share"; version = "2.2.1"; @@ -12,7 +11,10 @@ buildGoPackage rec { sha256 = "sha256-aAqKfi0ZX0UB07yGY6x0HcMspvq4rcJXKHSONxAwMlc="; }; - goPackagePath = "github.com/elisescu/tty-share"; + # Upstream has a `./vendor` directory with all deps which we rely upon. + vendorSha256 = null; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://tty-share.com"; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 5543b3442bd..dc50a3b9567 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.10.0"; + version = "5.6.10.1"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_0_b124e6f3a4944b32/${pname}_${version}_amd64.deb"; - sha256 = "fd201ce817abe32e1b582bb4b55fef85ac8132806f5ddf0548fd25bbfd48833c"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_1_de501d28cc034306/${pname}_${version}_amd64.deb"; + sha256 = "8faf896d2570d1d210793f46a3860e934d03498c1f11640d43721b6eb2b56860"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 5e5e1bead5a..01b7af16409 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.9"; + version = "0.9.12"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-yXvT9NMXtUxr9VVLADoL6PUOMko5yFFc51zNsfHz6S4="; + sha256 = "sha256-NQ/d+eXmc+GRxl5zby97S4U/YQnsRWGpwNZZL0Sqby8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 4bbd0289a15..d446e057174 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,23 +1,21 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "wego"; - version = "unstable-2019-02-11"; - rev = "994e4f141759a1070d7b0c8fbe5fad2cc7ee7d45"; + version = "2.1"; - goPackagePath = "github.com/schachmat/wego"; - - src = fetchgit { - inherit rev; - url = "https://github.com/schachmat/wego"; - sha256 = "1affzwi5rbp4zkirhmby8bvlhsafw7a4rs27caqwyj8g3jhczmhy"; + src = fetchFromGitHub { + owner = "schachmat"; + repo = pname; + rev = version; + sha256 = "sha256-lMcrFwYtlnivNjSbzyiAEAVX6ME87yB/Em8Cxb1LUS4="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-kv8c0TZdxCIfmkgCLDiNyoGqQZEKUlrNLEbjlG9rSPs="; - meta = { - license = lib.licenses.isc; + meta = with lib; { homepage = "https://github.com/schachmat/wego"; description = "Weather app for the terminal"; + license = licenses.isc; }; } diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix deleted file mode 100644 index 133315cd022..00000000000 --- a/pkgs/applications/misc/wego/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "31745d66dd679ac0ac4f8d3ecff168fce6170c6a"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "18c3d09a134a52720932bbaa92c798a0ab111004"; - sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; - }; - } - { - goPackagePath = "github.com/schachmat/ingo"; - fetch = { - type = "git"; - url = "https://github.com/schachmat/ingo"; - rev = "a4bdc0729a3fda62cc4069b6e490fc657fd54e33"; - sha256 = "1gw0kddy7jh3467imsqni86cf9yq7k6vpfc0ywkbwj0zsjsdgd49"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b016eb3dc98ea7f69ed55e8216b87187067ae621"; - sha256 = "1k0qr26046d228gi6ngkfxp4m1rjgxk4jj75h0kh1cpyp91n5rja"; - }; - } -] diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index d478655eed1..3920a3a8655 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-70fCyxiM4CiNuG4Lqr4Tq0FHak3wDcp8G93EKYj+0kc="; + sha256 = "sha256-4ksKXVeUGICHfx014s5g9mapS751dbexBjzyqNvk02M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 0a18975d7c0..db28952c31f 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iy03ucPFbFL/rRILt9P+NtfdGoIpjutbUDrykpZkAtk="; + sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-VeV/vsM2XCg9h8KoYmniCmo/MJHjwcfn/tUCoZ1rKzM="; + cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix index b07c526c0d5..983f8ac1ee3 100644 --- a/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "bombadillo"; - version = "2.3.3"; + version = "2.4.0"; src = fetchgit { url = "https://tildegit.org/sloum/bombadillo.git"; rev = version; - sha256 = "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q"; + sha256 = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 6fb29619ab9..fedb366c555 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -91,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.35.103"; + version = "1.36.112"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "UgperKruN2quKdFTf/iTa+dd2GB57nt+mu6KBe4VvYk="; + sha256 = "AottJZ+WEc47Y47XefVdN0AW6PO18CR77QGGwLuKOso="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 0eb1893e95c..9b18590817f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -266,7 +266,7 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; # Optional features: - use_gio = gnomeSupport || chromiumVersionAtLeast "99"; + use_gio = true; use_gnome_keyring = gnomeKeyringSupport; use_cups = cupsSupport; @@ -287,24 +287,8 @@ let } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs ungoogled { - chrome_pgo_phase = 0; - enable_hangout_services_extension = false; - enable_js_type_check = false; - enable_mdns = false; - enable_one_click_signin = false; - enable_reading_list = false; - enable_remoting = false; - enable_reporting = false; - enable_service_discovery = false; - exclude_unwind_tables = true; - google_api_key = ""; - google_default_client_id = ""; - google_default_client_secret = ""; - safe_browsing_mode = 0; - use_official_google_api_keys = false; - use_unofficial_version_number = false; - } // (extraAttrs.gnFlags or {})); + } // optionalAttrs ungoogled (importTOML ./ungoogled-flags.toml) + // (extraAttrs.gnFlags or {})); configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 084db58f38b..0202ead4605 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -19,7 +19,7 @@ }: let - llvmPackages = llvmPackages_13; + llvmPackages = llvmPackages_14; stdenv = llvmPackages.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; @@ -54,9 +54,6 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (chromiumVersionAtLeast "99") rec { - llvmPackages = llvmPackages_14; - stdenv = llvmPackages_14.stdenv; }); browser = callPackage ./browser.nix { diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml new file mode 100644 index 00000000000..f2bf29cda24 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml @@ -0,0 +1,23 @@ +build_with_tflite_lib=false +chrome_pgo_phase=0 +clang_use_chrome_plugins=false +disable_fieldtrial_testing_config=true +enable_hangout_services_extension=false +enable_js_type_check=false +enable_mdns=false +enable_mse_mpeg2ts_stream_parser=true +enable_nacl=false +enable_one_click_signin=false +enable_reading_list=false +enable_remoting=false +enable_reporting=false +enable_service_discovery=false +enable_widevine=true +exclude_unwind_tables=true +google_api_key="" +google_default_client_id="" +google_default_client_secret="" +safe_browsing_mode=0 +treat_warnings_as_errors=false +use_official_google_api_keys=false +use_unofficial_version_number=false diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 3ea5dea50cd..8341f2c6ee2 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -24,6 +24,7 @@ DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' +UNGOOGLED_FLAGS_PATH = dirname(abspath(__file__)) + '/ungoogled-flags.toml' COMMIT_MESSAGE_SCRIPT = dirname(abspath(__file__)) + '/get-commit-message.py' @@ -108,6 +109,12 @@ def get_latest_ungoogled_chromium_build(): } +def get_ungoogled_chromium_gn_flags(revision): + """Returns ungoogled-chromium's GN build flags for the given revision.""" + gn_flags_url = f'https://raw.githubusercontent.com/Eloston/ungoogled-chromium/{revision}/flags.gn' + return urlopen(gn_flags_url).read().decode() + + def channel_name_to_attr_name(channel_name): """Maps a channel name to the corresponding main Nixpkgs attribute name.""" if channel_name == 'stable': @@ -208,6 +215,8 @@ with urlopen(HISTORY_URL) as resp: 'rev': build['ungoogled_tag'], 'sha256': nix_prefetch_git(ungoogled_repo_url, build['ungoogled_tag'])['sha256'] } + with open(UNGOOGLED_FLAGS_PATH, 'w') as out: + out.write(get_ungoogled_chromium_gn_flags(build['ungoogled_tag'])) channels[channel_name] = channel @@ -227,6 +236,8 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit': if channel_name == 'stable': body = subprocess.check_output([COMMIT_MESSAGE_SCRIPT, version_new]).decode('utf-8') commit_message += '\n\n' + body + elif channel_name == 'ungoogled-chromium': + subprocess.run(['git', 'add', UNGOOGLED_FLAGS_PATH], check=True) subprocess.run(['git', 'add', JSON_PATH], check=True) subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) else: diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 45250322fb3..4de0ecc5377 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,63 +1,63 @@ { "stable": { - "version": "98.0.4758.102", - "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", - "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", + "version": "99.0.4844.74", + "sha256": "165vzxv3xi4r9ia3qnqsr4p9ai0344w1pnq03c6jdq7x613lcprd", + "sha256bin64": "1xzr7qv4rcardl3apr8w22dn81lzqkklhp26qqlbdcylacqqji04", "deps": { "gn": { - "version": "2021-12-07", + "version": "2022-01-10", "url": "https://gn.googlesource.com/gn", - "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", - "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" + "rev": "80a40b07305373617eba2d5878d353532af77da3", + "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" } }, "chromedriver": { - "version": "98.0.4758.102", - "sha256_linux": "054qm8agzj6axvasa7b10cz4jz8zfmmblvvifdnyhn4p3zqx74im", - "sha256_darwin": "1m6slaw7lqhlhmjjyaam7c21yyahpi34fv9vldqhra07b5r88dny", - "sha256_darwin_aarch64": "0n0lsk75dxv94b2zv25yqysyfbvbqhfql3bbp9abl1jcp00m8s3l" + "version": "99.0.4844.51", + "sha256_linux": "1r5wbcfbj9s216jyjasmiscsrsix9ap3pplp12rznrwn4898p51y", + "sha256_darwin": "1nak8p5hdrw94lx73m9c110zrwag4qr6487dhplm3qfrnrkdh8wp", + "sha256_darwin_aarch64": "0hkcx6a8bcjlbmp6z3ld23mi1kpyjn2g7m3ns9qw6ns4x3rn5i3r" } }, "beta": { - "version": "99.0.4844.45", - "sha256": "1j6s9r2k6zyyjk3f74k2103zlih96wrr2a83bk79fwc582af9505", - "sha256bin64": "0lqps8lf7yg9nn5z2iy6hfrx2df59hif8vhf0camx2lfmrkgw8qa", + "version": "100.0.4896.30", + "sha256": "06zfx9f6wv4j4fz7ss8pjlxfcsrwrvwqkmdk5bin7slxg4sq31fl", + "sha256bin64": "06s2p81grqrxl3p9ksy9q7s3s42ijmcw316nb51f7zx4ijk5hzya", "deps": { "gn": { - "version": "2022-01-10", + "version": "2022-01-21", "url": "https://gn.googlesource.com/gn", - "rev": "80a40b07305373617eba2d5878d353532af77da3", - "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" + "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", + "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" } } }, "dev": { - "version": "100.0.4896.12", - "sha256": "07jd3d5jhs659wwxnbxk6h93pz8zaynrw72b0y9l6l824lip6hl2", - "sha256bin64": "0fnxq0vjn00zai94p8jgx69bag30zzlfl2vzn0zb65pr10fpac87", + "version": "101.0.4929.5", + "sha256": "0330vs0np23x390lfnc5gzmbnkdak590rzqpa7abpfx1gzj1rd3s", + "sha256bin64": "0670z86sz2wxpfxda32cirara7yg87g67cymh8ik3w99g5q7cb1d", "deps": { "gn": { - "version": "2022-01-21", + "version": "2022-03-01", "url": "https://gn.googlesource.com/gn", - "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", - "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" + "rev": "d7c2209cebcfe37f46dba7be4e1a7000ffc342fb", + "sha256": "0b024mr8bdsnkkd3qkh097a7w0gpicarijnsbpfgkf6imnkccg5w" } } }, "ungoogled-chromium": { - "version": "98.0.4758.102", - "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", - "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", + "version": "99.0.4844.51", + "sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp", + "sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1", "deps": { "gn": { - "version": "2021-12-07", + "version": "2022-01-10", "url": "https://gn.googlesource.com/gn", - "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", - "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" + "rev": "80a40b07305373617eba2d5878d353532af77da3", + "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" }, "ungoogled-patches": { - "rev": "98.0.4758.102-1", - "sha256": "0baz90fnzpldw0wwibhmh4pmki7vlpci9b9vvifa0rj5cwckl8a0" + "rev": "99.0.4844.51-1", + "sha256": "0rs10jrng63lk4xgnqpgc8zxaj6lp70csbx6r0ihpv4z3rdn37va" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 25ae29459f0..d7b63fe46bb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "97.0.1"; + version = "98.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ach/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ach/firefox-98.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "a10737964c66f46a15ca60c29575a837340e9b967c849809717c7009c3a01c20"; + sha256 = "92fe50154b763faba3d923ba19be737a7e6c48c04652275da2727489c0f3b14f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/af/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/af/firefox-98.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a6ef82107f918234c84da51b49bc2018910e855ac4e7e5cc3a0e71f3583140b6"; + sha256 = "f086d9cf3142c7adebff590702f497e1f99d74ccb69b7001851e1b0329b9ff7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/an/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/an/firefox-98.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "34f5a0461707feffce732749958f508efd729ecedd8567dbe1387bde5e335a66"; + sha256 = "5e7e8fa95293bf2921596ecddd10217f10682e4a576b3f0f8c70021ee785afb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ar/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ar/firefox-98.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "5e126bcfa03c79e9ad777d76389a23e109dd852fc98698efc714d37125656f84"; + sha256 = "cf7e5bfe6fcc19e0e6ac6b2646118e25b471cffc025d1de85ac62b0569582285"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ast/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ast/firefox-98.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "931ae804e75fa4b039eb373a38b2f6fa8dffb852e418789d559d9a9c0612c54e"; + sha256 = "54c694772844caf3946520aa624d8a5c8d2d21ab29c64bc1c438011ad830d001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/az/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/az/firefox-98.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "549dda8a1049d074887f187689e73c38b814c1f1896752320f2a03f566bad2c8"; + sha256 = "0e342f5bc920684c2b7ae988a983e27e0bdf130b6f1e210952139edee2ea9827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/be/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/be/firefox-98.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "06b0f7aabf8ed42ee6f021bc37abb44029586f5ddd2673f885f73f94c64032c7"; + sha256 = "89973f6718cfb63e43713594089618355e5c8323b3912a7a67d4d0fdfbe1cfd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bg/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bg/firefox-98.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "72f5e07d24a2810659fc7d5c9a43214f427286f9a0096d602be0edbdb31d529c"; + sha256 = "b7ea5573feb114ba63e5f0b516f36d134b4015a262c2e7f824dcce5cf31d7058"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bn/firefox-98.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9f3d0376edd2c74b527190a5d53f0d2a36c371484fe4fff1f91c1d03b0a2dabd"; + sha256 = "bc4837219822c224b556c826f83bc913f9454da7aa9b26ff3a44119e5284b63d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/br/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/br/firefox-98.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "befbc0e991718afb4dc5362fa9aaae52a0e60fcac158a666a2b7a7b41eeaf834"; + sha256 = "36d61c43e4aaf323763676ca5ac5be3e4c23af46b4aeb00409ca7391cdf60143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bs/firefox-98.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "a4d41ac7495d4d5311d5e03224a1c75a03fa059b6638666fc0622674ebfc6248"; + sha256 = "6215685be94ad53ea827a6366673a14c327d2e4fc94fca51918b6cb2a8fb5897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ca-valencia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ca-valencia/firefox-98.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "2ff1b0f0035374f323fe2bfbacd321394fb040599ed064627f60d24c78571394"; + sha256 = "15220b2edf948b6027d391bf0140becb69f529565094f5f10a65b090456cc295"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ca/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ca/firefox-98.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6f979602867721179454d2f6286cbecbf0a14aa0d42ba68ff7d7ca751f15a341"; + sha256 = "1060f9d8a46d078b3a1234116a2b963537213084e74dec8fc6b2598a8e863196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cak/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cak/firefox-98.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "dd8bc5188874f0b5b300a03a7ded9fe059ddf9c9f69112429233f2905a5b329f"; + sha256 = "03a302fe8bea3dd231b204946cd843850526652ffd2b77b4110c97ddcd6b4f54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cs/firefox-98.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8daef8ab21ad86b68999e052114b17b52d44e64e85b8879b690717c4017aa983"; + sha256 = "6815701642c6a76a3ee5f75433aa91d8e0e23b8a68c3f2204862703a4426fede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cy/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cy/firefox-98.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "758d098d80d37b2bf15dcc3b16ad7289439166a3c7321bf815c555d96531589e"; + sha256 = "f68a21a0dd833f51a9d8e66e0c5d970b5d704472728e3585512d07fcbd28c470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/da/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/da/firefox-98.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "6fab3975b94d94809c734ee95cb26d9bcf24af71234a1bc3b8c4db0b97355405"; + sha256 = "66689f2a8ebdce69f3f83edf2e626017c51dfd823340a946e23550d93cbcfc80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/de/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/de/firefox-98.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1b776d58ce3b1d21580f725b065b164a6fc23e5b17d70025830286922f5c1455"; + sha256 = "183b0453e691f33ea7844a8a0b4fe91cacfca64b07375d85a84dc58aa95fdc5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/dsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/dsb/firefox-98.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9b9c082e7fe273635b1095e6caebf8645abf3aadcfbc26e098616095d64b2f6b"; + sha256 = "b129086ca18bf18ab583015c2602710e7164a53bb262c8e3ecdc62092d88eed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/el/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/el/firefox-98.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "475676b56b462193d6dd50932893b039e6826d247abf2d46a421415bd19a6c68"; + sha256 = "46f9fc4b9cabb2e9fbee8a6453b7e5cccbed4dc7529717e917e4c3be3bb7fc54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-CA/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-CA/firefox-98.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8c50ad38302dbae2d6737f6a03bc6127c850101c5f17c8a15b85d157b6b39ee5"; + sha256 = "5f7f255b6d210709f716920989f835f4908bdf02a5a2c1f9c12a393e03da6a8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-GB/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-GB/firefox-98.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e48d9aa35fe906f6e6d99eeffbef212730c15a3b9d5a7090dcf99e3e47eda9ab"; + sha256 = "a940242819cf79b1bd834520358e0aaea24e682cd5019668f356460a6815e4c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-US/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-US/firefox-98.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a63d28ae61926c0d7447f57d4e6fb514401d560abb50ce787bb6bd0e9b7b820f"; + sha256 = "1a3d68e5e449faec50a427f709b98078bb57aee8209743a0beac978a4a72a05e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/eo/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/eo/firefox-98.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "94394906bbe63f6dd414aa6b0739dc30082128e0e342fd408d33ab99cb01b9f9"; + sha256 = "d070191b8184943b55c4a68a3b523712ab04b0781ac835ec1f31de5aa170782a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-AR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-AR/firefox-98.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9738031b89b434127af39f20609b31ba767a004dc0ccf5d56b965165ab91fb82"; + sha256 = "d5a3c016b4090b926710c184729f2a59af3c257ec8ba48dcadb6367f67976192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-CL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-CL/firefox-98.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "ceb4fd38b2b81b16f2faa95995b11e760dad4e710cf4435e6d311245bd6cb483"; + sha256 = "c22546ecc83739731783c6090172b1a8ca9082415881d62c691a97ed27b0813f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-ES/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-ES/firefox-98.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "37f94ded6c285c01300ee014f1a55d955a70b980647b8ffd5a0709dc9df34378"; + sha256 = "33a424c76e44d1ee73e360da08a5aca42ab30bdcc3ad2524c0c209be37121978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-MX/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-MX/firefox-98.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b989f57bc1439e3204c912321df33626a9947691e76cb8bd22fb5bdcd77a86a2"; + sha256 = "5ee32de772d925389210cd210c326f3aec85e9ad45b8041a373cf8456008b7eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/et/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/et/firefox-98.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "757190b1a6de3cb7d44c005f9b23f745fb67f0c247956007f3ac269d494019cc"; + sha256 = "3bfdba6becdc20002d267ed8d695b72915f4d59073f0c0c5c5858bd383189017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/eu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/eu/firefox-98.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "092f0378fdfa3fe44f19fc71543609a8b96a9add6f41324d24edf7aa7b446d36"; + sha256 = "2c0669ed569b7676e10330d034802d9ffd24ca85ef38cff0208a7a02cba53d22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fa/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fa/firefox-98.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c1d003bdd9f21d6751de57b1e4d8b1057082f48260a94a732e3a3ae180ca186f"; + sha256 = "c7c8242892426c9cd1f0f60c3235de6dc7d9e77b3b341630c9d6887e34ff2761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ff/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ff/firefox-98.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "af04da4c9528145e7b14bdc5283a41422704c0302675703a84a4bc2b42f8139e"; + sha256 = "4a7352a86887d5200106ad725e7a41aab1d353547da2c1891fc399424112ba20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fi/firefox-98.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e3f7285b7d3666155863bd7d89bb7cf87008b755d34a7b5b04ec63425f7ed6c3"; + sha256 = "a696aa3e201f6b776610195e8e0130791015229a66082e3f1240d925210db6db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fr/firefox-98.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9fa04d611d74ba0688ad7ad7441759015724e61d7303eb211b7f7404603eb1b1"; + sha256 = "67022f4ed56749d968780a97e1efc14d272a38a96aaf4bc55584e6fe423d48ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fy-NL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fy-NL/firefox-98.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0d017580e4847f644d8b4b8d8e90aba0a92f3b3aa436b9de68f176f7f3b00cb6"; + sha256 = "1718465d4a46d4e8b0fba79b9e0fdadb241183745ad158fa65a3f8d17212d7eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ga-IE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ga-IE/firefox-98.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "73c602f8b41a5aefaa04646065197fbcad2e196c94b1d1537a019ebe33590a6d"; + sha256 = "65ea67422e9816b20be8259b5771f3db7f4c414e52cbc9975612a533ad4d6009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gd/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gd/firefox-98.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c1c9a41012983133bdd743e0afda81d7c752b04ac2cf73a7c4daa662d9db91c8"; + sha256 = "5ba3f664ee375bf22255c5d9776c8da83747f52aea566a4436d29b91b34afb7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gl/firefox-98.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8ca8b2e7a3549e1df2aebd86bc5192d6ba0b14c2581802f1ca06342ffb771ac4"; + sha256 = "58edc93a8885ae6c2686a8c8f67b93b19fc99376155770b4e72e821d762be0a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gn/firefox-98.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "10acfa3beecacbfaae592dbce92e72dc220cd27503334e28d3108846ec012e00"; + sha256 = "c5c08869c3390a95de8e490af4e69783bba03fe8d55a1c2b344339cab9fbc4f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gu-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gu-IN/firefox-98.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "d2ea8b9386be163260d4ee0940dd80c4fa88d235cef7470fe9859fb18b5360f3"; + sha256 = "35f29f0b0574ccbb02cf08d4714e2827ce364876ad7751ba7f1cc24e9f9861c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/he/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/he/firefox-98.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6dd00a7a9518868ce35e92e22951fba8e45690ad19afc297c82ec5d43690cbb8"; + sha256 = "27c5343c95f53dced72958155d7f8af100e3cdb8aabfebc3189f1a9c2550428c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hi-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hi-IN/firefox-98.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "fb583c15e2f5dba0c8c19c197f4e4f83c8e59ebcf568d3f52936bbbd4733830c"; + sha256 = "f8d7111c208a529c8f461284249d1c77f88e8d644c27f398aabdd414a7309802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hr/firefox-98.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "07d6ded87285b2192f3668cbdc74b6571e708bab6d77964aa8665f1940722ff4"; + sha256 = "721b61beae502b2b7039e29b959c2b4b8cde84260b601aa29bbcf80c73a633f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hsb/firefox-98.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "fcbd4351ef9a4c3ea3bc290bf17679f900e73339b63d10ccfa2c554c09497bf4"; + sha256 = "4eb192a2d3942e0c80ec2f3ba805a19824ab4c1d85e1ada9050409cf0cfd4ef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hu/firefox-98.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "1fade975a0ab75308b281b556c6980e81fc6a4c540746142534401e73323d9d7"; + sha256 = "70b9a67a51d3e61242c1ece908a81d0ce4b407bfdd9d3592a7025242cfb0ecce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hy-AM/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hy-AM/firefox-98.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ac7d7124aad964783b65d9d7de037005fde865a7922cf22b9e07f44f36830032"; + sha256 = "1135df2ba82e8834a8d38e436df2debab2601884c02a9ed876a64044dec9170e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ia/firefox-98.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "cda3d476e07f15cbdce88225d0b7fe785841d56327c63a53920dccff9ec8bb4d"; + sha256 = "0e8b652231ae2962c61a90466d1e8278c11ca3b4ce70432dd3a3541a7bd55760"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/id/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/id/firefox-98.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "3bcd1f707740b56e345c34dcb24453d33d9761eafeb9b3590d5e74e4558b5f33"; + sha256 = "5c35d191e9010e7a0e97844b38573b6fde93ec57e13c1fcb85f3bbe595257bd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/is/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/is/firefox-98.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "027f46db78d1796fa3ddbb3ec0f823e0a9e3677ca1f7e49eb1b9299be91c74a4"; + sha256 = "297aebec277c01bcc5dc0fcccc44946181991192e3f485ec4bc0555131f132ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/it/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/it/firefox-98.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7332a7566fb4f8748df9afdeaf5aa4634dab42cf63f52cc41cec13215820afa5"; + sha256 = "7d0c7162f4c3c264d5394814c99881e2a39f9fd406e7a32fb5319bf63c3fe344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ja/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ja/firefox-98.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "c485ee96c2e6e0f0a508c99b2189595289f3858464ca2c48301ae78bbc59b299"; + sha256 = "eb260c766f1c82d45393d5c7f3c3c945166f837ba02f061691bcb1b3f9d11b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ka/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ka/firefox-98.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "cd5b723c422e01d70856dd851337d719170585146029119f1490feec1d8ee188"; + sha256 = "ce8f6ee46fe3c8b836fd694b2642be066a81191a9011e33c0853396dea625880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kab/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kab/firefox-98.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "df540b3e9207f174cc6a280813d09c23abea18c1af540b9bc7e1330a4920be9c"; + sha256 = "05a282afed3bb3e573c4250368b3ff1edc4c322dfa81d30e8f8f3447199fe9c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kk/firefox-98.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1d6ae6bdfe89de470aebfff046d0ddd12dc85f4c7b9ad8931b8bdb9da7917906"; + sha256 = "558a35d13332976880b0cacb69d45f25d72e34d4ef43e7c92260621dc1287ff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/km/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/km/firefox-98.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "1a5fb9460b33db9f32000c96ccdcbbe1d2fc3fa177b2cfaece1dabc514e3467c"; + sha256 = "a3d3f64dc5e55e9b3168e18a64b2bda9d238e10bbc295d7ce7f4c1d964b6553e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kn/firefox-98.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3c5766b4c29c699309cc8191fb1aab01852db29467c38ef529704c54d9087689"; + sha256 = "b06d52db9c0e2984c8a652278595cbd0530512b9bb8e6d5ec5d3015620225bab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ko/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ko/firefox-98.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "08d9a5999a9b10fdaf9a386c9da99ec040200f2f19286cd7ff8e26de95955f5f"; + sha256 = "f1edc7483429824478a9a4d2f4f3a03a9adf23e9ae364ce8c50da8d97fb55052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lij/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lij/firefox-98.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "925ea94387cf5f07b053ca5b25dc2a50b0ad9f6372509e91116fb6d20675204e"; + sha256 = "e441db0a47d1265d1280a60c592b4b2ddd33751c1e9b38bd71afc2f25edfe469"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lt/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lt/firefox-98.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f062e05e6fb52a42f813428be5be582dbb24b46f3379aa0975451bd029134c12"; + sha256 = "989c66160ac78aec5a4d543a519e11cad772cbbeb6b5bd30832b04751217d621"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lv/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lv/firefox-98.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ca08ec6516a07aef0404716b0111df6941b9b167173079397a013f93db23e8a2"; + sha256 = "764a3821b57384676d1236e9553007a78583fd277d27174bf4970750ecbcf9e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/mk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/mk/firefox-98.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3ddc7afca0f7030fd667f345ace3105eef1126332d18f20c7221596704eb1196"; + sha256 = "104b650e57a1d521951086fcd337a21fb3133358dce8842c434089454a389f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/mr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/mr/firefox-98.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "684d22d5841abcf6c107106966568e6f7476d15e1dac80447721836c4a20a71b"; + sha256 = "396359e41e9fbbc03a548e6f77c1a607af0e3c09044d6b57e2cb01fb80fab94a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ms/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ms/firefox-98.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9630d0e0b4466593a59efaa383d6fd0e9c08887959e0b851f03aeadb5c64d43a"; + sha256 = "e8dcb2af15e9fbedb0e3ebdfabdda5f596fd469b6b20e4b6c5eaedc177e6c7bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/my/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/my/firefox-98.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "2bcab7bd7e35474466c3b587991cd8a62a18a30c14ea489d9c28932e1813db5e"; + sha256 = "89e64cb715720dafacbebc7ddd72a5c6cbd69995113f1b7d1e68805b09591df7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nb-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nb-NO/firefox-98.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d6c4f2ce45109e37ca35c0fab316fc31b849f256f4745858dddf519b27fd8e75"; + sha256 = "640c4b9f4e23d08df22d67e915cae12ba07aea80ef392658f693bd5a14a23572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ne-NP/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ne-NP/firefox-98.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ef96102307ab270615166a9feaddf0ae047d2c8a18d85015be7f388d00ad3cd1"; + sha256 = "efe07ad3079a3295744b8739d3718374137ee98d39622c0056f079196175dfed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nl/firefox-98.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4ea9eccaa1c7d354cdc199b33fedb6a7ed07400f331d33357c69ca7c2c654dfe"; + sha256 = "d979a5e416109251b0f27a50e5d2831ae2fbf3da6ed3d3e34b52adf2c19221ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nn-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nn-NO/firefox-98.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "59045e5cccac7dbc125e3fa3f8c9bff7b5d8b8b0e8f1e696f5bcd633bf9353e6"; + sha256 = "cdffc971080f506d083b7c4fb1edb769046a6b56ad5c6851fd3a09b48d401bfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/oc/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/oc/firefox-98.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "cdc9c76871be181f86871c55bd6819de9539bdcb11450cf3bac419f4bd44185c"; + sha256 = "7d4206e9e73132f13f5ac5377eb619c796ab1088f8a91958dd13789b0b309995"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pa-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pa-IN/firefox-98.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "aad979dbe94c225b4255ff6b7b78097f8a60ecb14570517eddcd7cbbc553a9bf"; + sha256 = "f46a2e85222e39c03019373cfd539ae5354c608e60783151f15bbdd1a8be3b62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pl/firefox-98.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1f1be85fe26c4a55171f7114052ba679c405e731b3db7934ee2ac35323f095c6"; + sha256 = "1853fb827d238af7122e9edb0d7553aab00196f5523addc641f93b3f26b02b0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pt-BR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pt-BR/firefox-98.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "588698a09d7320027027ace6196f6430aefe315cc9aae745f75568a062d6de6b"; + sha256 = "a5f4e7c3f0b187bc86c4b085536a8dddd9c2fff6f746db77ed186b6ccc4efb97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pt-PT/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pt-PT/firefox-98.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4cf0b84bbb4a5945ea787ca0f3d4da56a12073797dd603be29e408772a70860e"; + sha256 = "88dd8f0332d88ccd38ba119acdaeaad4fa3692b45759762871fba67a110af9b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/rm/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/rm/firefox-98.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b267cb45b84b114c266551c4863bfb22db9ff4725c0b6b9d39616e0b01f71e86"; + sha256 = "7e901202cb7b29f04c481df5bb330faa92e48d41dfe49ab614f089c4787ac36c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ro/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ro/firefox-98.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "26a6ba053a270db85fe008f72c23b905072a84c27815131d1a3af90fba0f3518"; + sha256 = "149b39e24f83bd14c9befc52ef92639ad02ac2059a247d8521a8e5f8659b0983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ru/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ru/firefox-98.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "caea6755305f8f077fc82895343c01a7e1eac0e1cc70faaa1915bb88cba01344"; + sha256 = "5739758546b279d77101391edd7cfe236ddbf69434ea89dea6c5d4f857a016e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sco/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sco/firefox-98.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "eb249baafdf9d54b61e923bf3f23d2f462d5026f4b81bacfadd713bd569d3255"; + sha256 = "cbb408a2be5d3c15ba7f9e865c02228f65c9ce59d2c29dd081638515404da03a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/si/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/si/firefox-98.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "44a98bc22309035b432c3f01c5f87d469df3f2bee44c26f54f507f10b7098908"; + sha256 = "b96e1604af6e1e828230a1a3652f83bdf28247dbcb9961b233d18a9bcc829da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sk/firefox-98.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a81e8f814a2816ad95414c6e43acf55d88e4ce0757de14ab163f6b622fc49d41"; + sha256 = "ebe0774a5872e8e9f3ed3c894d10dd9aebcbce1539e56febcbbb7ee97c3ee358"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sl/firefox-98.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a2b9f1dd69a9a3fd4b5198280462d06b49d5c63fd101865707cac6aa6fc9581c"; + sha256 = "2b3e38e812508438768d4f12e545d96f1b7e160d53edd26481ff70510d89388d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/son/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/son/firefox-98.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "0033fcff083aa29a738799cb9bb3d32eeeafaaa3a1d41c422048c89000a9968a"; + sha256 = "df1bc20d146bdb2d1491cb040c4eaac1a70d4af024a00863539b218b6e1098ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sq/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sq/firefox-98.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "3614b46f72a142655f58c0577345a772350ead46af9060cd20e8918f517c7cf4"; + sha256 = "9b40353c9c9911522fa495d35f19764b220e2c40488205050719c951911dac11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sr/firefox-98.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "034dceafc44b83ca9d493f98645bd0ae45fd513f55f20f0de85752679e39c570"; + sha256 = "d2ba0fe06528af4fed9907870bd72290df1c433c02bafad8b7b834a24b9a1427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sv-SE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sv-SE/firefox-98.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "aff9dc0399629aef20dff6eed5ecc7664cc8c83b53614b2cd011db6089262a9f"; + sha256 = "44fa731f57d2f0639d1e3595eebeb2491cd3dfff7ff8144eac663e966ffa8f6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/szl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/szl/firefox-98.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "9b6242e30b948507978f96180ec6d7d5921e32657f41fbe211a7c254cb11777b"; + sha256 = "37523769babf48c7c942d878c8c55bc0bd761a0e4df8a0d562416ccff46f8cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ta/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ta/firefox-98.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "368a48fe15bc7ed6359cbbba817b47a99a583cc3ce91d2d98f0387d3a9880a95"; + sha256 = "3aa9dc19988fb6663ac95b6c3b79d03313cd78cb4e80700708ac92c3939d513f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/te/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/te/firefox-98.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "dfeadd822000e10c0214d05c75203a6e9c98c4bf20d65377c35ee8d485a2707e"; + sha256 = "bd7a1af00c7aaf49c5ba667e7e85bac5672384b68f5f7cb96e4670f7363ff063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/th/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/th/firefox-98.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f1932432028ef648897e64bf033bb3e8984100052ea52a9840d000272f9d5eb7"; + sha256 = "962c9e428f1ab3d3d143920a503dcf6d5335489e7e691a4447c32ddfad0b55d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/tl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/tl/firefox-98.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9436d48c6b56c7b765a4ab6ce20bc12f3e5241691edb3b1517fe27a3a1fab6a5"; + sha256 = "6ae919a932170ccc3891f0805949e29cd403f6a2e6efed38b76c7817c9533cef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/tr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/tr/firefox-98.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bf0d0808d6d5f880bf382e9d440013855a6fda82275cc628833fb8cb694e4f6f"; + sha256 = "27127d6261975f62185966a8d2a9c4e686c92212b8f4e06a36b47d16434413aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/trs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/trs/firefox-98.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "546416fc106774a28b2234e31d5d9850ed4708a2e5be4a4231deb28f4544512a"; + sha256 = "a005665c64968a82221d6332ed20aa6702f197ec31960fd4a4a78871a947586c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/uk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/uk/firefox-98.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5395cb322632fc68ef84241a75786db589863709344d5dfa9cbb650bc94c8f6d"; + sha256 = "866021efaa23457b203bb2700b8f24649222855d7ac1f71bf05ee98469f8c7ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ur/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ur/firefox-98.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d8dcdc4d95646392582904a29946f652e670bf276dd1b156e5b28477f4369e50"; + sha256 = "d34a0c4f6937d8f6375c5d056cb615db37673917dfafec7d1f5201c38359a1c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/uz/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/uz/firefox-98.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7b1b8b9e9efd430ea5191d3e30c2b28ef28f9fad9779a4d65d1bd653c575986a"; + sha256 = "a5098a02bf4a8c983e81b2863afae1cccc007c69556d69432577928a9eed89d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/vi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/vi/firefox-98.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "6ccc1efad3f2a57b365195afbda665548d82d141f5143beb04691d995e0ad1ad"; + sha256 = "ec7c91879c348fdccbe73b498757d1ad7bb1461df530829012c33c706c023aa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/xh/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/xh/firefox-98.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "4099f3357f74bc5443ad59ef72bb1d1881b1d96965628544f72eb3bf72a02a36"; + sha256 = "0b8bb8c5eaf45faa1f128c08a8d47d7f1388f37e09f73f3ee9b0e77044aa83a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/zh-CN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/zh-CN/firefox-98.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9588d9eee65b7389c91ac43782f455169889742b2996bce8306fa07075f1c4b5"; + sha256 = "4cbe5d68f610f3778be063d132271fca35ad9c7a7914aa32459527b4c1800948"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/zh-TW/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/zh-TW/firefox-98.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d4f9228777a8af5e68616865fcdbf522cd73d69164ca0936098bbf0534911413"; + sha256 = "80d4bc113d203fdba00f6af11ef1fd7b9184204b1788124e66049ca5ec13b3c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ach/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ach/firefox-98.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "bb0e66383954377252fe15d1e3b251ff0e7ff518fa8d817f4f26b18449e8525b"; + sha256 = "98a4025d0771980dbd3d06511ba15de71d7df7311c7e683039d315bce7dcb590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/af/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/af/firefox-98.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5d73dbd6f2cd49f79e99538ba0b4247c8c29c92ce3417e6ddc23b89df59d4ba2"; + sha256 = "8519234c67e0f8b4e13df38ca98589d0a618f607eb940cf1f686f540a3dad527"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/an/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/an/firefox-98.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "43b1ccf184fee070ec1a279914eda6b25ab15f294468b524e4c2a5e975e7c818"; + sha256 = "61bcf050289a12e11c6a2b308f3323f39558aceaaa7b18cd95dd19609065a66f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ar/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ar/firefox-98.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6ef2f6bf6fac15b194a08aaec137adfe59ac7a8e1e06eacf88328dc1c917c994"; + sha256 = "961d7585e36e387d7a0f01bec3cb8359704a0716124211f2a24f5c046d49d338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ast/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ast/firefox-98.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "01aa7a8ea0263ba32f0c398918b184cb0d9f588df4330b16e37a8f3fb1efb165"; + sha256 = "bb104056866e6518bb0ab94ba179b525105ddba09fc969065dc48d15f70de5cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/az/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/az/firefox-98.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3605a671f1752f0ba3499720095b66a7d058b5a0aeec3f864d87d7027121c970"; + sha256 = "897fe5ebfd497eadda7858701217d6a0cf0bbf2a74389ffdfc46ddc8a5706480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/be/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/be/firefox-98.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9ecdd7986a2b2b0c28ec11eab24130e4d35c8dc96e9fd95bebd0fd2e724e38ef"; + sha256 = "6e4122643e4bd368c7adeb640554c7a5252562b767093aeb0e9cd63c9a533b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bg/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bg/firefox-98.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "c66c13d707aa0f52154061dd6d59407acd1bf5b1a29284da8821c2abbb2b02fe"; + sha256 = "481a3cc57cdd62d1ad23ef9f8f0c15087ff20335ab57bc28729dd74975460370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bn/firefox-98.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "bab8e1f9004caab4f2a4ba0dbfa22ce10957b5c2a4adf52049d64953200cc052"; + sha256 = "d56c44b8c5103072605b9fd3e5cec63ef613698bad3198543e67958c7ae2c97c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/br/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/br/firefox-98.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "07f177e9396567d4f0852c68b2080a04ac2f00c38c3cb0c1bc0fc4fcb3b629f5"; + sha256 = "2f25b1130142faa0efe08413512353319dd341d31221fd463f198ff8ec776b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bs/firefox-98.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e9fd1dfce60b27dd8037c144810379a2526c4d270d9c2bb2536a74df8be7a586"; + sha256 = "a0a33294d9eed0867463b56bd0e02e58836c5eae91718ba918160dc98eb7ac42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ca-valencia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ca-valencia/firefox-98.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f6ae71d70746a7c56ad416543cff9ceb4298dfe30d1bce4d72ea695131ebad95"; + sha256 = "fed1ba8e292c72cff4c28ce3c5e59f58fd20f25624444084394f7b1cd61446e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ca/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ca/firefox-98.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7b12613954b0e6b81ed7fb1fcca7099dc4500a72cec7333dd8de6a7deca28820"; + sha256 = "f2cff173d6c5f6d12f8b29f07b3ee0d51dc523d508f340a65a99404953e1cb74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cak/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cak/firefox-98.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b18f916d3eec4121c7a854ca2ba2ccf5baecf53d7a173578e19c3c3c50aed076"; + sha256 = "c48e7d51d10b4d398a3a737faf204cd695091da360a70f3fb6dcf8b5ddcc265d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cs/firefox-98.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "56afa0af38d7ec85b938a961363b781d4980ccfeec9945f0971be201a21b1cd1"; + sha256 = "1a223fcfa992f1f58e61f9c4903253e51adbf8a73380d09e9b38eda8f713c31d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cy/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cy/firefox-98.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f82d0db8338a0eb4cf5f180f4982c5c7db7db4b9fb953ec496aa2e9961966091"; + sha256 = "3f26e158ac5870fecd94d2b5a07f7116577fb0cacae5a98f456aa64b66eac64f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/da/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/da/firefox-98.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "fe7def9df91782a3adbdf02a4deac85ab07caa4f378f695e2253e0eccde3ab34"; + sha256 = "1ad6bd99e003d2c8a2d3dfb15360f52800b8e2b0c6ce586f1857ab491763a27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/de/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/de/firefox-98.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1fba10e324128c2d30b9a9a0489f1f065bda575afc7dbe0c6625ece2b96b4bc7"; + sha256 = "1f433c261278469c96f239c595ccaeaab2d735b461847b2a6f0770cb618e13d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/dsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/dsb/firefox-98.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "3e43d5c0d27290b023c7e53a48aad5894474d9a33a544a20cca4893fe4dd3267"; + sha256 = "c0aa0c513549ddcf73243d7b0fec5110d547be0536b79d2763714447cd80460f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/el/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/el/firefox-98.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "71864f8294844e051674f20d49b78f3b129ae10f7ae93c4bdc4e194ca6a586d3"; + sha256 = "0e341f6e22862bc0d92efce71243e64cde6e9324ac33bb1fbfed59b84fb4fb89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-CA/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-CA/firefox-98.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "845713d2c18c1bc029509590e6156edb2166dd7bfc8e5a8cb9e6092143bb8193"; + sha256 = "5dedc5db801b0f7c7bc42a2373e8558895a1fc757cb1f39f99b355729eff7e4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-GB/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-GB/firefox-98.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b5b2f7d607be95cccfc6dbc12298333e5f261a9cb27650dff946ea4246e87df8"; + sha256 = "05d2a3ed1e9b2d7693062758183187d0a8a4524d6644532029aadb1d2d1b9548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-US/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-US/firefox-98.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c736080050a9715077a004add55dcb3dcb3be891d5870939709096bc81195eed"; + sha256 = "01e9e15b89299cac4ec8931e84f11ed63ff3ee5e70cb73be4cb6f6f5d817cfb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/eo/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/eo/firefox-98.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "38f135a137826862f9319b88edd9ba0e41a7c57f7de3603ca23d5c6101b2cdc0"; + sha256 = "121a736e78d12f984270cea37b14915fe65a52c3dfd29e155f20a09707d69c58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-AR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-AR/firefox-98.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "63856d08aab14fec8b28aa6ad6f765aa43d5bf52cd1da5e48aa3c111e13be60c"; + sha256 = "a051af8c255954d2c025cb9d3a0ad2d1ad6bbfbc1bf69436abe8ec6674277ece"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-CL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-CL/firefox-98.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0bffa72431868aa53835a67b18a257e7b3083da778182b13f723f68a38478910"; + sha256 = "17a2fa85675f5fbf532da3485099315de98397e5286e2fa5a0b1c8b468a9c974"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-ES/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-ES/firefox-98.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "11adfe391791b2e17114c72d984db96586c70102d43563f907c371cd85c89b03"; + sha256 = "ffa84eba0ac4cd45fa385de6fba23b8bc69efbee1a3bc39b7e1fb95cf6e6581d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-MX/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-MX/firefox-98.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6b9360899c575c665e156dbb8a3f20b396bebb742f14eab9957f30f1dc2f644e"; + sha256 = "f73059f6dfa6df82282ce8cf5068fc5fdbc6320d2e73c981ff6571afba8b3959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/et/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/et/firefox-98.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "3fff6be4dd8d62163cbffee59d2d4811944f89b452a57192b3444515dd510bd2"; + sha256 = "250eb95ef69fa4e61fb6fff0c10c7f884684ca428318b1feed366a2b49809993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/eu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/eu/firefox-98.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1fb5ce8792f92d810f170746c61133d1835513dc644c6db88f1a4a6d81906815"; + sha256 = "6a709d754542a74104539e8e043f1b07652e007a1c062e067af4123d46c46071"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fa/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fa/firefox-98.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a69afe063a18b4f95fef028c584a46de1246fec45137e394e4b4a6f711be84c5"; + sha256 = "5435ad7aff621091454b61f2261e72ef1ba2fcd2b89d32148f8ffde0635e237e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ff/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ff/firefox-98.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "f1c3797c11b975d7a2feeb03d20cadd89396659c3661f7604853d9912a5b6faa"; + sha256 = "627f8970b92f5a96d8023406ca14c46471be457147d282e15e71db0163822a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fi/firefox-98.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "d8c628c73ff53c5883a8396bde4bb9b931e1dc7ac44637e9774b3d5d3ecf6b06"; + sha256 = "ef7912a562f3d01e20ee54dd505859ec6da549c8daba04c5003a8b618af722d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fr/firefox-98.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "85dbf4270eced53b4020d7a269a9d9ed4e55fa7251672b9c32feb96d6336b110"; + sha256 = "da5b3dd660ff8ac8f10f5419d0d848503a74948d76ebe45fbf88470703b24831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fy-NL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fy-NL/firefox-98.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "30da6a888702ba5060e461539ed51390014c79b55c1358e6a8b76c80c335199c"; + sha256 = "5d58c3ef8e75c22db07e82131d6773f8af8930d46a3ea9667bae07a59dd6b8bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ga-IE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ga-IE/firefox-98.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "3c1a33c4d7b3e3161f2b07ff95adbc466a2e9d718227d786ee6007318730c1a0"; + sha256 = "05a3402a6be754390c79a66160510696acf866002225a5d242d2f178e3c63dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gd/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gd/firefox-98.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "0ffce6d8f9e2d0d1b84c2c9b2ecc49a1861f88356c5b37d75522d537364f5208"; + sha256 = "6832439565a3a18ec623c5a6d0c36e429b2ef291bc8c0152da6934a108ca32a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gl/firefox-98.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "31fb23e14aa007cb6ea74b5ccd124d51a1d2c19cb6003d693afff07e83640666"; + sha256 = "2e55dcaf24d4fb028ff5dcba94fac38499897bbb7cecca79d6fafc0b83e21a9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gn/firefox-98.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "042b2c8e5652f2f9e1e3cb01a4308cec100680d45acaa37babcf33b8bef5512f"; + sha256 = "c25a77b99c022c3de29cea922e926db9e738771cd146acc6d71545cf8f1acdaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gu-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gu-IN/firefox-98.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5052d0c6a28b1c83e1c38b771f62f3c973089ccbfd048d0e089c8a637a80d218"; + sha256 = "e41991d388c6fecf9b22416c5f840e8f96d032d3be793101c9133ef7cc545850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/he/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/he/firefox-98.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "06a78cb3435dc6f8dabff279ad1c69f6f4d44c5a8e56d04d38dbfb046ad42fa8"; + sha256 = "55125f1e56fa6d8f5af4aba206e3ede2bb80f39414563a541f07eebc568de993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hi-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hi-IN/firefox-98.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "340d637d0de3df62ab79e69b3465a154a80e47a4dfe2b48cd949874457955cbe"; + sha256 = "4ebdde0d91f94399607c127953e738855a17463cea34a4360b630ce0e6add5c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hr/firefox-98.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "526fa7a1bf5e3e3b32f2fa61b8d28617873aba9bf1bacc5e13533b0621df993a"; + sha256 = "11f2449791c1613394764d36e1661cb05a83e2582904eb00ade9f09f58d4147d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hsb/firefox-98.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4443703e0b590e66dc4d295b1262d61f91cebb0a59ef6c246348a4e411663398"; + sha256 = "d7138688ce4edd030bb51d7eb68626a4055ef18dfaf30045d872c03b187b4ed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hu/firefox-98.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b2b1be8b090734f1069f7bd78294072bab28920312aa34125d02213a030bc9b1"; + sha256 = "693e08538b19f9d1aaab399e8d4b582e557e34ba5d2cae7de6c7e048b175dd3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hy-AM/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hy-AM/firefox-98.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a81e4add5314774f19fb514b539bdd7e12b907a4faf8b606c13f7dac8461e3b6"; + sha256 = "1e78ed371f092f9e1ec9ec7c43b16da6b5a277056983ea810af568e250c9d588"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ia/firefox-98.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a1ead289cc491600b89d63f96081b21e5f8172936023e42b5d949c0d5aea2bbd"; + sha256 = "a02a62a042cc51d7b6389366114816daf10cead0ce51a716ff58485fd7b856e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/id/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/id/firefox-98.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f56eaa86629a013f60c7af973a844abca72cb7ad236e02479bda9d1aeeb02b32"; + sha256 = "e548a304acb9075e6110c276482a1759cfb06b6cbd4edf2b7aa633f6762b91d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/is/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/is/firefox-98.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0d762f8c70bafdc9d8155572ff71ebbb0dfd9d83388298196a87ad130f8527a8"; + sha256 = "c43167df2a3739d7d9e7c8013cbe4a9ed5e18a060d06667ebf36102ad7a0587c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/it/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/it/firefox-98.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "54a79040a115b67cea2b912fd905d8acee05e737702c778628fd10282b27364e"; + sha256 = "4eba45221ef34d71353b3d442e8cc5a565fe79cad1a21b4de27129da92f165fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ja/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ja/firefox-98.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e92f3cf4d7f2f0e26280d814d6bf26f14fc2f5d8923451cbb6075607ba4d95c1"; + sha256 = "173c3f7afc252f495e9553c6b7a1afdd5090de2578a477e15307ccbecad937f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ka/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ka/firefox-98.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "ff89c8ecc80897ec8acea68de166ae6f626f181fc7f0c1d30ac5208c4a221eb7"; + sha256 = "de14be28830076b11610a8824cf20e161cb4e7c0e527d160caf7d214f41ba9a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kab/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kab/firefox-98.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bdcc2807c9ac16d6df6e1f35e2648f7e1776dd117edc1731d24192eaee5f9661"; + sha256 = "385dfe3ea1c1aafd4e0f3c4176bf2498876b34d7fee5195ba5fa5884203ae338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kk/firefox-98.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "535bb672a95a37550779c84ecb5eaf98f151a30123b2b7a099b7940e8bede683"; + sha256 = "c9b2f1fe4cdce853ec155a4b99d44279dc64c266706e58274413b0b37cf71317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/km/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/km/firefox-98.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3e60008c56da46e0897c326a843871d63fe0e534487f4a94f2e398ea6c5377f9"; + sha256 = "adc84f8768a71d7f2ed314dad0347a346b3592d47bb7ef621301deb2b72f7f56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kn/firefox-98.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "90d8c47a1cd42b7bd4f9e2c04ec6bfa701fc978a6ea680fc5e48bfd4fa6a727f"; + sha256 = "c0579f13e76c62e402065069ab7dcbddd7cfbea8e428b5bf2e77d42550d18557"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ko/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ko/firefox-98.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d62427eafe143f3d2aaa1eba6969358316b8c76c7fe926d8fc5985dddc588e7f"; + sha256 = "bfc610608666e626715000bc4fa48dccd43ce0036ee0111e926f92b75034a0f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lij/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lij/firefox-98.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "0db93d63e67c7f1bae536d425dd1789b0c0d1737fd23e8d0aa0c7b66f4c958a3"; + sha256 = "fb1afb37bd4d47aae8de6ff8b1a2dc34d41903ae4ead5a2671baeeb6ef3b3196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lt/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lt/firefox-98.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ae3cfea73e03c61afdea361c4b23408f7c894197c4ef370286a653d35e0eb406"; + sha256 = "0197a8c4ddf84ac38aba0533a84b4a57e783d3542b48e221b3317b39e9decddc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lv/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lv/firefox-98.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6bb0a946109cb8316a1d3b412602b590caf4f6a22fc7659fc43d79c0f921acab"; + sha256 = "a7631d6bfc46a140c226cd1914074084ac1bba0104c7811305d40291e015c2c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/mk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/mk/firefox-98.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6e36851e9c7b14e8c180ac9b715b245ec627fd2c73dbb4adc31219247696f658"; + sha256 = "78be93a5ef3ec79c9b7b8ed4134b25fd66db74e4160235e1ff57f87f7ecf7f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/mr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/mr/firefox-98.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "68678735aa1fa850cc30445e71fc2589f32d3845238a781c96d62164b00a1da6"; + sha256 = "3890be73f978299ebbd3c7ef0919a6d5f916729528ee90f7d1ef86b088fb748d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ms/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ms/firefox-98.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0dc9802f1ea0bfa4e2916dd4a7b02b7aaa5cac0238aa4bae62bad4eebd49939b"; + sha256 = "5bbded06e5eb3c4f628df573ca10aed952d72125ca1f96f74643e28210121e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/my/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/my/firefox-98.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "c3fdec85d214fa4f85b502647f9f0f50e0d473820e69a4f4f8d5d24fe58e6cd0"; + sha256 = "2a8ea9468c6fa4a4a303c4b5b1a9306898ed8f2fd60a3e8c9915ae549baefa09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nb-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nb-NO/firefox-98.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "48947dd10062ebef8e9095a1938dbb0b5e24689ffd5f835080512612e93f2efd"; + sha256 = "c7fb5c534a03afe15bc2c439b679dbf3316aea92d23d154b6902893633fa9b32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ne-NP/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ne-NP/firefox-98.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8952004bde5d731fe48ddde9bced409e5d2c46d25157542f3c72568b87a9be8b"; + sha256 = "d2b2731732202c4501e0989fdd95a68cca01aa4b13a02ca035247a1de7a7f299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nl/firefox-98.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f2c7c1348dabee858c89b8aaf37e5cfcf0cd867f4e9b0587285aef13aa302a26"; + sha256 = "2947d1783e0cc8126c086bb9a1ed139de735ddf2bcb4f104e9efb6d68d844503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nn-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nn-NO/firefox-98.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "bd05d1b619c77fbb502080f4862cbb715e628c814d8c35720998ec43d6c4920a"; + sha256 = "1aad31043951d9b81f707cd9c6259d6c215ae20f55776719c2553148dc3bb589"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/oc/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/oc/firefox-98.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6092e57f1d6bcaed08e5d1acdd15d9fda0430f1c0073a48fc38f8a73578f1fba"; + sha256 = "c237cab50aba2e059224d80ebddda67f13f8737899a29d6246418dcb09c486de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pa-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pa-IN/firefox-98.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "51bc6d1b738c12eedd1b35f829b51ceb157c65a25241e911e10c13289b92a5b1"; + sha256 = "e487db05bc46eae01509b5ac3a9f4aa6e3cd8bd0970366d9501c1a74653f3110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pl/firefox-98.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f286860bd5912b91fa62494837da2c335c4a4a484a164b4b999022c2813d5c28"; + sha256 = "a84f34fd417855acfeb89926fdacc8c4fdcb870251d3b43095e04d2392a6637f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pt-BR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pt-BR/firefox-98.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a1f48ba9c56f2c54899d14b1292cbb4e517482ba0552bf17ace7dd6b517eef4d"; + sha256 = "5a4e35c0efdb79e83d535b62d57c26d5021d20c26d2654b98f6078ebbf4b6094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pt-PT/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pt-PT/firefox-98.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6d91ff36f186ef11ba70d604443b7e818f608dd6d667f49a7892c1a69e64bdbc"; + sha256 = "f61b70f911e708f4964f4592e9b46c8e70a730f778aaa6e320ee7c0d3647253d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/rm/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/rm/firefox-98.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cc190575af60d5a09266b2296796978f7a37dd07b2709523b84b88499729e546"; + sha256 = "3b602a6d897e2311f1521a36ffc4be4c6b84705605aa1bf321b684010c02d59e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ro/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ro/firefox-98.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4193936ca7e10f01b91ab990ba0b7aa354c344a7749356bb9b30d251d46b84bf"; + sha256 = "94ff92349315c126c3c1294e9d468914b7f81ef8a0597c5fd039fe66bcad271e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ru/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ru/firefox-98.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f85ad1700117a99b8657d9fd9061935b77acfc4a0d7c8b3caa8d7c0ddf142a8d"; + sha256 = "1f24d74427e79b7c78ffcdfbe1a40c5e767ed0854a870babdf1f4956ddaa17bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sco/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sco/firefox-98.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "23d16650132fe30c6fb90797f744d09f21f16a0673821cc0c59392a9d2adbfab"; + sha256 = "2b11f6b4b380143ffb07764c6fb6fb139da7aaab0ea5bdad826b1c14eea09a3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/si/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/si/firefox-98.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "44ec177853f6d3d72ce141ebfc25508df4c63c8b37265df4dfcac8b48799b007"; + sha256 = "f644c5fcc35bb8e4a2d4ba1d7210cacfa498ca9aaed79174ac4f973021dbac63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sk/firefox-98.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4a31daac61e0ac3a729c5299dc5d14046bb2cadec61aad443fa4391a0cc99b3f"; + sha256 = "859bfb3a177429a24e585e6ad11fdf9220d5d0a2751ab861aa33e3e553a3fa2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sl/firefox-98.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8ca7306d8e68d9943ae3dbeffe3da88682c4c22fa9974142b9f609c4c62b06f7"; + sha256 = "e5ba078d2f83df37b8211f8423dc549358b9d1c508a9607d1d5e735501ca9845"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/son/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/son/firefox-98.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "9c5c17a9f85814779f88f320030bc6d935cac0b5b51ec9524283553c36c751c5"; + sha256 = "07f902640b9742954ac03b737fd402d1024e647d4cfc096ceff2ef5329853235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sq/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sq/firefox-98.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2c40123f37130de16e47175472086e5774598b5e6090de4d88e67512bf982c43"; + sha256 = "2dc1cdc47fabf4d212745f326dea7ad202527fa8dee9d90908812a3f7b152840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sr/firefox-98.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2ab762afa95e0d0baa3650e35612f4f56f9d4ddd2baa34f615e9fb7bf95353e3"; + sha256 = "d84a3a521ed43b9ce70a6984f6afb35bb02da5b4b9372cfdd47607151dbfdce5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sv-SE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sv-SE/firefox-98.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ea00b75128a67638d67ca83ce9f5e15f4afe9eda1903e90cd6f27820117fcac6"; + sha256 = "5c313719484370ac42a46cda464ef5096e866a93d821fd88d8cadc3fe483b8be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/szl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/szl/firefox-98.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "88ac139760b68702f33ad02889dacbd31d3c31140f3dff763dcbf6f9e7f6adf8"; + sha256 = "6933fcc3ca447d2c530bc4d5a3fac65351359de13ca8415c17034611d343e4d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ta/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ta/firefox-98.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3828cc9dea353d7fb259fd57396ddd59b316fb323caa6b8b47f485a6aad8e1a5"; + sha256 = "a1d11f11350ad8a1aca420774896721a71db6640e78798bd5d0e9563fa215350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/te/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/te/firefox-98.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "1dba53e1907eac8f76759b2fe0a5499c31c733dcd627193916e6d4ebab27c625"; + sha256 = "a09332149b4d4daf758cc75a0b50c793207e6dfa7f487f04864f8c41e2f7c2c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/th/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/th/firefox-98.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "461a11d1a033cf9ef113f0d362484696b29ba6d52e7e14ec4a3015ce55767f01"; + sha256 = "615300bf23c3903079601c5e4d9509bc3a7d5fa1e94a01aff09559f3c2994306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/tl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/tl/firefox-98.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "572f60b9222c9a008ea23eb0f9c184fff17af4393e887cf2db871a7f86f74b77"; + sha256 = "f323e7204e86b91cce656780e65bfb4166bd0e27d1ba84ede5e8b87ab6c4e122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/tr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/tr/firefox-98.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bcc59684f7e6c6efa6df66fb2eacec8b1a59f0aa42f8bea86a7e0fd6a29916a2"; + sha256 = "cf36e947181fc7750186b75edb0998df3219097ed94e4617435cff2690f626d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/trs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/trs/firefox-98.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "d97ea9fcc6ec94e168ddfe219f08fc202013e1cbfdf35e34749569e54f6ae65a"; + sha256 = "137270152321a9922decfbfcad4643ce9d3b127498d91ef7a4d60069d249632e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/uk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/uk/firefox-98.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "49078902f54f5e0ffbaa93a7a797a7795a1baeb5cb57942afd3c6df38b68683a"; + sha256 = "4571eb45952e27756ba8332cd62673c3cd21d58b85662d6eae7a43afc5aa9613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ur/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ur/firefox-98.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "7df5518a9e0f8a82b61bba992bbdb4c3ceb935768d057ffa3602036a921b1754"; + sha256 = "77d60ba1a7bf22d7fb690ec1c22dd35b84b3e59891d07c129335894d3c47e8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/uz/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/uz/firefox-98.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6a36b93b799cbaca9a7f5765723c63a1e42c1645bad6ca2e3ee8dad8d64f3c40"; + sha256 = "a716e77dae132d1741366836c9fb59320477f623cef47713e93ff7ea6c712d49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/vi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/vi/firefox-98.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "da081f083f64ebe61465848358ac018ca4417104ec94911d39f4ea87a858d49e"; + sha256 = "90d8f9ae57521d77e4f9db4166aa7124f4b935f3f1531639058cecd7cf96be36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/xh/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/xh/firefox-98.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "3dd0234d0ae5739290f7236264500c3ead31b6afa9b00cfbf8405e1ca13d1a57"; + sha256 = "ede2ab7f812aeef2f4f07ceac4df1edcdeca35c1b8d1d64053a7250fd781187e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/zh-CN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/zh-CN/firefox-98.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9e21e6ea94ad72b890c1eca95da2e1ed3f5c3b61ac56216092a7393c072048e4"; + sha256 = "02c61d1b1bb6e966444a800a319eb69fa36ce913614369d0c8f95388e4bdd14d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/zh-TW/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/zh-TW/firefox-98.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e8eefb56597f20a92c839a7e4ccfabfa009de100505982a72c8088a64ecca879"; + sha256 = "5c347fe33e423b8300fd6f2a0a3026896ac6c74af7bbdfead40f72874e65b0c2"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index d57839b0e4b..cace1829ccc 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -15,7 +15,9 @@ , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 , gtk3, wrapGAppsHook +, pkgsCross , debugBuild ? false +, runCommand ### optionals @@ -121,6 +123,15 @@ let }) else stdenv; + # Compile the wasm32 sysroot to build the RLBox Sandbox + # https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/ + # We only link c++ libs here, our compiler wrapper can find wasi libc and crt itself. + wasiSysRoot = runCommand "wasi-sysroot" {} '' + mkdir -p $out/lib/wasm32-wasi + for lib in ${pkgsCross.wasi32.llvmPackages.libcxx}/lib/* ${pkgsCross.wasi32.llvmPackages.libcxxabi}/lib/*; do + ln -s $lib $out/lib/wasm32-wasi + done + ''; in buildStdenv.mkDerivation ({ @@ -213,7 +224,11 @@ buildStdenv.mkDerivation ({ configureScript="$(realpath ./mach) configure" export MOZBUILD_STATE_PATH=$(pwd)/mozbuild - '' + (lib.optionalString googleAPISupport '' + '' + (lib.optionalString (lib.versionAtLeast version "95.0") '' + # RBox WASM Sandboxing + export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc + export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++ + '') + (lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # please get your own set of keys. @@ -258,6 +273,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional ltoSupport "--enable-lto=cross" # Cross-language LTO. ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld" + ++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}" ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" @@ -277,7 +293,6 @@ buildStdenv.mkDerivation ({ ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] ++ lib.optional enableOfficialBranding "--enable-official-branding" - ++ lib.optional (lib.versionAtLeast version "95") "--without-wasm-sandboxed-libraries" ++ extraConfigureFlags; postConfigure = '' @@ -356,6 +371,7 @@ buildStdenv.mkDerivation ({ inherit applicationName; inherit tests; inherit gtk3; + inherit wasiSysRoot; } // extraPassthru; hardeningDisable = [ "format" ]; # -Werror=format-security diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index bcedf9d22d8..bf1e1e2f4e4 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "97.0.1-1", + "packageVersion": "97.0.2-1", "source": { - "rev": "97.0.1-1", - "sha256": "10gbnkmyivawwqn3gf5c98l49b03j70gbniaar8bfl80j8av0v5j" + "rev": "97.0.2-1", + "sha256": "0pk9ci0wvz61879w3fvy8p1w4w8anv5s7rfiimz21m351gcf3d7m" }, "firefox": { - "version": "97.0.1", - "sha512": "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c" + "version": "97.0.2", + "sha512": "efbf33723f5979025454b6cc183927afb4bc72a51c00b5d45940122da596b8ac99080f3a6a59f5dd85a725e356349ec57e7eba1c36cdab7d55a28b04895d274c" } } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 7a5c91130f4..f5a156943c7 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,16 +7,16 @@ in rec { firefox = common rec { pname = "firefox"; - version = "97.0.1"; + version = "98.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c"; + sha512 = "1434ff775e6cdc6d9a75fa0e6d07a4680ada86ecfd7b65208c597ed765e847d900b68df355e6bea6461f6d86ee7a8b2ce3117f23826ad144bd87dfe64ee39b42"; }; meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco lovesegfault hexa ]; + maintainers = with lib.maintainers; [ lovesegfault hexa ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.6.0esr"; + version = "91.7.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; + sha512 = "c56aa38e9d706ff1f1838d2639dac82109dcffb54a7ea17326ae306604d78967ac32da13676756999bc1aa0bf50dc4e7072936ceb16e2e834bea48382ae4b48c"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 52fe1ffe2d0..4713320e068 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -105,7 +105,7 @@ let enterprisePolicies = { - policies = lib.optionalAttrs usesNixExtensions { + policies = { DisableAppUpdate = true; } // lib.optionalAttrs usesNixExtensions { diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index bf370dd6ec0..00d0bc8f6fd 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.10.6"; + version = "1.11.1"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-N4NB4lfWIN+jreAuaaGKRdpgwHy2CKrPrGxu1iSCZyU="; + sha256 = "sha256-RrdD+G8DKOBm0TpmRQg1uMGNFAlAADFeK3h6oyo5RZ4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index a37278bcc3d..bd7d42777f5 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "83.0.4254.54"; + version = "84.0.4316.31"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-kv90FmenGpAbNyw/puwEbR/vVNHV2d5UdX3amMTcI7k="; + sha256 = "sha256-ypSnarhtJNQn3yOtydjmf6WmHAYbOfMg3xatCxTfIMY="; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 7bf3ee9e75b..c79aa1d6f1d 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit patches; - installFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ]; # Add run-time dependencies to PATH. Append them to PATH so the user can # override the dependencies with their own PATH. diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 21e86a160cf..ce1d41834c3 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.6"; + version = "11.0.7"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "03c3l720x4c6mfq56fyqspc5sxw0mz1ph48l5wph06dzw8wd5cfz"; + sha256 = "197yf0abcb98kqds0xvki0b52rlhzyzdc98zmhrn7y8gmahc84cz"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0llg1nl7x7y4kp0hr3bbhdfggaf8praizkvcpp88x2i2zc9sp5mx"; + sha256 = "0yylfsgmnfn6zww0r6kp1d1wmmb0lfa4lqwkgr7d8rzi6q9spmqk"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 139bfdc965f..fc66f471e4b 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -12,6 +12,7 @@ , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, vivaldi-widevine ? null , commandLineArgs ? "" +, pulseSupport ? stdenv.isLinux, libpulseaudio }: let @@ -19,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.1.2567.39-1"; + version = "5.1.2567.49-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "140idghryk132nyb8np011xiwzgh518n0fxrkjnnvi3c67shq7qc"; + sha256 = "1cyd789apjh71vzry2zjxb0c215yarfryb9jzxjmkfvrqg4g23xr"; }; unpackPhase = '' @@ -40,7 +41,8 @@ in stdenv.mkDerivation rec { freetype fontconfig libXrender libuuid expat glib nss nspr libxml2 pango cairo libdrm mesa - ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; + ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs + ++ lib.optional pulseSupport libpulseaudio; libPath = lib.makeLibraryPath buildInputs + lib.optionalString (stdenv.is64bit) diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index a54ccfdf6cc..7df9b6b1e7a 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "21.6.2.817-1"; + version = "22.1.3.856-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-xeZkQzVPPNABxa3/YBLoZl1obbFdzxdqIgLyoA4PN8U="; + sha256 = "sha256-+xxyV8dBnfu2hQ/ykkp7wFSaojhlPLVvMmZdh/hyaoE="; }; nativeBuildInputs = [ @@ -109,21 +109,22 @@ stdenv.mkDerivation rec { ]; unpackPhase = '' - mkdir -p $TMP/ya $out/bin - cp $src $TMP/ya.deb - ar vx ya.deb + mkdir $TMP/ya/ $out/bin/ -p + ar vx $src tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/ya/ ''; installPhase = '' - cp -R $TMP/ya/opt $out/ + cp $TMP/ya/{usr/share,opt} $out/ -R + substituteInPlace $out/share/applications/yandex-browser-beta.desktop --replace /usr/ $out/ ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser ''; - runtimeDependencies = [ - libpulseaudio.out - (lib.getLib systemd) - ]; + runtimeDependencies = map lib.getLib [ + libpulseaudio + curl + systemd + ] ++ buildInputs; meta = with lib; { description = "Yandex Web Browser"; @@ -131,6 +132,12 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; - broken = true; + + knownVulnerabilities = [ + '' + Trusts a Russian government issued CA certificate for some websites. + See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details. + '' + ]; }; } diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 954ce2292ec..3707876fd74 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.2.1"; + version = "2022.3.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-y9TduC6Fa1p3UFvSeW9n42AUD63dp/LEagiv3xlT/4U="; + hash = "sha256-iVg+AXSBO+caeYxUR41infCvsCTZkJTf7K0oZnOQmnY="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 976ef396acf..503952fa59a 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.2.8"; + version = "3.3.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-A6YI5OGveJj9RRk1fMF3ejYYnMsbjxE34ximtkZUNys="; + sha256 = "sha256-BDHbbb3WqQvRJB1A4NInfvujjB3r/AMmVvos8i/CnyU="; }; - vendorSha256 = "sha256-hxSr0sNlz93JxOxnE2SnR6/OgCGK8DrJZxqQtSxfbj8="; + vendorSha256 = "sha256-YeSeaYOkNRjQgxsK9G7iPbVpfrPs4HRRFwfoUDxoCm0="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index a4b49adb1e2..4667b130e8d 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.0.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "00cwnfylra0msbb423ad21if98s6smzccsyidqsl4r2mrlkhahwm"; + sha256 = "sha256-tC9U0yvuMEwO4mzWyUC+v+/H0EzgwTu02waTQrx19Bs="; }; - vendorSha256 = "0fcgyyd11xfhn8i11bqnaw3h51bj1y8s37b4d8wzv31dr8zswqsc"; + vendorSha256 = "sha256-aXq92SI4cgJrmo67SEfg8YKPEpO2UW2fcYnKq9TmAQg="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index b14c98b4453..786615801ba 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-IjkksHa94gkNiaeksGHlLdeHlLS/uwI0GnKK0d3s5wk="; + sha256 = "sha256-0njXmYhZM4DXFeK9KboXnVw8uHdz4PFJ2aJxwhgyEc8="; }; - vendorSha256 = "sha256-3PzaMB7U19HnqS+zRbIupErE1S8+MzG92vQFq3oxHpE="; + vendorSha256 = "sha256-JVRLPsfI1ITilAOkVIAa2IjjuAlJ2PCpvYEkhnTzRDA="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 73888f41f92..aad583c675c 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "sha256-M0bYMaOqHkG1J6xGEqVvmYda/B6qDIrFOQhhW2LXiYE="; + sha256 = "sha256-I9OmTO5obTwAj4hkecUfmRYR4Q3rdllMfbpESv66eEQ="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 725cd419d08..4c22b9adca5 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -1,56 +1,56 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "driftctl"; - version = "0.20.0"; + version = "0.23.0"; src = fetchFromGitHub { - owner = "cloudskiff"; + owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-8egkz1wXvdNoTkbhOdvoP4hrBPmuiUvd2QaD6tPH2xU="; + sha256 = "sha256-TUwTvCsWB+n+shVU1hTzLYROG9Wp4ySzJwAnappK7TY="; }; - vendorSha256 = "sha256-lftOTcob8l9dUZkH2MMxzD6FZzLOR/PXEXFVdOaguK4="; - - postUnpack = '' - # Without this, tests fail to locate aws/3.19.0.json - for prefix in / \ - /pkg \ - /pkg/analyser \ - /pkg/alerter \ - /pkg/remote \ - /pkg/middlewares \ - /pkg/cmd/scan/output \ - /pkg/iac/terraform/state \ - /pkg/iac/supplier ; do - mkdir -p ./source/$prefix/github.com/cloudskiff - ln -sf $PWD/source ./source/$prefix/github.com/cloudskiff/driftctl - done - - # Disable check for latest version and telemetry, which are opt-out. - # Making it out-in is quite a job, and why bother? - find -name '*.go' \ - | xargs sed -i 's,https://2lvzgmrf2e.execute-api.eu-west-3.amazonaws.com/,https://0.0.0.0/,g' - - # and remove corresponding flags from --help, so things look tidy. - find -name driftctl.go | \ - xargs sed -i -e '/("no-version-check"/ d' -e '/("disable-telemetry"/ d' - - # Presumably it can be done with ldflags, but I failed to find incantation - # that would work, we here we go old-school. - find -name version.go | xargs sed -i -e 's/"dev"/"${version}"/' - find -name build.go | xargs sed -i -e 's/"dev"/"release"/' - - # Fix the tests that checks for dev-dev. - find -name version_test.go | xargs sed -i -e 's/"dev-dev/"${version}/' - find -name driftctl_test.go | xargs sed -i -e 's/"dev-dev/"${version}/' + vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/snyk/driftctl/pkg/version.version=v${version}" + "-X github.com/snyk/driftctl/build.env=release" + "-X github.com/snyk/driftctl/build.enableUsageReporting=false" + ]; + + postInstall = '' + installShellCompletion --cmd driftctl \ + --bash <($out/bin/driftctl completion bash) \ + --fish <($out/bin/driftctl completion fish) \ + --zsh <($out/bin/driftctl completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/driftctl --help + $out/bin/driftctl version | grep "v${version}" + # check there's no telemetry flag + $out/bin/driftctl --help | grep -vz "telemetry" + + runHook postInstallCheck ''; meta = with lib; { - description = "Tool to track infrastructure drift"; - homepage = "https://github.com/cloudskiff/driftctl"; + homepage = "https://driftctl.com/"; + changelog = "https://github.com/snyk/driftctl/releases/tag/v${version}"; + description = "Detect, track and alert on infrastructure drift"; + longDescription = '' + driftctl is a free and open-source CLI that warns of infrastructure drift + and fills in the missing piece in your DevSecOps toolbox. + ''; license = licenses.asl20; - maintainers = with maintainers; [ kaction ]; + maintainers = with maintainers; [ kaction jk ]; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index be22e1f534d..d5762d938a3 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.27.2"; - sha256 = "0rdsc9i8mjiwyb6l9sbhxirl4i3b50m6505wwvhxz4y5arzdi1k6"; - manifestsSha256 = "0h966xqjkvrblxd62iph9vwr2h7w1ig943hi5vg0swy4674v3ybf"; + version = "0.27.4"; + sha256 = "06951i332gr17nsbns8mh4kcjilqfw5w95shaznpaksx93f554g0"; + manifestsSha256 = "0fvzh7j3vi5hw8jbw2gisjnn53bffwnp7zm3dwcbv3svwpw7823d"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-xkhbGID+oI7+kLml8CveEet7gtPSty8LGv1gkqpqg6w="; + vendorSha256 = "sha256-7sHLXjyYMWSFckDPeVGJYK+nwhbRpD76tV334PCVYwA="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 9c929ba260e..df44c25cdc5 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.14"; + version = "0.6.15"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-4gHwf8zOkCKbOPU4Zq1u4h5vn0r1Vi/B++ERxvr/iuk="; + sha256 = "sha256-Gf4YxxyNALicb9GPpOW+Kzb2xrwcAU1XYOzXochH0LI="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 0e8e652fbb3..adb46540cba 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,29 +1,49 @@ -{ lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook -, jdk8_headless, jdk11_headless -, bash, coreutils, which -, bzip2, cyrus_sasl , protobuf3_7, snappy, zlib, zstd +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, jdk8_headless +, jdk11_headless +, bash +, coreutils +, which +, bzip2 +, cyrus_sasl +, protobuf3_7 +, snappy +, zlib +, zstd , openssl +, glibc +, nixosTests }: with lib; +assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + let - common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl, nativeLibs ? [ ], libPatches ? "" }: + common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: stdenv.mkDerivation rec { inherit pname version jdk libPatches untarDir openssl; src = fetchurl { - url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}.tar.gz"; - inherit sha256; + url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + sha256 = sha256.${stdenv.system}; }; + doCheck = true; nativeBuildInputs = [ makeWrapper ] - ++ optional (nativeLibs != [] || libPatches != "") [ autoPatchelfHook ]; + ++ optional (stdenv.isLinux && (nativeLibs != [ ] || libPatches != "")) [ autoPatchelfHook ]; buildInputs = [ openssl ] ++ nativeLibs; installPhase = '' mkdir -p $out/{lib/${untarDir}/conf,bin,lib} mv * $out/lib/${untarDir} - + '' + optionalString stdenv.isLinux '' + # All versions need container-executor, but some versions can't use autoPatchelf because of broken SSL versions + patchelf --set-interpreter ${glibc.out}/lib64/ld-linux-x86-64.so.2 $out/lib/${untarDir}/bin/container-executor + '' + '' for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do makeWrapper "$n" "$out/bin/$(basename $n)"\ --set-default JAVA_HOME ${jdk.home}\ @@ -34,6 +54,8 @@ let done '' + libPatches; + passthru = { inherit tests; }; + meta = { homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; @@ -51,9 +73,8 @@ let computers, each of which may be prone to failures. ''; maintainers = with maintainers; [ volth illustris ]; - platforms = [ "x86_64-linux" ]; + platforms = attrNames sha256; }; - }; in { @@ -62,8 +83,13 @@ in hadoop_3_3 = common rec { pname = "hadoop"; version = "3.3.1"; - sha256 = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd"; untarDir = "${pname}-${version}"; + sha256 = rec { + x86_64-linux = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd"; + x86_64-darwin = x86_64-linux; + aarch64-linux = "00ln18vpi07jq2slk3kplyhcj8ad41n0yl880q5cihilk7daclxz"; + aarch64-darwin = aarch64-linux; + }; jdk = jdk11_headless; inherit openssl; # TODO: Package and add Intel Storage Acceleration Library @@ -74,23 +100,28 @@ in ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/ ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/ ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/ + '' + optionalString stdenv.isLinux '' + # libjvm.so for Java >=11 patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 + # Java 8 has libjvm.so at a different path + patchelf --add-rpath ${jdk.home}/jre/lib/amd64/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 ''; + tests = nixosTests.hadoop; }; hadoop_3_2 = common rec { pname = "hadoop"; version = "3.2.2"; - sha256 = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp"; + sha256.x86_64-linux = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp"; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency # can be manually overriden - openssl = null; + tests = nixosTests.hadoop_3_2; }; hadoop2 = common rec { pname = "hadoop"; version = "2.10.1"; - sha256 = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97"; + sha256.x86_64-linux = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97"; jdk = jdk8_headless; - openssl = null; + tests = nixosTests.hadoop2; }; } diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 42d2e63eaac..408f1bd3ed8 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm"; - version = "3.8.0"; - gitCommit = "d14138609b01886f544b2025f5000351c9eb092e"; + version = "3.8.1"; + gitCommit = "5cb9af4b1b271d11d7a97a71df3ac337dd94ad37"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-/vxf3YfBP1WHFpqll6iq4m+X4NA16qHnuGA0wvrVRsg="; + sha256 = "sha256-AjNrn46l9gVC7MtGF59QWv+l6qYn+jzopsZtM/2faXY="; }; - vendorSha256 = "sha256-M7XId+2HIh1mFzU54qQZEisWdVq67RlGJjlw+2dpiDc="; + vendorSha256 = "sha256-ffbp7J8XDxo/s79pjoiDVbft0pr/lJpuJuKiMpQwkT0="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 3beb8e9c23c..fa355b65131 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -46,30 +46,30 @@ 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.23.3+k3s1"; # k3s git tag - k3sCommit = "6f4217a3405d16a1a51bbb40872d7dcb87207bb9"; # k3s git commit at the above version - k3sRepoSha256 = "sha256-0dRusG1vL+1KbmViIUNCZK1b+FEgV6otcVUyFonHmm4="; - k3sVendorSha256 = "sha256-8Yp9csyRNSYi9wo8E8mF8cu92wG1t3l18wJ8Y4L7HEA="; + k3sVersion = "1.23.4+k3s1"; # k3s git tag + k3sCommit = "43b1cb48200d8f6af85c16ed944d68fcc96b6506"; # k3s git commit at the above version + k3sRepoSha256 = "1sn7rd5hqfqvwj036blk0skmq6r8igbmiqk1dnpaqnkkddpzdgmc"; + k3sVendorSha256 = "sha256-1/kQvNqFUWwch1JH+twWzBdjNYseoZyVObB1+s9WPM4="; - k3sServerVendorSha256 = "sha256-9+2k/ipAOhc8JJU+L2dwaM01Dkw+0xyrF5kt6mL19G0="; + k3sServerVendorSha256 = "sha256-2KIFff43jfqWdxX61aWofrjmc5mMkr5aEJRFdGpLyU8="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. - traefikChartVersion = "10.9.1"; - traefikChartSha256 = "sha256-XM1DLofU1zEEFeB5bNQ7cgv102gXsToPP7SFh87QuGQ="; + traefikChartVersion = "10.14.1"; + traefikChartSha256 = "09a6cialx7nrh7nwi1gkkh8zcsasxcgb52dyx0r8bjq9ng29simj"; # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 - k3sRootVersion = "0.9.1"; - k3sRootSha256 = "0r2cj4l50cxkrvszpzxfk36lvbjf9vcmp6d5lvxg8qsah8lki3x8"; + k3sRootVersion = "0.11.0"; + k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620"; # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 - k3sCNIVersion = "0.9.1-k3s1"; - k3sCNISha256 = "1327vmfph7b8i14q05c2xdfzk60caflg1zhycx0mrf3d59f4zsz5"; + k3sCNIVersion = "1.0.1-k3s1"; + k3sCNISha256 = "11ihlzzdnqf9p21y0a4ckpbxac016nm7746dcykhj26ym9zxyv92"; # taken from go.mod, the 'github.com/containerd/containerd' line # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` containerdVersion = "1.5.9-k3s1"; - containerdSha256 = "sha256-7xlhBA6KuwFlw+jyThygv4Ow9F3xjjIUtS6x8YHwjic="; + containerdSha256 = "09wfy20z3c9fnla353pibpsb10xzl0f4xwp8qdjh3fwa1q2626gg"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion = "1.22.0-k3s1"; diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index eb79778c963..8f199bf9cc0 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -7,7 +7,7 @@ WORKDIR=$(mktemp -d) trap "rm -rf ${WORKDIR}" EXIT NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/ -NIXPKGS_K3S_FOLDER=${NIXPKGS_ROOT}$(dirname "${BASH_SOURCE[0]}")/ +NIXPKGS_K3S_FOLDER=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ cd ${NIXPKGS_K3S_FOLDER} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index f492bfd6884..d5faebdab3c 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-yWzrMkkusRueHyWT4LwrflH4N7BNri2ycHIuAyvXceo="; + sha256 = "sha256-PxiYxDHcA95MinNpEcXul2cYrV/VB6gThhYCZANqAGY="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index b7a7ab3c5d9..d4a02b6ab9e 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -65,8 +65,8 @@ rec { }; kops_1_22 = mkKops rec { - version = "1.22.2"; - sha256 = "sha256-9LT4/iwlPFiz+hUHE0y8DK8T9xwL9HkrrFUXrEqKbM8="; + version = "1.22.4"; + sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/kubemqctl/default.nix b/pkgs/applications/networking/cluster/kubemqctl/default.nix new file mode 100644 index 00000000000..a5ad1ea0a77 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubemqctl/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubemqctl"; + version = "3.5.1"; + src = fetchFromGitHub { + owner = "kubemq-io"; + repo = pname; + rev = "v${version}"; + sha256 = "0daqvd1y6b87xvnpdl2k0sa91zdmp48r0pgp6dvnb2l44ml8a4z0"; + }; + + ldflags = [ "-w" "-s" "-X main.version=${version}" ]; + + doCheck = false; # TODO tests are failing + + vendorSha256 = "1agn6i7cnsb5igvvbjzlaa5fgssr5h7h25y440q44bk16jxk6s74"; + + meta = { + homepage = "https://github.com/kubemq-io/kubemqctl"; + description = "Kubemqctl is a command line interface (CLI) for Kubemq Kubernetes Message Broker."; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ brianmcgee ]; + }; +} diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 8c8a6d92930..74b5578d023 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "22.1.4"; - sha256 = "00r58k26qnxjsqjdcqz04p21c1vvw5ls485gad0pcny370wrp65n"; - vendorSha256 = "sha256-5vYf9/BCSHJ0iydKhz+9yDg0rRXpLd+j8uD8kcKhByc="; + version = "22.2.4"; + sha256 = "1s53zlb7f0xp2vqa5fnsjdhjq203bsksrmdbrxkkm1yi3nc3p369"; + vendorSha256 = "sha256-cN19kKa4Ieweta95/4bKlAYn/Bq8j27H408za3OoJoI="; } diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 9a3a5f3a3d5..48ac2dc983e 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6v4oZmP/FBtHAdnxnbd/HFZln2LGOVGtMc1GyRV2aqs="; + sha256 = "sha256-fWev5KgJEuL2pDm17kxdqRKo7t3+dDt5UD5iTHneJSY="; }; - vendorSha256 = "sha256-joCJ4acSmClBJLZkW8DFeb0oha1Zowcpoaw6Elu+HrY="; + vendorSha256 = "sha256-7L5xA/2uQnu10QGZn49K3oJf4HBEvt8q/sOR6BRXlo0="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 047a472c398..1f08aad53e4 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -18,6 +18,8 @@ let nixops = super.nixops.overridePythonAttrs ( old: { + version = "${old.version}-pre-${lib.substring 0 7 super.nixops.src.rev or "dirty"}"; + postPatch = '' substituteInPlace nixops/args.py --subst-var version ''; diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index 5a121cbd3ec..27c496905e5 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -5,8 +5,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops.git"; - rev = "0c989d79c9052ebf52f12964131f4fc31ac20a18"; - sha256 = "07jz9grq3hjn1g9xybln5phbjhn2zsldcnan3lal6syzjggja6v1"; + rev = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3"; + sha256 = "199cw25cvjb8gxs56nc8ilq7v4560c6vgi1sh1vqrsqxayq1g4cs"; }; } ); @@ -15,8 +15,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops-aws.git"; - rev = "83900880a413218020ddd91d6cd3f5b823acb3fb"; - sha256 = "17gf4vfcl1vx81y9vk26zzcj6kac41kfhzwcx15cj91ivqrgn3b2"; + rev = "bc9de10b77aa74c9b245fd533f829e4307b984e8"; + sha256 = "12qsaxwlk67q04g13sqs4bxscpjspip5yphx6d8rq3iqki8yg4z9"; }; } ); @@ -74,9 +74,9 @@ self: super: { nixops-virtd = super.nixops-virtd.overridePythonAttrs ( _: { src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-libvirtd.git"; - rev = "1245280d97e0adc4643d02d1cf62ddd582c73e49"; - sha256 = "1z3zsx54585rcyabj6hrbwbd1c783rrlfj53np1sa3i7m93vmxzc"; + url = "https://github.com/lovesegfault/nixops-libvirtd.git"; + rev = "84d1688ee06afff136738b3eaf51f9cc3c08c350"; + sha256 = "1f3q9bwmdjr3qac7fh9b9hgw7l43hmiixbsmqm2zrnhb7xcyfmfg"; }; } ); diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index e0118fe7929..fa17d4286b3 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -8,14 +8,14 @@ python-versions = "*" [[package]] name = "apache-libcloud" -version = "3.4.1" +version = "3.5.0" description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" category = "main" optional = false -python-versions = ">=3.5, <4" +python-versions = ">=3.6, <4" [package.dependencies] -requests = ">=2.5.0" +requests = ">=2.26.0" [[package]] name = "babel" @@ -38,14 +38,14 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.20.20" +version = "1.21.18" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.23.20,<1.24.0" +botocore = ">=1.24.18,<1.25.0" jmespath = ">=0.7.1,<1.0.0" s3transfer = ">=0.5.0,<0.6.0" @@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.23.20" +version = "1.24.18" description = "Low-level, data-driven core of boto 3." category = "main" optional = false @@ -89,7 +89,7 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.0.9" +version = "2.0.12" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -181,7 +181,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "jsonpickle" -version = "2.0.0" +version = "2.1.0" description = "Python library for serializing any arbitrary object graph into JSON" category = "main" optional = false @@ -189,12 +189,12 @@ python-versions = ">=2.7" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["coverage (<5)", "pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "sklearn", "sqlalchemy", "enum34", "jsonlib"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "scikit-learn", "sqlalchemy", "enum34", "jsonlib"] "testing.libs" = ["demjson", "simplejson", "ujson", "yajl"] [[package]] name = "libvirt-python" -version = "7.10.0" +version = "8.1.0" description = "The libvirt virtualization API python binding" category = "main" optional = false @@ -202,11 +202,11 @@ python-versions = "*" [[package]] name = "markupsafe" -version = "2.0.1" +version = "2.1.0" description = "Safely add untrusted strings to HTML/XML markup." category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [[package]] name = "nixops" @@ -227,7 +227,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops.git" reference = "master" -resolved_reference = "0c989d79c9052ebf52f12964131f4fc31ac20a18" +resolved_reference = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3" [[package]] name = "nixops-aws" @@ -249,7 +249,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops-aws.git" reference = "master" -resolved_reference = "83900880a413218020ddd91d6cd3f5b823acb3fb" +resolved_reference = "bc9de10b77aa74c9b245fd533f829e4307b984e8" [[package]] name = "nixops-digitalocean" @@ -358,14 +358,14 @@ python-versions = "^3.7" develop = false [package.dependencies] -libvirt-python = "^7.0" +libvirt-python = "^8.0" nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} [package.source] type = "git" -url = "https://github.com/nix-community/nixops-libvirtd.git" -reference = "master" -resolved_reference = "1245280d97e0adc4643d02d1cf62ddd582c73e49" +url = "https://github.com/lovesegfault/nixops-libvirtd.git" +reference = "update-libvirt" +resolved_reference = "84d1688ee06afff136738b3eaf51f9cc3c08c350" [[package]] name = "nixopsvbox" @@ -443,7 +443,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pygments" -version = "2.10.0" +version = "2.11.2" description = "Pygments is a syntax highlighting package written in Python." category = "dev" optional = false @@ -451,7 +451,7 @@ python-versions = ">=3.5" [[package]] name = "pyparsing" -version = "3.0.6" +version = "3.0.7" description = "Python parsing module" category = "dev" optional = false @@ -493,7 +493,7 @@ python-versions = "*" [[package]] name = "requests" -version = "2.26.0" +version = "2.27.1" description = "Python HTTP for Humans." category = "main" optional = false @@ -511,7 +511,7 @@ use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "s3transfer" -version = "0.5.0" +version = "0.5.2" description = "An Amazon S3 Transfer Manager" category = "main" optional = false @@ -643,7 +643,7 @@ test = ["pytest"] [[package]] name = "typeguard" -version = "2.13.2" +version = "2.13.3" description = "Run-time type checker for Python" category = "main" optional = false @@ -663,7 +663,7 @@ python-versions = "*" [[package]] name = "urllib3" -version = "1.26.7" +version = "1.26.8" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false @@ -677,7 +677,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "e75c6429aa8989659a345f903e2e67d87514b5864751e33890d90aa2d20ef3e2" +content-hash = "63b68a38ca6f7b9189d2403c2c6d1ec7af29cc1ccdeab2fbc970b5dbd766c3c6" [metadata.files] alabaster = [ @@ -685,8 +685,8 @@ alabaster = [ {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"}, ] apache-libcloud = [ - {file = "apache-libcloud-3.4.1.tar.gz", hash = "sha256:88f18da0cf3fac0af723e743fb741d9d1be251881edab7a5a0d1629955b5011b"}, - {file = "apache_libcloud-3.4.1-py2.py3-none-any.whl", hash = "sha256:af1a5b3cda7bc3220093726ff67dbb70928521e2ec19d0e33a31b1e22fde1850"}, + {file = "apache-libcloud-3.5.0.tar.gz", hash = "sha256:073f10492976faa383a22b13b82c249827cfe90a083c71620e8316e815a6db3b"}, + {file = "apache_libcloud-3.5.0-py2.py3-none-any.whl", hash = "sha256:3789f4f2464fe18e317cdd3a03eff363268e096bc47f1f5770ee82d6ffe28c40"}, ] babel = [ {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"}, @@ -697,12 +697,12 @@ boto = [ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.20.20-py3-none-any.whl", hash = "sha256:6c173ffaf0604e34d6865edf7a9a71e1b3e79bd441b8b465ca4b2d44f840806d"}, - {file = "boto3-1.20.20.tar.gz", hash = "sha256:2c5377b6ab74eeccccd16f0f21537ede87b05c8322b0ccc852a68f36ea6c16c9"}, + {file = "boto3-1.21.18-py3-none-any.whl", hash = "sha256:d857feb6af9932e1ee3a748060a2cd9fd6043dbbccf66976eda54586597efdc0"}, + {file = "boto3-1.21.18.tar.gz", hash = "sha256:8d6f3c548f0ee03d742f404c96515e7579fc6968135aaa50dd855a046698ff79"}, ] botocore = [ - {file = "botocore-1.23.20-py3-none-any.whl", hash = "sha256:98275e47c941cada6507089ecfe91e420972209b1deeceaf55a89ea50d046347"}, - {file = "botocore-1.23.20.tar.gz", hash = "sha256:22e1c7b4b2b8b11d7001ca5ef2b41bda9a8be46fb3cb994a2948462666ac5ef1"}, + {file = "botocore-1.24.18-py3-none-any.whl", hash = "sha256:7ea8ef1ff7c4882ab59b337662f90ddf5ea860e95e7e209dca593a34ea585b1b"}, + {file = "botocore-1.24.18.tar.gz", hash = "sha256:d2da7ccbc5ddd61fe3cd45fcbd3de380d9e3a15bfa8fbfd2d9259a93dcc60c56"}, ] certifi = [ {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, @@ -761,8 +761,8 @@ cffi = [ {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.9.tar.gz", hash = "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"}, - {file = "charset_normalizer-2.0.9-py3-none-any.whl", hash = "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"}, + {file = "charset-normalizer-2.0.12.tar.gz", hash = "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"}, + {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -813,82 +813,53 @@ jmespath = [ {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, ] jsonpickle = [ - {file = "jsonpickle-2.0.0-py2.py3-none-any.whl", hash = "sha256:c1010994c1fbda87a48f8a56698605b598cb0fc6bb7e7927559fc1100e69aeac"}, - {file = "jsonpickle-2.0.0.tar.gz", hash = "sha256:0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"}, + {file = "jsonpickle-2.1.0-py2.py3-none-any.whl", hash = "sha256:1dee77ddc5d652dfdabc33d33cff9d7e131d428007007da4fd6f7071ae774b0f"}, + {file = "jsonpickle-2.1.0.tar.gz", hash = "sha256:84684cfc5338a534173c8dd69809e40f2865d0be1f8a2b7af8465e5b968dcfa9"}, ] libvirt-python = [ - {file = "libvirt-python-7.10.0.tar.gz", hash = "sha256:267774bbdf99d47515274542880499437dc94ae291771f5663c62020a62da975"}, + {file = "libvirt-python-8.1.0.tar.gz", hash = "sha256:a21ecfab6d29ac1bdd1bfd4aa3ef58447f9f70919aefecd03774613f65914e43"}, ] markupsafe = [ - {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"}, - {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3028252424c72b2602a323f70fbf50aa80a5d3aa616ea6add4ba21ae9cc9da4c"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:290b02bab3c9e216da57c1d11d2ba73a9f73a614bbdcc027d299a60cdfabb11a"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6e104c0c2b4cd765b4e83909cde7ec61a1e313f8a75775897db321450e928cce"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24c3be29abb6b34052fd26fc7a8e0a49b1ee9d282e3665e8ad09a0a68faee5b3"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:204730fd5fe2fe3b1e9ccadb2bd18ba8712b111dcabce185af0b3b5285a7c989"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d3b64c65328cb4cd252c94f83e66e3d7acf8891e60ebf588d7b493a55a1dbf26"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:96de1932237abe0a13ba68b63e94113678c379dca45afa040a17b6e1ad7ed076"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75bb36f134883fdbe13d8e63b8675f5f12b80bb6627f7714c7d6c5becf22719f"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-win32.whl", hash = "sha256:4056f752015dfa9828dce3140dbadd543b555afb3252507348c493def166d454"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:d4e702eea4a2903441f2735799d217f4ac1b55f7d8ad96ab7d4e25417cb0827c"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f0eddfcabd6936558ec020130f932d479930581171368fd728efcfb6ef0dd357"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5ddea4c352a488b5e1069069f2f501006b1a4362cb906bee9a193ef1245a7a61"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:09c86c9643cceb1d87ca08cdc30160d1b7ab49a8a21564868921959bd16441b8"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a0a0abef2ca47b33fb615b491ce31b055ef2430de52c5b3fb19a4042dbc5cadb"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:736895a020e31b428b3382a7887bfea96102c529530299f426bf2e636aacec9e"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:679cbb78914ab212c49c67ba2c7396dc599a8479de51b9a87b174700abd9ea49"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:84ad5e29bf8bab3ad70fd707d3c05524862bddc54dc040982b0dbcff36481de7"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-win32.whl", hash = "sha256:8da5924cb1f9064589767b0f3fc39d03e3d0fb5aa29e0cb21d43106519bd624a"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:454ffc1cbb75227d15667c09f164a0099159da0c1f3d2636aa648f12675491ad"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:142119fb14a1ef6d758912b25c4e803c3ff66920635c44078666fe7cc3f8f759"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b2a5a856019d2833c56a3dcac1b80fe795c95f401818ea963594b345929dffa7"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d1fb9b2eec3c9714dd936860850300b51dbaa37404209c8d4cb66547884b7ed"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:62c0285e91414f5c8f621a17b69fc0088394ccdaa961ef469e833dbff64bd5ea"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fc3150f85e2dbcf99e65238c842d1cfe69d3e7649b19864c1cc043213d9cd730"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f02cf7221d5cd915d7fa58ab64f7ee6dd0f6cddbb48683debf5d04ae9b1c2cc1"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d5653619b3eb5cbd35bfba3c12d575db2a74d15e0e1c08bf1db788069d410ce8"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:7d2f5d97fcbd004c03df8d8fe2b973fe2b14e7bfeb2cfa012eaa8759ce9a762f"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-win32.whl", hash = "sha256:3cace1837bc84e63b3fd2dfce37f08f8c18aeb81ef5cf6bb9b51f625cb4e6cd8"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:fabbe18087c3d33c5824cb145ffca52eccd053061df1d79d4b66dafa5ad2a5ea"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:023af8c54fe63530545f70dd2a2a7eed18d07a9a77b94e8bf1e2ff7f252db9a3"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d66624f04de4af8bbf1c7f21cc06649c1c69a7f84109179add573ce35e46d448"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c532d5ab79be0199fa2658e24a02fce8542df196e60665dd322409a03db6a52c"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e67ec74fada3841b8c5f4c4f197bea916025cb9aa3fe5abf7d52b655d042f956"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:30c653fde75a6e5eb814d2a0a89378f83d1d3f502ab710904ee585c38888816c"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:961eb86e5be7d0973789f30ebcf6caab60b844203f4396ece27310295a6082c7"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:598b65d74615c021423bd45c2bc5e9b59539c875a9bdb7e5f2a6b92dfcfc268d"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:599941da468f2cf22bf90a84f6e2a65524e87be2fce844f96f2dd9a6c9d1e635"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-win32.whl", hash = "sha256:e6f7f3f41faffaea6596da86ecc2389672fa949bd035251eab26dc6697451d05"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:b8811d48078d1cf2a6863dafb896e68406c5f513048451cd2ded0473133473c7"}, + {file = "MarkupSafe-2.1.0.tar.gz", hash = "sha256:80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f"}, ] nixops = [] nixops-aws = [] @@ -918,12 +889,12 @@ pycparser = [ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] pygments = [ - {file = "Pygments-2.10.0-py3-none-any.whl", hash = "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380"}, - {file = "Pygments-2.10.0.tar.gz", hash = "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"}, + {file = "Pygments-2.11.2-py3-none-any.whl", hash = "sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65"}, + {file = "Pygments-2.11.2.tar.gz", hash = "sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"}, ] pyparsing = [ - {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"}, - {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"}, + {file = "pyparsing-3.0.7-py3-none-any.whl", hash = "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484"}, + {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"}, ] python-dateutil = [ {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, @@ -938,12 +909,12 @@ pytz = [ {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, ] requests = [ - {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, - {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, + {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, + {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, ] s3transfer = [ - {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, - {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, + {file = "s3transfer-0.5.2-py3-none-any.whl", hash = "sha256:7a6f4c4d1fdb9a2b640244008e142cbc2cd3ae34b386584ef044dd0f27101971"}, + {file = "s3transfer-0.5.2.tar.gz", hash = "sha256:95c58c194ce657a5f4fb0b9e60a84968c808888aed628cd98ab8771fe1db98ed"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -982,8 +953,8 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] typeguard = [ - {file = "typeguard-2.13.2-py3-none-any.whl", hash = "sha256:4f7da3d80dda5e42d6973f11f33da3542b8bf86edc12ba926b2dbad62adf3fcf"}, - {file = "typeguard-2.13.2.tar.gz", hash = "sha256:7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"}, + {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"}, + {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"}, ] typing-extensions = [ {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, @@ -991,6 +962,6 @@ typing-extensions = [ {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ - {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"}, - {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"}, + {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"}, + {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"}, ] diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml index 89e6e34c771..acee33da249 100644 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -14,7 +14,10 @@ nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"} nixops-hetzner = {git = "https://github.com/NixOS/nixops-hetzner"} nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} -nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} +# FIXME: Once #30 lands this can be replaced +# https://github.com/nix-community/nixops-libvirtd/pull/30 +# nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} +nixops-virtd = { git = "https://github.com/lovesegfault/nixops-libvirtd.git", branch = "update-libvirt" } [tool.poetry.dev-dependencies] sphinx = "^3.1.2" diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 7c97b9eaedb..70c25579079 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.25.0"; + version = "0.25.1"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-woBmYDOOh3AQH0RZJtMCrOfjFBrpMPzv22cVZ2/xHZo="; - aarch64-linux = "sha256-3YUUdOZULjJZqVJP0aO/d1WulXlpwf012NYJ6Mc2qp8="; - x86_64-darwin = "sha256-9lbMyEid4I1fRLkLwGbmrB2OkycnGBPUU5wEdVZoTLo="; - aarch64-darwin = "sha256-Q0ZkQX9FpzEc6WC3mRoYfg9oW3fvLB1/Ksa64TDlSgo="; + x86_64-linux = "sha256-bYqycTB036J8trojySPNkC+jrw76F7+N4I4puGCyalU="; + aarch64-linux = "sha256-DlzSIZCAASPnflXQ8ndPU7/0jXA18U4bGGOfmgLXPr0="; + x86_64-darwin = "sha256-FaPyrPzO7AzC6LHQP5c58NjLTqU+ei8vFffT8x6mUhQ="; + aarch64-darwin = "sha256-31CYhAsHYIVAenp8hFHYj8LhFf3lSiOTw7gULBu3gio="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 3d34a65e292..8dcb08247e3 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "sha256-cXU+LnOCsGg+iwH5c7cKVi2Htw45AGxyjJFKXKbTkUo="; + sha256 = "sha256-js/UjnNYRW7s3b4TeprhmBe4cDLDYDrMeLtpASI9aN4="; }; - vendorSha256 = "sha256-CiVAzFN/ygIiyhZKYtJ197TZO3ppL/emWSj4hAlIanc="; + vendorSha256 = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 7876eb1c752..7770f98afe5 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,13 +1,26 @@ -{ lib, stdenv, fetchzip, makeWrapper, jdk8, python3Packages, extraPythonPackages ? [], coreutils, hadoop -, RSupport? true, R +{ lib +, stdenv +, fetchzip +, makeWrapper +, jdk8 +, python3Packages +, extraPythonPackages ? [ ] +, coreutils +, hadoop +, RSupport ? true +, R }: with lib; let - spark = { pname, version, src }: + spark = { pname, version, sha256 }: stdenv.mkDerivation rec { - inherit pname version src; + inherit pname version; + src = fetchzip { + url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; + sha256 = sha256; + }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk8 python3Packages.python ] ++ extraPythonPackages @@ -45,31 +58,29 @@ let ''; meta = { - description = "Apache Spark is a fast and general engine for large-scale data processing"; - homepage = "https://spark.apache.org/"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; + description = "Apache Spark is a fast and general engine for large-scale data processing"; + homepage = "https://spark.apache.org/"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; repositories.git = "git://git.apache.org/spark.git"; }; }; -in { - spark3 = spark rec { +in +{ + spark_3_2 = spark rec { + pname = "spark"; + version = "3.2.1"; + sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d"; + }; + spark_3_1 = spark rec { pname = "spark"; version = "3.1.2"; - - src = fetchzip { - url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; - sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf"; - }; + sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf"; }; - spark2 = spark rec { + spark_2_4 = spark rec { pname = "spark"; version = "2.4.8"; - - src = fetchzip { - url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; - sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv"; - }; + sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv"; }; } diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 8613abd9947..374d9c972c7 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: let # look for GO_LDFLAGS getting set in the Makefile - version = "0.14.2"; - sha256 = "sha256-sQtry94T5cDO+836D/p/8ptQi3WYKDBLr1QZyEXdLQI="; - vendorSha256 = "sha256-cd2iNMxWmkSWqqkPLYocUG+fCUXoeUXEuGQxjUWQnXk="; - pkgsVersion = "0.9.0-4-gc875fbe"; - extrasVersion = "0.7.0-2-gb4c9d21"; + version = "0.14.3"; + sha256 = "sha256-toEbWUZxnJkUe9jkZRdJrcPXu+CIh62fUKyX38OkXxU="; + vendorSha256 = "sha256-Pj1918TIOGfhkRiFEKkURL4xMFgWroiNsNU6yWzT8yk="; + pkgsVersion = "v0.9.0-6-gbfcc795"; + extrasVersion = "v0.7.0-2-gb4c9d21"; in buildGoModule rec { pname = "talosctl"; @@ -29,8 +29,8 @@ buildGoModule rec { "-X ${versionPkg}.Name=Talos" "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do "-X ${versionPkg}.Tag=${src.rev}" - "-X ${versionPkg}.PkgsVersion=v${pkgsVersion}" # PKGS - "-X ${versionPkg}.ExtrasVersion=v${extrasVersion}" # EXTRAS + "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS + "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS "-X ${imagesPkgs}.Username=talos-systems" # USERNAME "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 9f3c046a266..65a37168783 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-AmJN7hnYuhxYNG/qs7yv3phhffYKVaM8f7irhi9wRfA="; + sha256 = "sha256-rzKEjLjX2bPqgNGJYdyTuu15+9bq9WnsrJtsBzL/oOo="; }; vendorSha256 = null; @@ -52,10 +52,12 @@ buildGoModule rec { meta = with lib; { homepage = "https://tekton.dev"; changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}"; - description = "Provides a CLI for interacting with Tekton"; + description = "Provides a CLI for interacting with Tekton - tkn"; longDescription = '' - The Tekton Pipelines cli project provides a CLI for interacting with Tekton! - For your convenience, it is recommended that you install the Tekton CLI, tkn, together with the core component of Tekton, Tekton Pipelines. + The Tekton Pipelines cli project provides a CLI for interacting with + Tekton! For your convenience, it is recommended that you install the + Tekton CLI, tkn, together with the core component of Tekton, Tekton + Pipelines. ''; license = licenses.asl20; maintainers = with maintainers; [ jk mstrangfeld vdemeester ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5a81fd1b6b0..8ff0628a661 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -3,10 +3,10 @@ "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "repo": "terraform-provider-aci", - "rev": "v2.0.0", - "sha256": "1v62lfm9w8d8iq70nwjrry52zxh5ixmxfp0dlmxvck7qjzcng8rg", + "rev": "v2.0.1", + "sha256": "165k2sf4hq84zidlh0y5jmzwnid5gz7slhnb9rgp2771pzqm0gki", "vendorSha256": null, - "version": "2.0.0" + "version": "2.0.1" }, "acme": { "owner": "vancluever", @@ -30,20 +30,20 @@ "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v1.10.1", - "sha256": "0gbvq5hlibqxch4igicsyfqfbvm9pdz4901ywaabnd80jmsfhv4c", - "vendorSha256": "0rzxfybxdsl99mzr5r5amammpsjv66fiakialfws696mz915zz4k", - "version": "1.10.1" + "rev": "v1.11.0", + "sha256": "1ccliv8p36rh7f7zacjsa2x846d36nygbgs0vyjb0bpf5pl7grgd", + "vendorSha256": "19n841mby0l7ipjmmqsl5vnfmsj6y8fci1vzi8z6dqy3xcjlhwgb", + "version": "1.11.0" }, "alicloud": { "deleteVendor": true, "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.158.0", - "sha256": "0q5c9sdpjycrh61khc840l14h5r16kj9vf0nlsqffi9wi8k1i2zr", - "vendorSha256": "05vkn52s0x6kcyxxs0p7w6z1nclmvvla7rjv1ippzw7fgn2s19m0", - "version": "1.158.0" + "rev": "v1.160.0", + "sha256": "sha256-ijSOvBS8bcFKX0qa2Cl/xqDdwduamVdCWzgTCWao1Sg=", + "vendorSha256": "sha256-oKaghX3u8H9vDFvmo+jelTIbvuHnAt27Z9N0oEWxcxc=", + "version": "1.160.0" }, "ansible": { "owner": "nbering", @@ -85,37 +85,37 @@ "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.21.0-6.6.ga", - "sha256": "0svims34vw8xplza77flp675r90rsh9gj8cb5c02knnh4lgf7ffv", + "rev": "v2.21.1-6.6.ga", + "sha256": "16ym9zyvvz7kb44rm97wqa7h431jkh70q3gf68mmxihvxpjvfcdh", "vendorSha256": null, - "version": "2.21.0-6.6.ga" + "version": "2.21.1-6.6.ga" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.2.0", - "sha256": "1ijspv7bf6qi4s3k58vbaz4gbk6y60h7jrml2wjn6mas6pchiy0f", - "vendorSha256": "09p029a5qqhf28afhcs5pk2px18x2q6kc16xzjzmzpisvnfl4hfb", - "version": "4.2.0" + "rev": "v4.5.0", + "sha256": "sha256-L1LRuinU3YrqywRGpmUqGQgjZ1JuYhECjCN6ysYPzco=", + "vendorSha256": "sha256-3akEup/M7Zc5MPf2XA+324PxQiHegIwzR05JNSjYanw=", + "version": "4.5.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.18.0", - "sha256": "06l4w9g4p48gnb9c9mmnydvpyr89f8rijpf103ndsg6ack6k4mg2", + "rev": "v2.19.1", + "sha256": "sha256-n5jDlcy5rwCcrqoL3ut+HThDLQ8hPj2mZ15d7hhALFw=", "vendorSha256": null, - "version": "2.18.0" + "version": "2.19.1" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.98.0", - "sha256": "0cfdw70q1kh6f50gsc94mh1xi7s4z47wfsmskp1ahx7av7wpz1p6", + "rev": "v2.99.0", + "sha256": "sha256-HXLr22UVciRvW1iaa46sy37ivG41hKqhrQtCXpnl8ss=", "vendorSha256": null, - "version": "2.98.0" + "version": "2.99.0" }, "azurestack": { "owner": "hashicorp", @@ -139,19 +139,19 @@ "owner": "F5Networks", "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", - "rev": "v1.12.2", - "sha256": "08qs8psr4wy5f9qiv7chkmmsls19dwj2p2k6fqxdrd6pj2154rcg", + "rev": "v1.13.0", + "sha256": "0l1fgbzv3zjsgmnkg96ac299plx9zi4j54cjxrl27csvf87wi4lv", "vendorSha256": null, - "version": "1.12.2" + "version": "1.13.0" }, "bitbucket": { "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.4.1", - "sha256": "07y0biab2g6plkyp8scqf7b12alijnxq2zqqr05lbm6wgrc22kvk", - "vendorSha256": null, - "version": "2.4.1" + "rev": "v2.8.0", + "sha256": "sha256-W+mAud3DpBViLeFwXLWIwZ1+TOco8FWZnVrIbHUwgIU=", + "vendorSha256": "sha256-hSMVLDZXC9QMpcgREjEUjhxArtotrIrIyfdNIZw8uM4=", + "version": "2.8.0" }, "brightbox": { "owner": "brightbox", @@ -166,10 +166,10 @@ "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", - "rev": "v1.4.1", - "sha256": "15biy4gm8lwmqm1s5rjr0d77vy4mgyjwaa3wydrna1655w3rgkr6", - "vendorSha256": "0pjxrdpsn99g6hjp0flrk7czjb05ibnsjcggrvvpwzrbj55rqzgd", - "version": "1.4.1" + "rev": "v1.4.3", + "sha256": "sha256-5VF1cAFgdm2TR4wvuNlycpgQuVdHesFYnTv34MeauxY=", + "vendorSha256": "sha256-7X2cS5Erf373zu8xqe2KBSz52ZmZOnAlNC8lq2/LXV4=", + "version": "1.4.3" }, "checkpoint": { "deleteVendor": true, @@ -194,10 +194,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.9.1", - "sha256": "02kyjf2mizvxv1a2fkw2wsk0gmilj83sj3qv1d7g0wxxkxx00nd2", - "vendorSha256": "167jafxr4g43y9gvqjq5z7vd9cyf15d69wbrdvqsfzj8sszqfq5l", - "version": "3.9.1" + "rev": "v3.10.1", + "sha256": "sha256-2Ulavo82Y8dEOXtgpbgCwuCTOhAEoOFbgL4bK5HXQlY=", + "vendorSha256": "sha256-CgK1/Ddau3glxmzb7Y6o1RZbMV8dwA84F6n2OzuyZrU=", + "version": "3.10.1" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -230,10 +230,10 @@ "owner": "Constellix", "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", - "rev": "v0.4.0", - "sha256": "1z23nri0xk6y1xvrz89hda4ssnbgx6dfzq0fc4nywl6naf2nybyw", + "rev": "v0.4.1", + "sha256": "15myw5ff22wi4cykwc2plghmfwl6d6m9pfskjqiwq8hffv35h50v", "vendorSha256": null, - "version": "0.4.0" + "version": "0.4.1" }, "consul": { "owner": "hashicorp", @@ -257,10 +257,10 @@ "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.8.1", - "sha256": "0mvl80dsqzab1r3p5n446737dadzfbsyfbdy2w2xvmz4fgx6aklh", - "vendorSha256": "0p8czqb4hn5z9bfgsfajdpx46hwil0ax75j8xljlh1ccvpp2rvyz", - "version": "3.8.1" + "rev": "v3.9.0", + "sha256": "sha256-CncMqWIa1JiHkIkNAgIQl4fcKZVKZGD4BZSjuv5cw18=", + "vendorSha256": "sha256-U1gVP4o1mj21NW9z8jyV5KhuJNJRYAV1Qvg1fV1zGO4=", + "version": "3.9.0" }, "dhall": { "owner": "awakesecurity", @@ -275,10 +275,10 @@ "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.17.1", - "sha256": "0dfw4sjmsfzrs28gf5k4vqjs6phwa6w3pwi7fpbngnw6l2r4m6h9", + "rev": "v2.18.0", + "sha256": "sha256-MuJpBLOB8AeAlNhQC+rwT6mkZriU4+XgAqQY33xjFck=", "vendorSha256": null, - "version": "2.17.1" + "version": "2.18.0" }, "dme": { "owner": "DNSMadeEasy", @@ -329,19 +329,19 @@ "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.0-beta.4", - "sha256": "0ypw916sziy8dhvbv96f7d4as08ps18xxx8h6ip69mk74vf029sm", - "vendorSha256": "1w92k895ikrqm9n1hf36wlh9nq278vifl3r14v0rxa8g9awizfdr", - "version": "2.0.0-beta.4" + "rev": "v2.0.0", + "sha256": "sha256-wl8pRAB97JObpZvi2rdyDZP5itKcOnm6Gsbku1+5oqQ=", + "vendorSha256": "sha256-OCXTZg0JkaxJDEgoF2Qs4BcMSiYkQpLmehWdCpEmTzk=", + "version": "2.0.0" }, "exoscale": { "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.31.2", - "sha256": "1fncpy8vc72g6h560mnkwm160wah8iik4bn12mjgbz3nvjlsm04x", + "rev": "v0.33.0", + "sha256": "sha256-mih0Bo6fcNgpyeCQ+GWSPyTrPlGzmBXkEO43TOVWMds=", "vendorSha256": null, - "version": "0.31.2" + "version": "0.33.0" }, "external": { "owner": "hashicorp", @@ -356,19 +356,19 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v1.1.0", - "sha256": "02ymg29fmx23hgsifb8dr28yxl3h2d93cn4k6x8cx763nyfd5aqf", + "rev": "v1.1.2", + "sha256": "sha256-CxyVW9uE9mK+ZF8fyjAsrFKY82xAyGn9k1jOFqTaAhA=", "vendorSha256": null, - "version": "1.1.0" + "version": "1.1.2" }, "flexibleengine": { "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.27.0", - "sha256": "0xc0a1gzdld039b4vlivf9b8g3pjja6pfzyqhjx0iy01akm1a9cc", + "rev": "v1.27.1", + "sha256": "0glfs1hq9v3jdga8vvjrybld4g6qmyhy4kayapccbmdnbx9rpg76", "vendorSha256": null, - "version": "1.27.0" + "version": "1.27.1" }, "fortios": { "owner": "fortinetdev", @@ -392,39 +392,39 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.20.0", - "sha256": "0cibbzj3nj5dgi2mcr93bdxwvb7r2qscwshjbssbc7avwvhh3171", + "rev": "v4.21.0", + "sha256": "sha256-ayL22zlfZkGL/ycyQX384g7CjFHDgK8k010kg1fI4h4=", "vendorSha256": null, - "version": "4.20.0" + "version": "4.21.0" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.10.0", - "sha256": "1grmsjnr3af95qiwygmxnyij90bn89kd781s556yiq40qa776nql", - "vendorSha256": "04dqjcxx2z43p8c0z8hwr3xw7g4sggxgclqpk83rapprvbmh33dj", - "version": "3.10.0" + "rev": "v3.12.0", + "sha256": "sha256-6CrM2Pt4yB0ZaXvcgUPreIhJrUhXCNt/xt+fExzGJqc=", + "vendorSha256": "sha256-78/7+t75xFjLt1JfoVpHVPlM7q5BX+NI/I9ugfjdv+g=", + "version": "3.12.0" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.11.0", - "sha256": "1n3d4qxy2x69ryphqwyih7iz6slx5z1plyyzdcd7pxlaw8x8hpgm", - "vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7", - "version": "4.11.0" + "rev": "v4.13.0", + "sha256": "sha256-QSHlnvsWmkdUE7dd6HqzYtyYC+XDW69dIp/h7u1jD9g=", + "vendorSha256": "sha256-1tiFBc03RyIAtnu/NqhU3RowM8JhuLNS+blfyjXBcW0=", + "version": "4.13.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.11.0", - "sha256": "0ylfx8ks5azicnckkx3lrawf1gpsq95qsng550p51gr1wna1aqmy", - "vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7", - "version": "4.11.0" + "rev": "v4.13.0", + "sha256": "sha256-jjYUijzUgIiSC9eL6rbgtuBSh6bbHLjeifN+GIndrVs=", + "vendorSha256": "sha256-1tiFBc03RyIAtnu/NqhU3RowM8JhuLNS+blfyjXBcW0=", + "version": "4.13.0" }, "grafana": { "owner": "grafana", @@ -484,10 +484,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.33.0", - "sha256": "07m2kzx4m9gn9j5czlfdsq0a1ki8vfwlywrfgz2jxvz2cqnn4gsx", + "rev": "v1.34.1", + "sha256": "14dxnphzg53qc9jxp5gr4vv0gj9j9i36zdyxh9ffcpcv4y3v9lkj", "vendorSha256": null, - "version": "1.33.0" + "version": "1.34.1" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -511,10 +511,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.39.0-beta0", - "sha256": "1ms6jr2f112qxslv2lapvngkmg2mlf0jfjnpx6rxqzclq0xcjqn1", - "vendorSha256": "0g6bm2pvdvj24yw26d2w8d7nr9izzqwrwzdz4y9dbr426xycrgy5", - "version": "1.39.0-beta0" + "rev": "v1.39.2", + "sha256": "sha256-9r0tt0N3m/IYq/9oepQ4DcB78ds8pb1up1TyjFYzX1U=", + "vendorSha256": "sha256-8qgm1zDdwKNE/bs1n5cpY/DUD3SKtFmnvEgwtKorASk=", + "version": "1.39.2" }, "icinga2": { "owner": "Icinga", @@ -565,10 +565,10 @@ "owner": "kingsoftcloud", "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", - "rev": "v1.3.41", - "sha256": "0p8fl7dkp2nfw73ij769svm83cpvi1rw3aykf0qx33n9si78m892", - "vendorSha256": "1pm4kld23mvgs14z54fpfdvnj0alm8frkkmf0851hi58nazc54dq", - "version": "1.3.41" + "rev": "v1.3.42", + "sha256": "sha256-wj4o2XSz8ylZJdseIi/TadlhOwFWZ6nfDOUezbeGYw4=", + "vendorSha256": "sha256-nbAEaRFtFtB4ftLgnCv3MmkjFFbcNkCuxZc+G8/ObPE=", + "version": "1.3.42" }, "kubectl": { "owner": "gavinbunney", @@ -610,10 +610,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.25.2", - "sha256": "18w9x80zary64873d1r824g28l5dhkda1qq0lr895afwh8g11dfp", - "vendorSha256": "0c882yafydhdhnp5awb8llzbmiljfdbamqlx740347ywpliy0ga2", - "version": "1.25.2" + "rev": "v1.26.1", + "sha256": "sha256-bd0raIIh/VmTlSVYnNd98fpppRKnO46g8FI5OwZPjMg=", + "vendorSha256": "sha256-SCTWvTgJ0QYh2DEbTI9coa3Fp4fBHusytF+JFzAq2XA=", + "version": "1.26.1" }, "linuxbox": { "owner": "numtide", @@ -628,10 +628,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/local", "repo": "terraform-provider-local", - "rev": "v2.1.0", - "sha256": "0lv1mvy4pkx0sc49xny4j0h30m64lvr3rnmqk85i5p0xhyn77gf2", - "vendorSha256": null, - "version": "2.1.0" + "rev": "v2.2.2", + "sha256": "sha256-JpTdRi9EagrnhYnlq6sl6+t4SE6i7T7YrGTsYCDync8=", + "vendorSha256": "sha256-Ha/MGbXwwhbVxaHbkU2xBhyNcDxLivk7vYQjfVzWOcY=", + "version": "2.2.2" }, "logicmonitor": { "deleteVendor": true, @@ -719,10 +719,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.37.0", - "sha256": "1gx2sxm39ap84anaiffdacqqrgagymgxywxc0rnc7zkwvziazhw9", - "vendorSha256": "130ddc9qs6i8l2ka76n9rxwsz71h0wywbnjd3p2xbkkpqsg66lbz", - "version": "2.37.0" + "rev": "v2.39.2", + "sha256": "sha256-NfszsBliZAjY52kPWB7yhOEYZB2V4yOp6IDffF7EG6k=", + "vendorSha256": "sha256-DD6zXX7anks5jRw9tn8lUvgJY4k81oGSQr0a/xofkGk=", + "version": "2.39.2" }, "nomad": { "owner": "hashicorp", @@ -771,22 +771,22 @@ "version": "1.3.0" }, "oci": { - "owner": "terraform-providers", + "owner": "oracle", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v4.65.0", - "sha256": "19np5x4swc5k8zjg4rjhx85x7xr4jzyvbcpsgfqaqgdg99hjcmjq", + "rev": "v4.67.0", + "sha256": "sha256-kgnyGLF6UbWRbrjXDkh7y11jx4JO3hFo7/qdJzwX0rU=", "vendorSha256": null, - "version": "4.65.0" + "version": "4.67.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.21.0", - "sha256": "1j1nvg0qj8xaqnbwlrnhpy73032zc1ik78c0q1iq7xa2gs833qya", - "vendorSha256": "0l0di6cmm41z7i4d498xxc8wcrbg6r9w4vcdksqhz92s1gqs3f4z", - "version": "3.21.0" + "rev": "v3.22.1", + "sha256": "sha256-G1KJJSxJmzFlIUWOs+7htcgp61oWCu+ryCKaIHzxhzw=", + "vendorSha256": "sha256-n7ih8QtapA+xno1twlM2b2XGEesdJdJIPD+QWpmJDVA=", + "version": "3.22.1" }, "oktaasa": { "owner": "oktadeveloper", @@ -811,10 +811,10 @@ "owner": "OpenNebula", "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", - "rev": "v0.4.1", - "sha256": "13z14p8zkrmffai5pdiwi33xsznan015nl9b9cfyxi1is4m5i41m", - "vendorSha256": "0qyzavig8wnnjzm63pny5azywqyrnjm978yg5y0sr6zw8wghjd15", - "version": "0.4.1" + "rev": "v0.4.2", + "sha256": "sha256-h2trcyXJcdWQyonjdDLkJkcawE4AoFYnzLZtKPotMY0=", + "vendorSha256": "sha256-JTQJH0f8m6yBL8+jk6q02WPuvyre3mHql9Zy9OJW32M=", + "version": "0.4.2" }, "openstack": { "owner": "terraform-provider-openstack", @@ -829,10 +829,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.27.6", - "sha256": "1vq2h4ldvskw874fdnjqh1np5z09dh3q3lrqjmfand8ksrzacjjm", - "vendorSha256": "0bkya9ckh82bacaksqbb6010fwclz9wh1b5k1s9z9d0d6bgvf60m", - "version": "1.27.6" + "rev": "v1.27.7", + "sha256": "sha256-8y++zfxRam4sZvGWajyGiPv/5G8K7D4+ReNU7DBlqe8=", + "vendorSha256": "sha256-OqN+QGclKYo4jjQi0HJ/80zVTPkcOQyl4n6i2BpDZQE=", + "version": "1.27.7" }, "opsgenie": { "owner": "opsgenie", @@ -991,10 +991,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.8.1", - "sha256": "094a3avlvaacw8g45ll17x1wrch47m5bvj548rvmz77pdbhpzvr5", - "vendorSha256": "12c1lhyrl3bwnkvp4qw9wxawy54x3k86vh1dnnvf5n8916pvwcw0", - "version": "6.8.1" + "rev": "v6.10.0", + "sha256": "sha256-ZfNxab95ZDz68fEPfYd+w0E/fS/FPBVIs4kHTBhG858=", + "vendorSha256": "sha256-bX01PcLLpgWFMWxWPaUW8iEHxllqCmIX1/OIicB/h0M=", + "version": "6.10.0" }, "skytap": { "owner": "skytap", @@ -1005,6 +1005,15 @@ "vendorSha256": null, "version": "0.14.5" }, + "snowflake": { + "owner": "chanzuckerberg", + "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake", + "repo": "terraform-provider-snowflake", + "rev": "v0.25.36", + "sha256": "sha256-AeIQfdn68EnSj2BXZIsC0+L3EJ6tRHLD0NYHdPcf89w=", + "vendorSha256": "sha256-oYjoTZ79ricoFZTokiFcCKNXAeqFvW4RIMQmTp763gE=", + "version": "0.25.36" + }, "sops": { "owner": "carlpett", "provider-source-address": "registry.terraform.io/carlpett/sops", @@ -1018,10 +1027,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.68.0", - "sha256": "0llyy4rskspw4cy8jdbk175rli9s53mabj4b9yarm7apg17ai399", - "vendorSha256": "0j0airkc1p0y9w1w40fbwxmymf8rbal2ycrkp31x1c06f8s4lhzm", - "version": "1.68.0" + "rev": "v1.69.0", + "sha256": "sha256-pTQvqjh52B9w383yLvhNjDujSgQI1k8WpA1vpcY7RKI=", + "vendorSha256": "sha256-X7K0eHbmGBYnJ5ovnD/y6O9r7TTHgK7f7s9w4R5ThBU=", + "version": "1.69.0" }, "stackpath": { "owner": "stackpath", @@ -1036,10 +1045,10 @@ "owner": "StatusCakeDev", "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", - "rev": "v1.0.1", - "sha256": "16pwsna1bkrdppxn2vjgbx552vsg4f2igykcb26mw3vp6n9piwfl", - "vendorSha256": null, - "version": "1.0.1" + "rev": "v2.0.0-pre", + "sha256": "sha256-S9VJRGREoRJPIb9gv822Y/8ZRa0x7WoPjU7BxLlRpOM=", + "vendorSha256": "sha256-wKrbjxRCDk8GFAR0OFz4w9UnkIXH9EO/S+p2RKNLJaM=", + "version": "2.0.0-pre" }, "sumologic": { "owner": "SumoLogic", @@ -1063,10 +1072,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.61.13", - "sha256": "1g1y9x9xfhyjksn7wb60vddli9fwga5r7snvrsa7sh8fkwvpfs0s", + "rev": "v1.65.0", + "sha256": "sha256-NpKZ4KbEDxCYmG2E4F/bHEUmK6invkcIaNkXDZjhmDI=", "vendorSha256": null, - "version": "1.61.13" + "version": "1.65.0" }, "tfe": { "owner": "hashicorp", @@ -1191,10 +1200,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", - "rev": "v2.0.2", - "sha256": "0ncl2vs6gcx9wm710hg575hqinkg45ds73n209xwdbpxlbv8qb7m", + "rev": "v2.1.1", + "sha256": "sha256-Xu5BMmOHEX+ctPu8374BDGsRC5hnvzji5oI69ptIi3Y=", "vendorSha256": null, - "version": "2.0.2" + "version": "2.1.1" }, "vultr": { "owner": "vultr", @@ -1209,18 +1218,18 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", - "rev": "v3.0.0", - "sha256": "1awi74b7ny021krck0vp1gv6v93a4h0rgdl5xib82lf5pxnx4wgn", - "vendorSha256": "0gbwj4cqywip22irkx9hyghy6zx9dirm6gd3i70nclchvkg9dm1x", - "version": "3.0.0" + "rev": "v3.0.1", + "sha256": "sha256-6SQjYaN0yhcHdmM+vGvIDPHKxN34ns3Yz+CMTEo13s0=", + "vendorSha256": "sha256-PdSW3tyQUWbBiaM9U3NsqX/j4fMw9ZmjEDdyjxmRfD0=", + "version": "3.0.1" }, "yandex": { "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.71.0", - "sha256": "1ccfmn6j96jy6hhqijjas31ylsmhs1gj8367v3b94mgam7p1pxcd", - "vendorSha256": "16cdg3j00dkmddxgb94as49470a67nv8linfm6s9vrx3xvjk04xw", - "version": "0.71.0" + "rev": "v0.72.0", + "sha256": "0sjwyaqb7rgmwpskw95gmb5k0bfj06f9s8kn76rk1hc8rdqrl251", + "vendorSha256": "1bh7sc210n3rzq5065qzch8pfq3ppcg6fhy7yha23xaa5j8yabqx", + "version": "0.72.0" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index 57e1ab32f08..d7a05cf24a6 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -5,7 +5,7 @@ # Update all providers which have specified provider source address set -euo pipefail -providers=$( +readarray -t providers < <( jq -r 'to_entries | map_values(.value + { alias: .key }) | .[] @@ -13,10 +13,13 @@ providers=$( | .alias' providers.json ) -echo "Will update providers:" -echo "${providers}" +cat <<EOF +Will update ${#providers[@]} providers: -for provider in ${providers}; do - echo "Updating ${provider}" +${providers[*]} + +EOF + +for provider in "${providers[@]}"; do ./update-provider "$@" "${provider}" done diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 255e82aee1d..4310fcdcc27 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix nix-prefetch +#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl git jq moreutils nix nix-prefetch # shellcheck shell=bash # vim: ft=sh # @@ -75,45 +75,46 @@ if [[ -z ${provider} ]]; then exit 1 fi -provider_name=$(basename "${provider}") - # Usage: read_attr <key> read_attr() { - jq -r ".\"${provider_name}\".\"$1\"" providers.json + jq -r ".\"${provider}\".\"$1\"" providers.json } # Usage: update_attr <key> <value> update_attr() { if [[ $2 == "null" ]]; then - jq -S ".\"${provider_name}\".\"$1\" = null" providers.json | sponge providers.json + jq -S ".\"${provider}\".\"$1\" = null" providers.json | sponge providers.json else - jq -S ".\"${provider_name}\".\"$1\" = \"$2\"" providers.json | sponge providers.json + jq -S ".\"${provider}\".\"$1\" = \"$2\"" providers.json | sponge providers.json fi } -prefetch_github() { - # of a given owner, repo and rev, fetch the tarball and return the output of - # `nix-prefetch-url` - local owner=$1 - local repo=$2 - local rev=$3 - nix-prefetch-url --unpack "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz" +repo_root=$(git rev-parse --show-toplevel) + +generate_hash() { + nix-prefetch -I nixpkgs="${repo_root}" \ + "{ sha256 }: (import ${repo_root} {}).terraform-providers.${provider}.$1.overrideAttrs (_: { $2 = sha256; })" } -old_source_address="$(read_attr provider-source-address)" -old_vendor_sha256=$(read_attr vendorSha256) -old_version=$(read_attr version) +echo_provider() { + echo "== terraform-providers.${provider}: $* ==" +} if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then + echo_provider "init" source_address=registry.terraform.io/${provider} + provider=$(basename "${provider}") + update_attr "provider-source-address" "${source_address}" + update_attr version "0" + # create empty stings so nix-prefetch works + update_attr sha256 "" + update_attr vendorSha256 "" else - source_address=${old_source_address} -fi -if [[ ${source_address} == "null" ]]; then - echo "Could not find the source address for provider: ${provider}" - exit 1 + source_address="$(read_attr provider-source-address)" fi -update_attr "provider-source-address" "${source_address}" + +old_vendor_sha256=$(read_attr vendorSha256) +old_version=$(read_attr version) # The provider source address (used inside Terraform `required_providers` block) is # used to compute the registry API endpoint @@ -125,8 +126,10 @@ registry_response=$(curl -s https://"${source_address/\///v1/providers/}") version="$(jq -r '.version' <<<"${registry_response}")" if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && ${old_vendor_sha256} != "${vendorSha256}" ]]; then - echo "${provider_name} is already at version ${version}" + echo_provider "already at version ${version}" exit +else + echo_provider "updating from ${old_version} to ${version}" fi update_attr version "${version}" @@ -138,28 +141,23 @@ repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)" update_attr repo "${repo}" rev="$(jq -r '.tag' <<<"${registry_response}")" update_attr rev "${rev}" -sha256=$(prefetch_github "${org}" "${repo}" "${rev}") +echo_provider "calculating sha256" +sha256=$(generate_hash src outputHash) update_attr sha256 "${sha256}" if [[ -z ${vendorSha256} ]]; then if [[ ${old_vendor_sha256} == null ]]; then vendorSha256=null - elif [[ -n ${old_vendor_sha256} ]]; then - echo "=== Calculating vendorSha256 ===" - vendorSha256=$(nix-prefetch -I nixpkgs=../../../../.. "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") - # Deal with nix unstable - if [[ ${vendorSha256} == sha256-* ]]; then - vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "${vendorSha256}") - fi + else + echo_provider "calculating vendorSha256" + vendorSha256=$(generate_hash go-modules vendorSha256) fi fi -if [[ -n ${vendorSha256} ]]; then - update_attr vendorSha256 "${vendorSha256}" -fi +update_attr vendorSha256 "${vendorSha256}" # Check that the provider builds if [[ ${build} == 1 ]]; then - echo "=== Building terraform-providers.${provider_name} ===" - nix-build --no-out-link ../../../../.. -A "terraform-providers.${provider_name}" + echo_provider "building" + nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider}" fi diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 3954a143e5b..897acd76237 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -191,9 +191,9 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.6"; - sha256 = "sha256-Y1ARRCzqYBUQqpqwVrH0PPOZ9IWnw51yfyGFD/6P/ro="; - vendorSha256 = "sha256-RhGiY/APd12v0Hoqw381Wlk4oDx7aZt5zZvqkR99rd0="; + version = "1.1.7"; + sha256 = "sha256-E8qY17MSdA7fQW4wGSDiPzbndBP5SZwelAJAWzka/io="; + vendorSha256 = "sha256-lyy/hcr00ix6qZoxzSfCbXvDC8dRB2ZjrONywpqbVZ8="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index f8473481cc0..3e872c27142 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.13.1201"; + version = "0.13.1218"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "sha256-gJa8oVdgerDi0GdTSNus5rHLsFuzg8ZqVeKTMuPXu0o="; + sha256 = "sha256-RJdbNXO+6TqFLapWiZ1UeXGS5522ykQvhhNDEHPr8xE="; }; - vendorSha256 = "sha256-z3UDrwlMHFFH56U3oylSWE3wqWOCA4RI2smafHHwYkQ="; + vendorSha256 = "sha256-Xqgki072Iy+snRriPVJ9oaDNJ/LiKL+AuU+eVw0zlDU="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix index 560e593ba19..5f669a6b9d8 100644 --- a/pkgs/applications/networking/cluster/tgswitch/default.nix +++ b/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -1,13 +1,13 @@ { buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { pname = "tgswitch"; - version = "0.5.382"; + version = "0.5.389"; src = fetchFromGitHub { owner = "warrensbox"; repo = "tgswitch"; rev = version; - sha256 = "sha256-DbPf1o1XlXLpuYSrNMRwHRqi/urQhSfzPW5BPIvZC/Y="; + sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0="; }; goPackagePath = "github.com/warrensbox/tgswitch"; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 47392ea83a5..5193d1de5df 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/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.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dvY5kiLJ3psoQxG12E4qOjgF9GdXpjRKU3HlbPvwWBU="; + sha256 = "sha256-L5pXq4vfus8gpQMO+j2+WXMPkk3sv3WeeeYrBFd+w7s="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index b41e443ba32..7f1476d7fbf 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+rLDRVfB6wZ1wYoLE2wwRxzS6GmI6KYtOKdXZd+LnnU="; + sha256 = "sha256-kY12bsZyDb36KE2dWx6RVYlKTbJh+XFQcBpFXoCLgEM="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index e238e181ded..0b8650f3f7d 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.71"; + version = "1.2.74"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-bDaxxeHeswuoEU7YACa3tU80DFnmuFvEPfAq+pANSWY="; + sha256 = "sha256-Mfgvl6ljmYn9Vu/tWS0JAuH1pzQZ4zoD5+5ejUJF/Lg="; }; - vendorSha256 = "sha256-75uCGxW6Gqfhk5oImz26fUR8BeGHkikXHGJcCH32MxQ="; + vendorSha256 = "sha256-MsIbuwsb0sKEh3Z7ArtG/8SWFPaXLu+TGNruhsHhtb4="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/applications/networking/cozy-drive/default.nix index 57a791d9db4..9c0fda32ace 100644 --- a/pkgs/applications/networking/cozy-drive/default.nix +++ b/pkgs/applications/networking/cozy-drive/default.nix @@ -5,12 +5,12 @@ let pname = "cozydrive"; - version = "3.30.1"; + version = "3.32.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage"; - sha256 = "06w305l5iadd4k70jvrvw2scwlfxycign2nz0f2vrwwhqy8bpfqs"; + sha256 = "0qd5abswqbzqkk1krn9la5d8wkwfydkqrnbak3xmzbdxnkg4gc9a"; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 8b6a5e2cc25..c6ada11d356 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4az63Ff4aUAFMZoQeHshS9TxA/BIyHFZ/svFgAsU6WU="; + sha256 = "sha256-znBvV6z5rMfLeyEBRmAtfwVw1is5jJlGPQplXqEGAAM="; }; - vendorSha256 = "sha256-KbM2bKYnllxTw4B9W5E8iLZKvN/DJqBmWkXXLhEtsSQ="; + vendorSha256 = "sha256-S2og/isDy6Jvo9XgIV6XbgrmRJsLnePwh/gll/14Ds0="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index 9b173e85682..633c1e744bb 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -11,6 +11,7 @@ , wrapGAppsHook , glib +, glib-networking , gtk3 , libhandy , listparser ? callPackage ./listparser.nix { } @@ -44,6 +45,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib + glib-networking gtk3 libhandy webkitgtk diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 6c3a9b76935..f4a2306017a 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,15 +1,18 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.2.18"; + version = "3.3.3"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg="; + hash = "sha256-a76x4Klad3lct2M9RxSroUYKmEX7lPqDN+dFvfjavo8="; }; postPatch = '' @@ -18,7 +21,7 @@ python3Packages.buildPythonApplication rec { ln -sf requirements.in requirements.txt # remove dependency constraints - sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt + sed 's/[>=]=.*//' -i requirements.txt # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110 diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 764ba6a0d79..ebed984c4d5 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.37.0"; + version = "8.40.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-hU4tqDu95ej8ChiWJq3ZPhEwxBcmTQkA/n///pPVa5U="; + sha256 = "sha256-meiIDIG7OXxF2aclHA/8FN8aSz5KWJliDbm2p/flD4k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 4c8f356cdf4..1ca42b15417 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/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 = "1.6.1"; + version = "1.8.1"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-RJpLK16bedpqo/JJf3atpiuL5spHJNowomcusjZtEWA="; + sha256 = "13jd7hihkw3nlcj0m157z6qix61v6zjs52h5zmw2agm47qmv0w6z"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 4f19fd924e7..d3416ef5880 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,8 +3,8 @@ let inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { stable = "0.0.17"; - ptb = "0.0.27"; - canary = "0.0.133"; + ptb = "0.0.29"; + canary = "0.0.134"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -26,12 +26,12 @@ let ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "0yphs65wpyr0ap6y24b0nbhq7sm02dg5c1yiym1fxjbynm1mdvqb"; + sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0wx8wkgkzvw9094baa3dni834l0n4p6ih024bj1851sgwwnidb0a"; + sha256 = "sha256-HyJa6lGcKMPKWffO/pnNcn8fDTJj6O4J8Y5RA23a1kM="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index ac0869e5cdc..6d3353c2515 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.4", + "version": "1.10.6", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -61,7 +61,7 @@ "app-builder-lib": "^22.14.10", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "^15.3.5", + "electron": "^17", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 27dbb16f088..d1fb0fe1c62 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.4", - "desktopSrcHash": "cuMo0wRMC6+un3BQK0+Ecnjvs6HugNk71yElNJarlyc=", - "desktopYarnHash": "0llnqwgiqggfcgjyaar2h2r1pyw8m14icfb1pcdphqxrah9gpsar", - "webHash": "0vf8npddbx4dmq9c1ghak97jn28b18ssblbrq5smdhlzsnxlpm3l" + "version": "1.10.6", + "desktopSrcHash": "TJGYavawLDLbP9Sg7HxIcOkr7hcTfAwk4fyOOEv4KhI=", + "desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0", + "webHash": "1wax4h5gfcq4giyq1igsix748cngky487kwvf69zb1gz95hjds9r" } diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 99aef1526d5..565c44f72e9 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -25,7 +25,7 @@ flutter.mkFlutterApp rec { icon = "fluffychat"; desktopName = "Fluffychat"; genericName = "Chat with your friends (matrix client)"; - categories = "Chat;Network;InstantMessaging;"; + categories = [ "Chat" "Network" "InstantMessaging" ]; }; buildInputs = [ @@ -49,7 +49,7 @@ flutter.mkFlutterApp rec { # replace olm dummy path postConfigure = '' - M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*) + M=$(echo $depsFolder/.pub-cache/hosted/pub.dartlang.org/matrix-*) ln -sf ${olm}/lib/libolm.so.3 $M/ffi/olm/libolm.so ''; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index f35db8e3a11..bfe11b27218 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -65,6 +65,7 @@ mkDerivation rec { setuptools watchgod dbus-python + matrix-nio ]; qmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index bee1f7cf289..080ceda94b4 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , cmake +, asciidoc , cmark , lmdb , lmdbxx @@ -32,19 +33,20 @@ mkDerivation rec { pname = "nheko"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-KnWZ1DSTg8vtNSlpG5LGUG8YDHt25s9pMLpLuj0WLnM="; + sha256 = "sha256-roC1OIq0Vmj5rABNtH4IOMHX9aSlOMFC7ZHueuj/PmE="; }; nativeBuildInputs = [ lmdbxx cmake pkg-config + asciidoc ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index b264608f510..3f6d374c399 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -28,13 +28,13 @@ mkDerivation rec { pname = "qtox"; - version = "1.17.4"; + version = "1.17.6"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; rev = "v${version}"; - sha256 = "sha256-j1aAry4wjb4RResdu8PQzyVazvVxnxvZMoC59sO0frw="; + sha256 = "sha256-naKWoodSMw0AEtACvkASFmw9t0H0d2pcqOW79NNTYF0="; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index b5c558e7702..ac17f759088 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.7.7"; + version = "3.7.8"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb"; - sha256 = "sha256-WTsiNZ5XANdRQyJX4n8VL66JzyF8QyRWu2ctsV4TxuY="; + sha256 = "sha256-61HSJIFir+ikwui7KtPm2BDstIRWY/WruGX3WSfY5ZI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index c8f5f30daaf..d227dc4b0fb 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,7 +1,9 @@ { - "version": "1.10.3-sc.0.test.1", - "rev": "3a8eecb023c832acc4390d3a51c0940eafb2b3bd", - "srcHash": "07amc69ghfz39jbps14ysfql4m42dmzbdjq9hqvzirhqz52mshf3", - "webYarnHash": "0knkl8sanqcx0lxjclz6s8vm5wpn8aywx9vydz7lda3l6c2g5zqf", + "version": "1.10.4-sc.1", + "rev": "v1.10.4-sc.1", + "srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl", + "webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw", + "jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di", + "reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f", "desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn" } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index c3860c9f05c..f9e00c06470 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -25,10 +25,18 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - offlineCache = fetchYarnDeps { + webOfflineCache = fetchYarnDeps { yarnLock = src + "/element-web/yarn.lock"; sha256 = pinData.webYarnHash; }; + jsSdkOfflineCache = fetchYarnDeps { + yarnLock = src + "/matrix-js-sdk/yarn.lock"; + sha256 = pinData.jsSdkYarnHash; + }; + reactSdkOfflineCache = fetchYarnDeps { + yarnLock = src + "/matrix-react-sdk/yarn.lock"; + sha256 = pinData.reactSdkYarnHash; + }; nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; @@ -37,14 +45,30 @@ in stdenv.mkDerivation rec { export HOME=$PWD/tmp mkdir -p $HOME + pushd element-web - yarn config --offline set yarn-offline-mirror $offlineCache fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $webOfflineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules rm -rf node_modules/matrix-react-sdk - patchShebangs node_modules/ ../matrix-react-sdk/scripts/ ln -s $PWD/../matrix-react-sdk node_modules/ - ln -s $PWD/node_modules ../matrix-react-sdk/ + rm -rf node_modules/matrix-js-sdk + ln -s $PWD/../matrix-js-sdk node_modules/ + popd + + pushd matrix-js-sdk + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $jsSdkOfflineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules + popd + + pushd matrix-react-sdk + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $reactSdkOfflineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules scripts popd runHook postConfigure @@ -54,7 +78,7 @@ in stdenv.mkDerivation rec { runHook preBuild pushd matrix-react-sdk - node_modules/.bin/reskindex -h ../element-web/src/header + ../element-web/node_modules/.bin/reskindex -h ../element-web/src/header popd pushd element-web diff --git a/pkgs/applications/networking/instant-messengers/schildichat/update.sh b/pkgs/applications/networking/instant-messengers/schildichat/update.sh index 7abc0f3322b..6ddc99902c3 100755 --- a/pkgs/applications/networking/instant-messengers/schildichat/update.sh +++ b/pkgs/applications/networking/instant-messengers/schildichat/update.sh @@ -27,6 +27,8 @@ src_hash=$(echo $src_data | jq -r .sha256) web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock) desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock) +js_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-js-sdk/yarn.lock) +react_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-react-sdk/yarn.lock) cat > pin.json << EOF { @@ -34,6 +36,8 @@ cat > pin.json << EOF "rev": "$rev", "srcHash": "$src_hash", "webYarnHash": "$web_yarn_hash", + "jsSdkYarnHash": "$js_sdk_yarn_hash", + "reactSdkYarnHash": "$react_sdk_yarn_hash", "desktopYarnHash": "$desktop_yarn_hash" } EOF diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 8af5185386c..99ee871c917 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -4,7 +4,7 @@ , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa # Runtime dependencies: -, systemd, libnotify, libdbusmenu, libpulseaudio +, systemd, libnotify, libdbusmenu, libpulseaudio, xdg-utils # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.31.1"; # Please backport all updates to the stable channel. + version = "5.35.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-6w6znIIN5TFXTLLhazWyBXiqS5882zMNRZxYxnZjRHA="; + sha256 = "sha256-2KF2OLq6/vHElgloxn+kgQisJC+HAkpOBfsKfEPW35c="; }; nativeBuildInputs = [ @@ -84,6 +84,7 @@ in stdenv.mkDerivation rec { (lib.getLib systemd) libnotify libdbusmenu + xdg-utils ]; unpackPhase = "dpkg-deb -x $src ."; @@ -123,6 +124,7 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" ${customLanguageWrapperArgs} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) # Fix the desktop link @@ -145,7 +147,7 @@ in stdenv.mkDerivation rec { homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ ixmatus primeos equirosa ]; + maintainers = with lib.maintainers; [ mic92 equirosa ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 931e9f93d08..a1b897dce22 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220218"; + version = "20220314"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-6fwkhqXM6T0WCC1Y+GCmyLwStqhBTUAzDDsBTd5XlSE="; + sha256 = "sha256-E3gH4Ym2tmH9qmbfKWybgO6qUW2rpJQyhBh6LPpfFHE="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 4fc3d56bacc..b23f4f107ae 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.80.0.143"; + version = "8.81.0.268"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-SLypP+ZRHMWeB3KuvmmYb0Y1T3ipSpWNiYYQIzMCDDY="; + sha256 = "sha256-MqXLK+AdYkQVTeTjul9Dru78597FuThRUVq7/y9FYUU="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index ca6cc55d65a..80d04eabc82 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config -, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin +, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages_10, writeShellScriptBin }: let @@ -13,7 +13,7 @@ let [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg - qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi + qtwebsockets libpulseaudio quazip llvmPackages_10.libcxx llvmPackages_10.libcxxabi # llvmPackages_11 and higher crash https://github.com/NixOS/nixpkgs/issues/161395 ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 265e72c3867..c23e416d2c6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -70,7 +70,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "3.5.2"; + version = "3.6.0"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -79,7 +79,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "05324xvb00yz2jfigyy7izk8wnq8phm3sidw62kf7xqyh63qnrzh"; + sha256 = "0zcjm08nfdlxrsv0fi6dqg3lk52bcvsxnsf6jm5fv6gf5v9ia3hq"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index a3c61a6f337..200e0e887e3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2022-02-09"; + version = "unstable-2022-02-25"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "4cba1acdd718b700bb33945c0258283689d4eac7"; - sha256 = "0j201x9k38mvcyhf1wlyghyvdpv1l75xwgj9rl2l7r55afrpw4ca"; + rev = "a264028ec71d9096e0aa629113c49c25db89d260"; + sha256 = "10p3x8z3ps8s1ivi9y8px2gsg4pvsvz6g9wbgh5w8hilikxqq7r5"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 51b119aa6de..5fb0f14f36a 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -4,20 +4,20 @@ let pname = "vk-messenger"; - version = "5.2.3"; + version = "5.3.2"; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; - sha256 = "09zi2rzsank6lhw1z9yar1rp634y6qskvr2i0rvqg2fij7cy6w19"; + sha256 = "L0nE0zW4LP8udcE8uPy+cH9lLuQsUSq7cF13Gv7w2rI="; }; x86_64-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; - sha256 = "1m6saanpv1k5wc5s58jpf0wsgjsj7haabx8nycm1fjyhky1chirb"; + sha256 = "spDw9cfDSlIuCwOqREsqXC19tx62TiAz9fjIS9lYjSQ="; }; x86_64-darwin = fetchurl { - url = "https://web.archive.org/web/20210310071550/https://desktop.userapi.com/mac/master/vk.dmg"; - sha256 = "0j5qsr0fyl55d0x46xm4h2ykwr4y9z1dsllhqx5lnc15nc051s9b"; + url = "https://web.archive.org/web/20220302083827/https://desktop.userapi.com/mac/master/vk.dmg"; + sha256 = "hxK8I9sF6njfCxSs1KBCHfnG81JGKUgHKAeFLtuCNe0="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index a3398087455..4aa9dbc9b10 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.9.3.1911"; + version = "5.9.6.2225"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "0pamn028k96z0j9xzv56szk7sy0czd9myqm4p3hps1gkczc9wzs4"; + sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53"; }; }; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index d66efa86a7f..de4bb988d76 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,18 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "ipfs-cluster"; - version = "0.14.4"; + version = "0.14.5"; - vendorSha256 = "sha256-4j6aPs17YNXyPIRr5NshAPYIfNM08GlYV13jnGtJzQc="; + vendorSha256 = "sha256-ykUjq7Svp3+kUNnFkwsBlC+C4nws6Yvu3bk2Wb4c8vY="; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-82t3sHMKZiV6sYnW72N94qfRZ/aMkavj+hiAyg5viHQ="; + sha256 = "sha256-Xb7QbBmCJKgokxvdbtWxtnNIS/iUsYFLlRzgfoABAq8="; }; + # Remove patch when updating to >0.14.5 + patches = [ + (fetchpatch { + name = "remove-distribution-test.patch"; + url = "https://github.com/ipfs/ipfs-cluster/pull/1589/commits/49825d1df76f848806f1d76abce5e279221cc8c5.patch"; + sha256 = "sha256-mM2rc4ai/qhbvxnoRw5jO7BTRlD2/Tp037EuqqS49DE="; + }) + ]; + meta = with lib; { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; homepage = "https://cluster.ipfs.io/"; diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix index 08823cab573..71bd96d3b70 100644 --- a/pkgs/applications/networking/irc/kirc/default.nix +++ b/pkgs/applications/networking/irc/kirc/default.nix @@ -5,18 +5,18 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "0.2.9"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mcpcpc"; repo = pname; rev = version; - hash = "sha256-KRCVjz59SHjk86VgfGxYKk/Ti3o77dV7fdRu9mB3FSo="; + hash = "sha256-bLBrkbW/Iv1v9z5NOiMAA/dH5/9FlqusRV5rSqjdlPw="; }; dontConfigure = true; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { homepage = "http://kirc.io/"; diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index e102b1077a3..4d7f5b0ca36 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -3,9 +3,11 @@ , rustPlatform , fetchFromGitHub , pkg-config -, dbus -, openssl , Foundation +, dbusSupport ? stdenv.isLinux, dbus +# rustls will be used for TLS if useOpenSSL=false +, useOpenSSL ? stdenv.isLinux, openssl +, notificationSupport ? stdenv.isLinux }: rustPlatform.buildRustPackage rec { @@ -22,9 +24,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1"; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; - buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation; + buildInputs = lib.optionals dbusSupport [ dbus ] + ++ lib.optionals useOpenSSL [ openssl ] + ++ lib.optional stdenv.isDarwin Foundation; - buildFeatures = lib.optional stdenv.isLinux "desktop-notifications"; + buildFeatures = lib.optional notificationSupport "desktop-notifications"; meta = with lib; { description = "A console IRC client"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 80f15eeff3c..541ad8c68f2 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -28,21 +28,21 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "sha256-GnSi7uMxiyWSQau75q07NlX1ikaBeWOdrzOf9f0jnBM="; + sha256 = "sha256-TJ4JI97WiobkBxgnkUGh/XQAIlDV+PDgIxCzTqefiMw="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ "-DENABLE_MAN=ON" - "-DENABLE_DOC=ON" + "-DENABLE_DOC=OFF" # TODO: Documentation fails to build, was deactivated to push through security update "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 "-DENABLE_PHP=OFF" ] diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index 1adb61b8934..0d57e252e30 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.11"; + version = "2.9.26"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-KcvlnEfDzwhFzwaWLYuRGa8nh6MkjqZ+u+qJSJZl13U="; + sha256 = "sha256-phzjjW9KG0Z5WAzxtYdI7i2Nw4FHVNeEJswQreHga4M="; }; - vendorSha256 = "sha256-0KGeMJDv1BdqM1/uMk+mKpK+Nejz9PiCAfRy96pu3OQ="; + vendorSha256 = "sha256-Jzd6I3a/2Un2a3/T2vzFuHwe9Y3eGEvfpZWSwjWokM0="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index 4e70facb5f1..27779c96983 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.5.5"; + version = "0.5.9"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BZTecYNY8gbGe+r80QWi7FkC56dww9rrtwLfi9ya1mQ="; + sha256 = "sha256-g+ySsHnJ4FpmJLEjlutuiJmMkKI3Jb+HkWi1WBIo1aw="; }; - cargoSha256 = "sha256-2xkKJqp7uf0gh8g2zzDjSl8foTvPj6MVHfDuSr914HU="; + cargoSha256 = "sha256-NkkONl57zSilElVAOXUBxWnims4+EIVkkTdExbeBAaQ="; nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; @@ -34,6 +34,10 @@ rustPlatform.buildRustPackage rec { openssl ]; + # flag added because without end-to-end testing is ran which requires + # additional tooling and servers to test + cargoTestFlags = [ "--lib" ]; + postInstall = lib.optionalString enableCompletions '' # Install shell function installShellCompletion --cmd himalaya \ @@ -43,10 +47,10 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "CLI email client written in Rust"; + description = "Command-line interface for email management"; homepage = "https://github.com/soywod/himalaya"; changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ yanganto ]; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ toastal yanganto ]; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index eb708962e01..492abf1f37c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.6.1"; + version = "91.7.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/af/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/af/thunderbird-91.7.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b0d36d12bb29897b4502fe28fd5d05117b8cf3c6f2a8f9a0a88542b915587cda"; + sha256 = "bcc9a123b3de4d442836820d3eff52a37ff513b063850493e58c2132ad0ec029"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ar/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ar/thunderbird-91.7.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "26c86b4a73085d1b2b08e73a9adb1a2e8148fce1c8b27f3b1f9566fb72269361"; + sha256 = "4800a0be829e654d6917271b4944a5be3a8688e75eed58a4a5bae3643d2bce4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ast/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ast/thunderbird-91.7.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f0ffeb6273b2c748cdeb2b6e73e17848c6c1b583ee0dfae1ec7eda8b295bef09"; + sha256 = "779bf2732f89a82f36449d75d14ec4f8cbceb79c7f2d590f0407f4261fd9a5f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/be/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/be/thunderbird-91.7.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b55b54e87b28329d717023397d42d162299bf89dc47b6db5910b57263b377645"; + sha256 = "e1f033cf11d1d18828771ca81e90e6851a1b96971f0d3d81665ca6aebb6c737c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/bg/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/bg/thunderbird-91.7.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "93d99a4eebf65152ffede2b86f94f0bb4a626c0a0b0925514e529785b717ec21"; + sha256 = "293917397d1d52415bab86a1d27e9442b5bafb989e65cb3cbee0ba601970bc2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/br/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/br/thunderbird-91.7.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "944395c06dbc26d14add54d6e9e990496179ee0e956d585d84246e90d3a5a058"; + sha256 = "317883e2764505713e4507fffeaf1528f685fc774b99dc5b802164cdd1473292"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ca/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ca/thunderbird-91.7.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "426f1f2b8c3849e60e1e88e74f33c1bc51f8de3007fbbf9d58c0c477e7c4d0f2"; + sha256 = "cdfcbddc1697b46a85b67382d7b4a9d64d1ffc31d5faeb8e0edd21f4868a6008"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cak/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cak/thunderbird-91.7.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "04baa09f4f28e62057cb4a62981f916c820a82be5c7418367be67a5f1f180dff"; + sha256 = "8c1d1dff29b7631d5aad6384d02269b5c058bd1c37d85de0c92fd74e2a08e37c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cs/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cs/thunderbird-91.7.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d724b84ac07ec0dd8f81b790f4baf58c2d81f9d1e8aa121fe379aa968fd7c78a"; + sha256 = "3d1818c6d067552a7f7c62fc9dfae7370c309c9604f20ba1f1f4723020f04c7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cy/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cy/thunderbird-91.7.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "bde7231dda570182a0c4e73645025aad818be321bea0c0425dddb275b28d438c"; + sha256 = "d339d87800e4060120468314544b34b4dfc355a5369363d6df826a6f10682afc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/da/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/da/thunderbird-91.7.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b671d892a013f551ce32c3ee98d956227561a9ad9f168095521f8be1899bd1fe"; + sha256 = "e00bb159fa9d113272866986eb8f9c3e6c3f29748cc7240cc736c00ed3eb1927"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/de/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/de/thunderbird-91.7.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "cca775ff187ab71db985c031ff08d906fcfba2aa2aa25ad204f1223c94ee1fd8"; + sha256 = "af8365195927f75f6aac52fd91904193172f5e3b7bc09a7e52a94840ede1a6aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/dsb/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/dsb/thunderbird-91.7.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "19bd301bb47874abaece776961e85b277ae02cfe772c11f62b731d19c3d87b39"; + sha256 = "96bdb60659052126bca84a64a1f2fdd26654875d74feacd4b9d50cf66b90c3d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/el/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/el/thunderbird-91.7.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "40f279167634c0903f60297a76ce483a34233110c34d50d01fdd976f65337e41"; + sha256 = "af0101f1d999947cb02b3cf7c92eadab0f360b64f64788a3ea2ecbb6e8628c9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-CA/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-CA/thunderbird-91.7.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "41ac7d58a099e68cf87f604d77e8fa844e48264b52409b9f8637fc777d15bdad"; + sha256 = "3537bfe2ffe474e587df4549a243ace7fb02236e8a424fac9c9e23ea74978969"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-GB/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-GB/thunderbird-91.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e20e547b074816931fce3cffe04eb7b9690439f047b2154d2f0d36b7eda9071e"; + sha256 = "ff0daecd9a50d9bb060750d822bd0da409ac838f9280faf71ed6f146f1bd928d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-US/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-US/thunderbird-91.7.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "08e963292b4e63be2dad7a24eb125bca484107b05856dcebf98ceddaf47f1e87"; + sha256 = "f4da2a0627b042e61b8f25eb57396ab71d862c728abd9cc82e9eb102b27d26f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-AR/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-AR/thunderbird-91.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "23775b4446630146d6e6c34760cbb9c155a21bfa759d6b18135fe28e80459c7f"; + sha256 = "a052ed75f7b3aaa2fea27b7eaa658a0d75e03c5d8e51214e9207e79c8c656489"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-ES/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-ES/thunderbird-91.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0ba964ad2cc0d86b12e8498ccfd374931d0e26fb163994704aae622a420bffe8"; + sha256 = "312b2eb38ec895a77a10cbd41cf861f03520d9ce7ff6cc0b2fd9e282c1a85743"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/et/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/et/thunderbird-91.7.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "94a73f46e5e2e9672a0c54a4a445c5a24a60924e45d57218a0c5a3eda7437091"; + sha256 = "257137eab9877c8c6663cfa9200707f5ff5ff30076c72952f43db9eeb3fc334b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/eu/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/eu/thunderbird-91.7.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3fed5e7cc72572e7a71f2916ac1750b40c0896d7786bfb76a49679d15ac07031"; + sha256 = "69e426d23b3d29aa625d3fcc18080befe5ea717279a4d17a798c987819ce9f0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fi/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fi/thunderbird-91.7.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b7e233e744afd3569748013d091f57fbb8339e1cefd328d1808cccd0abd9f7c7"; + sha256 = "2acb1d75cf32c65ca281ee353a79973bda5b96cfb1b8c6d55f91f5051ad9b720"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fr/thunderbird-91.7.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "1066814d16f3de8e0a6b0aad4ecbc078bc4e76a5daad8173d7a0af1986fc49ba"; + sha256 = "979a4ab6ae26ed9fe2320bc0baf828588ee96899d9aa04781aa5e3f7e1e4e35a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fy-NL/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fy-NL/thunderbird-91.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "eeb7f557ac32ab426c5843061c1fa394671328794f9b0d5313351768ea020fa1"; + sha256 = "2cad6ddf73676bedc04d18afec2fce7f8085fe10400b514d5091113dbd1ccd39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ga-IE/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ga-IE/thunderbird-91.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8c1adead3a4c715cd2e6ebd7d23a086a6bb5308cb8620e35aeef151c3a25ad40"; + sha256 = "6a8b5f6f413bf2d9122b90865131f1b2e3d1f528a2c0c54b0c3118b16948ef6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gd/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gd/thunderbird-91.7.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "23db6bd6aded7d7424c2c0b5a5c9da938b504b517297b535d0eee907c20ff921"; + sha256 = "e739fdbcd525b1ec9a6415a1fc2b4f982895bc07e503324f8ee7cb9c44e30bf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gl/thunderbird-91.7.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "10483ac92240dd7f1a4cc25dfae74291ef3546ff36b51205bcb3fa2af2e97489"; + sha256 = "b8b87d0c8d200264e7aab95fc2f1a59b3ffd1b0a6143409cb947df6acce2711b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/he/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/he/thunderbird-91.7.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "211c4f58cd5553da8933386c4b1a7847f61df83212228f3ec4ef807a2115f220"; + sha256 = "3d8048e55eb538414b436387419d0ed2b4589a6846d55c49665af2741082bd03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hr/thunderbird-91.7.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3b71a6ab9df2a45c15342f241cb63f323170f692d204e9a98f9772f6e50809f4"; + sha256 = "e3eb72e83138d593046db8c72a09538b3b83abdef9b1534b9cf757751f172f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hsb/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hsb/thunderbird-91.7.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "0603f34c825bee5e813fb63c5f1060e5de31ab89d12abe4259f5f2c56f880e65"; + sha256 = "e110bd72de8a035ba2de4f849b09e60d11db161b09dda2bd4ba01ee7e42c0075"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hu/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hu/thunderbird-91.7.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "64db18fb3477198f696cbf8d100b45abb2cf74abc960c90143abad224fe56e48"; + sha256 = "2fc4d4e970257aff81352132dd73fc365cc7df822b70aef9716082cb455bbc6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hy-AM/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hy-AM/thunderbird-91.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ec3064d387558c56e80965fc87a73c19ae530802ffff3f0cd35e7026f76655e3"; + sha256 = "ff5d16b7712f6975e68305f4d50e3c97846238021a4ffeb87526a5db0eb76db3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/id/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/id/thunderbird-91.7.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a7635897857f1c4bc86b9208ecbfa983a80a889a24274ce2c41d1fd401163230"; + sha256 = "5063b921fbe8ea8273441868f1cda6e0e32a8fe00b2b866dd4f91c9f12f15011"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/is/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/is/thunderbird-91.7.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "310cae89c6a62b5a9cf19a81622395b1d9d2de1670dfb9542d8465fd2bebe3a6"; + sha256 = "55d42de9dea45c13ad4288144b544d61b789d94d85976525b18c6dd32a75d210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/it/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/it/thunderbird-91.7.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "826223383cfd0ed931f0df19100ec24e22c5ed6eabb71ebee2663a4199368fd5"; + sha256 = "7a6774106b689e6f829f8f74b03d23a85d79b9f8304d9a60d3fd172188e1bc26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ja/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ja/thunderbird-91.7.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a62b2d76c228d54a00dcb81931a010369ab5cb5f7e5d5601fa74076431ec39c9"; + sha256 = "b557c29aa992758dd4f92d3dab71cdac764b82b66359b75f2695de4fa052f918"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ka/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ka/thunderbird-91.7.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2e7b571096baa8d4d68eec97f25197b7504ef0e196bb711344180f4324b260e9"; + sha256 = "681430faee4d1e6512ca4a68142b6c3314f26e2944c7de04016404c60bae735e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kab/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kab/thunderbird-91.7.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "378de38b2393987fcbd22057c64c581365ddff6239d8055ac631df9903df4ed4"; + sha256 = "5b45b128a48395300ed63e033ea09562b368276c7e6a9ea7801db74b8db13e97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kk/thunderbird-91.7.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "51e8c5d832f8deb27d962ef175cd2bf6ea66fd8c0a24b7c647d4d98d524c3bef"; + sha256 = "a44dfb8259cd9e8c694e8c842cf5b691f2bfe5d9c5176dcc65bcfa9a316e78d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ko/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ko/thunderbird-91.7.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a63cf39f84cab3c6a6164a6c62ace5aab948ab71d8934f5869cd2290851c17ac"; + sha256 = "e04ab8d19264afe6207875ea08b878993041ca84b613c4184d608a4f8bbedcba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lt/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lt/thunderbird-91.7.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "1d44efdae4a299d57c1ab4769fccc5326e85b95cb2078332aadde3a3d0d72c7a"; + sha256 = "4cc3797ed91e6edfe994821bca011f20a64a7d1f6bc13634c1a31c877b161b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lv/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lv/thunderbird-91.7.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "cc8e4b043ae003d43240df52eed2b3b3a16cc09e963c6bc768d672e6dcb59022"; + sha256 = "011867f9ee77187f02b6ce0040ab9c2d4babd6d2bbbb4c174094cc5f35eca65d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ms/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ms/thunderbird-91.7.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "8b64d50a219467347cbe02e237fc1f5473a9d86d8b29fa0cfaa5c423c7265db3"; + sha256 = "8f9bd1f1d5052a8259f1096b38fef693f5a74e81b8a2bb69477fc1cfa7461796"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nb-NO/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nb-NO/thunderbird-91.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "71256fe14843fc5c3026dc17d39d9f10b0dcb5ebe0d1769740397db45164e8fe"; + sha256 = "7bc57e4bc1373b5b484eb98f9775b85bbe9c6564e246af157b51314f74a20c67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nl/thunderbird-91.7.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6cc1efd14f8fdfde047ac8245fcbd42cc6829d4973fadad43e5113d95c2334af"; + sha256 = "bff24b619fa4282cc6341828528798d0d256213b43f1bcb4b36070e370bd2ba6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nn-NO/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nn-NO/thunderbird-91.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "efcf3519eed57080c022d8ea3e45bb50cb302d6eead93b2e50d3e6d69635b1db"; + sha256 = "4286c9c093aacb233874bb1439e8b7880d7f3e81dc1bdeb24dd0096075d34b7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pa-IN/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pa-IN/thunderbird-91.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "69e27e7a1e7534b6903f3e6a1248b8d62617dbeda0051453f78ebe68bd0e978c"; + sha256 = "6ae5d50b4296201996b6ddf9ab2614534ec5fa3ed903c8e9d36c3254af820862"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pl/thunderbird-91.7.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "8903c2302e4ec1a77076cf51a770861738793d4f5ec87faa87da922f1be2d620"; + sha256 = "ac2fb293885f0a37d0ec6903cb72ca0d2126e18540a8e542ebf89e15748ed9e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-BR/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-BR/thunderbird-91.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "558adf768654a03738f755b765a2c6c3aad514ffbe532b4e47c0d94cd9dfd262"; + sha256 = "7d31e4ea4f14cf1b3c2c2c7dc9af2d0c2e97d397a6748cb53f8fc0ded21c3d5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-PT/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-PT/thunderbird-91.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2fb3c682ee289e2bdf1263b5c32f38e31090d742b108b373befb3f093d655e30"; + sha256 = "7eedd322ea310df8b308a075c995cb530892be67348b66bac82096cc3d7da035"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/rm/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/rm/thunderbird-91.7.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "9e489ce3861ee17a2ee145ed5edb1c0b2c0c3f1446f6fb64081ac623f381ef1d"; + sha256 = "606b4d58bc6afd7fe67be985d3eac5ad2c734c0037bd5e6380e9b0993579d762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ro/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ro/thunderbird-91.7.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4bf6b617ea7d4a2ebe81a73c09e24cd1e1bb360ca501a4f139c99a84d1492005"; + sha256 = "a189258f7986e540edec1c0cb35f84f58924a079cce2da2332ad80a323c63241"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ru/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ru/thunderbird-91.7.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "fd88dd41fd4c93d829c6e44d2d88092652827ed08121c6ba25cd410082cf4991"; + sha256 = "2677c5d98c13ad6cdf3698b644b38ea9c94e94e46eec9ef307036d5bd3d32c9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sk/thunderbird-91.7.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "53b6fa462a3057e9eec72f75d698631486514839bdf30f6388f9749848846462"; + sha256 = "f3d630189c20ff6d4246f4f67173f60ff89bc4643267e6fd27cc37a25437b6d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sl/thunderbird-91.7.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "cebe056640e0589c8f4ff029aa74f1666b1a0faeb742f356b74e07b2b0998e39"; + sha256 = "d2020220b3c54b9bbc114ff367c10818541bd070f5e0e0d4c56fdbb027bd8d85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sq/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sq/thunderbird-91.7.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9f1bf49edf710455bcf23cd6c14618518ae4b07a75d259e2cc821d5c85c0e0aa"; + sha256 = "91cc13d2a69372b619273feeabb961ae4e27dda6973b64cbb316db7207760c27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sr/thunderbird-91.7.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f287d6abde4537dffa599c54910bda7e0f90596f931d88921d0d3248c941166a"; + sha256 = "7b4c459eb200c9d407acfbcc451290a5f43c6b9f0aa4dac6d4536c267b6afadf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sv-SE/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sv-SE/thunderbird-91.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "02952a1f2d47394b4a8ce06af67a1058822c47660f69d606e719f215205709d8"; + sha256 = "be920ab8279dfe412f5e12082a7709d0e24ea7869f5a86d36e65962430a5798e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/th/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/th/thunderbird-91.7.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "8cec77f0fd16e9ab2b316ba884c26f35dbe15694e22e02ecd27d3caec68970bc"; + sha256 = "2a6d558efee3c0d02e4695b77b1f9dbaacf673f499a4ef28e3763358bb61346f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/tr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/tr/thunderbird-91.7.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "aa66efd16a8e5328e20052676d0e06f3ede903a88262c4b01ff0a78ec013f9cb"; + sha256 = "0cb0bb5991481cdb80d729f1c59276f4e1e12fac48b820fe5e352d63a44ff8ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uk/thunderbird-91.7.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "23d654a7755a846b2354c392a6d86f0794f126425e64a19af7c1f047bd758cae"; + sha256 = "056a958ad687e5b3a0c707379d15ba2b23e17a5c11f113edebcecaf5ab229ada"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uz/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uz/thunderbird-91.7.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c97b2d05e7043ba438f313569bb6165fd106b9f2351478549a6de5467f980280"; + sha256 = "31bf50803722d1b8017861da34237c41d725649a5884b33a15a3bc35738adb94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/vi/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/vi/thunderbird-91.7.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0c4341944eeb0d6724dbabda5dc68796cf40034dffed1d0af2d942af5eb242f2"; + sha256 = "55b5d7c9c3ce8b02d58cb371b58afeff39f08e8b45b1d8875aaa267273ff65b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-CN/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-CN/thunderbird-91.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "86bb80438e4e729faaf57a3b5651b936647ec6ff58c78e263011e242d7e41fbe"; + sha256 = "39983db7492adfd30f7c281f7de16f5538e65dfffd86579cc6abd91936c420b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-TW/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-TW/thunderbird-91.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "733ec3383204fff674456bdda36f7088e32914fceaa62fa6a98768e9ecbef321"; + sha256 = "0b0dbff293c33ed286904f798153c64e8ee631430e9293bc384ca1f1368c44f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/af/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/af/thunderbird-91.7.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3c8f1f172919ef3c5327bf337a49ed428f6581e3dc6f3ed69c7f6268cf8f4fea"; + sha256 = "dd662bf17307215d0ffab8ea10852bf1a742b5dc0564b07b1f3583239169fccb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ar/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ar/thunderbird-91.7.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e938549a5be6c8f1dff66e330cc9e059a352ed9b539145a812838aeec2668bdf"; + sha256 = "b3ea9d805c423c3ae2b7bdf74bcc3bc3cda88467c28c3eb02c5cf9f42bcee801"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ast/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ast/thunderbird-91.7.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a0d93d9f8c9ed659409f971ebecdd6134db8a4b954db9638b7a440c898adb0b3"; + sha256 = "5853f37ec0ac021ace8ee23b2255bc680c2ac5a8c81a4023a98235d3fa2b53d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/be/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/be/thunderbird-91.7.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "741da67fb46ef6e73196dec3f0c71ce1024e282421c6a8e111ffb9ba2a2a5014"; + sha256 = "ef0149c8c758a487cfd748f0a0cd114ee01d3fe63605952e3f5cb02c0fe2e351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/bg/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/bg/thunderbird-91.7.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "afb8fac75b94957f60686c170bec9af438d04c4f42d259e80c07bb446c875aff"; + sha256 = "9ce3b7ee2fae34af3e272d1a0a24a086901e032e589169005a4b75ca1dff6051"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/br/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/br/thunderbird-91.7.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "474656d25e48718b303b2d4463465bb7a272cadcabf6360adfaa7dd23c808c2b"; + sha256 = "6bb10ee9209b264889fd5338be11a6ed0295c4480eae1b0ca35ca8cd5e173066"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ca/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ca/thunderbird-91.7.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c2b4e38ea9810f10455c78de2d68a76655eb855ea8e3d55c895e6f8d5df84066"; + sha256 = "8b2cbcce416213c2628656722f2d6f4a8de47b8f601e6da665c99ba2710e3ae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cak/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cak/thunderbird-91.7.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1da916a640b36c8e2f84e733dfa6b1cd4a7e90dc2367e56522ad3525d646712d"; + sha256 = "140658bf9d5d0e7d8cdf7a6ecd987fd9d18a789d92a7ccc9fe64200fa531c0b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cs/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cs/thunderbird-91.7.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f0ff0220167566300fb0913f58056ff81c5b70f2835830d325c1235caa468a99"; + sha256 = "5c4dffc7b3f672edbaf6906e487fc6636ab25fcc8dc9e3697b2b8d2a90ba24da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cy/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cy/thunderbird-91.7.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1b8e7ae9b27dab0872443a2b26733888d569765e6e72cfaea775d157273c8344"; + sha256 = "b248ee575f00f1b4de3ac4be15886f270366b1073ad6dd84f4807ecc7fbd9a9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/da/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/da/thunderbird-91.7.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "79ae2ac91c0540e76578556c82bec7340baee79758ef0e157155aed8f1d68b3b"; + sha256 = "e2c03805474f8c39467217cd26a08133fd3cba61de35d4a2515b1d535bea6d0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/de/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/de/thunderbird-91.7.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "cf5096d178152abfcc5fbe7cd109722875d8d11575b526577e713a4efd28d226"; + sha256 = "5de15b1da2b90eac08889791178a2d8b304b97bb4377c2478a0142ad0dc166f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/dsb/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/dsb/thunderbird-91.7.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "a650eda884498dd7d0e3dbd73cb1e9b020f10e690ce26d77ed654c0202f1d915"; + sha256 = "20c2c5e9a57440eb046b35ce7f549d846e17afd26cf4883d7ee9de2223bce0d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/el/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/el/thunderbird-91.7.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "be65c035956efd25246265fa102f934fc14794457fc110d815b140165c81fed9"; + sha256 = "3c5c3462455517f391ef0aa194a39522397d971e8d5ab2113a47cde1bea3b7b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-CA/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-CA/thunderbird-91.7.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "dc906637f397a2ad86b72d8c4636b511263255327b3a92da5adc9d3444117311"; + sha256 = "adee07c4cc48bcd3595d32c881bedabf3410df9c3517c3f8f6feeb237552451d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-GB/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-GB/thunderbird-91.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0f028e97594448ab058b839e3a4ab2f3aaefe79732512a4f193c53dc75c59e3c"; + sha256 = "b9eaf0f03ac73e961a160017bfc3f4537592d6d6d63239c3a8249fdb08a5f232"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-US/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-US/thunderbird-91.7.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "5f24ac86a2e91f4568d179529caf5254c3aff65593b3a79d25ef96d03211d0c0"; + sha256 = "50783e08cf7bcb904bcca66270b55570a961390d078dae9998fcf8e527f92d3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-AR/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-AR/thunderbird-91.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5c5a93460f61d7e8a7168c14a46ff24fdecbf67c06da0aab2b30602bd1a1ef51"; + sha256 = "e43babb45d6bffed8e2f27b7a21c211306322cec480b928124118b6bf999b6f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-ES/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-ES/thunderbird-91.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8ecf33158eda96155604583c57dccc55c7168abd8dc161e8801da0e7c7d24b40"; + sha256 = "eead62cde35d787634bb1b6e6e8a96458f05e68d0bb9cd66c3926350d890c5a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/et/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/et/thunderbird-91.7.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a0e3b7c8c095dd8c116630fec01f50fca6b07d83902a7a004d2f4b52b02536e2"; + sha256 = "c3b4d1ebdc325e6ecd6f35012634ea5f4ffd620de7c30589a8999b128b986d59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/eu/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/eu/thunderbird-91.7.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e18f1f105a7e7a88410e749ed9e6e51685cbd6d9fd44f37c8146d333ba405274"; + sha256 = "b23c783109a22c71bd5b337e2633bf2d17f8ee7b580faa43164b2ce7d70d5c45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fi/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fi/thunderbird-91.7.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "984c5d69ef752ae62b08e6615ca19384ff9b2a46167d17ad01e71bec48dd7996"; + sha256 = "a34afada49c57d6816cfc472681b100366df881fdd343495b959df44dcc8bf5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fr/thunderbird-91.7.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "ae2fabdf55e587f3b57849ddd518bfac0035f5c0e1eaed585713f022fb50fcab"; + sha256 = "85c5472de95eb357bba1eb697b17b309ec586717ef09a735cc94b3d7ee069ce3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fy-NL/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fy-NL/thunderbird-91.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "a4abcd89e36fbdad7f2102142b0790f1223116b5a016bce6cffd59f5547b26e7"; + sha256 = "e654bd29cd2a4a99a09d0d7feca2af89cd308d8d9fca6ad1069e5b026e04cee2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ga-IE/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ga-IE/thunderbird-91.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "eff63f42237deb6ecaa60b940ec877e88827769346e14d55624ce3044fac1860"; + sha256 = "ae2e865abb044bb61f51f46636f84054f87ef0e2d46b0c4d85d990bcb05d45da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gd/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gd/thunderbird-91.7.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4399f90f6e28be1bfd68ef3273a4b11cb3a912394033a4ba4f0f722eceeb916e"; + sha256 = "54b117bb7ba110de0c3fb5e9c4d2743d54a49b941c273ed7f8c11dae30c1517e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gl/thunderbird-91.7.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "be6a01476604cf120131724e0e5afc1951421baf489c231fd10115b947a56f41"; + sha256 = "bcec6b86c99fd463cbb16974e43fb232bc93e5ff2b1b08b18332000b274eaa67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/he/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/he/thunderbird-91.7.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "fd3548a80dc4983b264f5a2062d87bd9956c681fc191d35246bac2248c61c429"; + sha256 = "9ab72a7b9a87a75b113421ceef891b3e546a056e48c039f7af20e85a1b17b598"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hr/thunderbird-91.7.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e149a9a469ef013264ffbcf10051e1476f946f52ad4eae8f734643394f6f74c8"; + sha256 = "b8ec76e30180214f2c4d2743686e8de374207fbad8677d5801eb941174217834"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hsb/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hsb/thunderbird-91.7.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "77baab4a6d3ba3339cc32475fdd654034eb57e61d2c51258e38eba6c14aa2f89"; + sha256 = "5d35c9c51d1d94c55cf72901866ce0896770d8939fbbefe234f312f1b18c6b17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hu/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hu/thunderbird-91.7.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c796ac09b0e4033f1ab9d1e6da4b78e540f1b731bfbcda040743e409164ea2f1"; + sha256 = "dc34328fd070973dd230158679bc34ba79075eaf8c62b4c3d67fc9daa8fd04a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hy-AM/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hy-AM/thunderbird-91.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "c6023895e3e26e7b52c277640702a821bf4a562287ba7d8e632a59774a6757ee"; + sha256 = "6e94dca126ef9f60dc8f6086b4396548fbf3db4cd85feba332ee9cdc5c5546e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/id/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/id/thunderbird-91.7.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a76f567644ef6092168e2c526839bc0901a18533f08ac525381e74f77e9fcb7d"; + sha256 = "7ef09c4636f141fc19ca67e0787d1a04d4b6856d6bfc57732f1eacc31fe6b437"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/is/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/is/thunderbird-91.7.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a023e32837355ab83583bcf504e9ff3210f3a68d30c73477ec158ef1162df4eb"; + sha256 = "8644c28c791152e6de4bf932417328afbcb3ff1832e85ded577d88a045071ceb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/it/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/it/thunderbird-91.7.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "459aec2da31a3159f0d81cb0876686e63d9b1e72ad36e967472d1ce98c380983"; + sha256 = "a17c80fdb39ff828ab0b7d8fb2274a2f9c1dafb4d8657c510e894697f72e6941"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ja/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ja/thunderbird-91.7.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "307faf7556594072ab83121c1774005392bc556396c5234a2467ef6843a490f9"; + sha256 = "50f48c0bb455132ee1a8e7f2a98a7e01688c0517c134dbf706538432615f44ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ka/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ka/thunderbird-91.7.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "42cd7f10453541b23099631f402ff70103131025ef868de06fe2e82430bb7eb3"; + sha256 = "16b4cdc1dda75f62f664f5d0780e4dd9e65c91414fa3c6e546ed9ae39a5f251b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kab/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kab/thunderbird-91.7.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "cc62b8ce7bea99dd9e9cf660f5dcaac4b9a44746b7b4cccf84612ef844df9e7e"; + sha256 = "ef2db45999395216684c0cdee16fbaa9ad8a665088d529bcb80df72d442b433b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kk/thunderbird-91.7.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "ee9e74534c1d7716ea80e2874007b4f9778942bcae559effc830477e614341ee"; + sha256 = "fb1e05654c70c6b4361892799bf5e2b2035183407db9cae5307b4191548c3bd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ko/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ko/thunderbird-91.7.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "12106fad7493ce63c189b0a7e92c9828c7b2d46d7f5cd9ecadbc90be041e6bbd"; + sha256 = "ca29bff1b2276510bba6bdaf280ea8a198fc36c77b325e60a4c1f5207a16a7e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lt/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lt/thunderbird-91.7.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ead9b5e035f2fcd1213aba5e63c8898b96bf0bfaefde7709228014aadf608420"; + sha256 = "7551bc85a46fa13c4fd7d72b31d34bda108bf5c7831825b7906c153542918f86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lv/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lv/thunderbird-91.7.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "72980d6c676a269b9d3220a171cffd67ebc1dc0759bef5ac15db76725aac86cc"; + sha256 = "a6fd175e80f8f14431500cd272f7a277ab7b210b6d81c4b80c333e34e13260f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ms/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ms/thunderbird-91.7.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "dfd0cfceee31c31a300ebe37fe99690008f5a21992e7188680b319fe5b5d0207"; + sha256 = "5fcb5b9a0a04957192a40fda0b097a1f781a98d9b18e6165810bbfad96cf188a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nb-NO/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nb-NO/thunderbird-91.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "7610a56f57d4753f6fd7a55147d7a22157453b47548fe807b5fdbc1ef166eda0"; + sha256 = "50d5e767ea3c826d3c924d5a50bce2db2eff9b5ada8c2fd10b4bd8c85061e9da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nl/thunderbird-91.7.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "6a470f707e9838937c67e2ce7c2da216e23964bab94c4590d20cedb4b337d18d"; + sha256 = "c44d23adedd33715a38aa6a704de273de1034dbf0964698224463a2eb3a22fde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nn-NO/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nn-NO/thunderbird-91.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e393dfbd10ae6ce910ed594ca6d314d048d57e98a1a01d53be82788d6a3988d2"; + sha256 = "c2081d7dc420cf97cbfc38901af9e3654bdd00610ad27cfc0a006afb7de003c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pa-IN/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pa-IN/thunderbird-91.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ddc8558e84531478a4295fe1a3b09f95df458e1f1ecec89b0e1ee19e0dea6e5c"; + sha256 = "426e6b686e8cfa660dadda666b7bfdc0a70ccb5db4134e4960cf7c408e88c9e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pl/thunderbird-91.7.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "015e25da0565942bbad23a9e0a345cbec4b24676c21286bbce3cf85938031ca2"; + sha256 = "c667bddefd1b82dd4945ca3a4a392f60b27ab7ab56e1b9fece0cac0dc4eb4971"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-BR/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-BR/thunderbird-91.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2966875426c08658dcc5aec7e91305e40342bb7318b8ba19482b036d6f1efc9e"; + sha256 = "ea24bf62001fa225ed08a05a34f8e5b0579de6c6b79fa08bd28760f41607ffd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-PT/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-PT/thunderbird-91.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c3ee66dff637e75aaa4a8e3d40c85176e152c19464e7afcbd40cc1e3108a1d91"; + sha256 = "8676b8fcd019099ede4973fa1e949e63ea06bd5dc599cc6dcc836dc49fdf4470"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/rm/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/rm/thunderbird-91.7.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c320c05190b160ad807528e9be6604ac5f79958fad9a4de32c55842a94db20fd"; + sha256 = "4aa9681f172a62d5be35c5c4e3ba500253541ef4f8e38eaf37fcb41dac7989c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ro/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ro/thunderbird-91.7.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "90547a8965aec3db8d4150c0e232bdf6e623df1850cb206a9cbca43432a3cd35"; + sha256 = "12c57824de26d6bfde6e9de1c3d5b5b1481213ce939fc4860c2fc86aaf8d64a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ru/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ru/thunderbird-91.7.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "1dbaf198232b519711c90646c05d77b16bdad20054aaa7f313255ac15e773dec"; + sha256 = "3afa7da7eacf0a3479b92a72c3d1f503d62961a9683c9cf5a538da90e5a3bae8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sk/thunderbird-91.7.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "8d92baafe787bdd054cf7c76a7135a6075da0bd573237f28dcb379fb6e1f7c49"; + sha256 = "1f5b0a28de82f795eb54daf44b8b807fdd30a7bff9dc5d1565adb001d38bd354"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sl/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sl/thunderbird-91.7.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f6ba6c8a7c7aacd28959c85adf708ad1661b4921c82035a1c954c6f6264d101a"; + sha256 = "340026146fd09e3ed7a49a7123898b3d005a147d4988bc2df2c86b173fa088fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sq/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sq/thunderbird-91.7.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "e4fe39206253ab53000e5d5265e2cf3183f8c15900f1f0e5ba23cbe141145e20"; + sha256 = "64a9d0d4652d2d709aed3aa1e2a09bcf17ce936c0c4c950a27f8784e0a89d995"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sr/thunderbird-91.7.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "469cda2fad3873e8de320ee7a68c45c4da6cad5e6d9904242d2c489a1e5b829e"; + sha256 = "eb59bc42ef366a5ecf98f20f53113e69cc2f6591008bcccf592bc76dab636945"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sv-SE/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sv-SE/thunderbird-91.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0303bb0290c84ede66d657ac88795e879611c42815e5eaec98beb235d7764922"; + sha256 = "0f833b8b7a83b06b2f3cab5bffe94bfe28cbfc043543f73102f6789fdce95e61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/th/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/th/thunderbird-91.7.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "5915739123b4c14d72f919fdb193a65e3a15ef472e563d21d7e1e872858f3364"; + sha256 = "149d88dbb883e9eb04584d080d5e746a0165fa9cecc100e1af875414bd2c1154"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/tr/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/tr/thunderbird-91.7.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "8cf4a385c861d5905b742a0366df783666a05e154b4e0f23e65f883c81b2bfd9"; + sha256 = "7b92aa7c7ace49f7e7d0489b5c69a2c1282fc267b3650aec765e194413b6e9e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uk/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uk/thunderbird-91.7.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7e1a14c20e1ef7aa923bdb8d09a3a513dedd653388721d8537f42354c0cf386d"; + sha256 = "217e921fb8d0fb6773ec7b4dabcb9a29293b15d2024353a4b542c8660f93e924"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uz/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uz/thunderbird-91.7.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "8f129954fcccf19fe4e46cb66f35fa298ef396d5327f647d1e7b813345dc7ecf"; + sha256 = "9428919a2d99f2ae953e50d148ab27200a3d9d8d02e5a8f5615a804468867922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/vi/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/vi/thunderbird-91.7.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ab232199fe149938019dd3e8a242630875be9529e32050f94add2419d2690726"; + sha256 = "2ee2b69190e6a5640b378d8a4b1dbe78aff7cae1db131aa162e23ee6626ee215"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-CN/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-CN/thunderbird-91.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "cb58b53ffb9eb1d05ff3ae856a80f8f504f86e8cdaa2075ff5b5bfcc27712b97"; + sha256 = "e0537b6f509428a3721bac1ab4ff4567568d9854ece675a68a7bc2c058176e7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-TW/thunderbird-91.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-TW/thunderbird-91.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "441a2fc15f7d4efeb7f76cef1166c694cd7713b12f75aab0ceae161f3e77f934"; + sha256 = "ec7aec372154e7e7281fd1b2d84068140c50577d8e1f3ad30006092fefc61766"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 5b0b66ca345..3ab0c58ecc5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.6.1"; + version = "91.7.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "a74d9489bbd2d62916eac8214c6c3a54dfa0c03b56ad471750724315f8bdd96b6ee1079687ac973264ba0f70bdfbf2f183f359c33f7fcda9a9e48914636b1ab2"; + sha512 = "2afaee16f155edcb0bdb46ebe282a733cf041ec6f562aebd06f8b675e46917f6f500fcc532fc54d74f3f4b0b489a88934a2c6c304f849873de4bc2690b9056a0"; }; patches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 0df8fc010e2..cf22d880406 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.6"; + version = "2022.1"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "0vpahryw4hm1k9p4vang84ji88znz67s7wxnwqndf02a627n7fcm"; + sha256 = "0s12y9j75k59kqkcvfflb1v5p3ny7xgc1m5bd635lvql1bv46c3i"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index c15e51921d4..a86ac412c14 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -40,13 +40,13 @@ let sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A=="; }; }; - "@azure/core-lro-2.2.3" = { + "@azure/core-lro-2.2.4" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.3.tgz"; - sha512 = "UMdlR9NsqDCLTba3EUbRjfMF4gDmWvld196JmUjbz9WWhJ2XT00OR5MXeWiR+vmGT+ETiO4hHFCi2/eGO5YVtg=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.4.tgz"; + sha512 = "e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ=="; }; }; "@azure/core-paging-1.2.1" = { @@ -85,13 +85,13 @@ let sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; }; }; - "@azure/ms-rest-js-2.6.0" = { + "@azure/ms-rest-js-2.6.1" = { name = "_at_azure_slash_ms-rest-js"; packageName = "@azure/ms-rest-js"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.0.tgz"; - sha512 = "4C5FCtvEzWudblB+h92/TYYPiq7tuElX8icVYToxOdggnYqeec4Se14mjse5miInKtZahiFHdl8lZA/jziEc5g=="; + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.1.tgz"; + sha512 = "LLi4jRe/qy5IM8U2CkoDgSZp2OH+MgDe2wePmhz8uY84Svc53EhHaamVyoU6BjjHBxvCRh1vcD1urJDccrxqIw=="; }; }; "@azure/ms-rest-nodeauth-3.1.1" = { @@ -103,22 +103,22 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/storage-blob-12.8.0" = { + "@azure/storage-blob-12.9.0" = { name = "_at_azure_slash_storage-blob"; packageName = "@azure/storage-blob"; - version = "12.8.0"; + version = "12.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.8.0.tgz"; - sha512 = "c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A=="; + url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.9.0.tgz"; + sha512 = "ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg=="; }; }; - "@babel/runtime-7.17.2" = { + "@babel/runtime-7.17.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.17.2"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz"; - sha512 = "hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz"; + sha512 = "L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA=="; }; }; "@colors/colors-1.5.0" = { @@ -139,13 +139,13 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@fontsource/open-sans-4.5.5" = { + "@fontsource/open-sans-4.5.6" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.5"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.5.tgz"; - sha512 = "h1oUPSQpoMnDrnzIZTVS9PPBFhWXS87v6/cd9FY2Xc+GKbOVcjPZxcvUDU1TnCie2QSoYY9aifERRV/d8JHtWQ=="; + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.6.tgz"; + sha512 = "bQuNS0H1VL1VLC6FwmReHlpJaICVe/seODU3Q9cpTQbJ5OtRD4TwWMrAjfTxqcFNollA6O0AlE4BnRSWMQLfvw=="; }; }; "@icetee/ftp-0.3.15" = { @@ -445,13 +445,13 @@ let sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A=="; }; }; - "@types/lodash-4.14.179" = { + "@types/lodash-4.14.180" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.179"; + version = "4.14.180"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz"; - sha512 = "uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.180.tgz"; + sha512 = "XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g=="; }; }; "@types/lossless-json-1.0.1" = { @@ -472,13 +472,13 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/node-12.20.46" = { + "@types/node-12.20.47" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.46"; + version = "12.20.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.46.tgz"; - sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz"; + sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg=="; }; }; "@types/node-17.0.21" = { @@ -976,13 +976,13 @@ let sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; }; }; - "aws-sdk-2.1082.0" = { + "aws-sdk-2.1093.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1082.0"; + version = "2.1093.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1082.0.tgz"; - sha512 = "aDrUZ63O/ocuC827ursDqFQAm3jhqsJu1DvMCCFg73y+FK9pXXNHp2mwdi3UeeHvtfxISCLCjuyO3VFd/tpVfA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1093.0.tgz"; + sha512 = "YD6VNemoKkzDMHsUiGP/MwpM0T20ukp3KTSxPY34Xw3Ww0zP19C54CfjaXhn//R27f2c57BtVez+he2RZ5GwyQ=="; }; }; "aws-sign2-0.7.0" = { @@ -1471,6 +1471,15 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "clamp-1.0.1" = { + name = "clamp"; + packageName = "clamp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz"; + sha1 = "66a0e64011816e37196828fdc8c8c147312c8634"; + }; + }; "class-validator-0.13.2" = { name = "class-validator"; packageName = "class-validator"; @@ -1777,6 +1786,15 @@ let sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ=="; }; }; + "cookie-0.4.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + }; + }; "cookie-0.4.2" = { name = "cookie"; packageName = "cookie"; @@ -1786,6 +1804,15 @@ let sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; }; }; + "cookie-parser-1.4.6" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz"; + sha512 = "z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA=="; + }; + }; "cookie-signature-1.0.6" = { name = "cookie-signature"; packageName = "cookie-signature"; @@ -2956,13 +2983,13 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-symbols-1.0.2" = { + "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; }; "has-tostringtag-1.0.0" = { @@ -3604,13 +3631,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "isbot-3.4.3" = { + "isbot-3.4.5" = { name = "isbot"; packageName = "isbot"; - version = "3.4.3"; + version = "3.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.4.3.tgz"; - sha512 = "5hAgiY9ysMIJcVQlGHcXptwgZr1yYbIGNBE36a3sPo7cLZ9eLTLx0qOssekFKaTHiXTwd/ZZMTuOS7w4faOmpw=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.4.5.tgz"; + sha512 = "+KD6q1BBtw0iK9aGBGSfxJ31/ZgizKRjhm8ebgJUBMx0aeeQuIJ1I72beCoIrltIZGrSm4vmrxRxrG5n1aUTtw=="; }; }; "isexe-2.0.0" = { @@ -4045,6 +4072,15 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; + "lodash.throttle-4.1.1" = { + name = "lodash.throttle"; + packageName = "lodash.throttle"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; + sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; + }; + }; "lodash.uniqby-4.7.0" = { name = "lodash.uniqby"; packageName = "lodash.uniqby"; @@ -4135,6 +4171,15 @@ let sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; }; }; + "luxon-2.3.1" = { + name = "luxon"; + packageName = "luxon"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz"; + sha512 = "I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA=="; + }; + }; "mailparser-3.4.0" = { name = "mailparser"; packageName = "mailparser"; @@ -4180,13 +4225,22 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; - "mappersmith-2.37.1" = { + "mappersmith-2.38.0" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.37.1"; + version = "2.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.37.1.tgz"; - sha512 = "3QiXhRADHTK/it1riJMJm/sHmLlGdw3pfLgZJQu9MfT1CNeiO93keNY0BVLlRmpPBsMER/P7kj3mtcAK2V331Q=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.38.0.tgz"; + sha512 = "D2+ICkvNGnGCz01MADdQQilcHGffwLd1ell4b4uXS9QYvLfrX0r5nl5zb9V+2YDy3142u6VUl1b154pxJAxw3g=="; + }; + }; + "material-colors-1.2.6" = { + name = "material-colors"; + packageName = "material-colors"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz"; + sha512 = "6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="; }; }; "md5-2.3.0" = { @@ -4261,22 +4315,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.51.0" = { + "mime-db-1.52.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.51.0"; + version = "1.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; - sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; }; - "mime-types-2.1.34" = { + "mime-types-2.1.35" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.34"; + version = "2.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; - sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; }; "mimic-fn-2.1.0" = { @@ -4486,49 +4540,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.106.0" = { + "n8n-core-0.109.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.106.0"; + version = "0.109.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.106.0.tgz"; - sha512 = "0aEoY00VPKNodcQl9NN2hTvqQysCNPeg/Ex1UKlt4b0xeqhkIEJ2KMILexXwHitPnTyJwXhn7ewqK7YafdKBcw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.109.0.tgz"; + sha512 = "hzimsUZbWHfG9RofSX7czg0DgB7YAIcLi7JRFUVB90HVdasFf1HQFVM2AwFZC/lLVckktuadWSpq2MOKW+lE3Q=="; }; }; - "n8n-design-system-0.12.0" = { + "n8n-design-system-0.14.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.12.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.12.0.tgz"; - sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.14.0.tgz"; + sha512 = "E9Tvnjd9hktVPsqBcX579Fr4Nn/QEVAHQaYZlPGrqxXLVD76mF0WQWJpU6XTZEs/9pKfEftk/TmDihtENLVTxg=="; }; }; - "n8n-editor-ui-0.132.0" = { + "n8n-editor-ui-0.135.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.132.0"; + version = "0.135.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.0.tgz"; - sha512 = "WOH1Lh+2VYTqBL75pe+WB0H2K8O/6BSW/Wsl5zXbrI0YXmaC9YEvSTAcmjxvjW+oYnYLfQR3p3j6g3AtNldiJQ=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.135.0.tgz"; + sha512 = "oM+Pnh4ZaUnDy5lj6u71EyXUPGNlbEIn3lpi4+xyO8tYtFyaN1kifS/q/a1sYrgZlwbWaksgUvTqufZ3Te6Yqw=="; }; }; - "n8n-nodes-base-0.163.0" = { + "n8n-nodes-base-0.166.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.163.0"; + version = "0.166.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.163.0.tgz"; - sha512 = "kLndPbDemejOGROHrf5KHs7E1yQ5JwwAdyhJpzWX4M2C2Od52YRk4G97r5FZsaxW/e6vJawY6tw1O6PVM1H6nw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.166.0.tgz"; + sha512 = "Iet76bGJrS3rTal5KbuBsJvYzAw3o9xfcLHERpDJyXOxgvrPfZ62A7RpmLMLA3KJLfKevY+VLGLWW5odTSvtEg=="; }; }; - "n8n-workflow-0.88.0" = { + "n8n-workflow-0.91.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.88.0"; + version = "0.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.88.0.tgz"; - sha512 = "Rrlw7MqzPS0Q8T2AIe+aDioIkxC9v1aDbs5L0L/SDlGe54W2uG9qmLZ9/TTfzZZ4qzXX6fTEMNbICVmlmbEaUQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.91.0.tgz"; + sha512 = "a4yqSvcalQs2MEDkOeadQc9cwK/3f6t+EKr/e8rEN5D9djnmuvoRJC+V9v6KPuHy66q1pv6w7fpmnrLRO+2WrA=="; }; }; "named-placeholders-1.1.2" = { @@ -5089,6 +5143,42 @@ let sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; }; }; + "passport-0.5.2" = { + name = "passport"; + packageName = "passport"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/passport/-/passport-0.5.2.tgz"; + sha512 = "w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw=="; + }; + }; + "passport-cookie-1.0.9" = { + name = "passport-cookie"; + packageName = "passport-cookie"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-cookie/-/passport-cookie-1.0.9.tgz"; + sha512 = "8a6foX2bbGoJzup0RAiNcC2tTqzYS46RQEK3Z4u8p86wesPUjgDaji3C7+5j4TGyCq4ZoOV+3YLw1Hy6cV6kyw=="; + }; + }; + "passport-jwt-4.0.0" = { + name = "passport-jwt"; + packageName = "passport-jwt"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.0.tgz"; + sha512 = "BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg=="; + }; + }; + "passport-strategy-1.0.0" = { + name = "passport-strategy"; + packageName = "passport-strategy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; + sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + }; + }; "path-case-3.0.4" = { name = "path-case"; packageName = "path-case"; @@ -5134,6 +5224,15 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + }; "pdf-parse-1.1.1" = { name = "pdf-parse"; packageName = "pdf-parse"; @@ -5287,13 +5386,13 @@ let sha512 = "vrlOGvNVELko0+J8NpGC5lHWDGrk8LQJq9nwAMIVEVBfN1Lib3BLxAaLRGDTuUnvl45j5N9dT2H85PULz6IjjQ=="; }; }; - "popsicle-redirects-1.1.0" = { + "popsicle-redirects-1.1.1" = { name = "popsicle-redirects"; packageName = "popsicle-redirects"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle-redirects/-/popsicle-redirects-1.1.0.tgz"; - sha512 = "XCpzVjVk7tty+IJnSdqWevmOr1n8HNDhL86v7mZ6T1JIIf2KGybxUk9mm7ZFOhWMkGB0e8XkacHip7BV8AQWQA=="; + url = "https://registry.npmjs.org/popsicle-redirects/-/popsicle-redirects-1.1.1.tgz"; + sha512 = "mC2HrKjdTAWDalOjGxlXw9j6Qxrz/Yd2ui6bPxpi2IQDYWpF4gUAMxbA8EpSWJhLi0PuWKDwTHHPrUPGutAoIA=="; }; }; "popsicle-transport-http-1.2.1" = { @@ -6340,13 +6439,13 @@ let sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA=="; }; }; - "sqlstring-2.3.2" = { + "sqlstring-2.3.3" = { name = "sqlstring"; packageName = "sqlstring"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.2.tgz"; - sha512 = "vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg=="; + url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz"; + sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="; }; }; "sse-channel-3.1.1" = { @@ -6367,13 +6466,13 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.6.0" = { + "ssh2-1.7.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.6.0.tgz"; - sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.7.0.tgz"; + sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g=="; }; }; "ssh2-sftp-client-7.2.2" = { @@ -6682,6 +6781,15 @@ let sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; }; }; + "tinycolor2-1.4.2" = { + name = "tinycolor2"; + packageName = "tinycolor2"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"; + sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; + }; + }; "tlds-1.224.0" = { name = "tlds"; packageName = "tlds"; @@ -7159,6 +7267,24 @@ let sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; }; }; + "vue-2.6.14" = { + name = "vue"; + packageName = "vue"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; + sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; + }; + }; + "vue-color-2.8.1" = { + name = "vue-color"; + packageName = "vue-color"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-color/-/vue-color-2.8.1.tgz"; + sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw=="; + }; + }; "vue-fragment-1.5.2" = { name = "vue-fragment"; packageName = "vue-fragment"; @@ -7177,6 +7303,15 @@ let sha512 = "SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw=="; }; }; + "vue2-boring-avatars-0.3.4" = { + name = "vue2-boring-avatars"; + packageName = "vue2-boring-avatars"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vue2-boring-avatars/-/vue2-boring-avatars-0.3.4.tgz"; + sha512 = "N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg=="; + }; + }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -7375,13 +7510,13 @@ let sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; }; }; - "xss-1.0.10" = { + "xss-1.0.11" = { name = "xss"; packageName = "xss"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz"; - sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz"; + sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ=="; }; }; "xtend-4.0.2" = { @@ -7480,10 +7615,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.165.0"; + version = "0.168.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.165.0.tgz"; - sha512 = "PYg5cXEeH6YzVZaSDD9yOZbPtTM/yfaohbZjijyyzVmlOBnI6teQsaY+aLqK6ST4LfMfpB0ZkXpaiBj6xE9azA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.168.1.tgz"; + sha512 = "bghyOcF+KZmRsmyC9p2ARb+RIlUBDwTKCMLd5eUFW1SKMBCWgQZwG8KCLCRApWjXjP1SYekeyDo1PSl5fa7Hxw=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7503,7 +7638,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@azure/core-lro-2.2.3" // { + (sources."@azure/core-lro-2.2.4" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -7524,18 +7659,18 @@ in ]; }) sources."@azure/ms-rest-azure-env-2.0.0" - (sources."@azure/ms-rest-js-2.6.0" // { + (sources."@azure/ms-rest-js-2.6.1" // { dependencies = [ sources."form-data-2.5.1" ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - (sources."@azure/storage-blob-12.8.0" // { + (sources."@azure/storage-blob-12.9.0" // { dependencies = [ sources."tslib-2.3.1" ]; }) - sources."@babel/runtime-7.17.2" + sources."@babel/runtime-7.17.7" sources."@colors/colors-1.5.0" (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ @@ -7543,7 +7678,7 @@ in sources."kuler-2.0.0" ]; }) - sources."@fontsource/open-sans-4.5.5" + sources."@fontsource/open-sans-4.5.6" sources."@icetee/ftp-0.3.15" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -7592,7 +7727,7 @@ in sources."@types/ftp-0.3.33" sources."@types/json-diff-0.5.2" sources."@types/jsonwebtoken-8.5.8" - sources."@types/lodash-4.14.179" + sources."@types/lodash-4.14.180" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" sources."@types/node-17.0.21" @@ -7664,7 +7799,7 @@ in ]; }) sources."avsc-5.7.3" - (sources."aws-sdk-2.1082.0" // { + (sources."aws-sdk-2.1093.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7774,6 +7909,7 @@ in sources."cheerio-select-1.5.0" sources."chokidar-3.5.2" sources."chownr-1.1.4" + sources."clamp-1.0.1" sources."class-validator-0.13.2" sources."clean-stack-3.0.1" sources."cli-color-0.1.7" @@ -7835,7 +7971,8 @@ in sources."content-disposition-0.5.4" sources."content-type-1.0.4" sources."convict-6.2.1" - sources."cookie-0.4.2" + sources."cookie-0.4.1" + sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" sources."core-js-3.21.1" sources."core-util-is-1.0.2" @@ -7923,6 +8060,7 @@ in sources."expand-tilde-2.0.2" (sources."express-4.17.3" // { dependencies = [ + sources."cookie-0.4.2" sources."debug-2.6.9" sources."ms-2.0.0" ]; @@ -8011,7 +8149,7 @@ in }) sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" @@ -8078,7 +8216,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-0.0.1" - sources."isbot-3.4.3" + sources."isbot-3.4.5" sources."isexe-2.0.0" sources."iso-639-1-2.1.13" sources."isstream-0.1.2" @@ -8137,6 +8275,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" + sources."lodash.throttle-4.1.1" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" sources."logform-2.4.0" @@ -8154,6 +8293,7 @@ in sources."yallist-2.1.2" ]; }) + sources."luxon-2.3.1" (sources."mailparser-3.4.0" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -8168,7 +8308,8 @@ in }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" - sources."mappersmith-2.37.1" + sources."mappersmith-2.38.0" + sources."material-colors-1.2.6" sources."md5-2.3.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -8177,8 +8318,8 @@ in sources."micromatch-4.0.4" sources."millisecond-0.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" @@ -8224,19 +8365,19 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.106.0" // { + (sources."n8n-core-0.109.0" // { dependencies = [ sources."qs-6.10.3" ]; }) - sources."n8n-design-system-0.12.0" - sources."n8n-editor-ui-0.132.0" - (sources."n8n-nodes-base-0.163.0" // { + sources."n8n-design-system-0.14.0" + sources."n8n-editor-ui-0.135.0" + (sources."n8n-nodes-base-0.166.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.88.0" + sources."n8n-workflow-0.91.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8341,6 +8482,10 @@ in sources."tslib-2.3.1" ]; }) + sources."passport-0.5.2" + sources."passport-cookie-1.0.9" + sources."passport-jwt-4.0.0" + sources."passport-strategy-1.0.0" (sources."path-case-3.0.4" // { dependencies = [ sources."tslib-2.3.1" @@ -8350,6 +8495,7 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" + sources."pause-0.0.1" (sources."pdf-parse-1.1.1" // { dependencies = [ sources."debug-3.2.7" @@ -8378,7 +8524,7 @@ in sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" - sources."popsicle-redirects-1.1.0" + sources."popsicle-redirects-1.1.1" sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" @@ -8534,10 +8680,10 @@ in }) sources."sprintf-js-1.1.2" sources."sqlite3-5.0.2" - sources."sqlstring-2.3.2" + sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.6.0" + sources."ssh2-1.7.0" sources."ssh2-sftp-client-7.2.2" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" @@ -8564,7 +8710,7 @@ in sources."tdigest-0.1.1" (sources."tedious-6.7.1" // { dependencies = [ - sources."@types/node-12.20.46" + sources."@types/node-12.20.47" sources."bl-3.0.1" sources."depd-2.0.0" sources."iconv-lite-0.5.2" @@ -8588,6 +8734,7 @@ in sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" + sources."tinycolor2-1.4.2" sources."tlds-1.224.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { @@ -8663,8 +8810,11 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."vm2-3.9.9" + sources."vue-2.6.14" + sources."vue-color-2.8.1" sources."vue-fragment-1.5.2" sources."vue-i18n-8.27.0" + sources."vue2-boring-avatars-0.3.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" @@ -8695,7 +8845,7 @@ in sources."xmlbuilder-11.0.1" sources."xpath.js-1.1.0" sources."xregexp-2.0.0" - (sources."xss-1.0.10" // { + (sources."xss-1.0.11" // { dependencies = [ sources."commander-2.20.3" ]; diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index a18257dfeb6..c06291c719e 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.37.7"; + version = "1.37.10"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-L5PeT4Y2oWM1WUJaBK9xgrpfkpvKM1+sA29A3AiDE38="; + sha256 = "sha256-iwxgDBIuTClikvXF+3mCjFKKV0upN+K+aL85ewYkMXo="; }; vendorSha256 = "sha256-6hWD05lXteqL7egj9tiRVHlevKM33i+a+zBUZs7PF7I="; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 02c383b30ff..cfee9d91c93 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,28 +1,41 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.5"; + version = "6.9.7"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-jMv4wIBsmgg2Q/Q/QDJnWa5wUeD1ur6Lu6eXOCLaGg4="; + sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/share/java mv $(ls */*.jar) $out/share/java makeWrapper $out/share/java/frostwire $out/bin/frostwire \ - --prefix PATH : ${jre}/bin/ + --prefix PATH : ${jre}/bin \ + --prefix LD_LIBRARY_PATH : $out/share/java \ + --set JAVA_HOME "${jre}" + + substituteInPlace $out/share/java/frostwire \ + --replace "export JAVA_PROGRAM_DIR=/usr/lib/frostwire/jre/bin" \ + "export JAVA_PROGRAM_DIR=${jre}/bin/" + + substituteInPlace $out/share/java/frostwire.desktop \ + --replace "Exec=/usr/bin/frostwire %U" "Exec=${placeholder "out"}/bin/frostwire %U" + + runHook postInstall ''; meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-linux"]; }; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 2ccf4ff4b86..f24f74e5ae0 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.15.3"; + version = "0.16.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-1iZpqPQeB46qIgznejL08/gB4wmTV66McFSY/nOITsU="; + sha256 = "sha256-0y2m8T/xzYZwUlcZ6g956fdtLef2Bphg4Kd/xpo2AGg="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 19e8d1eeba7..852fcf68987 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-gYHnorj2Up0aAVeltCCPOg/j3DY0ukWWNUU7uikvys0="; + sha256 = "sha256-+yKdB/glNf74drv9EvBwVMWrqr5ADBkSJVVDH+UKb2U="; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index efce24a06f9..9721c6b9ba4 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 -, freerdp, libssh, libgcrypt, gnutls +, freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core @@ -8,19 +8,20 @@ # The themes here are soft dependencies; only icons are missing without them. , gnome , withLibsecret ? true +, withVte ? true }: with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.24"; + version = "1.4.25"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-rcxgr3HVOWA3mTfX8tka9bPGDRDtKhBRsfQ3hv9XHf0="; + sha256 = "sha256-1val/KCClEtw1prVWuXJe8DmmQ7e7oqwAfAnT9G9iHI="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; @@ -33,10 +34,11 @@ stdenv.mkDerivation rec { libsoup spice-protocol spice-gtk libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz - ] ++ optionals withLibsecret [ libsecret ]; + ] ++ optionals withLibsecret [ libsecret ] + ++ optionals withVte [ vte ]; cmakeFlags = [ - "-DWITH_VTE=OFF" + "-DWITH_VTE=${if withVte then "ON" else "OFF"}" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" diff --git a/pkgs/applications/networking/remote/rustdesk/cargo.patch b/pkgs/applications/networking/remote/rustdesk/cargo.patch new file mode 100644 index 00000000000..ecf2f4af5be --- /dev/null +++ b/pkgs/applications/networking/remote/rustdesk/cargo.patch @@ -0,0 +1,50 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c3e139e..b77d8bd 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1761,11 +1761,11 @@ dependencies = [ + + [[package]] + name = "magnum-opus" +-version = "0.3.4-2" +-source = "git+https://github.com/open-trade/magnum-opus#ad0836164abf4a4df69009b1ee08eabe3a13b33f" ++version = "0.4.0" ++source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604" + dependencies = [ +- "bindgen 0.59.1", +- "target_build_utils", ++ "libc", ++ "opusic-sys", + ] + + [[package]] +@@ -2188,6 +2188,16 @@ version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" + ++[[package]] ++name = "opusic-sys" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5eace752ce07a037241dba8f02c654799f051e431b27028056bcb480e83b54f5" ++dependencies = [ ++ "cmake", ++ "libc", ++] ++ + [[package]] + name = "parity-tokio-ipc" + version = "0.7.2" +diff --git a/Cargo.toml b/Cargo.toml +index 75504a0..43e1624 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -32,7 +32,7 @@ libc = "0.2" + parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" } + flexi_logger = "0.17" + runas = "0.2" +-magnum-opus = { git = "https://github.com/open-trade/magnum-opus" } ++magnum-opus = { git = "https://github.com/TheRadioGuy/magnum-opus" } + dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true } + rubato = { version = "0.8", optional = true } + samplerate = { version = "0.2", optional = true } diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/applications/networking/remote/rustdesk/default.nix new file mode 100644 index 00000000000..677629dbcfb --- /dev/null +++ b/pkgs/applications/networking/remote/rustdesk/default.nix @@ -0,0 +1,104 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, makeWrapper +, rustPlatform +, cmake +, yasm +, nasm +, zip +, pkg-config +, clang +, gtk3 +, xdotool +, libxcb +, libXfixes +, alsa-lib +, pulseaudio +, libXtst +, libvpx +, libyuv +, libopus +, libsciter +, llvmPackages +, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "rustdesk"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "rustdesk"; + repo = "rustdesk"; + rev = "0325500ebf331b66220cec6e9078afb83b0e98a7"; + sha256 = "sha256-xglyyoiAjJx3y8+A2OYHZffjqjDkcTjIluPA/J42VVg="; + }; + + cargoSha256 = "sha256-4MQKa54f3X7IHGd29H6RY7v2toeHvTHInIpgXjdotjw="; + + LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; + + # Change magnus-opus version to upstream so that it does not use + # vcpkg for libopus since it does not work. + cargoPatches = [ + ./cargo.patch + ]; + + # Manually simulate a vcpkg installation so that it can link the libaries + # properly. + postUnpack = let + vcpkg_target = "x64-linux"; + in '' + export VCPKG_ROOT="$TMP/vcpkg"; + + mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib + + ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ''; + + nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook ]; + buildInputs = [ alsa-lib pulseaudio libXfixes libxcb xdotool gtk3 libvpx libopus libXtst libyuv ]; + + # Checks require an active X display. + doCheck = false; + + desktopItems = [ (makeDesktopItem { + name = "rustdesk"; + exec = meta.mainProgram; + icon = "rustdesk"; + desktopName = "RustDesk"; + comment = meta.description; + genericName = "Remote Desktop"; + categories = ["Network"]; + }) ]; + + # Add static ui resources and libsciter to same folder as binary so that it + # can find them. + postInstall = '' + mkdir -p $out/{share/src,lib/rustdesk} + + # so needs to be next to the executable + mv $out/bin/rustdesk $out/lib/rustdesk + ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk + + makeWrapper $out/lib/rustdesk/rustdesk $out/bin/rustdesk \ + --run "cd $out/share" + + cp -a $src/src/ui $out/share/src + + install -Dm0644 $src/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg + ''; + + meta = with lib; { + description = "Yet another remote desktop software"; + homepage = "https://rustdesk.com"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ leixb ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "rustdesk"; + }; +} diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index dfed1f59075..bf9f59444aa 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,7 +1,21 @@ -{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh -, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: +{ lib +, fetchurl +, cups +, libssh +, libXpm +, nx-libs +, openldap +, openssh +, qt5 +, qtbase +, qtsvg +, qtx11extras +, qttools +, phonon +, pkg-config +}: -mkDerivation rec { +qt5.mkDerivation rec { pname = "x2goclient"; version = "4.1.2.2"; @@ -10,8 +24,24 @@ mkDerivation rec { sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So="; }; - buildInputs = [ cups libssh libXpm nx-libs openldap openssh - qtbase qtsvg qtx11extras qttools phonon pkg-config ]; + buildInputs = [ + cups + libssh + libXpm + nx-libs + openldap + openssh + qtbase + qtsvg + qtx11extras + qttools + phonon + ]; + + nativeBuildInputs = [ + pkg-config + qt5.wrapQtAppsHook + ]; postPatch = '' substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd" @@ -26,7 +56,7 @@ mkDerivation rec { installTargets = [ "install_client" "install_man" ]; - qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ]; + qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" "--set QT_QPA_PLATFORM xcb" ]; meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 7d5d414a4f9..f2cd1282fc6 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "8.0.5"; + version = "8.0.6"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "1p9wkvnr3km829gy84b1w1pv72pany5vr3r7ydz1c0aqrp0snfhx"; + sha256 = "sha256-pImSrQ63AS1hi9CUvFAR91ZHgPCJB0ZOAA0fEZ24O8o="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 5bcbac74ca7..401d6dfa32c 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -3,7 +3,6 @@ , autoconf , automake , fetchFromGitHub -, fetchpatch , libpcap , ncurses , openssl @@ -12,25 +11,15 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-92wPRDFSoIOYFv3XKdsuYH8j3D8kXyg++q6VpIIMGDg="; + sha256 = "sha256-P618QLk85W0oPisAGiRfpCgHCddKutUkGjwdfgsV4Es="; }; - patches = [ - # Pull fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/irontec/sngrep/pull/382 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/irontec/sngrep/commit/d09e1c323dbd7fc899e8985899baec568f045601.patch"; - sha256 = "sha256-nY5i3WQh/oKboEAh4wvxF5Imf2BHYEKdFj+WF1M3SSA="; - }) - ]; - nativeBuildInputs = [ autoconf automake diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 2cbf706ea78..68af0bd2890 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.15"; + version = "2.4.16"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nYko7htg16Sp/Fs+KuPflrpHn8WShM0OKozhr9BFH5U="; + sha256 = "sha256-GoufEcCu/Cg2Fu0RcjTi4te/7+gZfQRTj+AtK0YnF5I="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 76bddac6c23..31d0ce461d0 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-jQoY0mA/vAOCaCMR8Aapt49AF7HAmjPsr3MKLoaa24g="; + sha256 = "sha256-/CRDdKUeLQ/jSLrd44Tjbb0lfgFFnJkpmFEYZJFQHY8="; }; - vendorSha256 = "sha256-hZcMt3LlK5FuhhlwCmYtlDAJv1QNK+YY7NvZaWMBuys="; + vendorSha256 = "sha256-GBDGckGewo5Yp8zwAKwwXkSP5lx0fQR4AHQFkzO7Q0Q="; doCheck = false; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index e419a350489..6e9093373c9 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -8,19 +8,22 @@ , lib , udev , wrapGAppsHook +, libxshmfence }: stdenv.mkDerivation rec { pname = "termius"; - version = "7.17.1"; + version = "7.34.1"; src = fetchurl { # find the latest version with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.version' # and the url with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_81.snap"; - sha256 = "sha256-jNwWQTjUy8nJ8gHlbP9WgDlARWOhTQAA7KAcQNXKhNg="; + # and the sha512 with + # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_101.snap"; + sha512 = "7fdd82535fd288277b01fedde4739dc97782236fbf25372efa56114bba676c21277ed96b32a1d46ac86af19925b14935818af50985d43a1307639530db044af4"; }; desktopItem = makeDesktopItem { @@ -40,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = atomEnv.packages ++ [ libxshmfence ]; unpackPhase = '' runHook preUnpack diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 9ef7afcf958..767a4202ae8 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -17,6 +17,7 @@ let comment = "Free Runtime Environment for Java Applications."; desktopName = "Jameica"; genericName = "Jameica"; + icon = "jameica"; categories = [ "Office" ]; }; in diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c5b5fc56f78..aac85b9d400 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome, glib, ncurses, libepoxy, gpgme -, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] +, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null , ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null diff --git a/pkgs/applications/office/paperless-ng/default.nix b/pkgs/applications/office/paperless-ng/default.nix index 2fcb2388b8c..ab140f90ced 100644 --- a/pkgs/applications/office/paperless-ng/default.nix +++ b/pkgs/applications/office/paperless-ng/default.nix @@ -1,5 +1,6 @@ { lib , fetchurl +, fetchpatch , nixosTests , python3 , ghostscript @@ -17,10 +18,6 @@ let py = python3.override { packageOverrides = self: super: { django = super.django_3; - django-picklefield = super.django-picklefield.overrideAttrs (oldAttrs: { - # Checks do not pass with django 3 - doInstallCheck = false; - }); # Avoid warning in django-q versions > 1.3.4 # https://github.com/jonaswinkler/paperless-ng/issues/857 # https://github.com/Koed00/django-q/issues/526 @@ -54,6 +51,15 @@ py.pkgs.pythonPackages.buildPythonApplication rec { sha256 = "oVSq0AWksuWC81MF5xiZ6ZbdKKtqqphmL+xIzJLaDMw="; }; + patches = [ + # Fix the `slow_write_pdf` test: + # https://github.com/NixOS/nixpkgs/issues/136626 + (fetchpatch { + url = "https://github.com/paperless-ngx/paperless-ngx/commit/4fbabe43ea12811864e9676b04d82a82b38e799d.patch"; + sha256 = "sha256-8ULep5aeW3wJAQGy2OEAjFYybELNq1DzCC1uBrZx36I="; + }) + ]; + format = "other"; # Make bind address configurable @@ -155,34 +161,38 @@ py.pkgs.pythonPackages.buildPythonApplication rec { zope_interface ]; - doCheck = true; + installPhase = '' + mkdir -p $out/lib + cp -r . $out/lib/paperless-ng + chmod +x $out/lib/paperless-ng/src/manage.py + makeWrapper $out/lib/paperless-ng/src/manage.py $out/bin/paperless-ng \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : "${path}" + ''; + checkInputs = with py.pkgs.pythonPackages; [ - pytest - pytest-cov pytest-django pytest-env pytest-sugar pytest-xdist factory_boy + pytestCheckHook ]; + pytestFlagsArray = [ "src" ]; + # The tests require: # - PATH with runtime binaries # - A temporary HOME directory for gnupg # - XDG_DATA_DIRS with test-specific fonts - checkPhase = '' - pushd src - PATH="${path}:$PATH" HOME=$(mktemp -d) XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" pytest - popd - ''; + preCheck = '' + export PATH="${path}:$PATH" + export HOME=$(mktemp -d) + export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" - installPhase = '' - mkdir -p $out/lib - cp -r . $out/lib/paperless-ng - chmod +x $out/lib/paperless-ng/src/manage.py - makeWrapper $out/lib/paperless-ng/src/manage.py $out/bin/paperless-ng \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PATH : "${path}" + # Disable unneeded code coverage test + substituteInPlace src/setup.cfg \ + --replace "--cov --cov-report=html" "" ''; passthru = { diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index 9b6f352d97a..8f08b56d4d5 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 4ddc0b4e278..f1eb43dbdbc 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -49,5 +49,6 @@ buildPythonPackage rec { homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 16ee7733ed2..f80f40929a1 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -16,6 +16,7 @@ , texlive , imagemagick , perlPackages +, writeScript }: let @@ -27,12 +28,19 @@ let imagemagick perlPackages.Po4a ]; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; in python3Packages.buildPythonApplication rec { - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; + inherit src version; pname = "paperwork"; + sample_docs = sample_documents // { + # a trick for the update script + name = "sample_documents"; + src = sample_documents; + }; + sourceRoot = "source/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: @@ -69,7 +77,7 @@ python3Packages.buildPythonApplication rec { export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share # build the user manual - PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_documents} make data + PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_docs} make data for i in src/paperwork_gtk/model/help/out/*.pdf; do install -Dt $site/model/help/out $i done @@ -122,12 +130,20 @@ python3Packages.buildPythonApplication rec { openpaperwork-core pypillowfight pyxdg - python-dateutil setuptools ]; disallowedRequisites = documentation_deps; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + version=$(list-git-tags https://gitlab.gnome.org/World/OpenPaperwork/paperwork.git | sed 's/^v//' | sort -V | tail -n1) + update-source-version paperwork "$version" --file=pkgs/applications/office/paperwork/src.nix + docs_version="$(curl https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/raw/$version/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh | grep TEST_DOCS_TAG= | cut -d'"' -f2)" + update-source-version paperwork.sample_docs "$docs_version" --file=pkgs/applications/office/paperwork/src.nix --version-key=rev + ''; + meta = { description = "A personal document manager for scanned documents"; homepage = "https://openpaper.work/"; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index a5141a43e50..980a4aabf7a 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "0d1cw6k1giqs8ji8h3h97ckb134s8pszgip0nac5hmw0mvqq84xa"; + sha256 = "2M2eMP54F3RRDMBuAZ1gBiBoMmTRJaHTUwtTjj4ZU+4="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 121c1ccf36e..1d7a02daa9c 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.2.9"; + version = "22.3.1"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "ced99f4b2106148c683267c2c5ccc5902dc6b98249eb7c132dde2bd6ea37bc34"; + sha256 = "4d75684751a10f24d20d993b30748c7a09bd8bdfd4e1d4d5703746954a0f6bb2"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/pkgs/applications/office/softmaker/desktop_items.nix index dfdf45da9e5..a97b3f7d37b 100644 --- a/pkgs/applications/office/softmaker/desktop_items.nix +++ b/pkgs/applications/office/softmaker/desktop_items.nix @@ -25,7 +25,9 @@ "application/vnd.openxmlformats-officedocument.spreadsheetml.template" "application/vnd.ms-excel.sheet.macroenabled.12" "application/vnd.ms-excel.template.macroEnabled.12" - "application/x-dif;text/spreadsheet;text/csv" + "application/x-dif" + "text/spreadsheet" + "text/csv" "application/x-prn" "application/vnd.ms-excel.sheet.binary.macroenabled.12" ]; diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index b8b98c19bbf..7cf777ae13f 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -8,22 +8,20 @@ python3.pkgs.buildPythonApplication rec { pname = "timeline"; - version = "2.4.0"; + version = "2.6.0"; src = fetchurl { url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip"; - sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23"; + sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E="; }; nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; pythonPath = with python3.pkgs; [ - wxPython_4_1 + wxPython_4_0 humblewx icalendar markdown - pysvg-py3 - pillow ]; checkInputs = [ diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index d8fe8649381..2055bfc0fc7 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -1,41 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, wxGTK +, cmake +, ninja +, wrapGAppsHook +, unstableGitUpdater +}: stdenv.mkDerivation rec { pname = "treesheets"; - version = "1.0.1"; + version = "unstable-2022-03-12"; src = fetchFromGitHub { - owner = "aardappel"; - repo = "treesheets"; - rev = "v${version}"; - sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4"; + owner = "aardappel"; + repo = "treesheets"; + rev = "120c10d4d9ea1ce76db5c1bbd6f5d705b397b57d"; + sha256 = "oXgOvvRoZpueEeWnD3jsc6y5RIAzkXzLeEe7BSErBpw="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wxGTK ]; + nativeBuildInputs = [ + cmake + ninja + wrapGAppsHook + ]; - preConfigure = "cd src"; + buildInputs = [ + wxGTK + ]; - postInstall = '' - mkdir "$out/share" -p - cp -av ../TS "$out/share/libexec" + NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; - mkdir "$out/bin" -p - makeWrapper "$out/share/libexec/treesheets" "$out/bin/treesheets" - - mkdir "$out/share/doc" -p - - for f in readme.html docs examples - do - mv -v "$out/share/libexec/$f" "$out/share/doc" - ln -sv "$out/share/doc/$f" "$out/share/libexec/$f" - done - - mkdir "$out/share/applications" -p - mv -v "$out/share/libexec/treesheets.desktop" "$out/share/applications" - substituteInPlace "$out/share/applications/treesheets.desktop" \ - --replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg" - ''; + passthru = { + updateScript = unstableGitUpdater { }; + }; meta = with lib; { description = "Free Form Data Organizer"; @@ -49,9 +47,9 @@ stdenv.mkDerivation rec { planning, requirements gathering, presentation of information, etc. ''; - homepage = "https://strlen.com/treesheets/"; + homepage = "https://strlen.com/treesheets/"; maintainers = with maintainers; [ obadz avery ]; - platforms = platforms.linux; - license = licenses.zlib; + platforms = platforms.linux; + license = licenses.zlib; }; } diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 178b2351a6b..46f2569b13a 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -142,7 +142,6 @@ stdenv.mkDerivation rec { installPhase = let steam-run = (steam.override { extraPkgs = p: buildInputs; - nativeOnly = true; }).run; in '' prefix=$out/opt/kingsoft/wps-office diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix deleted file mode 100644 index d0d8374e64c..00000000000 --- a/pkgs/applications/office/zanshin/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ mkDerivation -, lib -, fetchurl -, extra-cmake-modules -, boost -, akonadi-calendar -, kontactinterface -, krunner -}: - -mkDerivation rec { - pname = "zanshin"; - version = "21.12.2"; - - src = fetchurl { - url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz"; - sha256 = "sha256-zMCV4KIrqeKHEsMbqEbnm/DgQiGxZbZXDVMuSSrXj8Y="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - ]; - - buildInputs = [ - boost - akonadi-calendar - kontactinterface - krunner - ]; - - meta = with lib; { - description = "A powerful yet simple application to manage your day to day actions, getting your mind like water"; - homepage = "https://zanshin.kde.org/"; - maintainers = with maintainers; [ zraexy ]; - platforms = platforms.linux; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 29f8ec7b5e5..93836cee281 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0ibcr2ypnyl2aq324sbmmr18ksxszg81yrhybawx46ba9vym6j99"; + sha256 = "sha256-TrvyPcpSMACrbKPVOjxHsVsC28LmruiVO/CyCPh0KZ8="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index 543e6820a76..52049302a27 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "phd2"; - version = "2.6.10"; + version = "2.6.11"; src = fetchFromGitHub { owner = "OpenPHDGuiding"; repo = "phd2"; rev = "v${version}"; - sha256 = "sha256-2ZiPjhlguWXFcC53xG1aqAode7twtoHWszFUMQkK5xU="; + sha256 = "sha256-iautgHOVzdLWYGOVu3wHBDt30uCbaP58mDz/l7buB1k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index b50cb4b71d0..4a51e88dc3b 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "0.99.10.1"; + version = "1.0.0"; src = fetchFromGitLab { owner = "free-astro"; repo = pname; rev = version; - sha256 = "sha256-gqV+pJNaU+GnYiUo/imofgNdeM+AtDg/pSH7aoqhkYA="; + sha256 = "sha256-yqWFEa1fnSwl0ecN9hMI13QCfj0f69CFqTJlEAhTpJI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/angsd/default.nix b/pkgs/applications/science/biology/angsd/default.nix new file mode 100644 index 00000000000..02e00cd19ad --- /dev/null +++ b/pkgs/applications/science/biology/angsd/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, curl, openssl }: + +stdenv.mkDerivation rec { + pname = "angsd"; + version = "0.937"; + + src = fetchFromGitHub { + owner = "ANGSD"; + repo = "angsd"; + sha256 = "1020gh066dprqhfi90ywqzqqnq7awn49wrkkjnizmmab52v00kxs"; + rev = "${version}"; + }; + + buildInputs = [ htslib zlib bzip2 xz curl openssl ]; + + makeFlags = [ "HTSSRC=systemwide" "prefix=$(out)" ]; + + meta = with lib; { + description = "Program for analysing NGS data"; + homepage = "http://www.popgen.dk/angsd"; + maintainers = [ maintainers.bzizou ]; + license = licenses.gpl2; + }; +} + diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 68cdd9f120b..bbe661b4f0a 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1260"; + version = "1268"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = version; - sha256 = "sha256-bJNvoHr2sQYtiC3tr1GA0T0kRhDyx6hU3OOSTvKUSCs="; + sha256 = "sha256-9yzeLg3xporl32sZ1Ks8s63jXJNGUiI64XyQmhbQF4M="; }; nativeBuildInputs = [ unzip ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Genomic sequence aligner"; - homepage = "http://last.cbrc.jp/"; - license = licenses.gpl3; + homepage = "https://gitlab.com/mcfrith/last"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jbedo ]; platforms = platforms.x86_64; }; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index bba8a02b76e..7e162e2d27c 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; + makeFlags = lib.optionals stdenv.isAarch64 [ "arm_neon=1" "aarch64=1" ]; + installPhase = '' mkdir -p $out/bin cp minimap2 $out/bin @@ -25,7 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://lh3.github.io/minimap2"; license = licenses.mit; platforms = platforms.all; - badPlatforms = platforms.aarch64; maintainers = [ maintainers.arcadio ]; }; } diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index cc983e24618..3f837edb4c8 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.24"; + version = "14.32.30"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-YxYNb2fS7KiUkZDSRx4FN+ZeMMNpfTaElitRE4RtD0g="; + sha256 = "sha256-VpOoduUA0iD+nI83GSQYQDHoK2Snog0NHkHWHfpLqFM="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 3c2b11c0e29..698095715cc 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "22.3.0"; + version = "22.7.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-ASnweoVBYSnO/FjE9tpLgaOAgiPQeUnw7CzwkKRXnAg="; + sha256 = "sha256-xK4C+0/Qpc2vXPmsI8KuHuDJLmJ5LXdAfRIREE+gkWA="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix new file mode 100644 index 00000000000..fc840fe45fb --- /dev/null +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: + +stdenv.mkDerivation rec { + pname = "QtRVSim"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "cvut"; + repo = "qtrvsim"; + rev = "refs/tags/v${version}"; + sha256 = "B1l+ysrodeDbxYfdLLMF8yk4/uPXTcDrTaMtYm89HuU="; + }; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + buildInputs = [ qtbase ]; + + meta = with lib; { + description = "RISC-V CPU simulator for education purposes"; + longDescription = '' + RISC-V CPU simulator for education purposes with pipeline and cache visualization. + Developed at FEE CTU for computer architecture classes. + ''; + homepage = "https://github.com/cvut/qtrvsim"; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ jdupak ]; + mainProgram = "qtrvsim_gui"; + }; +} diff --git a/pkgs/applications/science/electronics/gaw/default.nix b/pkgs/applications/science/electronics/gaw/default.nix new file mode 100644 index 00000000000..928613737b4 --- /dev/null +++ b/pkgs/applications/science/electronics/gaw/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchurl +, lib +, gtk3 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "gaw"; + version = "20200922"; + + src = fetchurl { + url = "https://download.tuxfamily.org/gaw/download/gaw3-${version}.tar.gz"; + sha256 = "0qmap11v470a1yj4ypfvdq6wkfni77ijqpknka8b4fndi62sl4wa"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 ]; + + meta = with lib; { + description = "Gtk Analog Wave viewer"; + longDescription = '' + Gaw is a software tool for displaying analog waveforms from + sampled datas, for example from the output of simulators or + input from sound cards. Data can be imported to gaw using files, + direct tcp/ip connection or directly from the sound card. + ''; + homepage = "http://gaw.tuxfamily.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/applications/science/electronics/xschem/default.nix new file mode 100644 index 00000000000..25fa0aca467 --- /dev/null +++ b/pkgs/applications/science/electronics/xschem/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, lib +, bison +, cairo +, flex +, libX11 +, libXpm +, pkg-config +, tcl +, tk +}: + +stdenv.mkDerivation rec { + pname = "xschem"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "StefanSchippers"; + repo = "xschem"; + rev = version; + sha256 = "sha256-C57jo8tAbiqQAgf4Xp2lpFGOr6F1knPpFcYxPiqSM4k="; + }; + + nativeBuildInputs = [ bison flex pkg-config ]; + + buildInputs = [ cairo libX11 libXpm tcl tk ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + description = "Schematic capture and netlisting EDA tool"; + longDescription = '' + Xschem is a schematic capture program, it allows creation of + hierarchical representation of circuits with a top down approach. + By focusing on interfaces, hierarchy and instance properties a + complex system can be described in terms of simpler building + blocks. A VHDL or Verilog or Spice netlist can be generated from + the drawn schematic, allowing the simulation of the circuit. + ''; + homepage = "https://xschem.sourceforge.io/stefan/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index fe73f4f4d6e..60454ca9ce9 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2021.11.12"; + version = "2022.03.04"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "f6fa2ddcfc89099726d60386befba874c7ac1e0d"; - hash = "sha256-0rvMPZ+kL0m/GjlCLx3eXYQ0osQ2wQiS3+csqPl3U9s="; + rev = "d7ecb23eeee9c9b4924182ce570c2e33eb18abff"; + hash = "sha256-aufWRTggJNOaUFsjh5+HFDqEur+nuM0hZSsTfGptbks="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 96e8da059a4..aaac288b615 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, coreutils, nettools, java, polyml, z3, veriT, vampire, eprover-ho, rlwrap, makeDesktopItem }: +{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, rlwrap, perl, makeDesktopItem }: # nettools needed for hostname stdenv.mkDerivation rec { @@ -77,6 +77,10 @@ stdenv.mkDerivation rec { substituteInPlace lib/Tools/env \ --replace /usr/bin/env ${coreutils}/bin/env + substituteInPlace src/Tools/Setup/src/Environment.java \ + --replace 'cmd.add("/usr/bin/env");' "" \ + --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" + rm -r heaps '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} @@ -90,6 +94,24 @@ stdenv.mkDerivation rec { buildPhase = '' export HOME=$TMP # The build fails if home is not set + setup_name=$(basename contrib/isabelle_setup*) + + #The following is adapted from https://isabelle.sketis.net/repos/isabelle/file/Isabelle2021-1/Admin/lib/Tools/build_setup + TARGET_DIR="contrib/$setup_name/lib" + rm -rf "$TARGET_DIR" + mkdir -p "$TARGET_DIR/isabelle/setup" + declare -a ARGS=("-Xlint:unchecked") + + SOURCES="$(${perl}/bin/perl -e 'while (<>) { if (m/(\S+\.java)/) { print "$1 "; } }' "src/Tools/Setup/etc/build.props")" + for SRC in $SOURCES + do + ARGS["''${#ARGS[@]}"]="src/Tools/Setup/$SRC" + done + ${java}/bin/javac -d "$TARGET_DIR" -classpath ${scala}/lib/scala-compiler.jar "''${ARGS[@]}" + ${java}/bin/jar -c -f "$TARGET_DIR/isabelle_setup.jar" -e "isabelle.setup.Setup" -C "$TARGET_DIR" isabelle + rm -rf "$TARGET_DIR/isabelle" + + # Prebuild HOL Session bin/isabelle build -v -o system_heaps -b HOL ''; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 22e755bd852..1eea97a0fd2 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.39.2"; + version = "3.41.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "402f41cdedbd46a368fb7807bebe83550d887631"; - sha256 = "0jddakr07ixspw19xblpj1882vxxaljg3fflhn4myvigwzkav334"; + rev = "154ac72f4ff674bc4486ac611f926a3d6b999f9f"; + sha256 = "0mpxlfjq460x1vi3v6qzgjv74asg0qlhykd51pj347795x5b1hf1"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/applications/science/logic/nuXmv/default.nix new file mode 100644 index 00000000000..021c612d106 --- /dev/null +++ b/pkgs/applications/science/logic/nuXmv/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "nuXmv"; + version = "2.0.0"; + + src = fetchurl { + url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-linux64.tar.gz"; + sha256 = "0nndrw994clf8lnlcfzdf1mf00vif3fvd4xsiwcjpbyk12091zqr"; + }; + + installPhase= '' + runHook preInstall + install -Dm755 -t $out/bin ./bin/nuXmv + runHook postInstall + ''; + + meta = with lib; { + description = "Symbolic model checker for analysis of finite and infinite state systems"; + homepage = "https://nuxmv.fbk.eu/pmwiki.php"; + license = licenses.unfree; + maintainers = with maintainers; [ siraben ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index e701fb2711f..ef6f9b157d2 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-6VkBGDzqG3mplpvFh5DIR0I1I2/J0Pi7xYk/yVn04Kg="; + sha256 = "sha256-5Gw9+J+3LHNUNbcHxsQR/ivWndL2P7yBt/Q35fBMg58="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/applications/science/math/sage/patches/no-cython-sources-in-tracebacks-on-ipython8.patch b/pkgs/applications/science/math/sage/patches/no-cython-sources-in-tracebacks-on-ipython8.patch deleted file mode 100644 index 871e494c362..00000000000 --- a/pkgs/applications/science/math/sage/patches/no-cython-sources-in-tracebacks-on-ipython8.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/src/sage/repl/interface_magic.py b/src/sage/repl/interface_magic.py -index 8a455b69b0..a93e1c9e04 100644 ---- a/src/sage/repl/interface_magic.py -+++ b/src/sage/repl/interface_magic.py -@@ -260,7 +260,7 @@ class InterfaceMagic(object): - 2 - 120 - sage: shell.run_cell('%%gap foo\n1+1;\n') -- ...File "<string>", line unknown -+ ...File...<string>... - SyntaxError: Interface magics have no options, got "foo" - <BLANKLINE> - sage: shell.run_cell('%%gap?') -diff --git a/src/sage/repl/interpreter.py b/src/sage/repl/interpreter.py -index 71dbe429fd..36b1d986d6 100644 ---- a/src/sage/repl/interpreter.py -+++ b/src/sage/repl/interpreter.py -@@ -70,25 +70,6 @@ that shell. The bulk of this functionality is provided through - - TESTS: - --Check that Cython source code appears in tracebacks:: -- -- sage: from sage.repl.interpreter import get_test_shell -- sage: shell = get_test_shell() -- sage: print("dummy line"); shell.run_cell('1/0') # see #25320 for the reason of the `...` and the dummy line in this test -- dummy line -- ... -- ZeroDivisionError...Traceback (most recent call last) -- <ipython-input-...> in <module>... -- ----> 1 Integer(1)/Integer(0) -- .../sage/rings/integer.pyx in sage.rings.integer.Integer...div... -- ... -- -> ... raise ZeroDivisionError("rational division by zero") -- ....: x = <Rational> Rational.__new__(Rational) -- ....: mpq_div_zz(x.value, ....value, (<Integer>right).value) -- <BLANKLINE> -- ZeroDivisionError: rational division by zero -- sage: shell.quit() -- - Test prompt transformer:: - - sage: from sage.repl.interpreter import SagePromptTransformer -@@ -423,7 +404,7 @@ def SagePreparseTransformer(lines): - sage: from sage.repl.interpreter import get_test_shell - sage: shell = get_test_shell() - sage: shell.run_cell(bad_syntax) -- File "<string>", line unknown -+ File...<string>... - SyntaxError: Mismatched ']' - <BLANKLINE> - sage: shell.quit() diff --git a/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch b/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch new file mode 100644 index 00000000000..5fea8830903 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch @@ -0,0 +1,81 @@ +diff --git a/src/sage/interfaces/tachyon.py b/src/sage/interfaces/tachyon.py +index 3f1dcdb538..b6fa8d1fbd 100644 +--- a/src/sage/interfaces/tachyon.py ++++ b/src/sage/interfaces/tachyon.py +@@ -261,13 +261,13 @@ written in the sequence they are listed in the examples in this section. + The {\bf PROJECTION} keyword must be followed by one of the supported + camera projection mode identifiers {\bf PERSPECTIVE}, {\bf PERSPECTIVE_DOF}, + {\bf ORTHOGRAPHIC}, or {\bf FISHEYE}. The {\bf FISHEYE} projection mode +-requires two extra parameters {\bf FOCALLENGTH} and {\bf APERTURE} ++requires two extra parameters {\bf FOCALDIST} and {\bf APERTURE} + which precede the regular camera options. + + \begin{verbatim} + Camera + projection perspective_dof +- focallength 0.75 ++ focaldist 0.75 + aperture 0.02 + Zoom 0.666667 + Aspectratio 1.000000 +diff --git a/src/sage/plot/plot3d/tachyon.py b/src/sage/plot/plot3d/tachyon.py +index 08caf38d67..3e827411ce 100644 +--- a/src/sage/plot/plot3d/tachyon.py ++++ b/src/sage/plot/plot3d/tachyon.py +@@ -92,7 +92,7 @@ angle, right angle):: + Finally there is the ``projection='perspective_dof'`` option. :: + + sage: T = Tachyon(xres=800, antialiasing=4, raydepth=10, +- ....: projection='perspective_dof', focallength='1.0', aperture='.0025') ++ ....: projection='perspective_dof', focaldist='1.0', aperture='.0025') + sage: T.light((0,5,7), 1.0, (1,1,1)) + sage: T.texture('t1', opacity=1, specular=.3) + sage: T.texture('t2', opacity=1, specular=.3, color=(0,0,1)) +@@ -186,7 +186,7 @@ class Tachyon(WithEqualityById, SageObject): + or ``'fisheye'``. + - ``frustum`` - (default ''), otherwise list of four numbers. Only + used with projection='fisheye'. +- - ``focallength`` - (default ''), otherwise a number. Only used ++ - ``focaldist`` - (default ''), otherwise a number. Only used + with projection='perspective_dof'. + - ``aperture`` - (default ''), otherwise a number. Only used + with projection='perspective_dof'. +@@ -331,7 +331,7 @@ class Tachyon(WithEqualityById, SageObject): + Use of the ``projection='perspective_dof'`` option. This may not be + implemented correctly. :: + +- sage: T = Tachyon(xres=800,antialiasing=4, raydepth=10, projection='perspective_dof', focallength='1.0', aperture='.0025') ++ sage: T = Tachyon(xres=800,antialiasing=4, raydepth=10, projection='perspective_dof', focaldist='1.0', aperture='.0025') + sage: T.light((0,5,7), 1.0, (1,1,1)) + sage: T.texture('t1', opacity=1, specular=.3) + sage: T.texture('t2', opacity=1, specular=.3, color=(0,0,1)) +@@ -365,7 +365,7 @@ class Tachyon(WithEqualityById, SageObject): + look_at=[0, 0, 0], + viewdir=None, + projection='PERSPECTIVE', +- focallength='', ++ focaldist='', + aperture='', + frustum=''): + r""" +@@ -391,7 +391,7 @@ class Tachyon(WithEqualityById, SageObject): + self._camera_position = (-3, 0, 0) # default value + self._updir = updir + self._projection = projection +- self._focallength = focallength ++ self._focaldist = focaldist + self._aperture = aperture + self._frustum = frustum + self._objects = [] +@@ -624,9 +624,9 @@ class Tachyon(WithEqualityById, SageObject): + camera_out = r""" + camera + projection %s""" % (tostr(self._projection)) +- if self._focallength != '': ++ if self._focaldist != '': + camera_out = camera_out + r""" +- focallength %s""" % (float(self._focallength)) ++ focaldist %s""" % (float(self._focaldist)) + if self._aperture != '': + camera_out = camera_out + r""" + aperture %s""" % (float(self._aperture)) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 73a5881d214..22e3a288b7d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -119,15 +119,13 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/32959 ./patches/linbox-1.7-upgrade.patch - # To emit better tracebacks, IPython 8 parses Python files using the ast - # module (via the stack_data package). Since Cython is a superset of Python, - # this results in no Cython code being printed in tracebacks. Fixing this - # properly is tracked in https://github.com/alexmojaki/stack_data/issues/21, - # but for now we just disable the corresponding test. An alternative would - # be to revert IPython's IPython/core/ultratb.py, but this would need to be - # Sage-specific (since it would worsen tracebacks for pure Python code). - # Sage tracks this at https://trac.sagemath.org/ticket/33170 - ./patches/no-cython-sources-in-tracebacks-on-ipython8.patch + # https://trac.sagemath.org/ticket/33170 + (fetchSageDiff { + base = "9.5.rc1"; + name = "ipython-8-update.patch"; + rev = "a90a314616d86d6be9c0d5233f0d36c4bfe06231"; + sha256 = "sha256-pXdtokTo84xNCnV+HyAKEzG562z8FjzJ7hczOja0dRw="; + }) # https://trac.sagemath.org/ticket/32968 (fetchSageDiff { @@ -155,6 +153,9 @@ stdenv.mkDerivation rec { rev = "97d7958bed441cf2ccc714d88f83d3a8426bc085"; sha256 = "sha256-y1STE0oxswnijGCsBw8eHWWqpmT1XMznIfA0vvX9pFA="; }) + + # adapted from https://trac.sagemath.org/ticket/23712#comment:22 + ./patches/tachyon-renamed-focallength.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index bd2f94ac4a7..3ca998643ac 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.5.1"; + version = "0.6.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "v${version}"; - sha256 = "sha256-tb/720WPqcO4w1EMmidjtEidsjZ0dEhe+/vnJPM6kxo="; + sha256 = "sha256-gfZc3R8hrYy4Nco+XwG29lzZd537ByEgd3RL8h7f6DQ="; }; nativeBuildInputs = [ @@ -52,7 +52,6 @@ python3Packages.buildPythonApplication rec { pythonPath = with python3Packages; [ bibtexparser pygobject3 - watchgod ]; postPatch = '' diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index f8037c01e08..872438158d6 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { # Hardcode path to fix use with cmake sed -i cmake/scripts/ROOTConfig.cmake.in \ - -e 'iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' + -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' patchShebangs build/unix/ '' + lib.optionalString noSplash '' diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/applications/science/robotics/mission-planner/default.nix index 3dbb1a4bf5a..3f0a6a6cde5 100644 --- a/pkgs/applications/science/robotics/mission-planner/default.nix +++ b/pkgs/applications/science/robotics/mission-planner/default.nix @@ -12,11 +12,11 @@ let }; in stdenv.mkDerivation rec { inherit pname; - version = "1.3.74"; + version = "1.3.76"; src = fetchurl { url = "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip"; - sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; + sha256 = "sha256-vdunUGwLjDKf1LDhtyTQAExddecyWc1TdZOyuu0qMlk="; }; nativeBuildInputs = [ makeWrapper mono unzip ]; diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 78c6c0988c5..e7730ba4b94 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -54,16 +54,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-eVPy47T2wcsN7NxtwMoyuC6loBVXsoJjJ/2q31i3vxQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Q/ulRgU6zNLRZUjL83O/Krx85voPWZPZDo65CLp/aOg="; }; - cargoSha256 = "sha256-RY+qidm7NZFKq6P8qVaMpxYfTfHpZac2YJwuNbOJwoM="; + cargoSha256 = "sha256-S1V8hDuzp4sf6945gqs8QNVdu8jwPGVYjVbV6EY28Hk="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index 4c46bcc6c3f..e8fbb8cb9fa 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -1,48 +1,42 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ fetchzip, lib, stdenvNoCC }: /* - This derivation is impure: it relies on an Xcode toolchain being installed - and available in the expected place. The values of sandboxProfile - are copied pretty directly from the MacVim derivation, which - is also impure. In order to build you at least need the `sandbox` - option set to `relaxed` or `false`. + This cannot be built from source as it requires entitlements and + for that it needs to be code signed. Automatic updates will have + to be disabled via preferences instead of at build time. To do + that edit $HOME/Library/Preferences/com.googlecode.iterm2.plist + and add: + SUEnableAutomaticChecks = 0; */ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.14"; + version = "3.4.15"; - src = fetchFromGitHub { - owner = "gnachman"; - repo = "iTerm2"; - rev = "v${version}"; - sha256 = "sha256-sDCnBO7xDpecu2cSjpHwync2DVsj9EKUmgpqEVLtxRM="; + src = fetchzip { + url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; + sha256 = "sha256-ZE/uYBKB2popdIdZWA8AvyJiwMzt32u6u/H/AyNcoVo="; }; - patches = [ ./disable_updates.patch ]; - postPatch = '' - sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj - ''; - - preConfigure = "LD=$CC"; - makeFlagsArray = ["Nix"]; installPhase = '' - mkdir -p $out/Applications - mv Build/Products/Deployment/iTerm2.app $out/Applications/iTerm.app - ''; - - sandboxProfile = '' - (allow file-read* file-write* process-exec mach-lookup) - ; block homebrew dependencies - (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) + runHook preInstall + APP_DIR="$out/Applications/iTerm2.app" + mkdir -p "$APP_DIR" + cp -r . "$APP_DIR" + mkdir -p "$out/bin" + cat << EOF > "$out/bin/iterm2" + #!${stdenvNoCC.shell} + open -na "$APP_DIR" --args "$@" + EOF + chmod +x "$out/bin/iterm2" + runHook postInstall ''; meta = with lib; { description = "A replacement for Terminal and the successor to iTerm"; homepage = "https://www.iterm2.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ tricktron ]; - platforms = platforms.darwin; - hydraPlatforms = []; + maintainers = with maintainers; [ steinybot tricktron ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index cca7e7eb9b9..1e6db04dd76 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,36 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring, - harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel, - libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, - libxkbcommon, libXi, libXext, wayland-protocols, wayland, - lcms2, - librsync, - installShellFiles, - dbus, - darwin, - Cocoa, - CoreGraphics, - Foundation, - IOKit, - Kernel, - OpenGL, - libcanberra, - libicns, - libpng, - python3, - zlib, +{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring +, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel +, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor +, libxkbcommon, libXi, libXext, wayland-protocols, wayland +, lcms2 +, librsync +, installShellFiles +, dbus +, darwin +, Cocoa +, CoreGraphics +, Foundation +, IOKit +, Kernel +, OpenGL +, libcanberra +, libicns +, libpng +, python3 +, zlib +, bashInteractive +, zsh +, fish +, fetchpatch }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.24.2"; + version = "0.24.4"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-nGBdoOueX8tcxXRDqKQ/Q+woT6rNQeLXwy1MJbwizKs="; + sha256 = "sha256-c6XM/xeGZ68srf8xQJA1iYCUR3kXNceTMxsZAnbFmug="; }; buildInputs = [ @@ -74,6 +78,19 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; + patches = [ + (fetchpatch { + name = "fix-zsh-completion-test-1.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/297592242c290a81ca4ba08802841f4c33a4de25.patch"; + sha256 = "sha256-/V6y/4AaJsZvx1KS5UFZ+0zyAoZuLgbgFORZ1dX/1qE="; + }) + (fetchpatch { + name = "fix-zsh-completion-test-2.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/d8ed42ae8e014d9abf9550a65ae203468f8bfa43.patch"; + sha256 = "sha256-Azgzqf5atW999FVn9rSGKMyZLsI692dYXhJPx07GBO0="; + }) + ]; + # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; @@ -101,7 +118,14 @@ buildPythonApplication rec { runHook postBuild ''; - checkInputs = [ pillow ]; + checkInputs = [ + pillow + + # Shells needed for shell integration tests + bashInteractive + zsh + fish + ]; checkPhase = let buildBinPath = @@ -132,9 +156,9 @@ buildPythonApplication rec { wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" installShellCompletion --cmd kitty \ - --bash <("$out/bin/kitty" + complete setup bash) \ - --fish <("$out/bin/kitty" + complete setup fish) \ - --zsh <("$out/bin/kitty" + complete setup zsh) + --bash <("$out/bin/kitty" +complete setup bash) \ + --fish <("$out/bin/kitty" +complete setup fish2) \ + --zsh <("$out/bin/kitty" +complete setup zsh) terminfo_src=${if stdenv.isDarwin then ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index da9bfac952b..3e4454726b6 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.11.1"; + version = "3.12.1"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "1n7588bl83sp51jwjq97f526c7fkh0kq90idw3nayb4zmi530irx"; + sha256 = "sha256-jVcf/nrEq8dM8rw40ZhXGJjt3DQLroCePtIAdAsVIfs="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 738260646f2..3530b2d1d2f 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "370"; + version = "372"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "ljxdhAoPD0wHf/KEWG6LH4Pz+YPcpvdPSzYZdbU4jII="; + sha256 = "xtCBJ8skCcOgS8rlWbcCUZbtdwu3vyZjCry0XZX2CrE="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 0aa3f0d02ab..38aca7350a6 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZFKUG8dE1hpWPGitdQlYeBSzWn3LPR7VGWsuq1Le5OQ="; + sha256 = "sha256-7S676bpSrlAqpbgDj9nAo0WjeitbbHoYc693MJm35Js="; deepClone = true; }; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index a0dc4a205d6..c1f2c281c7a 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-RlEPC9yyPYj974UVto7w+r24Lc5+Et1Ks49o+QTdrZQ="; + sha256 = "sha256-khW+Ri+MZytMZcd2tRXhc/D6kOOhk+LP6MsS+GijjQM="; }; - cargoSha256 = "sha256-4tOeYiRBF4qDUiI6yU093y0Ttq7+CdmGaA5eqdMjgow="; + cargoSha256 = "sha256-SD1y+l86wqlJUUaG4ae4PXXSMS+4CPth3F4pLYbXMVc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/gg/default.nix b/pkgs/applications/version-management/git-and-tools/gg/default.nix index a5ea070ec0f..032c461a74c 100644 --- a/pkgs/applications/version-management/git-and-tools/gg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gg/default.nix @@ -3,32 +3,41 @@ , fetchFromGitHub , installShellFiles , makeWrapper +, bash +, coreutils , git , pandoc }: -buildGoModule rec { +let + version = "1.3.0"; + commit = "5bfe79b3632f15c442e8dc51ec206ab76354487f"; +in buildGoModule { pname = "gg-scm"; - version = "1.1.0"; + inherit version; src = fetchFromGitHub { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-kLmu4h/EBbSFHrffvusKq38X3/ID9bOlLMvEUtnFGhk="; + sha256 = "e628aeddb94d2470de860df09ef65499f8c5493fb336bf3df8502842ee02487f"; }; - patches = [ ./skip-broken-revert-tests.patch ]; + postPatch = '' + substituteInPlace cmd/gg/editor_unix.go \ + --replace /bin/sh ${bash}/bin/sh + ''; subPackages = [ "cmd/gg" ]; ldflags = [ "-s" "-w" "-X" "main.versionInfo=${version}" - "-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+" + "-X" "main.buildCommit=${commit}" ]; - vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk="; + vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; - nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ]; - buildInputs = [ git ]; + nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; + checkInputs = [ bash coreutils git ]; + buildInputs = [ bash git ]; postInstall = '' wrapProgram $out/bin/gg --suffix PATH : ${git}/bin diff --git a/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch b/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch deleted file mode 100644 index f8540952ae7..00000000000 --- a/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmd/gg/revert_test.go b/cmd/gg/revert_test.go -index 9420e9b..ff6ca93 100644 ---- a/cmd/gg/revert_test.go -+++ b/cmd/gg/revert_test.go -@@ -592,6 +592,7 @@ func TestRevert_LocalRename(t *testing.T) { - } - - func TestRevert_UnknownFile(t *testing.T) { -+ t.Skip("Broken in 1.1.0") - t.Parallel() - t.Run("EmptyRepo", func(t *testing.T) { - t.Parallel() diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 3774b43d37d..36b813f547e 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-T0xThL4VHzpNMQV8fTVnG7R+D9ol/Z7a4MYMXbkQ680="; + sha256 = "sha256-NvVm/deO4LSIl5TSziqsrGt9atCXjt4UZ/VJfmX3i4c="; }; - vendorSha256 = "sha256-tJg/vekGUYP4q1ZP5UV3+lXv6bht4doVV3IaGH+4uf8="; + vendorSha256 = "sha256-pBjg6WyD61+Bl3ttcpl/b9XoWBCi7cDvE8NPaZGu7Aw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 87bd4d891c7..543e3a7501a 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.7.8"; + version = "1.7.11"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-NZlPcr13onxgbmKPdv0ODOhYDT5T+OeSvHE8VGOGyo4="; + sha256 = "sha256-/JecaTRmqTB1I0tqBRidlqWOvNE6U5zep5/lFi8VTCc="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index b93491e267c..c9bf60a1eb9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-cctgZz65BliOePal4zrPpTbxMkz4GJj6gIh2YzEg+Do="; + sha256 = "sha256-CJ/2Cv/XoLq9U7u5mexH8iCCHbGtV6xohP3FapqO3+g="; }; - cargoSha256 = "sha256-M/BNqLZnLthaBONwn5XMmulmqyZTWv5LQFvxASDrBCI="; + cargoSha256 = "sha256-pYStKDgvvV/Z96TAonpDW7DIs1YSO6gAoiUCieVa9QY="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 3fd3a37419f..829ebedc1e8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , installShellFiles , git -, stestr , nix-update-script , testVersion , git-machete @@ -22,19 +21,15 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git stestr ]; - - postCheck = '' - stestr run - ''; + checkInputs = [ git ]; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh + installShellCompletion --fish completion/git-machete.fish ''; postInstallCheck = '' - git init test "$($out/bin/git-machete version)" = "git-machete version ${version}" ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 4490f8068e0..b76f7515eba 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { pname = "git-remote-hg"; - version = "1.0.2.1"; + version = "1.0.3.2"; src = fetchFromGitHub { owner = "mnauw"; repo = "git-remote-hg"; rev = "v${version}"; - sha256 = "1crgq13v2p9wmw1yhckmyzybh8h1nz3839qhqvzh48vxqkailzmn"; + sha256 = "0b5lfbrcrvzpz380817md00lbgy5yl4y76vs3vm0bpm5wmr7c027"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix index ec4db1631b0..a4e0290d310 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix @@ -2,8 +2,8 @@ }: let - version = "1.2.2"; - sha256 = "sha256-PhxYiTMXg8qRqwbrZaw9UH7pdvXTEnrd09TiYPepzmk="; + version = "1.3.0"; + sha256 = "sha256-CFv9gZQHeEiZctJFyB6PJ1dVNkrQ7PlVtgZuteQQTJ0="; in stdenv.mkDerivation { pname = "git-vendor"; diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix index 3c110402912..f8034ce42d7 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.5.14"; + version = "1.5.15"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q1zPPT0gNI96n8PIk1qATRzxm5vmGmRMwZ9j7bb8knk="; + sha256 = "sha256-4oI0opwbmEyHc3zx06l8bDPnOi7rGrMqUJPBDAfmPY0="; }; - cargoSha256 = "sha256-JKM98cpZz2MTa+f2A7NRcKwGjbm4YRabMlV6DHXT64U="; + cargoSha256 = "sha256-rmECD/0ThDXBAGqDMNbyHi9eoGNOJhBndaxCuUS/qpc="; # tests require it to be in a git repository preCheck = '' diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index f1be6a4fc8d..8f4acbc3fc4 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "lab"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "0g8v3cli8rvr0zsxiv4w0afzqmh0d85a832c4hc75b3f9amkr0dl"; + sha256 = "sha256-sw00D/PJaLAPHoPdJC2WYUNklIzMbc/bXt2jlQZ7E90="; }; subPackages = [ "." ]; - vendorSha256 = "09xn5vycb9shygs13pfwxlb89j6rhrbplm10mfgxi4kzlvm7agl6"; + vendorSha256 = "sha256-FwnVMH//GwFbi+llFF6XNqrZX2hRB4r51p8TRz2vN+g="; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix index 7d91fb77542..e1129a72742 100644 --- a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "lucky-commit"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "not-an-aardvark"; repo = pname; rev = "v${version}"; - sha256 = "0vs668i1yglfcqs94jhwdk90v0lja2w5kr5gakz082wykilms0zg"; + sha256 = "sha256-FnH9rDy6opu0WJnCgAFvxJXWKyD2v5eGPNmbC1cvzko="; }; - cargoSha256 = "sha256-MvopLKhovwXaEmRgXnAzJeuhPgqnMjt0EtKUGSWFpaY="; + cargoSha256 = "sha256-iEYkOPAcWIwK7mthovrGFHfp/NsQ4ycqiTZvkHnYWzA="; buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index a431a50af3b..63f7a459a70 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pass-git-helper"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; rev = "v${version}"; - sha256 = "sha256-HEdOR6jS16c4UIatlgB6HeBtyyxePSab+6e2hu85dsI="; + sha256 = "sha256-An9JKnS/Uor7iZ+lbBGR3eOkxOgV+SjnCWN/QmqFI/I="; }; propagatedBuildInputs = [ pyxdg ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index f4eeb4aac12..7fe27da6080 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.21"; + version = "2.22"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-nl/NFbyL0MWgvpwaqkCOkKuSquFTQRKZ7Ski5qYRL9w="; + sha256 = "sha256-oVwvoZdjD6V3CHECZOYBSYVtCX1XwW5fynyCn7Oj+Bc="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 7da383e325d..37000982d8e 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.16.2"; + version = "1.16.3"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-fN7F76TzxBwvUbe2Ha5sfAk6x+FaUDIdx8YaQKfndSU="; + sha256 = "sha256-kT87CV/P1MUBLRetzYdIsIGVDjp9F6zmD2ovmcmy4Ys="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 319fddcc06b..83991407fd4 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "github-desktop"; - version = "2.9.6"; + version = "2.9.9"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - sha256 = "sha256-YL3Gc76jWfQvY96pAlS5JB7BwSOUklNvGR0tOBdQHuE="; + sha256 = "sha256-LMKOxQR3Bgw00LnKqAe2hq+eASgwC7y0cxNSSt/sjWA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 55a2f1627b9..2cdc2936535 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -3,7 +3,7 @@ , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid -, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems +, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon }: with lib; @@ -11,22 +11,25 @@ with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; - version = "8.2.1"; + version = "8.3.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-FjG7htwMRLZmwH6OjjyHkGUTaVNzuMTn6BjXUnCgwAA="; + sha256 = "sha256-iAXw6+KCyfyabyJvBQ5cLNEMNbsELL9sQaZkzZL7+/w="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-cBZ53lekhPl5yjxclg2PeMCL0NKwshkKhP/lFbEinCs="; + sha256 = "sha256-Spgx5JQ/AENYdvkl7+YnBaNk/VI9DdyN17ABfxanfZ4="; }; - aarch64-darwin = srcs.x86_64-darwin; + aarch64-darwin = fetchzip { + url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; + sha256 = "sha256-PJ4/R1pHbfoSBHhIyiqcGoE13FSWQapxj4Lq+ZdcYCQ="; + }; }; src = srcs.${stdenv.hostPlatform.system} or throwSystem; @@ -85,6 +88,8 @@ let krb5 libdrm mesa + libxshmfence + libxkbcommon ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix new file mode 100644 index 00000000000..3737828ef72 --- /dev/null +++ b/pkgs/applications/version-management/gitqlient/default.nix @@ -0,0 +1,41 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, qmake +, qtwebengine +, gitUpdater +}: + +mkDerivation rec { + pname = "gitqlient"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "francescmm"; + repo = pname; + rev = "v${version}"; + sha256 = "018jz6b28zwr205jmgw13ddlfvlhxqf0cw1pfjiwsi6i8gay7w6s"; + }; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtwebengine + ]; + + qmakeFlags = [ + "GitQlient.pro" + ]; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + homepage = "https://github.com/francescmm/GitQlient"; + description = "Multi-platform Git client written with Qt"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix new file mode 100644 index 00000000000..fbf800363ab --- /dev/null +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, dbus +, sqlite +, Security +, SystemConfiguration +, libiconv +, testVersion +, jujutsu +}: + +rustPlatform.buildRustPackage rec { + pname = "jujutsu"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "martinvonz"; + repo = "jj"; + rev = "v${version}"; + sha256 = "sha256-BOT2pKcOSOha28fba62X+GgILcplhkMWhZo7Q0gGTQ8="; + }; + + cargoSha256 = "sha256-uvR+WXX2iIWFhcPYpOoOS1WBvOXuhTmgVVT2446c6XE="; + + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + dbus + sqlite + ] ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + libiconv + ]; + + passthru.tests = { + version = testVersion { + package = jujutsu; + command = "jj --version"; + }; + }; + + meta = with lib; { + description = "A Git-compatible DVCS that is both simple and powerful"; + homepage = "https://github.com/martinvonz/jj"; + changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 17d21f30e3b..9dc3e0329e3 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,13 +21,18 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.0.3"; + version = "6.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-Z/E2R6RlF6K1Z83Lc8mHIdddNqBDLeuxUCK3f5wTgzM="; + sha256 = "sha256-hvmGReRWWpJWmR3N4it3uOfSLKb7tgwfTNvYRpo4zB8="; }; + patches = [ + # Fix the type of libc buffer for aarch64-linux + ./fix-rhg-type-aarch64.patch + ]; + format = "other"; passthru = { inherit python; }; # pass it so that the same version can be used in hg2git @@ -35,7 +40,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE="; + sha256 = "sha256-+Y91gEC8vmyutNpVFAAL4MSg4KnpFbhH12CIuMRx0Mc="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -181,6 +186,10 @@ in nativeBuildInputs = self.nativeBuildInputs; dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + doCheck = false; installPhase = '' runHook preInstall diff --git a/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch b/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch new file mode 100644 index 00000000000..84417b497c0 --- /dev/null +++ b/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch @@ -0,0 +1,12 @@ +diff --git a/rust/hg-core/src/lock.rs b/rust/hg-core/src/lock.rs +--- a/rust/hg-core/src/lock.rs ++++ b/rust/hg-core/src/lock.rs +@@ -145,7 +145,7 @@ lazy_static::lazy_static! { + + /// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414 + const BUFFER_SIZE: usize = 1024; +- let mut buffer = [0_i8; BUFFER_SIZE]; ++ let mut buffer = [0 as libc::c_char; BUFFER_SIZE]; + let hostname_bytes = unsafe { + let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE); + if result != 0 { diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkrev/default.nix index 36e9154571b..66c1aa4d0e1 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkrev/default.nix @@ -1,18 +1,21 @@ { lib, stdenv, fetchurl, tcl, tk }: stdenv.mkDerivation rec { - pname = "tkcvs"; - version = "8.2.1"; + pname = "tkrev"; + version = "9.4.1"; src = fetchurl { - url = "mirror://sourceforge/tkcvs/tkcvs_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; + url = "mirror://sourceforge/tkcvs/tkrev_${version}.tar.gz"; + sha256 = "sha256-WHDZPShEB9Q+Bjbb37mogJLUZk2GuWoO8bz+Zydc7i4="; }; buildInputs = [ tcl tk ]; patchPhase = '' - sed -e 's@exec wish@exec ${tk}/bin/wish@' -i tkcvs/tkcvs.tcl tkdiff/tkdiff + for file in tkrev/tkrev.tcl tkdiff/tkdiff; do + substituteInPlace "$file" \ + --replace "exec wish" "exec ${tk}/bin/wish" + done ''; installPhase = '' diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 66f3b9a0aaf..6a9903c25b2 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -7,11 +7,11 @@ python3Packages.buildPythonApplication rec { pname = "tortoisehg"; - version = "6.0"; + version = "6.1"; src = fetchurl { url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "sha256-25uQ2llF/+wqdGpun/nzlvAf286OIRmlZUISZ0szH6Y="; + sha256 = "sha256-UG13BlFY9DcsCPWaBiYa6r2oA3ieJtTYfXknDoKNkYI="; }; # Extension point for when thg's mercurial is lagging behind mainline. diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 4f09fc14d9f..0e97eab1773 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -12,7 +12,7 @@ , desktop-file-utils , makeWrapper , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook4 , meson , gjs , gtk4 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { pkg-config python3 shared-mime-info # for update-mime-database - wrapGAppsHook # for gsettings + wrapGAppsHook4 # for gsettings ]; buildInputs = [ diff --git a/pkgs/applications/video/epgstation/client/package.json b/pkgs/applications/video/epgstation/client/package.json new file mode 100644 index 00000000000..6ba9974afa5 --- /dev/null +++ b/pkgs/applications/video/epgstation/client/package.json @@ -0,0 +1,57 @@ +{ + "name": "epgstation-client", + "version": "2.6.20", + "private": true, + "scripts": { + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "watch": "vue-cli-service build --watch --mode development" + }, + "dependencies": { + "@mdi/font": "6.5.95", + "aribb24.js": "1.8.8", + "axios": "0.24.0", + "eventemitter2": "6.4.5", + "hls.js": "1.1.2", + "inversify": "6.0.1", + "json-stable-stringify": "1.0.1", + "lodash": "4.17.21", + "material-design-icons-iconfont": "6.1.1", + "mpegts.js": "1.6.10", + "reflect-metadata": "0.1.13", + "resize-observer-polyfill": "1.5.1", + "roboto-fontface": "*", + "smoothscroll-polyfill": "0.4.4", + "socket.io-client": "4.3.2", + "typeface-roboto": "1.1.13", + "vue": "2.6.14", + "vue-class-component": "7.2.6", + "vue-property-decorator": "9.1.2", + "vue-router": "3.5.3", + "vuetify": "2.5.10", + "vuetify-datetime-picker": "2.1.1", + "@types/hls.js": "0.13.3", + "@types/json-stable-stringify": "1.0.33", + "@types/lodash": "4.14.178", + "@types/smoothscroll-polyfill": "0.3.1", + "@types/socket.io-client": "1.4.36", + "@typescript-eslint/eslint-plugin": "4.33.0", + "@typescript-eslint/parser": "4.33.0", + "@vue/cli-plugin-eslint": "4.5.12", + "@vue/cli-plugin-typescript": "4.5.13", + "@vue/cli-plugin-vuex": "4.5.13", + "@vue/cli-service": "4.5.13", + "@vue/eslint-config-prettier": "6.0.0", + "@vue/eslint-config-typescript": "7.0.0", + "eslint": "7.32.0", + "eslint-plugin-prettier": "3.4.1", + "eslint-plugin-vue": "7.20.0", + "prettier": "2.4.1", + "sass": "1.32.12", + "sass-loader": "10.2.0", + "typescript": "4.4.4", + "vue-cli-plugin-vuetify": "2.4.3", + "vue-template-compiler": "2.6.14", + "vuetify-loader": "1.7.3" + } +} diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 3d910ad4c0e..77510ae153d 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -10,17 +10,18 @@ , nodePackages , gzip , jq +, yq }: let # NOTE: use updateScript to bump the package version pname = "EPGStation"; - version = "1.7.5"; + version = "2.6.20"; src = fetchFromGitHub { owner = "l3tnun"; repo = "EPGStation"; rev = "v${version}"; - sha256 = "06yaf5yb5rp3q0kdhw33df7px7vyfby885ckb6bdzw3wnams5d8m"; + sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig="; }; workaround-opencollective-buildfailures = stdenv.mkDerivation { @@ -35,19 +36,44 @@ let ''; }; - pkg = nodePackages.epgstation.override (drv: { + client = nodePackages.epgstation-client.override (drv: { + # FIXME: remove this option if possible + # + # Unsetting this option resulted NPM attempting to re-download packages. + dontNpmInstall = true; + + meta = drv.meta // { + inherit (nodejs.meta) platforms; + }; + }); + + server = nodePackages.epgstation.override (drv: { inherit src; + bypassCache = false; + + # This is set to false to keep devDependencies at build time. Build time + # dependencies are pruned afterwards. + production = false; + buildInputs = [ bash ]; nativeBuildInputs = [ + nodejs workaround-opencollective-buildfailures makeWrapper - nodePackages.node-pre-gyp - ]; + ] ++ (with nodePackages; [ + node-pre-gyp + node-gyp-build + ]); preRebuild = '' # Fix for not being able to connect to mysql using domain sockets. - patch -p1 ${./use-mysql-over-domain-socket.patch} + patch -p1 < ${./use-mysql-over-domain-socket.patch} + + # Workaround for https://github.com/svanderburg/node2nix/issues/275 + sed -i -e "s|#!/usr/bin/env node|#! ${nodejs}/bin/node|" node_modules/node-gyp-build/bin.js + + find . -name package-lock.json -delete ''; postInstall = let @@ -56,12 +82,19 @@ let '' mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1} - pushd $out/lib/node_modules/EPGStation + pushd $out/lib/node_modules/epgstation + + cp -r ${client}/lib/node_modules/epgstation-client/node_modules client/node_modules + chmod -R u+w client/node_modules npm run build + npm prune --production + pushd client + npm prune --production + popd - mv config/{enc.sh,enc.js} $out/libexec + mv config/enc.js.template $out/libexec/enc.js mv LICENSE Readme.md $out/share/doc/epgstation mv doc/* $out/share/doc/epgstation sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \ @@ -82,8 +115,9 @@ let ln -sfT /var/lib/epgstation/thumbnail thumbnail makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ - --run "cd $out/lib/node_modules/EPGStation" \ - --prefix PATH : ${lib.makeBinPath runtimeDeps} + --run "cd $out/lib/node_modules/epgstation" \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} \ + --set APP_ROOT_PATH "$out/lib/node_modules/epgstation" popd ''; @@ -99,22 +133,25 @@ let common-updater-scripts genericUpdater writers - jq; + jq + yq; }; # nodePackages.epgstation is a stub package to fetch npm dependencies and - # is marked as broken to prevent users from installing it directly. This - # technique ensures epgstation can share npm packages with the rest of - # nixpkgs while still allowing us to heavily customize the build. It also - # allows us to provide devDependencies for the epgstation build process - # without doing the same for all the other node packages. - meta = drv.meta // { broken = false; }; + # its meta.platforms is made empty to prevent users from installing it + # directly. This technique ensures epgstation can share npm packages with + # the rest of nixpkgs while still allowing us to heavily customize the + # build. It also allows us to provide devDependencies for the epgstation + # build process without doing the same for all the other node packages. + meta = drv.meta // { + inherit (nodejs.meta) platforms; + }; }); in -pkg // { +server // { name = "${pname}-${version}"; - meta = with lib; pkg.meta // { + meta = with lib; server.meta // { maintainers = with maintainers; [ midchildan ]; # NOTE: updateScript relies on this being correct diff --git a/pkgs/applications/video/epgstation/epgstation.1 b/pkgs/applications/video/epgstation/epgstation.1 index bb5c0238137..2dc67f64608 100644 --- a/pkgs/applications/video/epgstation/epgstation.1 +++ b/pkgs/applications/video/epgstation/epgstation.1 @@ -27,7 +27,7 @@ platforms, run to start EPGStation. .Sh FILES .Bl -tag -width Ds -compact -.It Pa /etc/epgstation/config.json +.It Pa /etc/epgstation/config.yml .Nm configuration file. .El @@ -48,5 +48,9 @@ Restore the EPGstation database. .Pp .Dl $ epgstation run restore /path/to/src .Pp +Restore the EPGstation database from the prior v1 release. +.Pp +.Dl $ epgstation run v1migrate /path/to/src +.Pp .Sh SEE ALSO .Xr npm 1 diff --git a/pkgs/applications/video/epgstation/package.json b/pkgs/applications/video/epgstation/package.json index 53b1ebca2da..cf302a95161 100644 --- a/pkgs/applications/video/epgstation/package.json +++ b/pkgs/applications/video/epgstation/package.json @@ -1,85 +1,72 @@ { - "name": "EPGStation", - "version": "1.7.5", + "name": "epgstation", + "version": "2.6.20", "description": "DTV Software in Japan.", "repository": { "type": "git", - "url": "https://github.com/l3tnun/EPGStation.git" + "url": "git+https://github.com/l3tnun/EPGStation-V2.git" }, "author": "l3tnun", "license": "MIT", "bugs": { - "url": "https://github.com/l3tnun/EPGStation/issues" - }, - "homepage": "https://github.com/l3tnun/EPGStation#readme", - "engines": { - "node": "^10.x.x < 11 || ^12.14.0 < 13 || ^14.5.0 < 15" + "url": "https://github.com/l3tnun/EPGStation-V2/issues" }, + "homepage": "https://github.com/l3tnun/EPGStation-V2#readme", "dependencies": { - "aribts": "^2.1.12", - "b24.js": "1.0.3", - "basic-auth": "2.0.1", + "arib-subtitle-timedmetadater": "4.0.9", + "aribts": "2.1.12", + "axios": "0.24.0", "body-parser": "1.19.0", - "chart.js": "2.9.3", - "css-ripple-effect": "1.0.5", - "diskusage": "1.1.3", + "cors": "2.8.5", + "diskusage-ng": "1.0.2", "express": "4.17.1", - "express-openapi": "7.0.1", - "fs-extra": "9.0.1", - "hls-b24.js": "0.12.3", - "js-yaml": "3.14.0", - "lodash": "4.17.20", + "express-openapi": "9.3.0", + "file-type": "16.5.3", + "inversify": "5.1.1", + "js-yaml": "4.1.0", + "lodash": "4.17.21", "log4js": "6.3.0", - "material-design-icons": "3.0.1", - "material-design-lite": "1.3.0", "minimist": "1.2.5", - "mirakurun": "3.3.1", - "mithril": "2.0.4", + "mirakurun": "3.9.0-beta.26", "mkdirp": "1.0.4", - "multer": "1.4.2", + "multer": "1.4.3", "mysql": "2.18.1", - "openapi-types": "7.0.1", - "pg": "8.3.3", - "request": "2.88.2", - "socket.io": "2.3.0", - "socket.io-client": "2.3.0", - "sqlite3": "5.0.0", - "swagger-ui-dist": "3.34.0", + "openapi-types": "9.3.0", + "reflect-metadata": "0.1.13", + "socket.io": "4.3.1", + "source-map-support": "0.5.20", + "sqlite3": "5.0.2", + "swagger-ui-dist": "3.52.5", + "typeorm": "0.2.38", "url-join": "4.0.1", - "@types/basic-auth": "1.1.3", - "@types/body-parser": "1.19.0", - "@types/chart.js": "2.9.24", - "@types/express": "4.17.8", - "@types/hls.js": "0.13.1", - "@types/js-yaml": "3.12.5", - "@types/lodash": "4.14.161", - "@types/material-design-lite": "1.1.16", - "@types/minimist": "1.2.0", - "@types/mithril": "2.0.3", - "@types/mkdirp": "1.0.1", - "@types/multer": "1.4.4", - "@types/mysql": "2.15.15", - "@types/node": "14.11.1", - "@types/pg": "7.14.5", - "@types/request": "2.48.5", - "@types/socket.io": "2.1.11", - "@types/socket.io-client": "1.4.33", - "@types/sqlite3": "3.1.6", - "@types/url-join": "4.0.0", - "del": "5.1.0", + "@types/body-parser": "1.19.1", + "@types/express": "4.17.13", + "@types/file-type": "10.9.1", + "@types/js-yaml": "4.0.4", + "@types/lodash": "4.14.176", + "@types/minimist": "1.2.2", + "@types/mkdirp": "1.0.2", + "@types/mongodb": "4.0.6", + "@types/multer": "1.4.7", + "@types/node": "16.11.6", + "@types/socket.io": "3.0.1", + "@types/source-map-support": "0.5.4", + "@types/sqlite3": "3.1.7", + "@types/url-join": "4.0.1", + "@typescript-eslint/eslint-plugin": "4.33.0", + "@typescript-eslint/parser": "4.33.0", + "del": "6.0.0", + "eslint": "7.32.0", + "eslint-config-prettier": "8.3.0", + "eslint-plugin-prettier": "3.4.1", "gulp": "4.0.2", - "gulp-clean-css": "4.3.0", - "gulp-concat": "2.6.1", - "gulp-dart-sass": "1.0.2", + "gulp-eslint": "6.0.0", "gulp-plumber": "1.2.1", - "gulp-sourcemaps": "2.6.5", - "gulp-tslint": "8.1.4", + "gulp-sourcemaps": "3.0.0", "gulp-typescript": "5.0.1", - "terser-webpack-plugin": "4.2.2", - "ts-loader": "8.0.4", - "tslint": "6.1.3", - "typescript": "4.0.3", - "webpack": "4.44.2", - "webpack-stream": "6.1.0" + "prettier": "2.4.1", + "ts-loader": "9.2.6", + "ts-node": "10.4.0", + "typescript": "4.4.4" } } diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index 5c2fbe66f04..5eb23be6c52 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -6,6 +6,7 @@ , genericUpdater , writers , jq +, yq }: let @@ -40,6 +41,11 @@ in writers.writeBash "update-epgstation" '' } | del(.devDependencies, .main, .scripts)' \ "$SRC/package.json" \ > package.json + ${jq}/bin/jq '. + { + dependencies: (.dependencies + .devDependencies), + } | del(.devDependencies, .main, .scripts)' \ + "$SRC/client/package.json" \ + > client/package.json # Regenerate node packages to update the pre-overriden epgstation derivation. # This must come *after* package.json has been regenerated. @@ -49,18 +55,11 @@ in writers.writeBash "update-epgstation" '' # Generate default streaming settings for the nixos module. pushd ../../../../nixos/modules/services/video/epgstation - ${jq}/bin/jq ' - { liveHLS - , liveMP4 - , liveWebM - , mpegTsStreaming - , mpegTsViewer - , recordedDownloader - , recordedStreaming - , recordedHLS - , recordedViewer - }' \ - "$SRC/config/config.sample.json" \ + ${yq}/bin/yq -j '{ urlscheme , stream }' \ + "$SRC/config/config.yml.template" \ > streaming.json + + # Fix generated output for EditorConfig compliance + printf '\n' >> streaming.json # rule: insert_final_newline popd '' diff --git a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch b/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch index 48640f2ba08..87bb3e7fbd1 100644 --- a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch +++ b/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch @@ -1,17 +1,46 @@ -diff --git a/src/server/ConfigInterface.ts b/src/server/ConfigInterface.ts -index d23badd..1dd2b98 100644 ---- a/src/server/ConfigInterface.ts -+++ b/src/server/ConfigInterface.ts -@@ -11,9 +11,10 @@ interface ConfigInterface { - dbPath: string; - dbInfoPath: string; - mysql: { +diff --git a/ormconfig.js b/ormconfig.js +index 5591853b..838c06cb 100644 +--- a/ormconfig.js ++++ b/ormconfig.js +@@ -38,8 +38,6 @@ switch (config.dbtype) { + + case 'mysql': + ormConfig.type = 'mysql'; +- ormConfig.host = config.mysql.host; +- ormConfig.port = config.mysql.port; + ormConfig.username = config.mysql.user; + ormConfig.password = config.mysql.password; + ormConfig.database = config.mysql.database; +@@ -49,6 +47,12 @@ switch (config.dbtype) { + } else { + ormConfig.charset = config.mysql.charset; + } ++ if (config.mysql.socketPath) { ++ ormConfig.socketPath = config.mysql.socketPath; ++ } else { ++ ormConfig.host = config.mysql.host; ++ ormConfig.port = config.mysql.port; ++ } + break; + + case 'postgres': +diff --git a/src/model/IConfigFile.ts b/src/model/IConfigFile.ts +index 6a502e83..ba84a423 100644 +--- a/src/model/IConfigFile.ts ++++ b/src/model/IConfigFile.ts +@@ -61,12 +61,13 @@ export default interface IConfigFile { + regexp?: boolean; + }; + mysql?: { - host: string; + host?: string; -+ socketPath?: string; user: string; -- password: string; -+ password?: string; +- port: number; ++ port?: number; + password: string; database: string; - connectTimeout: number; - connectionLimit: number; + charset?: string; ++ socketPath?: string; + }; + postgres?: { + host: string; diff --git a/pkgs/applications/video/f1viewer/default.nix b/pkgs/applications/video/f1viewer/default.nix index 33e1863428e..7c091b425af 100644 --- a/pkgs/applications/video/f1viewer/default.nix +++ b/pkgs/applications/video/f1viewer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "f1viewer"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "SoMuchForSubtlety"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cTXueIOD+OXx4WikhdNv3v/F2/f5aDicyPP7FgTU6AM="; + sha256 = "sha256-MY8xqpAzK1c4XL7w/LR83DyHFCI5X7wldosDDo7pXNI="; }; - vendorSha256 = "sha256-47uLx4t0N1T3zqZ9o/su/onJEUdGXpq+iVSUaRnwW3I="; + vendorSha256 = "sha256-8c1+t6Lo11Q2kEDy9IWLw9bsZYtJFksE7Om3ysx7fc4="; meta = with lib; { description = diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 28a974a7cc6..a2f802c6e87 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.6"; + version = "1.22.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aPPRzNotm3ATL0lEq+49lrlrHoNp+Dm1Im5jYF4E1vY="; + sha256 = "sha256-vxiq6q8fPh8ZLKnxYdIN591UQW73FWsoke1PvKTkko8="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index 93f11e78ffb..d80384f7b26 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook +{ lib, stdenv, fetchurl, openjdk17, makeWrapper, autoPatchelfHook , zlib, libzen, libmediainfo, curl, libmms, glib }: @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "filebot"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { - url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "sha256-fz0B9P/UBrlKGPZkheMd/4cFnWHt+brS3zRTv4nVt9o="; + url = "https://web.archive.org/web/20220226124706/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; + sha256 = "sha256-LNvfAueDMd2TedK6bqnNG+J/4YhhbmUca9iyUkoUNkE="; }; unpackPhase = "tar xvf $src"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' wrapProgram $out/opt/filebot.sh \ - --prefix PATH : ${lib.makeBinPath [ openjdk11 ]} + --prefix PATH : ${lib.makeBinPath [ openjdk17 ]} # Expose the binary in bin to make runnable. ln -s $out/opt/filebot.sh $out/bin/filebot ''; diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 8b90704a535..c93be6b6383 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications + mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/icons/hicolor/scalable/apps cp -a ${appimageContents}/{locales,resources} $out/share/${pname} cp -a ${appimageContents}/freetube.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons $out/share + cp -a ${appimageContents}/usr/share/icons/hicolor/scalable/freetube.svg $out/share/icons/hicolor/scalable/apps substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 0ffb5170dc2..99ddd7b24b6 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitHub { owner = "vishen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BCOyeXo3uoR4ry/nFbF+//U62/hHnPK+tbG+8Rv6Rv0="; + sha256 = "sha256-h8qWwMaEhXnj6ZSrKAXBVbrMR0je41EoOtFeN9XlCuk="; }; - vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; + vendorSha256 = "sha256-PpMLHuJR6irp+QHhzguwGtBy30HM7DR0tNGiwB07M5E="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; diff --git a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix index 758e509b85d..9c7041441ff 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "19.0.2"; + version = "19.1.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "sha256-iFAOoQvZAdvJvN8FBg2w+oZWtr8mYdBQ3QX58HLmBho="; + sha256 = "sha256-sYVb4nhUz2j19yv3/cyLyUAC+1K0c05+iAMEfpPifjs="; }; extraBuildInputs = [ jsoncpp libhdhomerun ]; diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 89eeed89048..18319468eae 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -38,24 +38,24 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20211024"; - kodiVersion = "19.3"; + kodiReleaseDate = "20220303"; + kodiVersion = "19.4"; rel = "Matrix"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "02bnknk87zzv9j6b6k9c0xx47q2gh399j6v25rm94g7rhzf8phbw"; + sha256 = "sha256-XDtmY3KthiD91kvueQRSamBcdM7fBpRntmZX6KRsCzE="; }; ffmpeg = stdenv.mkDerivation rec { pname = "kodi-ffmpeg"; - version = "4.3.2"; + version = "4.3.2"; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ffmpeg/FFMPEG-VERSION src = fetchFromGitHub { owner = "xbmc"; repo = "FFmpeg"; - rev = "${version}-${rel}-${kodiVersion}"; + rev = "${version}-${rel}-19.2"; sha256 = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f"; }; preConfigure = '' diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix index d1f60c3dd2c..e6be6f54e1d 100644 --- a/pkgs/applications/video/losslesscut-bin/appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/appimage.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version }: +{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }: let pname = "losslesscut"; @@ -11,7 +11,7 @@ let src = fetchurl { url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; name = nameSource; - sha256 = "0aqz5ijl5japfzzbcdcd2mmihkb8b2fc2hs9kkm3211yb37c5ygv"; + inherit sha256; }; extracted = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 01f9c158062..be7786f9102 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,9 +1,9 @@ { callPackage, stdenvNoCC, lib }: let - version = "3.33.1"; - appimage = callPackage ./appimage.nix { inherit version; }; - dmg = callPackage ./dmg.nix { inherit version; }; - windows = callPackage ./windows.nix { inherit version; }; + version = "3.43.0"; + appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; }; + dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; }; + windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; }; in ( if stdenvNoCC.isDarwin then dmg else if stdenvNoCC.isCygwin then windows @@ -13,7 +13,7 @@ in ( meta = with lib; { description = "The swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; - license = licenses.mit; + license = licenses.gpl2Only; maintainers = with maintainers; [ ShamrockLee ]; } // oldAttrs.meta // { platforms = diff --git a/pkgs/applications/video/losslesscut-bin/dmg.nix b/pkgs/applications/video/losslesscut-bin/dmg.nix index 3d0bad19757..3cbd77198b9 100644 --- a/pkgs/applications/video/losslesscut-bin/dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/dmg.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, fetchurl, undmg, version }: +{ stdenvNoCC, lib, fetchurl, undmg, version , sha256 }: let pname = "losslesscut"; @@ -10,7 +10,7 @@ let src = fetchurl { url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; name = nameSource; - sha256 = "0xa1avbwar7x7kv5yn2ldca4vj3nwaz0dhjm3bcdy59q914xn3dj"; + inherit sha256; }; in stdenvNoCC.mkDerivation { inherit pname version src; diff --git a/pkgs/applications/video/losslesscut-bin/windows.nix b/pkgs/applications/video/losslesscut-bin/windows.nix index fe5df9d6c90..0e6ed9b0412 100644 --- a/pkgs/applications/video/losslesscut-bin/windows.nix +++ b/pkgs/applications/video/losslesscut-bin/windows.nix @@ -3,6 +3,7 @@ , fetchurl , unzip , version +, sha256 , useMklink ? false , customSymlinkCommand ? null }: @@ -18,12 +19,12 @@ let else if useMklink then (targetPath: linkPath: "mklink ${targetPath} ${linkPath}") else (targetPath: linkPath: "ln -s ${targetPath} ${linkPath}"); in stdenvNoCC.mkDerivation { - inherit pname version; + inherit pname version sha256; src = fetchurl { name = nameSource; url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; - sha256 = "1rq9frab0jl9y1mgmjhzsm734jvz0a646zq2wi5xzzspn4wikhvb"; + inherit sha256; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 26d80b1596c..712ccacd7a0 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.16.5"; + version = "1.16.7"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "1y14yxhjj0sdq0s24qr58m0ddhna2rf0q0w3ny888as4wbqiwvm0"; + sha256 = "sha256-YjsYW2MmzDZqOMdYlqE0dZ399Qq8hJRQ9BCViNexLHs="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "131vdi4gyc996z77rrcqb9nfbd62j8314ai4ib1jnilmrsrk93p5"; + sha256 = "sha256-TL0PRP/pDg16qsbYi9RYyD0egNDaxuApmR86hiR/Rq8="; }; in mkDerivation { @@ -55,15 +55,15 @@ in mkDerivation { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon - install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* - install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* - install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop - install -Dm444 -t $out/share/icons/hicolor/16x16 ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/* - install -Dm444 -t $out/share/icons/hicolor/32x32 ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/* - install -Dm444 -t $out/share/icons/hicolor/64x64 ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/* - install -Dm444 -t $out/share/icons/hicolor/128x128 ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/* - install -Dm444 -t $out/share/icons/hicolor/256x256 ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/* + install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon + install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* + install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* + install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop + install -Dm444 -t $out/share/icons/hicolor/16x16/apps ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/* + install -Dm444 -t $out/share/icons/hicolor/32x32/apps ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/* + install -Dm444 -t $out/share/icons/hicolor/64x64/apps ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/* + install -Dm444 -t $out/share/icons/hicolor/128x128/apps ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/* + install -Dm444 -t $out/share/icons/hicolor/256x256/apps ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/* runHook postInstall ''; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 576f79c4779..3ceda57fb89 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -15,7 +15,6 @@ , freetype , libass , libpthreadstubs -, mujs , nv-codec-headers , lua , libuchardet @@ -56,6 +55,7 @@ , cmsSupport ? true, lcms2 , dvdnavSupport ? stdenv.isLinux, libdvdnav , jackaudioSupport ? false, libjack2 +, javascriptSupport ? true, mujs , libpngSupport ? true, libpng , openalSupport ? true, openalSoft , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio @@ -108,6 +108,7 @@ in stdenv.mkDerivation rec { (lib.enableFeature archiveSupport "libarchive") (lib.enableFeature cddaSupport "cdda") (lib.enableFeature dvdnavSupport "dvdnav") + (lib.enableFeature javascriptSupport "javascript") (lib.enableFeature openalSupport "openal") (lib.enableFeature sdl2Support "sdl2") (lib.enableFeature sixelSupport "sixel") @@ -134,7 +135,6 @@ in stdenv.mkDerivation rec { libpthreadstubs libuchardet luaEnv - mujs ] ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals archiveSupport [ libarchive ] ++ lib.optionals bluraySupport [ libbluray ] @@ -145,6 +145,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals drmSupport [ libdrm mesa ] ++ lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ lib.optionals jackaudioSupport [ libjack2 ] + ++ lib.optionals javascriptSupport [ mujs ] ++ lib.optionals libpngSupport [ libpng ] ++ lib.optionals openalSupport [ openalSoft ] ++ lib.optionals pulseSupport [ libpulseaudio ] diff --git a/pkgs/applications/video/mpv/scripts/vr-reversal.nix b/pkgs/applications/video/mpv/scripts/vr-reversal.nix new file mode 100644 index 00000000000..4c4aacef31d --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/vr-reversal.nix @@ -0,0 +1,35 @@ +{ lib, stdenvNoCC, fetchFromGitHub, ffmpeg }: + +stdenvNoCC.mkDerivation rec { + pname = "vr-reversal"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "dfaker"; + repo = pname; + rev = "v${version}"; + sha256 = "1wn2ngcvn7wcsl3kmj782x5q9130qw951lj6ilrkafp6q6zscpqr"; + }; + + dontBuild = true; + + # reset_rot is only available in ffmpeg 5.0, see 5bcc61ce87922ecccaaa0bd303a7e195929859a8 + postPatch = lib.optionalString (lib.versionOlder ffmpeg.version "5.0") '' + substituteInPlace 360plugin.lua --replace ":reset_rot=1:" ":" + ''; + + installPhase = '' + mkdir -p $out/share/mpv/scripts + cp -r 360plugin.lua $out/share/mpv/scripts/ + ''; + + passthru.scriptName = "360plugin.lua"; + + meta = with lib; { + description = "Script for mpv to play VR video with optional saving of head tracking data."; + homepage = "https://github.com/dfaker/VR-reversal"; + license = licenses.unlicense; + platforms = platforms.all; + maintainers = with maintainers; [ schnusch ]; + }; +} diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 6d4e0f18d6f..eecb3a6b974 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "smplayer"; - version = "21.10.0"; + version = "22.2.0"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-p6036c8KX3GCINmkjHZlDLgHhLKri+t2WNWzP4KsSI8="; + hash = "sha256-7DMvIqW3vzjVzJPyjbXuHHcf1T6EFcf/a/mVYqa3XS8="; }; nativeBuildInputs = [ @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ qtscript ]; + buildInputs = [ + qtscript + ]; dontUseQmakeConfigure = true; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 911373c58e3..395da881ea9 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -27,7 +27,7 @@ }: let basename = "streamlink-twitch-gui"; - runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; + runtimeLibs = lib.makeLibraryPath [ gtk3-x11 libudev0-shim ]; runtimeBins = lib.makeBinPath [ streamlink ]; arch = if stdenv.hostPlatform.system == "x86_64-linux" @@ -39,16 +39,16 @@ let in stdenv.mkDerivation rec { pname = "${basename}-bin"; - version = "1.11.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz"; - sha256 = + hash = if arch == "linux64" then - "0y96nziavvpdvrpn58p6a175kaa8cgadp19rnbm250x9cypn1d9y" + "sha256-5AgQ+nvv/J493Zi+F+6QRT/DGg8JyusXsP5qVuXtiG4=" else - "0sfmhqf55w7wavqy4idsqpkf5p7l8sapjxap6xvyzpz4z5z6xr7y"; + "sha256-+jgTpIYb4BPM7Ixmo+YUeOX5OlQlMaRVEXf3WzS2lAI="; }; nativeBuildInputs = with xorg; [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 957911e239c..415790b4c11 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "3.1.1"; + version = "3.2.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-hVzTHpAOOuHVMoo3Ejv//irsUBoddLzdEvDSonWAYOQ="; + sha256 = "sha256-l3DS2DhExTeKc+FBMNy3YKvIVlZsqgpB/FuXoN7V2SY="; }; checkInputs = with python3Packages; [ @@ -44,7 +44,6 @@ python3Packages.buildPythonApplication rec { ''; changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md"; license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ]; }; } diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index a5e65480b2b..c19b8fa15cd 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -82,11 +82,11 @@ let in stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.16"; + version = "3.0.17"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "sha256-/641/GT2JcF1Vx0jRrxfYge+mXYlF/FUI+dPGDmUEPY="; + sha256 = "sha256-SL2b8zeqEHoVJOulfFLcSpHin1qX+97pL2pNupA4PNA="; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of @@ -187,11 +187,6 @@ stdenv.mkDerivation rec { BUILDCC = "${stdenv.cc}/bin/gcc"; patches = [ - # Required in order to run newer srt plugin. Remove it when next release arrives - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4250fe8f28c220d883db454cec2b2c76a07473eb/trunk/vlc-3.0.11.1-srt_1.4.2.patch"; - sha256 = "53poWjZfwq/6l316sqiCp0AtcGweyXBntcLDFPSokHQ="; - }) # patches to build with recent live555 # upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473 (fetchpatch { diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 955d609d7a2..b381d3ccca1 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "21.0"; + version = "22.1"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "00b0ij9sfv7zsrgwrcj2rzpy1z8bp0m0lmzjp433xzpcgcnzw3w5"; + sha256 = "sha256-KWCGcGB4HCpV7uSM4otQhSGEzQ+1jQip2fiAysNN54k="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "0lf7bb468s2ic9vabx954i46605gf7c6064vvwqvz7djk30z0y0d"; + cargoSha256 = "sha256-R70H1R9jFnQyOLI4UNuRzpOAAnGSBGpiHFKbxP2472o="; + + OPENSSL_NO_VENDOR = true; # Integration tests require root. cargoTestFlags = [ "--bins" ]; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index e83fc4ef501..980955fcda6 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "colima"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nov+DIaeYaRJy7Cz1hcKJUA88IKlZ4z/tn4WASZjxLI="; + sha256 = "sha256-g7q2DmtyArtW7Ii2XF5umXQ0+BlCSa1Q7VNNuIuX65k="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index aa4a9000d23..281f1f24612 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-0Fbmtb7Ec6WcA7ARtgdBK5i7yAq2t3iXtfLb/MZcKJA="; + sha256 = "sha256-NOFDUOypq/1ePM8rdK2cDnH1LsSZJ7eQOzDc5h4/PvY="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 4a2ec178be2..07e0cb6c533 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -18,6 +18,7 @@ let disabledTests = [ "test_capabilities.py" "test_cwd.py" + "test_delete.py" "test_detach.py" "test_exec.py" "test_hooks.py" @@ -37,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-zGtHO8CgpbXTh8nZ6WA0ocakzLjL/PW2IULI5QSEPVI="; + sha256 = "sha256-5q8HirGOPsbaJ7JoLa4DRYkZX3kucWOZ633nzx4zVhg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix new file mode 100644 index 00000000000..8e9ea890a9b --- /dev/null +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -0,0 +1,38 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "distrobox"; + version = "1.2.13"; + + src = fetchFromGitHub { + owner = "89luca89"; + repo = pname; + rev = version; + sha256 = "047mrhsfi88mgwylnnyxg6xa7hjjrajn2pf7vfmb6161myqybvfy"; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ./install -p $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Wrapper around podman or docker to create and start containers"; + longDescription = '' + Use any linux distribution inside your terminal. Enable both backward and + forward compatibility with software and freedom to use whatever distribution + you’re more comfortable with + ''; + homepage = "https://distrobox.privatedns.org/"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index cd8a1f5041a..3bc0f225de6 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.37.3"; + version = "1.37.4"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "sha256-jzwQ3nrhLDiQXcVkPiXrRAmpLQOD8ILBnoCEUiEbxzw="; + sha256 = "sha256-iz1V+wcrJf0grOe81kwbXPBqnvXpHnh7IMDdugaUOH0="; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index a149b5e4b33..440d094b430 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-5EV0Rw1+ufxQ1wmQ0EJXQ7HVtXVbB4do/tet0QFRi08="; + sha256 = "sha256-PSqVe4m2na6BjNxIKKZG1ja6zEzwI2AwgJlaMfaW2EM="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 35856eae01c..e2a3f1e1077 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.2.3"; + version = "2.3.3"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-c6rwRFJ/9moukd56qrmHxOeULhSPHCU0Cj+vw4TQ8+Q="; + sha256 = "sha256-PFR7EcRkqn/d6gYlMNN36nRIslYEN0JFSbFU9niGc+Y="; }; - vendorSha256 = "sha256-W+bcjUXPZjldjhgaGsUKS1vSvS3yP/kH0QqwyvhL7Ww="; + vendorSha256 = "sha256-L6PNKK1ID7ZVX/4sG72wn9ZjWlx0lsNuiBc/EtCN03E="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index c2769a0ccf3..9d35e87f161 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { x86_64-linux = "sha256-yeWVsrvH3yYlS2uH/TkSleHjXvIDnHWcZSvLgV+CGF0="; - aarch64-linux = "sha256-75UC+HeVUfUk1HRvTJsOHbHHkgr6me1OtxDF7lahf68="; + aarch64-linux = "sha256-9ggRmijwXE9adVFv5XommgvdpeeWnWUFES+Ep2GrBVo="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/flintlock/default.nix b/pkgs/applications/virtualization/flintlock/default.nix new file mode 100644 index 00000000000..d258604496e --- /dev/null +++ b/pkgs/applications/virtualization/flintlock/default.nix @@ -0,0 +1,49 @@ +{ lib +, cni-plugins +, buildGoModule +, firecracker +, containerd +, runc +, makeWrapper +, fetchFromGitHub +}: + +buildGoModule rec{ + pname = "flintlock"; + version = "0.1.0-alpha.9"; + + src = fetchFromGitHub { + owner = "weaveworks"; + repo = "flintlock"; + rev = "v${version}"; + sha256 = "sha256-Xw3g2wh0fPUknSuAKoJL3jxVZS50wSPZ9Wz05zkTVXM="; + }; + + vendorSha256 = "sha256-EjVlM6AD+O/z6+R5TRBmmRWbrP4C+qyvsnEjwOkDkUE="; + + subPackages = [ "cmd/flintlock-metrics" "cmd/flintlockd" ]; + + ldflags = [ "-s" "-w" "-X github.com/weaveworks/flintlock/internal/version.Version=v${version}" ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + firecracker + ]; + + postInstall = '' + for prog in flintlockd flintlock-metrics; do + wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ cni-plugins firecracker containerd runc ]} + done + ''; + + meta = with lib; { + description = "Create and manage the lifecycle of MicroVMs backed by containerd"; + homepage = "https://github.com/weaveworks/flintlock"; + license = licenses.mpl20; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 4f58f012716..68e902253ed 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hzoc5zbdnHHTY04aGn+77lHvPh+KNOPoZmW19YIZHv8="; + sha256 = "sha256-Y15oYAdq+bsG2qD/ZTqXHgkelAdQF4SnOE79gDhlNGE="; }; - vendorSha256 = "sha256-eJnwXXYWMaIfM8SW4MtmG4wsPA/9sx4j2AkOd6GpnsY="; + vendorSha256 = "sha256-66CcLWG45vZwM2LVc1xsjJYyxefGEBW4fY3wo1ESQUM="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 5d2be06db0a..60db5708922 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. + cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ]; postUnpack = '' echo ${src.rev} > source/VERSION diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index c3721bbe36e..6018608a3f1 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook -, bash, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto +{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook +, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto , libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst , pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which , libdrm, udev @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.3.5"; + version = "12.0.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "03fahljrijq4ij8a4v8d7806mpf22ppkgr61n5s974g3xfdvpl13"; + sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U="; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -22,10 +22,24 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - buildInputs = [ fuse glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] + buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + patches = [ + # glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow + # Will be fixed in the release after 12.0.0 + (fetchpatch { + url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch"; + sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh"; + }) + ]; + + prePatch = '' + cd .. + ''; + postPatch = '' + cd open-vm-tools sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am @@ -43,6 +57,7 @@ stdenv.mkDerivation rec { "--without-kernel-modules" "--without-xmlsecurity" "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" + "--with-fuse=fuse3" ] ++ lib.optional (!withX) "--without-x"; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 46b8e1c7ed5..7d783b211bb 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-DpSDMjUFA8coRInJO1jhMALOYG444WRFw1w7vJKc7cw="; + sha256 = "sha256-uLpvTnn2EWEI8+5gC3ofMjsZ9O7nLOaaUGGuvSE1gdE="; }; vendorSha256 = null; @@ -58,6 +58,7 @@ buildGoModule rec { installPhase = '' runHook preInstall + mkdir -p {$out/{bin,etc,lib,share},$man} # ensure paths exist for the wrapper ${if stdenv.isDarwin then '' mv bin/{darwin/podman,podman} '' else '' diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index d4815336124..fa3a50bc535 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -3,6 +3,7 @@ , makeWrapper , symlinkJoin , lib +, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -15,6 +16,7 @@ , iptables , iproute2 , catatonit +, gvproxy }: # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed @@ -25,6 +27,7 @@ let podman = podman-unwrapped; binPath = lib.makeBinPath ([ + ] ++ lib.optionals stdenv.isLinux [ runc crun conmon @@ -40,6 +43,8 @@ let # this only works for some binaries, others may need to be be added to `binPath` or in the modules paths = [ + gvproxy + ] ++ lib.optionals stdenv.isLinux [ catatonit # added here for the pause image and also set in `containersConf` for `init_path` podman.rootlessport ]; diff --git a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch b/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch deleted file mode 100644 index 03e47a57863..00000000000 --- a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit cdc3e7eeafa9f683214d2c15d52ef384c3de6611 -Author: aszlig <aszlig@nix.build> -Date: Mon Mar 18 13:21:01 2019 +0100 - - 9pfs: Ignore O_NOATIME open flag - - Since Linux 4.19, overlayfs uses the O_NOATIME flag on its lowerdir, - which in turn causes errors when the Nix store is mounted in the guest - because the file owner of the store paths typically don't match the - owner of the QEMU process. - - After submitting a patch to the overlayfs mailing list[1], it turns out - that my patch was incomplete[2] and needs a bit more rework. - - So instead of using an incomplete kernel patch in nixpkgs, which affects - *all* users of overlayfs, not just NixOS VM tests, I decided that for - now it's better to patch QEMU instead. - - The change here really only ignores the O_NOATIME flag so that the - behaviour is similar to what NFS does. From open(2): - - This flag may not be effective on all filesystems. One example is NFS, - where the server maintains the access time. - - This change is therefore only temporary until the final fix lands in the - stable kernel releases. - - [1]: https://www.spinics.net/lists/linux-unionfs/msg06755.html - [2]: https://www.spinics.net/lists/linux-unionfs/msg06756.html - - Signed-off-by: aszlig <aszlig@nix.build> - -diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c -index 55821343e5..0b8425fe18 100644 ---- a/hw/9pfs/9p.c -+++ b/hw/9pfs/9p.c -@@ -127,7 +127,6 @@ static int dotl_to_open_flags(int flags) - { P9_DOTL_LARGEFILE, O_LARGEFILE }, - { P9_DOTL_DIRECTORY, O_DIRECTORY }, - { P9_DOTL_NOFOLLOW, O_NOFOLLOW }, -- { P9_DOTL_NOATIME, O_NOATIME }, - { P9_DOTL_SYNC, O_SYNC }, - }; - diff --git a/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch b/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch new file mode 100644 index 00000000000..a498d309c23 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch @@ -0,0 +1,77 @@ +From 4ca09b7cd1d42eb6b1587fed74cd4d684e31bfbe Mon Sep 17 00:00:00 2001 +From: Keno Fischer <keno@juliacomputing.com> +Date: Sun, 27 Feb 2022 17:35:22 -0500 +Subject: [PATCH] 9p: darwin: meson: Allow VirtFS on Darwin + +To allow VirtFS on darwin, we need to check that pthread_fchdir_np is +available, which has only been available since macOS 10.12. + +Additionally, virtfs_proxy_helper is disabled on Darwin. This patch +series does not currently provide an implementation of the proxy-helper, +but this functionality could be implemented later on. + +Signed-off-by: Keno Fischer <keno@juliacomputing.com> +[Michael Roitzsch: - Rebase for NixOS] +Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> +[Will Cohen: - Rebase to master] +Signed-off-by: Will Cohen <wwcohen@gmail.com> +Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> +[Will Cohen: - Add check for pthread_fchdir_np to virtfs + - Add comments to patch commit + - Note that virtfs_proxy_helper does not work + on macOS + - Fully adjust meson virtfs error note to specify + macOS + - Rebase to master] +Signed-off-by: Will Cohen <wwcohen@gmail.com> +Message-Id: <20220227223522.91937-12-wwcohen@gmail.com> +Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> +Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com> +--- + fsdev/meson.build | 1 + + meson.build | 17 +++++++++++------ + 2 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/fsdev/meson.build b/fsdev/meson.build +index adf57cc43e..b632b66348 100644 +--- a/fsdev/meson.build ++++ b/fsdev/meson.build +@@ -7,6 +7,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( + 'qemu-fsdev.c', + ), if_false: files('qemu-fsdev-dummy.c')) + softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) ++softmmu_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss) + + if have_virtfs_proxy_helper + executable('virtfs-proxy-helper', +diff --git a/meson.build b/meson.build +index 2265fa409a..6d73c02903 100644 +--- a/meson.build ++++ b/meson.build +@@ -1383,12 +1383,17 @@ endif + have_host_block_device = (targetos != 'darwin' or + cc.has_header('IOKit/storage/IOMedia.h')) + +-have_virtfs = (targetos == 'linux' and +- have_system and +- libattr.found() and +- libcap_ng.found()) +- +-have_virtfs_proxy_helper = have_virtfs and have_tools ++have_virtfs = get_option('virtfs') \ ++ .require(targetos == 'linux' or targetos == 'darwin', ++ error_message: 'virtio-9p (virtfs) requires Linux or macOS') \ ++ .require(targetos == 'linux' or cc.has_function('pthread_fchdir_np'), ++ error_message: 'virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') \ ++ .require(targetos == 'darwin' or (libattr.found() and libcap_ng.found()), ++ error_message: 'virtio-9p (virtfs) on Linux requires libcap-ng-devel and libattr-devel') \ ++ .disable_auto_if(not have_tools and not have_system) \ ++ .allowed() ++ ++have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools + + if get_option('virtfs').enabled() + if not have_virtfs +-- +2.35.1 + diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ee923f4e0cd..2b183dd48d0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python3, python3Packages, zlib, pkg-config, glib, buildPackages , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool -, makeWrapper, runtimeShell +, makeWrapper, runtimeShell, removeReferencesTo , attr, libcap, libcap_ng, socat , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] + nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; @@ -88,14 +88,62 @@ stdenv.mkDerivation rec { patches = [ ./fix-qemu-ga.patch - ./9p-ignore-noatime.patch # Cocoa clipboard support only works on macOS 10.14+ (fetchpatch { url = "https://gitlab.com/qemu-project/qemu/-/commit/7e3e20d89129614f4a7b2451fe321cc6ccca3b76.diff"; sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2"; revert = true; }) - ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; + # 9p-darwin for 7.0 backported to 6.2.0 + # + # Can generally be removed when updating derivation to 7.0. Nine of the + # patches can be drawn directly from QEMU upstream, but the second commit + # and the eleventh commit had to be modified when rebasing back to 6.2.0. + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/e0bd743bb2dd4985791d4de880446bdbb4e04fed.patch"; + sha256 = "sha256-c6QYL3zig47fJwm6rqkqGp3E1PakVTaihvXDRebbBlQ="; + }) + ./rename-9p-util.patch + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/f41db099c71151291c269bf48ad006de9cbd9ca6.patch"; + sha256 = "sha256-70/rrhZw+02JJbJ3CoW8B1GbdM4Lwb2WkUdwstYAoIQ="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/6b3b279bd670c6a2fa23c9049820c814f0e2c846.patch"; + sha256 = "sha256-7WqklSvLirEuxTXTIMQDQhWpXnwMseJ1RumT+faq/Y8="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/67a71e3b71a2834d028031a92e76eb9444e423c6.patch"; + sha256 = "sha256-COFm/SwfJSoSl9YDpL6ceAE8CcE4mGhsGxw1HMuL++o="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/38d7fd68b0c8775b5253ab84367419621aa032e6.patch"; + sha256 = "sha256-iwGIzq9FWW6zpbDg/IKrp5OZpK9cgQqTRWWq8WBIHRQ="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/57b3910bc3513ab515296692daafd1c546f3c115.patch"; + sha256 = "sha256-ybl9+umZAcQKHYL7NkGJQC0W7bccTagA9KQiFaR2LYA="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/b5989326f558faedd2511f29459112cced2ca8f5.patch"; + sha256 = "sha256-s+O9eCgj2Ev+INjL9LY9MJBdISIdZLslI3lue2DICGM="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/029ed1bd9defa33a80bb40cdcd003699299af8db.patch"; + sha256 = "sha256-mGqcRWcEibDJdhTRrN7ZWrMuCfUWW8vWiFj7sb2/RYo="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/d3671fd972cd185a6923433aa4802f54d8b62112.patch"; + sha256 = "sha256-GUh5o7mbFTm/dm6CqcGdoMlC+YrV8RlcEwu/mxrfTzo="; + }) + ./allow-virtfs-on-darwin.patch + # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin + # support on nix requires utimensat fallback. The patch adding this fallback + # set was removed during the process of upstreaming this functionality, and + # will still be needed in nix until the macOS SDK reaches 10.13+. + ./provide-fallback-for-utimensat.patch + ] + ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; postPatch = '' # Otherwise tries to ensure /var/run exists. @@ -175,6 +223,7 @@ stdenv.mkDerivation rec { # copy qemu-ga (guest agent) to separate output mkdir -p $ga/bin cp $out/bin/qemu-ga $ga/bin/ + remove-references-to -t $out $ga/bin/qemu-ga '' + lib.optionalString gtkSupport '' # wrap GTK Binaries for f in $out/bin/qemu-system-*; do @@ -219,6 +268,7 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' + ln -s $out/libexec/virtiofsd $out/bin ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; @@ -239,5 +289,6 @@ stdenv.mkDerivation rec { mainProgram = "qemu-kvm"; maintainers = with maintainers; [ eelco qyliss ]; platforms = platforms.unix; + priority = 10; # Prefer virtiofsd from the virtiofsd package. }; } diff --git a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch new file mode 100644 index 00000000000..dbc4e2b9af5 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch @@ -0,0 +1,190 @@ +From 70328c307001f4bb75d30d93c5bba3c3cd790c88 Mon Sep 17 00:00:00 2001 +From: Keno Fischer <keno@juliacomputing.com> +Date: Sat, 16 Jun 2018 20:56:54 -0400 +Subject: [PATCH] 9p: darwin: Provide fallback impl for utimensat + +This function is new in Mac OS 10.13. Provide a fallback implementation +when building against older SDKs. The complication in the definition comes +having to separately handle the used SDK version and the target OS version. + +- If the SDK version is too low (__MAC_10_13 not defined), utimensat is not + defined in the header, so we must not try to use it (doing so would error). +- Otherwise, if the targetted OS version is at least 10.13, we know this + function is available, so we can unconditionally call it. +- Lastly, we check for the availability of the __builtin_available macro to + potentially insert a dynamic check for this OS version. However, __builtin_available + is only available with sufficiently recent versions of clang and while all + Apple clang versions that ship with Xcode versions that support the 10.13 + SDK support with builtin, we want to allow building with compilers other + than Apple clang that may not support this builtin. + +Signed-off-by: Keno Fischer <keno@juliacomputing.com> +Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> +Signed-off-by: Will Cohen <wwcohen@gmail.com> +--- + hw/9pfs/9p-local.c | 2 +- + hw/9pfs/9p-util-darwin.c | 96 ++++++++++++++++++++++++++++++++++++++++ + hw/9pfs/9p-util-linux.c | 6 +++ + hw/9pfs/9p-util.h | 8 ++++ + 4 files changed, 111 insertions(+), 1 deletion(-) + +diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c +index d42ce6d8b8..b2c1fa42e1 100644 +--- a/hw/9pfs/9p-local.c ++++ b/hw/9pfs/9p-local.c +@@ -1085,7 +1085,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path, + goto out; + } + +- ret = utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW); ++ ret = utimensat_nofollow(dirfd, name, buf); + close_preserve_errno(dirfd); + out: + g_free(dirpath); +diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c +index bec0253474..2fc0475292 100644 +--- a/hw/9pfs/9p-util-darwin.c ++++ b/hw/9pfs/9p-util-darwin.c +@@ -95,3 +95,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) + } + + #endif ++ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ ++static int update_times_from_stat(int fd, struct timespec times[2], ++ int update0, int update1) ++{ ++ struct stat buf; ++ int ret = fstat(fd, &buf); ++ if (ret == -1) { ++ return ret; ++ } ++ if (update0) { ++ times[0] = buf.st_atimespec; ++ } ++ if (update1) { ++ times[1] = buf.st_mtimespec; ++ } ++ return 0; ++} ++ ++int utimensat_nofollow(int dirfd, const char *filename, ++ const struct timespec times_in[2]) ++{ ++ int ret, fd; ++ int special0, special1; ++ struct timeval futimes_buf[2]; ++ struct timespec times[2]; ++ memcpy(times, times_in, 2 * sizeof(struct timespec)); ++ ++/* Check whether we have an SDK version that defines utimensat */ ++#if defined(__MAC_10_13) ++# if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13 ++# define UTIMENSAT_AVAILABLE 1 ++# elif __has_builtin(__builtin_available) ++# define UTIMENSAT_AVAILABLE __builtin_available(macos 10.13, *) ++# else ++# define UTIMENSAT_AVAILABLE 0 ++# endif ++ if (UTIMENSAT_AVAILABLE) { ++ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); ++ } ++#endif ++ ++ /* utimensat not available. Use futimes. */ ++ fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); ++ if (fd == -1) { ++ return -1; ++ } ++ ++ special0 = times[0].tv_nsec == UTIME_OMIT; ++ special1 = times[1].tv_nsec == UTIME_OMIT; ++ if (special0 || special1) { ++ /* If both are set, nothing to do */ ++ if (special0 && special1) { ++ ret = 0; ++ goto done; ++ } ++ ++ ret = update_times_from_stat(fd, times, special0, special1); ++ if (ret < 0) { ++ goto done; ++ } ++ } ++ ++ special0 = times[0].tv_nsec == UTIME_NOW; ++ special1 = times[1].tv_nsec == UTIME_NOW; ++ if (special0 || special1) { ++ ret = futimes(fd, NULL); ++ if (ret < 0) { ++ goto done; ++ } ++ ++ /* If both are set, we are done */ ++ if (special0 && special1) { ++ ret = 0; ++ goto done; ++ } ++ ++ ret = update_times_from_stat(fd, times, special0, special1); ++ if (ret < 0) { ++ goto done; ++ } ++ } ++ ++ futimes_buf[0].tv_sec = times[0].tv_sec; ++ futimes_buf[0].tv_usec = times[0].tv_nsec / 1000; ++ futimes_buf[1].tv_sec = times[1].tv_sec; ++ futimes_buf[1].tv_usec = times[1].tv_nsec / 1000; ++ ret = futimes(fd, futimes_buf); ++ ++done: ++ close_preserve_errno(fd); ++ return ret; ++} +diff --git a/hw/9pfs/9p-util-linux.c b/hw/9pfs/9p-util-linux.c +index db451b0784..320697f347 100644 +--- a/hw/9pfs/9p-util-linux.c ++++ b/hw/9pfs/9p-util-linux.c +@@ -68,3 +68,9 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) + { + return mknodat(dirfd, filename, mode, dev); + } ++ ++int utimensat_nofollow(int dirfd, const char *filename, ++ const struct timespec times[2]) ++{ ++ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); ++} +diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h +index 1f74d37558..a4b002d1b5 100644 +--- a/hw/9pfs/9p-util.h ++++ b/hw/9pfs/9p-util.h +@@ -36,6 +36,12 @@ static inline int qemu_lsetxattr(const char *path, const char *name, + #define qemu_lsetxattr lsetxattr + #endif + ++/* Compatibility with old SDK Versions for Darwin */ ++#if defined(CONFIG_DARWIN) && !defined(UTIME_NOW) ++#define UTIME_NOW -1 ++#define UTIME_OMIT -2 ++#endif ++ + static inline void close_preserve_errno(int fd) + { + int serrno = errno; +@@ -96,6 +102,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename, + char *list, size_t size); + ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, + const char *name); ++int utimensat_nofollow(int dirfd, const char *filename, ++ const struct timespec times[2]); + + /** + * Darwin has d_seekoff, which appears to function similarly to d_off. +-- +2.35.1 + diff --git a/pkgs/applications/virtualization/qemu/rename-9p-util.patch b/pkgs/applications/virtualization/qemu/rename-9p-util.patch new file mode 100644 index 00000000000..fe3e2d7b4b8 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/rename-9p-util.patch @@ -0,0 +1,54 @@ +From 011b121d7f84c8974f03a81582cf1107249245bb Mon Sep 17 00:00:00 2001 +From: Keno Fischer <keno@juliacomputing.com> +Date: Sun, 27 Feb 2022 17:35:13 -0500 +Subject: [PATCH] 9p: Rename 9p-util -> 9p-util-linux +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The current file only has the Linux versions of these functions. +Rename the file accordingly and update the Makefile to only build +it on Linux. A Darwin version of these will follow later in the +series. + +Signed-off-by: Keno Fischer <keno@juliacomputing.com> +[Michael Roitzsch: - Rebase for NixOS] +Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> +Signed-off-by: Will Cohen <wwcohen@gmail.com> +Reviewed-by: Greg Kurz <groug@kaod.org> +Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> +Message-Id: <20220227223522.91937-3-wwcohen@gmail.com> +Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> +--- + hw/9pfs/{9p-util.c => 9p-util-linux.c} | 0 + hw/9pfs/meson.build | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + rename hw/9pfs/{9p-util.c => 9p-util-linux.c} (100%) + +diff --git a/hw/9pfs/9p-util.c b/hw/9pfs/9p-util-linux.c +similarity index 100% +rename from hw/9pfs/9p-util.c +rename to hw/9pfs/9p-util-linux.c +diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build +index 99be5d9119..1b28e70040 100644 +--- a/hw/9pfs/meson.build ++++ b/hw/9pfs/meson.build +@@ -4,7 +4,6 @@ fs_ss.add(files( + '9p-posix-acl.c', + '9p-proxy.c', + '9p-synth.c', +- '9p-util.c', + '9p-xattr-user.c', + '9p-xattr.c', + '9p.c', +@@ -14,6 +13,7 @@ fs_ss.add(files( + 'coth.c', + 'coxattr.c', + )) ++fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c')) + fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) + softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss) + +-- +2.35.1 + diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index af2c4939ad0..c6442b57a42 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, acpica-tools, python3 }: +{ lib, stdenv, fetchgit, acpica-tools, python3 }: stdenv.mkDerivation rec { pname = "seabios"; - version = "1.15.0"; + version = "1.16.0"; - src = fetchurl { - url = "https://www.seabios.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-YownF8mUMmtFMlFXPRBZ4qOhEtSqSIds4nyz8d4ZiPg="; + src = fetchgit { + url = "https://git.seabios.org/seabios.git"; + rev = "rel-${version}"; + sha256 = "0acal1rr7sya86wlhw2mgimabwhjnr0y1pl5zxwb79j8k1w1r8sh"; }; nativeBuildInputs = [ python3 ]; @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.seabios.org"; license = licenses.lgpl3; - maintainers = [ maintainers.tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index fb62a0d2e11..aa225c1d173 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,22 +1,21 @@ -{ lib, fetchurl, python3Packages, intltool, file -, wrapGAppsHook, gtk-vnc, vte, avahi, dconf -, gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, libosinfo, gnome -, gtksourceview4, docutils +{ lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc +, vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt +, gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio +, e2fsprogs, findutils, gzip, cdrtools, xorriso , spiceSupport ? true, spice-gtk ? null -, cpio, e2fsprogs, findutils, gzip -, cdrtools }: with lib; -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "virt-manager"; - version = "3.2.0"; + version = "4.0.0"; - src = fetchurl { - url = "https://releases.pagure.org/virt-manager/${pname}-${version}.tar.gz"; - sha256 = "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-3ycXNBuf91kI2cJCRw0ZzaWkaIVwb/lmkOKeHNwpH9Y="; }; nativeBuildInputs = [ @@ -32,7 +31,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ pygobject3 ipaddress libvirt libxml2 requests cdrtools ]; @@ -42,14 +41,16 @@ python3Packages.buildPythonApplication rec { ''; postConfigure = '' - ${python3Packages.python.interpreter} setup.py configure --prefix=$out + ${python3.interpreter} setup.py configure --prefix=$out ''; - setupPyGlobalFlags = [ "--no-update-icon-cache" ]; + setupPyGlobalFlags = [ "--no-update-icon-cache" "--no-compile-schemas" ]; dontWrapGApps = true; preFixup = '' + glib-compile-schemas $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") # these are called from virt-install in initrdinject.py gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}") @@ -57,14 +58,17 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3Packages; [ cpio cdrtools pytestCheckHook ]; + checkInputs = with python3.pkgs; [ + pytestCheckHook + cpio + cdrtools + xorriso + ]; - disabledTestPaths = [ - "tests/test_cli.py" - "tests/test_disk.py" - "tests/test_checkprops.py" - "tests/test_storage.py" - ]; # Error logs: https://gist.github.com/superherointj/fee040872beaafaaa19b8bf8f3ff0be5 + disabledTests = [ + "testAlterDisk" + "test_misc_nonpredicatble_generate" + ]; preCheck = '' export HOME=. diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 6ac7377122d..bad1e98296c 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/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.1.0"; + version = "7.1.3"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-SBX50wQbNUvgmnO0B0iXiEXEmJrkVmtNqUUv0O6yRic="; + sha256 = "sha256-eSarw5RG2ckup9pNlZtAyZAN8IPZy94RRfej9ppiLfo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index e7cc1a477c5..f6ba52013f6 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "berry"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "JLErvin"; repo = pname; rev = version; - hash = "sha256-E1kjqSv2eylJ/9EGcxQrJ2P7VaehyUiirk0TxlPWSnM="; + hash = "sha256-6asph0QXzhmHuYcfrLcQ8RTP4QzX8m6AcCp5ImA++9M="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + homepage = "https://berrywm.org/"; description = "A healthy, bite-sized window manager"; longDescription = '' berry is a healthy, bite-sized window manager written in C for unix @@ -69,11 +70,8 @@ stdenv.mkDerivation rec { - Intuitively place new windows in unoccupied spaces. - Virtual desktops. ''; - homepage = "https://berrywm.org/"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; } -# TODO: report upstream that `which` is not POSIX; the `command` shell builtin -# should be used instead diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index cdcfcca15ea..89da6b6b11e 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.6"; + version = "0.21.7"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2PBGw5LHIOOPXBZ+12wL2ZGH+gfbkXNIItpE6SLT8so="; + sha256 = "sha256-2fh1/7/or++AzvkJfwXD07UiyX8U8CIEe+qXc5S82mM="; }; - cargoSha256 = "sha256-wtxfdQw5zKCxYu7N2BpcLVTlitQmwY7s8oO4dpK8MjE="; + cargoSha256 = "sha256-ERBxY0PBQOvAVeWCRcB7rApTLjtHxa0KMV4qGlU/j/Q="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/i3/swallow.nix b/pkgs/applications/window-managers/i3/swallow.nix new file mode 100644 index 00000000000..31101721e4c --- /dev/null +++ b/pkgs/applications/window-managers/i3/swallow.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, poetry-core +, i3ipc +, xlib +, six +}: + +buildPythonApplication rec { + pname = "i3-swallow"; + version = "unstable-2022-02-19"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jamesofarrell"; + repo = "i3-swallow"; + rev = "6fbc04645c483fe733de56b56743e453693d4c78"; + sha256 = "1l3x8mixwq4n0lnyp0wz5vijgnypamq6lqjazcd2ywl2jv8d6fif"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + i3ipc + xlib + six + ]; + + # No tests available + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/jamesofarrell/i3-swallow"; + description = "Swallow a terminal window in i3wm"; + license = licenses.mit; + platforms = platforms.linux; + mainProgram = "swallow"; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index deac4bed607..75cb96f27f4 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.9.4"; + version = "2.9.6"; src = fetchFromGitHub { - owner = "ice-wm"; + owner = "ice-wm"; repo = pname; rev = version; - hash = "sha256-ne2lqo9CAhGgC8dd9R03zhFXy9nPBQR0NcfAY0DeVj4="; + hash = "sha256-qC8gEVJ/cmsEbF8jMzv7zyvVcjlbXhgHU3ixe7RLcnA="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { perl pkg-config ]; + buildInputs = [ expat fontconfig @@ -108,11 +109,11 @@ stdenv.mkDerivation rec { system. Application windows can be managed by keyboard and mouse. Windows can be iconified to the taskbar, to the tray, to the desktop or be made hidden. They are controllable by a quick switch window (Alt+Tab) and in a - window list. A handful of configurable focus models are - menu-selectable. Setups with multiple monitors are supported by RandR and - Xinerama. IceWM is very configurable, themeable and well documented. It - includes an optional external background wallpaper manager with - transparency support, a simple session manager and a system tray. + window list. A handful of configurable focus models are menu-selectable. + Setups with multiple monitors are supported by RandR and Xinerama. IceWM + is very configurable, themeable and well documented. It includes an + optional external background wallpaper manager with transparency support, + a simple session manager and a system tray. ''; license = licenses.lgpl2Only; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index 580fd29faa0..f58b71ef03a 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -21,20 +21,15 @@ stdenv.mkDerivation rec { pname = "labwc"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "labwc"; repo = pname; rev = version; - hash = "sha256-O9jVDR7UROt5u8inUsZjbzB3dQTosiLYqXkeOyGrbaM="; + hash = "sha256-G0EQuXSHftl4JLXKIro+tmhbApwAhlzcjPEL7DP6LHk="; }; - patches = [ - # Required to fix the build with wlroots 0.15.1: - ./relax-the-version-constraint-for-wlroots.patch - ]; - nativeBuildInputs = [ meson ninja @@ -64,6 +59,6 @@ stdenv.mkDerivation rec { description = "A Wayland stacking compositor, similar to Openbox"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + inherit (wayland.meta) platforms; }; } diff --git a/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch b/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch deleted file mode 100644 index 9a790f28516..00000000000 --- a/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 21d8bfcf7899f5ec50b29f523ace4c19cbfbe919 Mon Sep 17 00:00:00 2001 -From: Michael Weiss <dev.primeos@gmail.com> -Date: Fri, 4 Feb 2022 21:17:05 +0100 -Subject: [PATCH] build: Relax the version constraint for wlroots to accept - patch releases - -Patch releases only contain backwards compatible changes (mainly bug -fixes) so we want to allow them. This fixes the build with the recently -released wlroots 0.15.1 and uses the same version constraints as other -projects that depend on wlroots (e.g., Sway). ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f950b8e..1905dda 100644 ---- a/meson.build -+++ b/meson.build -@@ -37,7 +37,7 @@ if git.found() - endif - add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c') - --wlroots_version = ['=0.15.0'] -+wlroots_version = ['>=0.15.0', '<0.16.0'] - wlroots_proj = subproject( - 'wlroots', - default_options: ['default_library=static', 'examples=false'], --- -2.34.1 diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index c4a33628e13..4a48225d801 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -69,4 +69,7 @@ in name = "${unwrapped.pname}-${unwrapped.version}"; # export underlying qtile package passthru = { inherit unwrapped; }; + + # restore original qtile attrs + inherit (unwrapped) pname version meta; }) diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index 6d91d8c8f46..e98adefa447 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "swaybg"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaybg"; rev = "v${version}"; - sha256 = "17508q9wsw6c1lsxlcbxj74z2naqhwi5c7lkbq24m4lk8qmy0576"; + hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 194525dcffb..727d9b4e6b3 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus, libevdev +, wayland, libxkbcommon, pcre, json_c, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests @@ -8,8 +8,19 @@ , isNixOS ? false , enableXWayland ? true +, systemdSupport ? stdenv.isLinux +, dbusSupport ? true +, dbus +, trayEnabled ? systemdSupport && dbusSupport }: +# The "sd-bus-provider" meson option does not include a "none" option, +# but it is silently ignored iff "-Dtray=disabled". We use "basu" +# (which is not in nixpkgs) instead of "none" to alert us if this +# changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 +assert trayEnabled -> systemdSupport && dbusSupport; +let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in + stdenv.mkDerivation rec { pname = "sway-unwrapped"; version = "1.7"; @@ -47,16 +58,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wayland libxkbcommon pcre json_c dbus libevdev + wayland libxkbcommon pcre json_c libevdev pango cairo libinput libcap pam gdk-pixbuf librsvg wayland-protocols libdrm (wlroots.override { inherit enableXWayland; }) + ] ++ lib.optionals dbusSupport [ + dbus ]; - mesonFlags = [ - "-Dsd-bus-provider=libsystemd" - ] + mesonFlags = + [ "-Dsd-bus-provider=${sd-bus-provider}" ] ++ lib.optional (!enableXWayland) "-Dxwayland=disabled" + ++ lib.optional (!trayEnabled) "-Dtray=disabled" ; passthru.tests.basic = nixosTests.sway; diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index fd424e3074a..0928fbcfb4e 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols, systemd +, wayland, wayland-protocols +, systemdSupport ? stdenv.isLinux, systemd }: stdenv.mkDerivation rec { @@ -15,9 +16,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols systemd ]; + buildInputs = [ wayland wayland-protocols ] + ++ lib.optionals systemdSupport [ systemd ]; - mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; + mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ]; meta = with lib; { description = "Idle management daemon for Wayland"; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 6dccedad827..b70160b1dbf 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "0r95p4w11dwm5ra614vddz83r8j7z6gd120z2vcchy7m9b0f15kf"; + sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; }; - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '1.4'" "version: '${version}'" - ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 827fce89702..c1f531683d7 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -8,6 +8,7 @@ , isNixOS ? false , enableXWayland ? true +, dbusSupport ? true }: assert extraSessionCommands != "" -> withBaseWrapper; @@ -27,7 +28,7 @@ let export DBUS_SESSION_BUS_ADDRESS exec ${sway}/bin/sway "$@" else - exec ${dbus}/bin/dbus-run-session ${sway}/bin/sway "$@" + exec ${if !dbusSupport then "" else "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@" fi ''; in symlinkJoin { diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 8917784bc6c..7186675a5c6 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -1,7 +1,7 @@ { lib, stdenv -, lapack-reference, openblasCompat, openblas +, lapack-reference, openblas , isILP64 ? false -, blasProvider ? if isILP64 then openblas else openblasCompat }: +, blasProvider ? openblas }: let blasFortranSymbols = [ @@ -32,10 +32,13 @@ let blasImplementation = lib.getName blasProvider; + blasProvider' = if blasImplementation == "mkl" + then blasProvider + else blasProvider.override { blas64 = isILP64; }; in -assert isILP64 -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl"; +assert isILP64 -> blasImplementation == "mkl" || blasProvider'.blas64; stdenv.mkDerivation { pname = "blas"; @@ -43,13 +46,13 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - meta = (blasProvider.meta or {}) // { + meta = (blasProvider'.meta or {}) // { description = "${lib.getName blasProvider} with just the BLAS C and FORTRAN ABI"; }; passthru = { inherit isILP64; - provider = blasProvider; + provider = blasProvider'; implementation = blasImplementation; }; @@ -62,10 +65,10 @@ stdenv.mkDerivation { installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig - libblas="${lib.getLib blasProvider}/lib/libblas${canonicalExtension}" + libblas="${lib.getLib blasProvider'}/lib/libblas${canonicalExtension}" if ! [ -e "$libblas" ]; then - echo "$libblas does not exist, ${blasProvider.name} does not provide libblas." + echo "$libblas does not exist, ${blasProvider'.name} does not provide libblas." exit 1 fi @@ -79,11 +82,11 @@ stdenv.mkDerivation { '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname libblas${canonicalExtension} $out/lib/libblas${canonicalExtension} - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ -id $out/lib/libblas${canonicalExtension} \ - -add_rpath ${lib.getLib blasProvider}/lib \ + -add_rpath ${lib.getLib blasProvider'}/lib \ $out/lib/libblas${canonicalExtension} '' else "") + '' @@ -99,10 +102,10 @@ Libs: -L$out/lib -lblas Cflags: -I$dev/include EOF - libcblas="${lib.getLib blasProvider}/lib/libcblas${canonicalExtension}" + libcblas="${lib.getLib blasProvider'}/lib/libcblas${canonicalExtension}" if ! [ -e "$libcblas" ]; then - echo "$libcblas does not exist, ${blasProvider.name} does not provide libcblas." + echo "$libcblas does not exist, ${blasProvider'.name} does not provide libcblas." exit 1 fi @@ -111,11 +114,11 @@ EOF '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname libcblas${canonicalExtension} $out/lib/libcblas${canonicalExtension} - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libcblas${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libcblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ -id $out/lib/libcblas${canonicalExtension} \ - -add_rpath ${lib.getLib blasProvider}/lib \ + -add_rpath ${lib.getLib blasProvider'}/lib \ $out/lib/libcblas${canonicalExtension} '' else "") + '' if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then @@ -135,6 +138,6 @@ EOF mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} - ln -sf ${blasProvider}/include/* $dev/include + ln -sf ${blasProvider'}/include/* $dev/include ''); } diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 61da183c835..80fb7be8c1e 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv -, lapack-reference, openblasCompat, openblas +, lapack-reference, openblas , isILP64 ? false -, lapackProvider ? if isILP64 then openblas else openblasCompat }: +, lapackProvider ? openblas }: let @@ -11,10 +11,13 @@ let else stdenv.hostPlatform.extensions.sharedLibrary; lapackImplementation = lib.getName lapackProvider; + lapackProvider' = if lapackImplementation == "mkl" + then lapackProvider + else lapackProvider.override { blas64 = isILP64; }; in -assert isILP64 -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl"; +assert isILP64 -> lapackImplementation == "mkl" || lapackProvider'.blas64; stdenv.mkDerivation { pname = "lapack"; @@ -22,13 +25,13 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - meta = (lapackProvider.meta or {}) // { - description = "${lib.getName lapackProvider} with just the LAPACK C and FORTRAN ABI"; + meta = (lapackProvider'.meta or {}) // { + description = "${lib.getName lapackProvider'} with just the LAPACK C and FORTRAN ABI"; }; passthru = { inherit isILP64; - provider = lapackProvider; + provider = lapackProvider'; implementation = lapackImplementation; }; @@ -41,10 +44,10 @@ stdenv.mkDerivation { installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig - liblapack="${lib.getLib lapackProvider}/lib/liblapack${canonicalExtension}" + liblapack="${lib.getLib lapackProvider'}/lib/liblapack${canonicalExtension}" if ! [ -e "$liblapack" ]; then - echo "$liblapack does not exist, ${lapackProvider.name} does not provide liblapack." + echo "$liblapack does not exist, ${lapackProvider'.name} does not provide liblapack." exit 1 fi @@ -53,7 +56,7 @@ stdenv.mkDerivation { '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension} - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider}/lib" $out/lib/liblapack${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider'}/lib" $out/lib/liblapack${canonicalExtension} '' else "") + '' if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then @@ -70,10 +73,10 @@ Cflags: -I$dev/include Libs: -L$out/lib -llapack EOF - liblapacke="${lib.getLib lapackProvider}/lib/liblapacke${canonicalExtension}" + liblapacke="${lib.getLib lapackProvider'}/lib/liblapacke${canonicalExtension}" if ! [ -e "$liblapacke" ]; then - echo "$liblapacke does not exist, ${lapackProvider.name} does not provide liblapacke." + echo "$liblapacke does not exist, ${lapackProvider'.name} does not provide liblapacke." exit 1 fi @@ -82,7 +85,7 @@ EOF '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension} - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider}/lib" $out/lib/liblapacke${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider'}/lib" $out/lib/liblapacke${canonicalExtension} '' else "") + '' if [ -f "$out/lib/liblapacke.so.3" ]; then @@ -102,6 +105,6 @@ EOF mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} - ln -sf ${lapackProvider}/include/* $dev/include + ln -sf ${lapackProvider'}/include/* $dev/include ''); } diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 9ceaab88946..0bee6ce065a 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -68,6 +68,8 @@ rec { xdg-utils iana-etc krb5 + gsettings-desktop-schemas + hicolor-icon-theme # dont show a gtk warning about hicolor not being installed ]; # list of libraries expected in an appimage environment: @@ -123,7 +125,6 @@ rec { atk at-spi2-atk libudev0-shim - networkmanager098 xorg.libXt xorg.libXmu @@ -180,6 +181,8 @@ rec { fribidi p11-kit + gmp + # libraries not on the upstream include list, but nevertheless expected # by at least one appimage libtool.lib # for Synfigstudio diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 1c4e2b60769..d0f88df4453 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -93,6 +93,32 @@ let paths = [ etcPkg ldconfig ] ++ basePkgs ++ targetPaths; extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall; ignoreCollisions = true; + postBuild = '' + if [[ -d $out/share/gsettings-schemas/ ]]; then + # Recreate the standard schemas directory if its a symlink to make it writable + if [[ -L $out/share/glib-2.0 ]]; then + ln -s $(readlink $out/share/glib-2.0) $out/share/glib-2.0.old + rm -rf $out/share/glib-2.0 + fi + + mkdir -p $out/share/glib-2.0/schemas + + # symlink any schema files or overrides to the standard schema directory + if [[ -e $out/share/glib-2.0.old/schemas ]]; then + ln -fs $out/share/glib-2.0.old/schemas/*.xml $out/share/glib-2.0/schemas + ln -fs $out/share/glib-2.0.old/schemas/*.gsettings-schemas.override $out/share/glib-2.0/schemas + fi + + for d in $out/share/gsettings-schemas/*; do + # Force symlink, in case there are duplicates + ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas + ln -fs $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas + done + + # and compile them + ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + fi + ''; }; staticUsrProfileMulti = buildEnv { diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index abf577baa2d..7251500f76c 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -134,6 +134,32 @@ let paths = [ etcPkg ] ++ basePkgs ++ targetPaths; extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall; ignoreCollisions = true; + postBuild = '' + if [[ -d $out/share/gsettings-schemas/ ]]; then + # Recreate the standard schemas directory if its a symlink to make it writable + if [[ -L $out/share/glib-2.0 ]]; then + ln -s $(readlink $out/share/glib-2.0) $out/share/glib-2.0.old + rm -rf $out/share/glib-2.0 + fi + + mkdir -p $out/share/glib-2.0/schemas + + # symlink any schema files or overrides to the standard schema directory + if [[ -e $out/share/glib-2.0.old/schemas ]]; then + ln -fs $out/share/glib-2.0.old/schemas/*.xml $out/share/glib-2.0/schemas + ln -fs $out/share/glib-2.0.old/schemas/*.gsettings-schemas.override $out/share/glib-2.0/schemas + fi + + for d in $out/share/gsettings-schemas/*; do + # Force symlink, in case there are duplicates + ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas + ln -fs $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas + done + + # and compile them + ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + fi + ''; }; staticUsrProfileMulti = buildEnv { diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index a6e991914e6..c59118d6c09 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -33,6 +33,20 @@ NIX_CFLAGS_COMPILE_@suffixSalt@="-B@out@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@" # Export and assign separately in order that a failing $(..) will fail # the script. +# Currently bootstrap-tools does not split glibc, and gcc files into +# separate directories. As a workaround we want resulting cflags to be +# ordered as: crt1-cflags libc-cflags cc-cflags. Otherwise we mix crt/libc.so +# from different libc as seen in +# https://github.com/NixOS/nixpkgs/issues/158042 +# +# Note that below has reverse ordering as we prepend flags one-by-one. +# Once bootstrap-tools is split into different directories we can stop +# relying on flag ordering below. + +if [ -e @out@/nix-support/cc-cflags ]; then + NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" +fi + if [[ "$cInclude" = 1 ]] && [ -e @out@/nix-support/libc-cflags ]; then NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi @@ -49,10 +63,6 @@ if [ -e @out@/nix-support/libcxx-ldflags ]; then NIX_CXXSTDLIB_LINK_@suffixSalt@+=" $(< @out@/nix-support/libcxx-ldflags)" fi -if [ -e @out@/nix-support/cc-cflags ]; then - NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" -fi - if [ -e @out@/nix-support/gnat-cflags ]; then NIX_GNATFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE_@suffixSalt@" fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index d3561282d3f..b5651d72a92 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }: +{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert }: { name ? "${args.pname}-${args.version}" , pname ? name @@ -74,40 +74,13 @@ let inherit dotnet-sdk dotnet-test-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType; }) dotnetConfigureHook dotnetBuildHook dotnetCheckHook dotnetInstallHook dotnetFixupHook; - _nugetDeps = linkFarmFromDrvs "${name}-nuget-deps" (import nugetDeps { - fetchNuGet = { pname, version, sha256 }: fetchurl { - name = "${pname}-${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; - inherit sha256; - }; - }); + _nugetDeps = mkNugetDeps { name = "${name}-nuget-deps"; nugetDeps = import nugetDeps; }; _localDeps = linkFarmFromDrvs "${name}-local-nuget-deps" projectReferences; - nuget-source = stdenvNoCC.mkDerivation rec { - name = "${pname}-nuget-source"; - meta.description = "A Nuget source with the dependencies for ${pname}"; - - nativeBuildInputs = [ dotnetPackages.Nuget xml2 ]; - buildCommand = '' - export HOME=$(mktemp -d) - mkdir -p $out/{lib,share} - - nuget sources Add -Name nixos -Source "$out/lib" - nuget init "${_nugetDeps}" "$out/lib" - ${lib.optionalString (projectReferences != []) - "nuget init \"${_localDeps}\" \"$out/lib\""} - - # Generates a list of all unique licenses' spdx ids. - find "$out/lib" -name "*.nuspec" -exec sh -c \ - "xml2 < {} | grep "license=" | cut -d'=' -f2" \; | sort -u > $out/share/licenses - ''; - } // { # This is done because we need data from `$out` for `meta`. We have to use overrides as to not hit infinite recursion. - meta.licence = let - depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses"); - getLicence = spdx: lib.filter (license: license.spdxId or null == spdx) (builtins.attrValues lib.licenses); - in (lib.flatten (lib.forEach depLicenses (spdx: - if (getLicence spdx) != [] then (getLicence spdx) else [] ++ lib.optional (spdx != "") spdx - ))); + nuget-source = mkNugetSource { + name = "${args.pname}-nuget-source"; + description = "A Nuget source with the dependencies for ${args.pname}"; + deps = [ _nugetDeps _localDeps ]; }; in stdenvNoCC.mkDerivation (args // { @@ -129,9 +102,6 @@ in stdenvNoCC.mkDerivation (args // { # gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping dontWrapGApps = args.dontWrapGApps or true; - DOTNET_NOLOGO = args.DOTNET_NOLOGO or true; # This disables the welcome message. - DOTNET_CLI_TELEMETRY_OPTOUT = args.DOTNET_CLI_TELEMETRY_OPTOUT or true; - passthru = { fetch-deps = writeScript "fetch-${pname}-deps" '' set -euo pipefail @@ -158,7 +128,6 @@ in stdenvNoCC.mkDerivation (args // { ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - -p:RestoreUseStaticGraphEvaluation=true \ --packages "$HOME/nuget_pkgs" \ ${lib.optionalString (dotnetRestoreFlags != []) (builtins.toString dotnetRestoreFlags)} \ ${lib.optionalString (dotnetFlags != []) (builtins.toString dotnetFlags)} diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh index e0522dc95ce..59daacbac0e 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -9,14 +9,11 @@ dotnetConfigureHook() { parallelFlag="--disable-parallel" fi - export HOME=$(mktemp -d) - for project in ${projectFile[@]} ${testProjectFile[@]}; do env \ dotnet restore "$project" \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - -p:RestoreUseStaticGraphEvaluation=true \ --source "@nugetSource@/lib" \ ${parallelFlag-} \ "${dotnetRestoreFlags[@]}" \ diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix new file mode 100644 index 00000000000..75178d5b779 --- /dev/null +++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix @@ -0,0 +1,9 @@ +{ linkFarmFromDrvs, fetchurl }: +{ name, nugetDeps }: + linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps { + fetchNuGet = { pname, version, sha256 }: fetchurl { + name = "${pname}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; + inherit sha256; + }; + }) diff --git a/pkgs/build-support/dotnet/make-nuget-source/default.nix b/pkgs/build-support/dotnet/make-nuget-source/default.nix new file mode 100644 index 00000000000..0690a05aa2b --- /dev/null +++ b/pkgs/build-support/dotnet/make-nuget-source/default.nix @@ -0,0 +1,30 @@ +{ dotnetPackages, lib, xml2, stdenvNoCC }: +{ name, description ? "", deps ? [] }: +let + _nuget-source = stdenvNoCC.mkDerivation rec { + inherit name; + meta.description = description; + + nativeBuildInputs = [ dotnetPackages.Nuget xml2 ]; + buildCommand = '' + export HOME=$(mktemp -d) + mkdir -p $out/{lib,share} + + nuget sources Add -Name nixos -Source "$out/lib" + ${ lib.concatMapStringsSep "\n" (dep: + ''nuget init "${dep}" "$out/lib"'' + ) deps } + + # Generates a list of all unique licenses' spdx ids. + find "$out/lib" -name "*.nuspec" -exec sh -c \ + "xml2 < {} | grep "license=" | cut -d'=' -f2" \; | sort -u > $out/share/licenses + ''; +} // { # This is done because we need data from `$out` for `meta`. We have to use overrides as to not hit infinite recursion. + meta.licence = let + depLicenses = lib.splitString "\n" (builtins.readFile "${_nuget-source}/share/licenses"); + getLicence = spdx: lib.filter (license: license.spdxId or null == spdx) (builtins.attrValues lib.licenses); + in (lib.flatten (lib.forEach depLicenses (spdx: + if (getLicence spdx) != [] then (getLicence spdx) else [] ++ lib.optional (spdx != "") spdx + ))); +}; +in _nuget-source diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index 55a49937018..d2e7882caf6 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -8,6 +8,8 @@ if [ $# -eq 0 ]; then fi pkgs=$1 +tmpfile=$(mktemp /tmp/nuget-to-nix.XXXXXX) +trap "rm -f ${tmpfile}" EXIT echo "{ fetchNuGet }: [" @@ -17,7 +19,9 @@ while read pkg_spec; do sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkg_spec") pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" - echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })" -done < <(find $1 -name '*.nuspec' | sort) + echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })" >> ${tmpfile} +done < <(find $1 -name '*.nuspec') + +LC_ALL=C sort --ignore-case ${tmpfile} echo "]" diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 740baa8cff5..6e25b2d6ecc 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -54,9 +54,9 @@ fetchurl ({ "$tmpfile" > "$out" if [ ! -s "$out" ]; then - echo "error: Filtered patch '$out$' is empty (while the original patch file was not)!" 1>&2 + echo "error: Filtered patch '$out' is empty (while the original patch file was not)!" 1>&2 echo "Check your includes and excludes." 1>&2 - echo "Normalizd patch file was:" 1>&2 + echo "Normalized patch file was:" 1>&2 cat "$tmpfile" 1>&2 exit 1 fi diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index e4d6f02a94b..954c88d1baf 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -1,6 +1,6 @@ { - # Content-addressable Nix mirrors. + # Content-addressable Nix mirrors hashedMirrors = [ "https://tarballs.nixos.org" ]; @@ -8,37 +8,73 @@ # Mirrors for mirror://site/filename URIs, where "site" is # "sourceforge", "gnu", etc. - luarocks = [ - "https://luarocks.org/" - "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/" - "https://luafr.org/moonrocks/" - "http://luarocks.logiceditor.com/rocks/" + # Alsa Project + alsa = [ + "https://www.alsa-project.org/files/pub/" + "ftp://ftp.alsa-project.org/pub/" + "http://alsa.cybermirror.org/" + "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/" ]; - # SourceForge. - sourceforge = [ - "https://downloads.sourceforge.net/" - "https://prdownloads.sourceforge.net/" - "https://netcologne.dl.sourceforge.net/sourceforge/" - "https://versaweb.dl.sourceforge.net/sourceforge/" - "https://freefr.dl.sourceforge.net/sourceforge/" - "https://osdn.dl.sourceforge.net/sourceforge/" - "https://kent.dl.sourceforge.net/sourceforge/" + # Apache + apache = [ + "https://www-eu.apache.org/dist/" + "https://ftp.wayne.edu/apache/" + "https://www.apache.org/dist/" + "https://archive.apache.org/dist/" # fallback for old releases + "https://apache.cs.uu.nl/" + "https://apache.cs.utah.edu/" + "http://ftp.tudelft.nl/apache/" + "ftp://ftp.funet.fi/pub/mirrors/apache.org/" ]; - # OSDN (formerly SourceForge.jp). - osdn = [ - "https://osdn.dl.osdn.jp/" - "https://osdn.mirror.constant.com/" - "https://mirrors.gigenet.com/OSDN/" - "https://osdn.dl.sourceforge.jp/" - "https://jaist.dl.sourceforge.jp/" + # Bioconductor mirrors (from https://bioconductor.org/about/mirrors/) + # The commented-out ones don't seem to allow direct package downloads; + # they serve error messages that result in hash mismatches instead + bioc = [ + # http://bioc.ism.ac.jp/ + # http://bioc.openanalytics.eu/ + # http://bioconductor.fmrp.usp.br/ + # http://mirror.aarnet.edu.au/pub/bioconductor/ + # http://watson.nci.nih.gov/bioc_mirror/ + "https://bioconductor.statistik.tu-dortmund.de/packages/" + "https://mirrors.ustc.edu.cn/bioc/" + "http://bioconductor.jp/packages/" + ]; + + # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html + bitlbee = [ + "https://get.bitlbee.org/" + "https://ftp.snt.utwente.nl/pub/software/bitlbee/" + "http://bitlbee.intergenia.de/" + ]; + + # GCC + gcc = [ + "https://bigsearcher.com/mirrors/gcc/" + "https://mirror.koddos.net/gcc/" + "ftp://ftp.nluug.nl/mirror/languages/gcc/" + "ftp://ftp.fu-berlin.de/unix/languages/gcc/" + "ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/" + "ftp://gcc.gnu.org/pub/gcc/" + ]; + + # GNOME + gnome = [ + # This one redirects to some mirror closeby, so it should be all you need + "https://download.gnome.org/" + + "https://fr2.rpmfind.net/linux/gnome.org/" + "https://ftp.acc.umu.se/pub/GNOME/" + "https://ftp.belnet.be/mirror/ftp.gnome.org/" + "ftp://ftp.cse.buffalo.edu/pub/Gnome/" + "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/" ]; - # GNU (https://www.gnu.org/prep/ftp.html). + # GNU (https://www.gnu.org/prep/ftp.html) gnu = [ # This one redirects to a (supposedly) nearby and (supposedly) up-to-date - # mirror. + # mirror "https://ftpmirror.gnu.org/" "https://ftp.nluug.nl/pub/gnu/" @@ -47,23 +83,13 @@ "https://mirror.dogado.de/gnu/" "https://mirror.tochlab.net/pub/gnu/" - # This one is the master repository, and thus it's always up-to-date. + # This one is the master repository, and thus it's always up-to-date "https://ftp.gnu.org/pub/gnu/" "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/" ]; - # GCC. - gcc = [ - "https://bigsearcher.com/mirrors/gcc/" - "https://mirror.koddos.net/gcc/" - "ftp://ftp.nluug.nl/mirror/languages/gcc/" - "ftp://ftp.fu-berlin.de/unix/languages/gcc/" - "ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/" - "ftp://gcc.gnu.org/pub/gcc/" - ]; - - # GnuPG. + # GnuPG gnupg = [ "https://gnupg.org/ftp/gcrypt/" "https://mirrors.dotsrc.org/gcrypt/" @@ -72,11 +98,23 @@ "http://www.ring.gr.jp/pub/net/" ]; - # kernel.org's /pub (/pub/{linux,software}) tree. - kernel = [ - "https://cdn.kernel.org/pub/" - "http://linux-kernel.uio.no/pub/" - "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" + # IBiblio (former metalab/sunsite) + # Most of the time the expressions refer to the /pub/Linux/ subdirectory; + # however there are other useful files outside it + ibiblioPubLinux = [ + "https://www.ibiblio.org/pub/Linux/" + "ftp://ftp.ibiblio.org/pub/linux/" + "ftp://ftp.gwdg.de/pub/linux/metalab/" + "ftp://ftp.metalab.unc.edu/pub/linux/" + ]; + + # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php + imagemagick = [ + "https://www.imagemagick.org/download/" + "https://mirror.checkdomain.de/imagemagick/" + "https://ftp.nluug.nl/ImageMagick/" + "https://ftp.sunet.se/mirror/imagemagick.org/ftp/" + "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors ]; # Mirrors from https://download.kde.org/ls-lR.mirrorlist @@ -89,13 +127,99 @@ "https://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/" ]; - # Gentoo files. - gentoo = [ - "https://ftp.snt.utwente.nl/pub/os/linux/gentoo/" - "https://distfiles.gentoo.org/" - "https://mirrors.kernel.org/gentoo/" + # kernel.org's /pub (/pub/{linux,software}) tree + kernel = [ + "https://cdn.kernel.org/pub/" + "http://linux-kernel.uio.no/pub/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" ]; + # MySQL + mysql = [ + "https://cdn.mysql.com/Downloads/" + ]; + + # Maven Central + maven = [ + "https://repo1.maven.org/maven2/" + ]; + + # Mozilla projects + mozilla = [ + "https://download.cdn.mozilla.net/pub/mozilla.org/" + "https://archive.mozilla.org/pub/" + ]; + + # OSDN (formerly SourceForge.jp) + osdn = [ + "https://osdn.dl.osdn.jp/" + "https://osdn.mirror.constant.com/" + "https://mirrors.gigenet.com/OSDN/" + "https://osdn.dl.sourceforge.jp/" + "https://jaist.dl.sourceforge.jp/" + ]; + + # PostgreSQL + postgresql = [ + "https://ftp.postgresql.org/pub/" + ]; + + # Roy marples mirrors + roy = [ + "https://roy.marples.name/downloads/" + "https://cflags.cc/roy/" + ]; + + # Sage mirrors (https://www.sagemath.org/mirrors.html) + sageupstream = [ + # Africa (HTTPS) + "https://sagemath.mirror.ac.za/spkg/upstream/" + "https://mirror.ufs.ac.za/sagemath/spkg/upstream/" + + # America, North (HTTPS) + "https://mirrors.mit.edu/sage/spkg/upstream/" + "https://mirrors.xmission.com/sage/spkg/upstream/" + + # Asia (HTTPS) + "https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/" + "https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/" + "http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/" + "https://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/" + "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/" + + # Australia (HTTPS) + "https://mirror.aarnet.edu.au/pub/sage/spkg/upstream/" + + # Europe (HTTPS) + "https://sage.mirror.garr.it/mirrors/sage/spkg/upstream/" + "https://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/" + + # Africa (non-HTTPS) + "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/" + + # America, North (non-HTTPS) + "http://www.cecm.sfu.ca/sage/spkg/upstream/" + + # America, South (non-HTTPS) + "http://sagemath.c3sl.ufpr.br/spkg/upstream/" + "http://linorg.usp.br/sage/spkg/upstream" + + # Asia (non-HTTPS) + "http://ftp.kaist.ac.kr/sage/spkg/upstream/" + "http://ftp.riken.jp/sagemath/spkg/upstream/" + + # Europe (non-HTTPS) + "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/" + "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/" + ]; + + # SAMBA + samba = [ + "https://www.samba.org/ftp/" + "http://www.samba.org/ftp/" + ]; + + # GNU Savannah savannah = [ # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html "https://mirror.easyname.at/nongnu/" @@ -126,28 +250,56 @@ "ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/" ]; - samba = [ - "https://www.samba.org/ftp/" - "http://www.samba.org/ftp/" + # SourceForge + sourceforge = [ + "https://downloads.sourceforge.net/" + "https://prdownloads.sourceforge.net/" + "https://netcologne.dl.sourceforge.net/sourceforge/" + "https://versaweb.dl.sourceforge.net/sourceforge/" + "https://freefr.dl.sourceforge.net/sourceforge/" + "https://osdn.dl.sourceforge.net/sourceforge/" + "https://kent.dl.sourceforge.net/sourceforge/" ]; - # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . - bitlbee = [ - "https://get.bitlbee.org/" - "https://ftp.snt.utwente.nl/pub/software/bitlbee/" - "http://bitlbee.intergenia.de/" + # Steam Runtime + steamrt = [ + "https://repo.steampowered.com/steamrt/" + "https://public.abbradar.moe/steamrt/" ]; - # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php - imagemagick = [ - "https://www.imagemagick.org/download/" - "https://mirror.checkdomain.de/imagemagick/" - "https://ftp.nluug.nl/ImageMagick/" - "https://ftp.sunet.se/mirror/imagemagick.org/ftp/" - "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors + # TCSH shell + tcsh = [ + "https://astron.com/pub/tcsh/" + "https://astron.com/pub/tcsh/old/" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/" + "ftp://ftp.astron.com/pub/tcsh/" + "ftp://ftp.astron.com/pub/tcsh/old/" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/" ]; - # CPAN mirrors. + # XFCE + xfce = [ + "https://archive.xfce.org/" + "https://mirror.netcologne.de/xfce/" + "https://archive.be.xfce.org/xfce/" + "https://archive.al-us.xfce.org/" + "http://archive.se.xfce.org/xfce/" + "http://mirror.perldude.de/archive.xfce.org/" + "http://archive.be2.xfce.org/" + "http://ftp.udc.es/xfce/" + ]; + + # X.org + xorg = [ + "https://xorg.freedesktop.org/releases/" + "https://ftp.x.org/archive/" + ]; + + ### Programming languages' package repos + + # Perl CPAN cpan = [ "https://cpan.metacpan.org/" "https://cpan.perl.org/" @@ -155,7 +307,35 @@ "https://backpan.perl.org/" # for old releases ]; - # CentOS. + # Haskell Hackage + hackage = [ + "https://hackage.haskell.org/package/" + ]; + + # Lua Rocks + luarocks = [ + "https://luarocks.org/" + "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/" + "https://luafr.org/moonrocks/" + "http://luarocks.logiceditor.com/rocks/" + ]; + + # Python PyPI + pypi = [ + "https://files.pythonhosted.org/packages/source/" + # pypi.io is a more semantic link, but atm it’s referencing + # files.pythonhosted.org over two redirects + "https://pypi.io/packages/source/" + ]; + + # Python Test-PyPI + testpypi = [ + "https://test.pypi.io/packages/source/" + ]; + + ### Linux distros + + # CentOS centos = [ # For old releases "https://vault.centos.org/" @@ -168,7 +348,7 @@ "http://mirror.centos.org/centos/" ]; - # Debian. + # Debian debian = [ "https://httpredir.debian.org/debian/" "https://ftp.debian.org/debian/" @@ -181,17 +361,9 @@ "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/" ]; - # Ubuntu. - ubuntu = [ - "https://nl.archive.ubuntu.com/ubuntu/" - "https://old-releases.ubuntu.com/ubuntu/" - "https://mirrors.edge.kernel.org/ubuntu/" - "http://de.archive.ubuntu.com/ubuntu/" - "http://archive.ubuntu.com/ubuntu/" - ]; - - # Fedora (please only add full mirrors that carry old Fedora distributions as well). - # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content). + # Fedora + # Please add only full mirrors that carry old Fedora distributions as well + # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content) fedora = [ "https://archives.fedoraproject.org/pub/fedora/" "https://fedora.osuosl.org/" @@ -203,7 +375,14 @@ "http://mirror.1000mbps.com/fedora/" ]; - # openSUSE. + # Gentoo + gentoo = [ + "https://ftp.snt.utwente.nl/pub/os/linux/gentoo/" + "https://distfiles.gentoo.org/" + "https://mirrors.kernel.org/gentoo/" + ]; + + # openSUSE opensuse = [ "https://opensuse.hro.nl/opensuse/distribution/" "https://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/" @@ -213,169 +392,21 @@ "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/" ]; - gnome = [ - # This one redirects to some mirror closeby, so it should be all you need. - "https://download.gnome.org/" - - "https://fr2.rpmfind.net/linux/gnome.org/" - "https://ftp.acc.umu.se/pub/GNOME/" - "https://ftp.belnet.be/mirror/ftp.gnome.org/" - "ftp://ftp.cse.buffalo.edu/pub/Gnome/" - "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/" - ]; - - xfce = [ - "https://archive.xfce.org/" - "https://mirror.netcologne.de/xfce/" - "https://archive.be.xfce.org/xfce/" - "https://archive.al-us.xfce.org/" - "http://archive.se.xfce.org/xfce/" - "http://mirror.perldude.de/archive.xfce.org/" - "http://archive.be2.xfce.org/" - "http://ftp.udc.es/xfce/" - ]; - - # X.org. - xorg = [ - "https://xorg.freedesktop.org/releases/" - "https://ftp.x.org/archive/" - ]; - - apache = [ - "https://www-eu.apache.org/dist/" - "https://ftp.wayne.edu/apache/" - "https://www.apache.org/dist/" - "https://archive.apache.org/dist/" # fallback for old releases - "https://apache.cs.uu.nl/" - "https://apache.cs.utah.edu/" - "http://ftp.tudelft.nl/apache/" - "ftp://ftp.funet.fi/pub/mirrors/apache.org/" - ]; - - postgresql = [ - "https://ftp.postgresql.org/pub/" - ]; - - metalab = [ - "ftp://ftp.gwdg.de/pub/linux/metalab/" - "ftp://ftp.metalab.unc.edu/pub/linux/" - ]; - - # Bioconductor mirrors (from https://bioconductor.org/about/mirrors/) - # The commented-out ones don't seem to allow direct package downloads; - # they serve error messages that result in hash mismatches instead. - bioc = [ - # http://bioc.ism.ac.jp/ - # http://bioc.openanalytics.eu/ - # http://bioconductor.fmrp.usp.br/ - # http://mirror.aarnet.edu.au/pub/bioconductor/ - # http://watson.nci.nih.gov/bioc_mirror/ - "https://bioconductor.statistik.tu-dortmund.de/packages/" - "https://mirrors.ustc.edu.cn/bioc/" - "http://bioconductor.jp/packages/" - ]; - - # Hackage mirrors - hackage = [ - "https://hackage.haskell.org/package/" - ]; - - # Roy marples mirrors - roy = [ - "https://roy.marples.name/downloads/" - "https://cflags.cc/roy/" - ]; - - # Sage mirrors (https://www.sagemath.org/mirrors.html) - sageupstream = [ - # Africa (HTTPS) - "https://sagemath.mirror.ac.za/spkg/upstream/" - "https://mirror.ufs.ac.za/sagemath/spkg/upstream/" - - # America, North (HTTPS) - "https://mirrors.mit.edu/sage/spkg/upstream/" - "https://mirrors.xmission.com/sage/spkg/upstream/" - - # Asia (HTTPS) - "https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/" - "https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/" - "http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/" - "https://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/" - "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/" - - # Australia (HTTPS) - "https://mirror.aarnet.edu.au/pub/sage/spkg/upstream/" - - # Europe (HTTPS) - "https://sage.mirror.garr.it/mirrors/sage/spkg/upstream/" - "https://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/" - - # Africa (non-HTTPS) - "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/" - - # America, North (non-HTTPS) - "http://www.cecm.sfu.ca/sage/spkg/upstream/" - - # America, South (non-HTTPS) - "http://sagemath.c3sl.ufpr.br/spkg/upstream/" - "http://linorg.usp.br/sage/spkg/upstream" - - # Asia (non-HTTPS) - "http://ftp.kaist.ac.kr/sage/spkg/upstream/" - "http://ftp.riken.jp/sagemath/spkg/upstream/" - - # Europe (non-HTTPS) - "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/" - "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/" + # Ubuntu + ubuntu = [ + "https://nl.archive.ubuntu.com/ubuntu/" + "https://old-releases.ubuntu.com/ubuntu/" + "https://mirrors.edge.kernel.org/ubuntu/" + "http://de.archive.ubuntu.com/ubuntu/" + "http://archive.ubuntu.com/ubuntu/" ]; - # MySQL mirrors - mysql = [ - "https://cdn.mysql.com/Downloads/" - ]; + # ... and other OSes in general - # OpenBSD mirrors + # OpenBSD openbsd = [ "https://ftp.openbsd.org/pub/OpenBSD/" "ftp://ftp.nluug.nl/pub/OpenBSD/" "ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/" ]; - - # Steam Runtime mirrors - steamrt = [ - "https://repo.steampowered.com/steamrt/" - "https://public.abbradar.moe/steamrt/" - ]; - - # Python PyPI mirrors - pypi = [ - "https://files.pythonhosted.org/packages/source/" - # pypi.io is a more semantic link, but atm it’s referencing - # files.pythonhosted.org over two redirects - "https://pypi.io/packages/source/" - ]; - - # Python Test-PyPI mirror - testpypi = [ - "https://test.pypi.io/packages/source/" - ]; - - # Mozilla projects. - mozilla = [ - "https://download.cdn.mozilla.net/pub/mozilla.org/" - "https://archive.mozilla.org/pub/" - ]; - - # Maven Central - maven = [ - "https://repo1.maven.org/maven2/" - ]; - - # Alsa Project - alsa = [ - "https://www.alsa-project.org/files/pub/" - "ftp://ftp.alsa-project.org/pub/" - "http://alsa.cybermirror.org/" - "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/" - ]; } diff --git a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix index 63ef7e65507..d21e0475e2d 100644 --- a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix +++ b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix @@ -4,33 +4,34 @@ let pListText = lib.generators.toPlist { } { CFBundleDevelopmentRegion = "English"; CFBundleExecutable = "$name"; - CFBundleIconFiles = [ "$iconPlistArray" ]; + CFBundleIconFile = "$icon"; CFBundleIdentifier = "org.nixos.$name"; CFBundleInfoDictionaryVersion = "6.0"; CFBundleName = "$name"; CFBundlePackageType = "APPL"; CFBundleSignature = "???"; }; - -# The generation of the CFBundleIconFiles array is a bit of a hack, since we -# will always end up with an empty first element (<string></string>) but macOS -# appears to ignore this which allows us to use the nix PList generator. in writeScriptBin "write-darwin-bundle" '' shopt -s nullglob - readonly prefix="$1" - readonly name="$2" - readonly exec="$3" - iconPlistArray="" - - for icon in "$prefix/Applications/$name.app/Contents/Resources"/*; do - iconPlistArray="$iconPlistArray</string><string>"$(basename "$icon")"" - done + readonly prefix=$1 + readonly name=$2 + readonly exec=$3 + readonly icon=$4.icns + readonly squircle=''${5:-1} + readonly plist=$prefix/Applications/$name.app/Contents/Info.plist - cat > "$prefix/Applications/$name.app/Contents/Info.plist" <<EOF + cat > "$plist" <<EOF ${pListText} EOF + if [[ $squircle != 0 && $squircle != "false" ]]; then + sed " + s|CFBundleIconFile|CFBundleIconFiles|; + s|<string>$icon</string>|<array><string>$icon</string></array>| + " -i "$plist" + fi + cat > "$prefix/Applications/$name.app/Contents/MacOS/$name" <<EOF #!/bin/bash exec $prefix/bin/$exec diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 787f0f67847..d831fe24d33 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -1,4 +1,4 @@ -{ lib, writeTextFile, desktop-file-utils }: +{ lib, writeTextFile, buildPackages }: # All possible values as defined by the spec, version 1.4. # Please keep in spec order for easier maintenance. @@ -34,19 +34,24 @@ , extraConfig ? {} # Additional values to be added literally to the final item, e.g. vendor extensions }: let + # FIXME: workaround until https://github.com/NixOS/nixpkgs/pull/162246 lands + cleanName = if lib.hasInfix " " name + then throw "makeDesktopItem: name must not contain spaces!" + else name; + # There are multiple places in the FDO spec that make "boolean" values actually tristate, # e.g. StartupNotify, where "unset" is literally defined as "do something reasonable". # So, handle null values separately. boolOrNullToString = value: if value == null then null else if builtins.isBool value then lib.boolToString value - else throw "Value must be a boolean or null!"; + else throw "makeDesktopItem: value must be a boolean or null!"; # Multiple values are represented as one string, joined by semicolons. # Technically, it's possible to escape semicolons in values with \;, but this is currently not implemented. - renderList = value: - if !builtins.isList value then throw "Value must be a list!" - else if builtins.any (item: lib.hasInfix ";" item) value then throw "Values in list must not contain semicolons!" + renderList = key: value: + if !builtins.isList value then throw "makeDesktopItem: value for ${key} must be a list!" + else if builtins.any (item: lib.hasInfix ";" item) value then throw "makeDesktopItem: values in ${key} list must not contain semicolons!" else if value == [] then null else builtins.concatStringsSep ";" value; @@ -60,18 +65,18 @@ let "NoDisplay" = boolOrNullToString noDisplay; "Comment" = comment; "Icon" = icon; - "OnlyShowIn" = renderList onlyShowIn; - "NotShowIn" = renderList notShowIn; + "OnlyShowIn" = renderList "onlyShowIn" onlyShowIn; + "NotShowIn" = renderList "notShowIn" notShowIn; "DBusActivatable" = boolOrNullToString dbusActivatable; "TryExec" = tryExec; "Exec" = exec; "Path" = path; "Terminal" = boolOrNullToString terminal; - "Actions" = renderList (builtins.attrNames actions); - "MimeType" = renderList mimeTypes; - "Categories" = renderList categories; - "Implements" = renderList implements; - "Keywords" = renderList keywords; + "Actions" = renderList "actions" (builtins.attrNames actions); + "MimeType" = renderList "mimeTypes" mimeTypes; + "Categories" = renderList "categories" categories; + "Implements" = renderList "implements" implements; + "Keywords" = renderList "keywords" keywords; "StartupNotify" = boolOrNullToString startupNotify; "StartupWMClass" = startupWMClass; "URL" = url; @@ -111,8 +116,8 @@ let content = [ mainSectionRendered ] ++ actionsRendered; in writeTextFile { - name = "${name}.desktop"; - destination = "/share/applications/${name}.desktop"; + name = "${cleanName}.desktop"; + destination = "/share/applications/${cleanName}.desktop"; text = builtins.concatStringsSep "\n" content; - checkPhase = "${desktop-file-utils}/bin/desktop-file-validate $target"; + checkPhase = "${buildPackages.desktop-file-utils}/bin/desktop-file-validate $target"; } diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 6bdec501630..18e8784cfab 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -2,7 +2,7 @@ { pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args: -let Dune = if args.useDune2 or false then dune_2 else dune_1; in +let Dune = if args.useDune2 or true then dune_2 else dune_1; in if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) || (args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion) diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.py b/pkgs/build-support/setup-hooks/auto-patchelf.py new file mode 100644 index 00000000000..26fd623e3da --- /dev/null +++ b/pkgs/build-support/setup-hooks/auto-patchelf.py @@ -0,0 +1,329 @@ +#!/usr/bin/env python3 + +from collections import defaultdict +from contextlib import contextmanager +from dataclasses import dataclass +from elftools.common.exceptions import ELFError # type: ignore +from elftools.elf.dynamic import DynamicSection # type: ignore +from elftools.elf.elffile import ELFFile # type: ignore +from elftools.elf.enums import ENUM_E_TYPE, ENUM_EI_OSABI # type: ignore +from itertools import chain +from pathlib import Path, PurePath + +from typing import Tuple, Optional, Iterator, List, DefaultDict, Set + +import argparse +import os +import pprint +import subprocess +import sys + + + +@contextmanager +def open_elf(path: Path) -> Iterator[ELFFile]: + with path.open('rb') as stream: + yield ELFFile(stream) + + +def is_static_executable(elf: ELFFile) -> bool: + # Statically linked executables have an ELF type of EXEC but no INTERP. + return (elf.header["e_type"] == 'ET_EXEC' + and not elf.get_section_by_name(".interp")) + + +def is_dynamic_executable(elf: ELFFile) -> bool: + # We do not require an ELF type of EXEC. This also catches + # position-independent executables, as they typically have an INTERP + # section but their ELF type is DYN. + return bool(elf.get_section_by_name(".interp")) + + +def get_dependencies(elf: ELFFile) -> List[str]: + dependencies = [] + # This convoluted code is here on purpose. For some reason, using + # elf.get_section_by_name(".dynamic") does not always return an + # instance of DynamicSection, but that is required to call iter_tags + for section in elf.iter_sections(): + if isinstance(section, DynamicSection): + for tag in section.iter_tags('DT_NEEDED'): + dependencies.append(tag.needed) + break # There is only one dynamic section + + return dependencies + + +def get_rpath(elf: ELFFile) -> List[str]: + # This convoluted code is here on purpose. For some reason, using + # elf.get_section_by_name(".dynamic") does not always return an + # instance of DynamicSection, but that is required to call iter_tags + for section in elf.iter_sections(): + if isinstance(section, DynamicSection): + for tag in section.iter_tags('DT_RUNPATH'): + return tag.runpath.split(':') + + for tag in section.iter_tags('DT_RPATH'): + return tag.rpath.split(':') + + break # There is only one dynamic section + + return [] + + +def get_arch(elf: ELFFile) -> str: + return elf.get_machine_arch() + + +def get_osabi(elf: ELFFile) -> str: + return elf.header["e_ident"]["EI_OSABI"] + + +def osabi_are_compatible(wanted: str, got: str) -> bool: + """ + Tests whether two OS ABIs are compatible, taking into account the + generally accepted compatibility of SVR4 ABI with other ABIs. + """ + if not wanted or not got: + # One of the types couldn't be detected, so as a fallback we'll + # assume they're compatible. + return True + + # Generally speaking, the base ABI (0x00), which is represented by + # readelf(1) as "UNIX - System V", indicates broad compatibility + # with other ABIs. + # + # TODO: This isn't always true. For example, some OSes embed ABI + # compatibility into SHT_NOTE sections like .note.tag and + # .note.ABI-tag. It would be prudent to add these to the detection + # logic to produce better ABI information. + if wanted == 'ELFOSABI_SYSV': + return True + + # Similarly here, we should be able to link against a superset of + # features, so even if the target has another ABI, this should be + # fine. + if got == 'ELFOSABI_SYSV': + return True + + # Otherwise, we simply return whether the ABIs are identical. + return wanted == got + + +def glob(path: Path, pattern: str, recursive: bool) -> Iterator[Path]: + return path.rglob(pattern) if recursive else path.glob(pattern) + + +cached_paths: Set[Path] = set() +soname_cache: DefaultDict[Tuple[str, str], List[Tuple[Path, str]]] = defaultdict(list) + + +def populate_cache(initial: List[Path], recursive: bool =False) -> None: + lib_dirs = list(initial) + + while lib_dirs: + lib_dir = lib_dirs.pop(0) + + if lib_dir in cached_paths: + continue + + cached_paths.add(lib_dir) + + for path in glob(lib_dir, "*.so*", recursive): + if not path.is_file(): + continue + + resolved = path.resolve() + try: + with open_elf(path) as elf: + osabi = get_osabi(elf) + arch = get_arch(elf) + rpath = [Path(p) for p in get_rpath(elf) + if p and '$ORIGIN' not in p] + lib_dirs += rpath + soname_cache[(path.name, arch)].append((resolved.parent, osabi)) + + except ELFError: + # Not an ELF file in the right format + pass + + +def find_dependency(soname: str, soarch: str, soabi: str) -> Optional[Path]: + for lib, libabi in soname_cache[(soname, soarch)]: + if osabi_are_compatible(soabi, libabi): + return lib + return None + + +@dataclass +class Dependency: + file: Path # The file that contains the dependency + name: Path # The name of the dependency + found: bool = False # Whether it was found somewhere + + +def auto_patchelf_file(path: Path, runtime_deps: list[Path]) -> list[Dependency]: + try: + with open_elf(path) as elf: + + if is_static_executable(elf): + # No point patching these + print(f"skipping {path} because it is statically linked") + return [] + + if elf.num_segments() == 0: + # no segment (e.g. object file) + print(f"skipping {path} because it contains no segment") + return [] + + file_arch = get_arch(elf) + if interpreter_arch != file_arch: + # Our target architecture is different than this file's + # architecture, so skip it. + print(f"skipping {path} because its architecture ({file_arch})" + f" differs from target ({interpreter_arch})") + return [] + + file_osabi = get_osabi(elf) + if not osabi_are_compatible(interpreter_osabi, file_osabi): + print(f"skipping {path} because its OS ABI ({file_osabi}) is" + f" not compatible with target ({interpreter_osabi})") + return [] + + file_is_dynamic_executable = is_dynamic_executable(elf) + + file_dependencies = map(Path, get_dependencies(elf)) + + except ELFError: + return [] + + rpath = [] + if file_is_dynamic_executable: + print("setting interpreter of", path) + subprocess.run( + ["patchelf", "--set-interpreter", interpreter_path.as_posix(), path.as_posix()], + check=True) + rpath += runtime_deps + + print("searching for dependencies of", path) + dependencies = [] + # Be sure to get the output of all missing dependencies instead of + # failing at the first one, because it's more useful when working + # on a new package where you don't yet know the dependencies. + for dep in file_dependencies: + if dep.is_absolute() and dep.is_file(): + # This is an absolute path. If it exists, just use it. + # Otherwise, we probably want this to produce an error when + # checked (because just updating the rpath won't satisfy + # it). + continue + elif (libc_lib / dep).is_file(): + # This library exists in libc, and will be correctly + # resolved by the linker. + continue + + if found_dependency := find_dependency(dep.name, file_arch, file_osabi): + rpath.append(found_dependency) + dependencies.append(Dependency(path, dep, True)) + print(f" {dep} -> found: {found_dependency}") + else: + dependencies.append(Dependency(path, dep, False)) + print(f" {dep} -> not found!") + + # Dedup the rpath + rpath_str = ":".join(dict.fromkeys(map(Path.as_posix, rpath))) + + if rpath: + print("setting RPATH to:", rpath_str) + subprocess.run( + ["patchelf", "--set-rpath", rpath_str, path.as_posix()], + check=True) + + return dependencies + + +def auto_patchelf( + paths_to_patch: List[Path], + lib_dirs: List[Path], + runtime_deps: List[Path], + recursive: bool =True, + ignore_missing: bool =False) -> None: + + if not paths_to_patch: + sys.exit("No paths to patch, stopping.") + + # Add all shared objects of the current output path to the cache, + # before lib_dirs, so that they are chosen first in find_dependency. + populate_cache(paths_to_patch, recursive) + populate_cache(lib_dirs) + + dependencies = [] + for path in chain.from_iterable(glob(p, '*', recursive) for p in paths_to_patch): + if not path.is_symlink() and path.is_file(): + dependencies += auto_patchelf_file(path, runtime_deps) + + missing = [dep for dep in dependencies if not dep.found] + + # Print a summary of the missing dependencies at the end + for dep in missing: + print(f"auto-patchelf could not satisfy dependency {dep.name} wanted by {dep.file}") + + if missing and not ignore_missing: + sys.exit('auto-patchelf failed to find all the required dependencies.\n' + 'Add the missing dependencies to --libs or use --ignore-missing.') + + +def main() -> None: + parser = argparse.ArgumentParser( + prog="auto-patchelf", + description='auto-patchelf tries as hard as possible to patch the' + ' provided binary files by looking for compatible' + 'libraries in the provided paths.') + parser.add_argument( + "--ignore-missing", + action="store_true", + help="Do not fail when some dependencies are not found.") + parser.add_argument( + "--no-recurse", + dest="recursive", + action="store_false", + help="Patch only the provided paths, and ignore their children") + parser.add_argument( + "--paths", nargs="*", type=Path, + help="Paths whose content needs to be patched.") + parser.add_argument( + "--libs", nargs="*", type=Path, + help="Paths where libraries are searched for.") + parser.add_argument( + "--runtime-dependencies", nargs="*", type=Path, + help="Paths to prepend to the runtime path of executable binaries.") + + print("automatically fixing dependencies for ELF files") + args = parser.parse_args() + pprint.pprint(vars(args)) + + auto_patchelf( + args.paths, + args.libs, + args.runtime_dependencies, + args.recursive, + args.ignore_missing) + + +interpreter_path: Path = None # type: ignore +interpreter_osabi: str = None # type: ignore +interpreter_arch: str = None # type: ignore +libc_lib: Path = None # type: ignore + +if __name__ == "__main__": + nix_support = Path(os.environ['NIX_BINTOOLS']) / 'nix-support' + interpreter_path = Path((nix_support / 'dynamic-linker').read_text().strip()) + libc_lib = Path((nix_support / 'orig-libc').read_text().strip()) / 'lib' + + with open_elf(interpreter_path) as interpreter: + interpreter_osabi = get_osabi(interpreter) + interpreter_arch = get_arch(interpreter) + + if interpreter_arch and interpreter_osabi and interpreter_path and libc_lib: + main() + else: + sys.exit("Failed to parse dynamic linker (ld) properties.") diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 4b3a1c5c390..9822674196a 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -1,289 +1,21 @@ #!/usr/bin/env bash declare -a autoPatchelfLibs -declare -Ag autoPatchelfFailedDeps +declare -a extraAutoPatchelfLibs gatherLibraries() { autoPatchelfLibs+=("$1/lib") } -# wrapper around patchelf to raise proper error messages -# containing the tried file name and command -runPatchelf() { - patchelf "$@" || (echo "Command failed: patchelf $*" && exit 1) -} - # shellcheck disable=SC2154 # (targetOffset is referenced but not assigned.) addEnvHooks "$targetOffset" gatherLibraries -isExecutable() { - # For dynamically linked ELF files it would be enough to check just for the - # INTERP section. However, we won't catch statically linked executables as - # they only have an ELF type of EXEC but no INTERP. - # - # So what we do here is just check whether *either* the ELF type is EXEC - # *or* there is an INTERP section. This also catches position-independent - # executables, as they typically have an INTERP section but their ELF type - # is DYN. - isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \ - | grep '^ *Type: *EXEC\>\|^ *INTERP\>')" - # not using grep -q, because it can cause Broken pipe - # https://unix.stackexchange.com/questions/305547/broken-pipe-when-grepping-output-but-only-with-i-flag - [ -n "$isExeResult" ] -} - -# We cache dependencies so that we don't need to search through all of them on -# every consecutive call to findDependency. -declare -Ag autoPatchelfCachedDepsAssoc -declare -ag autoPatchelfCachedDeps - -addToDepCache() { - if [[ ${autoPatchelfCachedDepsAssoc[$1]+f} ]]; then return; fi - - # store deps in an assoc. array for efficient lookups - # otherwise findDependency would have quadratic complexity - autoPatchelfCachedDepsAssoc["$1"]="" - - # also store deps in normal array to maintain their order - autoPatchelfCachedDeps+=("$1") -} - -declare -gi depCacheInitialised=0 -declare -gi doneRecursiveSearch=0 -declare -g foundDependency - -getDepsFromElfBinary() { - # NOTE: This does not use runPatchelf because it may encounter non-ELF - # files. Caller is expected to check the return code if needed. - patchelf --print-needed "$1" 2> /dev/null -} - -getRpathFromElfBinary() { - # NOTE: This does not use runPatchelf because it may encounter non-ELF - # files. Caller is expected to check the return code if needed. - local rpath - IFS=':' read -ra rpath < <(patchelf --print-rpath "$1" 2> /dev/null) || return $? - - printf "%s\n" "${rpath[@]}" -} - -populateCacheForDep() { - local so="$1" - local rpath found - rpath="$(getRpathFromElfBinary "$so")" || return 1 - - for found in $(getDepsFromElfBinary "$so"); do - local rpathElem - for rpathElem in $rpath; do - # Ignore empty element or $ORIGIN magic variable which should be - # deterministically resolved by adding this package's library - # files early anyway. - # - # shellcheck disable=SC2016 - # (Expressions don't expand in single quotes, use double quotes for - # that.) - if [[ -z "$rpathElem" || "$rpathElem" == *'$ORIGIN'* ]]; then - continue - fi - - local soname="${found%.so*}" - local foundso= - for foundso in "$rpathElem/$soname".so*; do - addToDepCache "$foundso" - done - - # Found in this element of the rpath, no need to check others. - if [ -n "$foundso" ]; then - break - fi - done - done - - # Not found in any rpath element. - return 1 -} - -populateCacheWithRecursiveDeps() { - # Dependencies may add more to the end of this array, so we use a counter - # with while instead of a regular for loop here. - local -i i=0 - while [ $i -lt ${#autoPatchelfCachedDeps[@]} ]; do - populateCacheForDep "${autoPatchelfCachedDeps[$i]}" - i=$i+1 - done -} - -getBinArch() { - $OBJDUMP -f "$1" 2> /dev/null | sed -ne 's/^architecture: *\([^,]\+\).*/\1/p' -} - -# Returns the specific OS ABI for an ELF file in the format produced by -# readelf(1), like "UNIX - System V" or "UNIX - GNU". -getBinOsabi() { - $READELF -h "$1" 2> /dev/null | sed -ne 's/^[ \t]*OS\/ABI:[ \t]*\(.*\)/\1/p' -} - -# Tests whether two OS ABIs are compatible, taking into account the generally -# accepted compatibility of SVR4 ABI with other ABIs. -areBinOsabisCompatible() { - local wanted="$1" - local got="$2" - - if [[ -z "$wanted" || -z "$got" ]]; then - # One of the types couldn't be detected, so as a fallback we'll assume - # they're compatible. - return 0 - fi - - # Generally speaking, the base ABI (0x00), which is represented by - # readelf(1) as "UNIX - System V", indicates broad compatibility with other - # ABIs. - # - # TODO: This isn't always true. For example, some OSes embed ABI - # compatibility into SHT_NOTE sections like .note.tag and .note.ABI-tag. - # It would be prudent to add these to the detection logic to produce better - # ABI information. - if [[ "$wanted" == "UNIX - System V" ]]; then - return 0 - fi - - # Similarly here, we should be able to link against a superset of features, - # so even if the target has another ABI, this should be fine. - if [[ "$got" == "UNIX - System V" ]]; then - return 0 - fi - - # Otherwise, we simply return whether the ABIs are identical. - if [[ "$wanted" == "$got" ]]; then - return 0 - fi - - return 1 -} - -# NOTE: If you want to use this function outside of the autoPatchelf function, -# keep in mind that the dependency cache is only valid inside the subshell -# spawned by the autoPatchelf function, so invoking this directly will possibly -# rebuild the dependency cache. See the autoPatchelf function below for more -# information. -findDependency() { - local filename="$1" - local arch="$2" - local osabi="$3" - local lib dep - - if [ $depCacheInitialised -eq 0 ]; then - for lib in "${autoPatchelfLibs[@]}"; do - for so in "$lib/"*.so*; do addToDepCache "$so"; done - done - depCacheInitialised=1 - fi - - for dep in "${autoPatchelfCachedDeps[@]}"; do - if [ "$filename" = "${dep##*/}" ]; then - if [ "$(getBinArch "$dep")" = "$arch" ] && areBinOsabisCompatible "$osabi" "$(getBinOsabi "$dep")"; then - foundDependency="$dep" - return 0 - fi - fi - done - - # Populate the dependency cache with recursive dependencies *only* if we - # didn't find the right dependency so far and afterwards run findDependency - # again, but this time with $doneRecursiveSearch set to 1 so that it won't - # recurse again (and thus infinitely). - if [ $doneRecursiveSearch -eq 0 ]; then - populateCacheWithRecursiveDeps - doneRecursiveSearch=1 - findDependency "$filename" "$arch" || return 1 - return 0 - fi - return 1 -} - -autoPatchelfFile() { - local dep rpath="" toPatch="$1" - - local interpreter - interpreter="$(< "$NIX_BINTOOLS/nix-support/dynamic-linker")" - - local interpreterArch interpreterOsabi toPatchArch toPatchOsabi - interpreterArch="$(getBinArch "$interpreter")" - interpreterOsabi="$(getBinOsabi "$interpreter")" - toPatchArch="$(getBinArch "$toPatch")" - toPatchOsabi="$(getBinOsabi "$toPatch")" - - if [ "$interpreterArch" != "$toPatchArch" ]; then - # Our target architecture is different than this file's architecture, - # so skip it. - echo "skipping $toPatch because its architecture ($toPatchArch) differs from target ($interpreterArch)" >&2 - return 0 - elif ! areBinOsabisCompatible "$interpreterOsabi" "$toPatchOsabi"; then - echo "skipping $toPatch because its OS ABI ($toPatchOsabi) is not compatible with target ($interpreterOsabi)" >&2 - return 0 - fi - - if isExecutable "$toPatch"; then - runPatchelf --set-interpreter "$interpreter" "$toPatch" - # shellcheck disable=SC2154 - # (runtimeDependencies is referenced but not assigned.) - if [ -n "$runtimeDependencies" ]; then - for dep in $runtimeDependencies; do - rpath="$rpath${rpath:+:}$dep/lib" - done - fi - fi - - local libcLib - libcLib="$(< "$NIX_BINTOOLS/nix-support/orig-libc")/lib" - - echo "searching for dependencies of $toPatch" >&2 - - local missing - missing="$(getDepsFromElfBinary "$toPatch")" || return 0 - - # This ensures that we get the output of all missing dependencies instead - # of failing at the first one, because it's more useful when working on a - # new package where you don't yet know its dependencies. - - for dep in $missing; do - if [[ "$dep" == /* ]]; then - # This is an absolute path. If it exists, just use it. Otherwise, - # we probably want this to produce an error when checked (because - # just updating the rpath won't satisfy it). - if [ -f "$dep" ]; then - continue - fi - elif [ -f "$libcLib/$dep" ]; then - # This library exists in libc, and will be correctly resolved by - # the linker. - continue - fi - - echo -n " $dep -> " >&2 - if findDependency "$dep" "$toPatchArch" "$toPatchOsabi"; then - rpath="$rpath${rpath:+:}${foundDependency%/*}" - echo "found: $foundDependency" >&2 - else - echo "not found!" >&2 - autoPatchelfFailedDeps["$dep"]="$toPatch" - fi - done - - if [ -n "$rpath" ]; then - echo "setting RPATH to: $rpath" >&2 - runPatchelf --set-rpath "$rpath" "$toPatch" - fi -} - # Can be used to manually add additional directories with shared object files # to be included for the next autoPatchelf invocation. addAutoPatchelfSearchPath() { local -a findOpts=() - # XXX: Somewhat similar to the one in the autoPatchelf function, maybe make - # it DRY someday... while [ $# -gt 0 ]; do case "$1" in --) shift; break;; @@ -296,15 +28,19 @@ addAutoPatchelfSearchPath() { esac done - while IFS= read -r -d '' file; do - addToDepCache "$file" + local dir= + while IFS= read -r -d '' dir; do + extraAutoPatchelfLibs+=("$dir") done < <(find "$@" "${findOpts[@]}" \! -type d \ - \( -name '*.so' -o -name '*.so.*' \) -print0) + \( -name '*.so' -o -name '*.so.*' \) -print0 \ + | sed -z 's#/[^/]*$##' \ + | uniq -z + ) } + autoPatchelf() { local norecurse= - while [ $# -gt 0 ]; do case "$1" in --) shift; break;; @@ -317,47 +53,14 @@ autoPatchelf() { esac done - if [ $# -eq 0 ]; then - echo "autoPatchelf: No paths to patch specified." >&2 - return 1 - fi - - echo "automatically fixing dependencies for ELF files" >&2 - - # Add all shared objects of the current output path to the start of - # autoPatchelfCachedDeps so that it's chosen first in findDependency. - addAutoPatchelfSearchPath ${norecurse:+--no-recurse} -- "$@" - - while IFS= read -r -d $'\0' file; do - isELF "$file" || continue - segmentHeaders="$(LANG=C $READELF -l "$file")" - # Skip if the ELF file doesn't have segment headers (eg. object files). - # not using grep -q, because it can cause Broken pipe - grep -q '^Program Headers:' <<<"$segmentHeaders" || continue - if isExecutable "$file"; then - # Skip if the executable is statically linked. - grep -q "^ *INTERP\\>" <<<"$segmentHeaders" || continue - fi - # Jump file if patchelf is unable to parse it - # Some programs contain binary blobs for testing, - # which are identified as ELF but fail to be parsed by patchelf - patchelf "$file" || continue - autoPatchelfFile "$file" - done < <(find "$@" ${norecurse:+-maxdepth 1} -type f -print0) - - # fail if any dependencies were not found and - # autoPatchelfIgnoreMissingDeps is not set - local depsMissing=0 - for failedDep in "${!autoPatchelfFailedDeps[@]}"; do - echo "autoPatchelfHook could not satisfy dependency $failedDep wanted by ${autoPatchelfFailedDeps[$failedDep]}" - depsMissing=1 - done - # shellcheck disable=SC2154 - # (autoPatchelfIgnoreMissingDeps is referenced but not assigned.) - if [[ $depsMissing == 1 && -z "$autoPatchelfIgnoreMissingDeps" ]]; then - echo "Add the missing dependencies to the build inputs or set autoPatchelfIgnoreMissingDeps=true" - exit 1 - fi + local runtimeDependenciesArray=($runtimeDependencies) + @pythonInterpreter@ @autoPatchelfScript@ \ + ${norecurse:+--no-recurse} \ + ${autoPatchelfIgnoreMissingDeps:+--ignore-missing} \ + --paths "$@" \ + --libs "${autoPatchelfLibs[@]}" \ + "${extraAutoPatchelfLibs[@]}" \ + --runtime-dependencies "${runtimeDependenciesArray[@]/%//lib}" } # XXX: This should ultimately use fixupOutputHooks but we currently don't have diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index d1175d3a5f9..b2e2738cb6e 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -10,31 +10,156 @@ getDesktopParam() { awk -F "=" "/${pattern}/ {print \$2}" "${file}" } +# Convert a freedesktop.org icon theme for a given app to a .icns file. When possible, missing +# icons are synthesized from SVG or rescaled from existing ones (when within the size threshold). +convertIconTheme() { + local -r out=$1 + local -r sharePath=$2 + local -r iconName=$3 + local -r theme=${4:-hicolor} + + local -ra iconSizes=(16 32 48 128 256 512) + local -ra scales=([1]="" [2]="@2") + + # Based loosely on the algorithm at: + # https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#icon_lookup + # Assumes threshold = 2 for ease of implementation. + function findIcon() { + local -r iconSize=$1 + local -r scale=$2 + + local scaleSuffix=${scales[$scale]} + local exactSize=${iconSize}x${iconSize}${scaleSuffix} + + if [[ $exactSize = '48x48@2' ]]; then + # macOS does not support a 2x scale variant of 48x48 icons + # See: https://en.wikipedia.org/wiki/Apple_Icon_Image_format#Icon_types + echo "unsupported" + return 0 + fi + + local -a validSizes=( + ${exactSize} + $((iconSize + 1))x$((iconSize + 1))${scaleSuffix} + $((iconSize + 2))x$((iconSize + 2))${scaleSuffix} + $((iconSize - 1))x$((iconSize - 1))${scaleSuffix} + $((iconSize - 2))x$((iconSize - 2))${scaleSuffix} + ) + + for iconIndex in "${!candidateIcons[@]}"; do + for maybeSize in "${validSizes[@]}"; do + icon=${candidateIcons[$iconIndex]} + if [[ $icon = */$maybeSize/* ]]; then + if [[ $maybeSize = $exactSize ]]; then + echo "fixed $icon" + else + echo "threshold $icon" + fi + return 0 + fi + done + done + echo "scalable" + } + + function resizeIcon() { + local -r in=$1 + local -r out=$2 + local -r iconSize=$3 + local -r scale=$4 + + local density=$((72 * scale))x$((72 * scale)) + local dim=$((iconSize * scale)) + + magick convert -scale "${dim}x${dim}" -density "$density" -units PixelsPerInch "$in" "$out" + } + + function synthesizeIcon() { + local -r in=$1 + local -r out=$2 + local -r iconSize=$3 + local -r scale=$4 + + if [[ $in != '-' ]]; then + local density=$((72 * scale))x$((72 * scale)) + local dim=$((iconSize * scale)) + rsvg-convert --keep-aspect-ratio --width "$dim" --height "$dim" "$in" --output "$out" + magick convert -density "$density" -units PixelsPerInch "$out" "$out" + else + return 1 + fi + } + + function getIcons() { + local -r sharePath=$1 + local -r iconname=$2 + local -r theme=$3 + local -r resultdir=$(mktemp -d) + + local -ar candidateIcons=( + "${sharePath}/icons/${theme}/"*"/${iconname}.png" + "${sharePath}/icons/${theme}/"*"/${iconname}.xpm" + ) + + local -a scalableIcon=("${sharePath}/icons/${theme}/scalable/${iconname}.svg"*) + if [[ ${#scalableIcon[@]} = 0 ]]; then + scalableIcon=('-') + fi + + for iconSize in "${iconSizes[@]}"; do + for scale in "${!scales[@]}"; do + local iconResult=$(findIcon $iconSize $scale) + local type=${iconResult%% *} + local icon=${iconResult#* } + local scaleSuffix=${scales[$scale]} + local result=${resultdir}/${iconSize}x${iconSize}${scales[$scale]}${scaleSuffix:+x}.png + case $type in + fixed) + local density=$((72 * scale))x$((72 * scale)) + magick convert -density "$density" -units PixelsPerInch "$icon" "$result" + ;; + threshold) + # Synthesize an icon of the exact size if a scalable icon is available + # instead of scaling one and ending up with a fuzzy icon. + if ! synthesizeIcon "${scalableIcon[0]}" "$result" "$iconSize" "$scale"; then + resizeIcon "$icon" "$result" "$iconSize" "$scale" + fi + ;; + scalable) + synthesizeIcon "${scalableIcon[0]}" "$result" "$iconSize" "$scale" || true + ;; + *) + ;; + esac + done + done + echo "$resultdir" + } + + iconsdir=$(getIcons "$sharePath" "apps/${iconName}" "$theme") + if [[ ! -z "$(ls -1 "$iconsdir/"*)" ]]; then + icnsutil compose "$out/${iconName}.icns" "$iconsdir/"* + else + echo "Warning: no icons were found. Creating an empty icon for ${iconName}.icns." + touch "$out/${iconName}.icns" + fi +} + # For a given .desktop file, generate a darwin '.app' bundle for it. convertDesktopFile() { - local -r file="$1" + local -r file=$1 + local -r sharePath=$(dirname "$(dirname "$file")") local -r name=$(getDesktopParam "${file}" "^Name") local -r exec=$(getDesktopParam "${file}" "Exec") - local -r iconName=$(getDesktopParam "${file}" "Icon") - local -r iconFiles=$(find "$out/share/icons/" -name "${iconName}.*" 2>/dev/null); - local -r pixMaps=$(find "$out/share/pixmaps/" -name "${iconName}.xpm" 2>/dev/null); + local -r iconName=$(getDesktopParam "${file}" "^Icon") + local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon") mkdir -p "$out/Applications/${name}.app/Contents/MacOS" mkdir -p "$out/Applications/${name}.app/Contents/Resources" - local i=0; - for icon in $iconFiles; do - ln -s "$icon" "$out/Applications/${name}.app/Contents/Resources/$i-$(basename "$icon")" - (( i +=1 )); - done - - for pixmap in $pixMaps; do - local newIconName="$i-$(basename "$pixmap")"; - convert "$pixmap" "$out/Applications/${name}.app/Contents/Resources/${newIconName%.xpm}.png" - (( i +=1 )); - done + convertIconTheme "$out/Applications/${name}.app/Contents/Resources" "$sharePath" "$iconName" - write-darwin-bundle "$out" "$name" "$exec" + write-darwin-bundle "$out" "$name" "$exec" "$iconName" "$squircle" } convertDesktopFiles() { diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 604096135c2..fa606583289 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -51,7 +51,19 @@ makeWrapper() { local varName="$2" # name of list variable to add to local separator="$3" # character used to separate elements of list local value="$4" # one value, or multiple values separated by `separator`, to add to list - if test -n "$value"; then + + # Disable file globbing, since bash will otherwise try to find + # filenames matching the the value to be prefixed/suffixed if + # it contains characters considered wildcards, such as `?` and + # `*`. We want the value as is, except we also want to split + # it on on the separator; hence we can't quote it. + local reenableGlob=0 + if [[ ! -o noglob ]]; then + reenableGlob=1 + fi + set -o noglob + + if [[ -n "$value" ]]; then local old_ifs=$IFS IFS=$separator @@ -86,6 +98,10 @@ makeWrapper() { done IFS=$old_ifs fi + + if (( reenableGlob )); then + set +o noglob + fi } mkdir -p "$(dirname "$wrapper")" diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index a6a3cd001b4..46df792bdf6 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -38,7 +38,8 @@ rec { contents ? [], diskSize ? 1024, runScript ? "#!${stdenv.shell}\nexec /bin/sh", - runAsRoot ? null + runAsRoot ? null, + memSize ? 512 }: let layer = mkLayer { inherit name; @@ -54,6 +55,7 @@ rec { size = diskSize; fullName = "singularity-run-disk"; }; + inherit memSize; } '' rm -rf $out diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 30301e3b2e5..0fb9bd939a5 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, buildPackages, lib, stdenv, libiconv, gawk, gnused, gixy }: +{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gawk, gnused, gixy }: let aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else prev: {}; @@ -301,6 +301,42 @@ let writePyPy3Bin = name: writePyPy3 "/bin/${name}"; + + makeFSharpWriter = { dotnet-sdk ? pkgs.dotnet-sdk, fsi-flags ? "", libraries ? _: [] }: nameOrPath: + let + fname = last (builtins.split "/" nameOrPath); + path = if strings.hasSuffix ".fsx" nameOrPath then nameOrPath else "${nameOrPath}.fsx"; + _nugetDeps = mkNugetDeps { name = "${fname}-nuget-deps"; nugetDeps = libraries; }; + + nuget-source = mkNugetSource { + name = "${fname}-nuget-source"; + description = "A Nuget source with the dependencies for ${fname}"; + deps = [ _nugetDeps ]; + }; + + fsi = writeBash "fsi" '' + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_NOLOGO=1 + script="$1"; shift + ${dotnet-sdk}/bin/dotnet fsi --quiet --nologo --readline- ${fsi-flags} "$@" < "$script" + ''; + + in content: writers.makeScriptWriter { + interpreter = fsi; + } path + '' + #i "nuget: ${nuget-source}/lib" + ${ content } + exit 0 + ''; + + writeFSharp = + makeFSharpWriter {}; + + writeFSharpBin = name: + writeFSharp "/bin/${name}"; + }; in writers // (aliases writers) diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index decd7e42d5c..d2e5cef83aa 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -150,6 +150,29 @@ let print(y[0]['test']) ''; + fsharp = makeFSharpWriter { + libraries = { fetchNuGet }: [ + (fetchNuGet { pname = "FSharp.SystemTextJson"; version = "0.17.4"; sha256 = "1bplzc9ybdqspii4q28l8gmfvzpkmgq5l1hlsiyg2h46w881lwg2"; }) + ]; + } "test-writers-fsharp" '' + #r "nuget: FSharp.SystemTextJson, 0.17.4" + + module Json = + open System.Text.Json + open System.Text.Json.Serialization + let options = JsonSerializerOptions() + options.Converters.Add(JsonFSharpConverter()) + let serialize<'a> (o: 'a) = JsonSerializer.Serialize<'a>(o, options) + let deserialize<'a> (str: string) = JsonSerializer.Deserialize<'a>(str, options) + + type Letter = A | B + let a = {| Hello = Some "World"; Letter = A |} + if a |> Json.serialize |> Json.deserialize |> (=) a + then "success" + else "failed" + |> printfn "%s" + ''; + pypy2NoLibs = writePyPy2 "test-writers-pypy2-no-libs" {} '' print("success") ''; @@ -161,6 +184,10 @@ let pypy3NoLibs = writePyPy3 "test-writers-pypy3-no-libs" {} '' print("success") ''; + + fsharpNoNugetDeps = writeFSharp "test-writers-fsharp-no-nuget-deps" '' + printfn "success" + ''; }; diff --git a/pkgs/data/documentation/execline-man-pages/default.nix b/pkgs/data/documentation/execline-man-pages/default.nix index ed4389cad6c..1a9d9a87ab9 100644 --- a/pkgs/data/documentation/execline-man-pages/default.nix +++ b/pkgs/data/documentation/execline-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "execline-man-pages"; - version = "2.8.1.0.3"; - sha256 = "1n7c75lmyrjzzcbwjl6fxhfs4k29qlr66r1q35799h942cn4li7v"; + version = "2.8.1.0.4"; + sha256 = "1cxi09dlzvjbilmzgmr3xvwvx0l3s1874k3gr85kbjnvp1c1r6cd"; description = "Port of the documentation for the execline suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/pkgs/data/documentation/s6-man-pages/default.nix b/pkgs/data/documentation/s6-man-pages/default.nix index db4d05a91b0..7d407bade41 100644 --- a/pkgs/data/documentation/s6-man-pages/default.nix +++ b/pkgs/data/documentation/s6-man-pages/default.nix @@ -2,7 +2,7 @@ buildManPages { pname = "s6-man-pages"; - version = "2.11.0.0.5"; + version = "2.11.0.1.1"; sha256 = "03gl0vvdaqfb5hs0dfdbs9djxiyq3abcx9vwgkfw22b1rm2fa0r6"; description = "Port of the documentation for the s6 supervision suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; diff --git a/pkgs/data/documentation/s6-networking-man-pages/default.nix b/pkgs/data/documentation/s6-networking-man-pages/default.nix index 769f34348b1..502aab98ca4 100644 --- a/pkgs/data/documentation/s6-networking-man-pages/default.nix +++ b/pkgs/data/documentation/s6-networking-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "s6-networking-man-pages"; - version = "2.5.0.0.2"; - sha256 = "1ix8qrivp9prw0m401d7s9vkxhw16a4sxfhrs7abf9qqhs2zkd1r"; + version = "2.5.1.0.1"; + sha256 = "1h87s3wixsms8ys7gvm1s9d8pzn73q5j4sgybpi3gmr55d4cwra4"; description = "Port of the documentation for the s6-networking suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 8c806b87d4b..de3d7638eb9 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -9,8 +9,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "1ce0e2e446232e7647c5588c1f603f1dd88e0f67"; - sha256 = "0gj5qcm7ck8m5zfmiabay2f7wbxldmrkw8m3xi7v9i8y8hx0jkxr"; + rev = "763edca12ccd6c67e51f10891d1ced8b2510904f"; + sha256 = "sha256-1/wQXkRWvpRia8UDvvvmzHinPG8q2Tz9Uoeegej9uC8="; }; # we only need this if we are using a version that hasn't been released. We diff --git a/pkgs/data/fonts/borg-sans-mono/default.nix b/pkgs/data/fonts/borg-sans-mono/default.nix new file mode 100644 index 00000000000..57b0a23bf7b --- /dev/null +++ b/pkgs/data/fonts/borg-sans-mono/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchzip }: + +let + 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"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; + + meta = with lib; { + description = "Droid Sans Mono Slashed + Hasklig-style ligatures"; + homepage = "https://github.com/marnen/borg-sans-mono"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 9689fddd391..8b11e5d504a 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -2,15 +2,15 @@ stdenvNoCC.mkDerivation { pname = "google-fonts"; - version = "unstable-2021-06-12"; + version = "unstable-2022-02-26"; outputs = [ "out" "adobeBlank" ]; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "370c795d7e5f9b02db9a793c2779e2c8f94c6adc"; - sha256 = "sha256-XKjxmupY2KuefCtKZMXWaba1TnNwdYM/P0xGXOtBGmM="; + rev = "2fba0d68602b7eb3374d030c1c34939de56023f9"; + sha256 = "sha256-IFkKwRRyZeOXD8/9n8UDrruUKK6oQK4BD9wYN2dmSAc="; }; patchPhase = '' diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 08c4a1b145e..3ebaf49abeb 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/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 = "10.1.0"; + version = "15.0.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 0ce5212b131..f67f97dfaaf 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "09fwk1sm2i0yf2qvwc99g46jhhi9jwmxrqm02m9n348gcsvml7k1"; - iosevka-aile = "07nykjvm5acnxc585y7qfs38d1mm4x654wykq24cwd0qdialz2yn"; - iosevka-curly = "1v9v5xhv4pdihb2q1hgzlw3z54vpg9lvjf753z95x97ah246kbyc"; - iosevka-curly-slab = "0av94y57pi9vy8skb96dbvlcbz7j6hz7cvhsrdpx50nbf9x2ya4b"; - iosevka-etoile = "0vinmfcxs16rx1i86sl7ig7hwwyfwv49vh12k6yx9gx56jyywj51"; - iosevka-slab = "18sjdj5gdg993a0mzvx43l3ll7q2l8w30j12934nlzlw5cadv8gf"; - iosevka-ss01 = "1k08nwzgdz78iiijd6bzfricjbwa23xmzjm6jq72q7cvcqrwpzfj"; - iosevka-ss02 = "139q7ps9y97qzmyqr45xqphw5szr4a119pm1jnwrc5scplnhiisb"; - iosevka-ss03 = "1rbsvrc11skznnk448nj0brfvj58zhgkczlq7skhb8rc3mznhgb8"; - iosevka-ss04 = "0rr7zy9n84lqxj7h0ljd091m8a5yjs0kzpyp3j68mvccsdwncqq4"; - iosevka-ss05 = "035rv0pq7741n6c7zkajjzis2rkdyb75z9zjzyiiylfx19j6d6a7"; - iosevka-ss06 = "0bvbl36zpk79f3h7svs51l0wbllmnnkgxmdk76ikfg4a490nz4g9"; - iosevka-ss07 = "061xngjvznr6syk1y996fmnjqpj0kvnnibibr46lgqcx5xb1w38x"; - iosevka-ss08 = "0szc3iydg3kkg6v42ym52b7nd6ljfwrfcw7n3j1av9vhf5gmn0rv"; - iosevka-ss09 = "1p0hsl6vihly2drh6yiniijcwvwjz35d34d6jfxavjhx028h92mw"; - iosevka-ss10 = "152asnmd7m7q1hligkv4ar8h71xn96586p9whplvmkgfrcr731p7"; - iosevka-ss11 = "0mf3gg1b9x3i1j8c3yqks7sc56j97fwx736pr01bf99lw4jchd2h"; - iosevka-ss12 = "136s3i5dwz0iv8mivq8fraadhbqzjjc5h2c5wqydvmw9i7rpyp2h"; - iosevka-ss13 = "0n9886kn9sr89rwnc0r0q9d2a16fykq5asd0cazrs95jbqq0acix"; - iosevka-ss14 = "128y8dgsawdz20lyjshdl7932222dph6qyiirim6rkh99bp2kdy6"; - iosevka-ss15 = "0h2ywzn2gmaj61n5gzdms7v3yqa3x474icdg10vqds7i86n6g8am"; - iosevka-ss16 = "1c1sr4lphwf8x5xdagciws8dr7ia8jh2cy3zv787g8dhflhzvc1i"; - iosevka-ss17 = "1gqbwx89hcnky7bi1xscz13ykh4srvycbfgf9z4b5j26wflfk2a9"; - iosevka-ss18 = "07h0zcf789g6qw5laznf5y67syh003lwhr6141ifz2zv2sgjl716"; - sgr-iosevka = "0h9yg63cjc0s4kbl5k9lpic48y5iz0hlm8bi7h2h850zhbj405fm"; - sgr-iosevka-aile = "1sv0lb2xb18skwvvw95qzdi9hqr1mr3gi2p4plqlbxq6bjpcvc57"; - sgr-iosevka-curly = "1irg71zrbqnw1r2ar5qkfzdjzb1ziwd22jyvm9g1gynjiwh1idaj"; - sgr-iosevka-curly-slab = "12lc9gqlbnp4crp9qrqf38dlzwaqanyj3l9xyasd96z33wmgnvcr"; - sgr-iosevka-etoile = "0j78cbrdsz9qnvs6y6vkv1ys2spfv9l207z20zkyw5m0i3yvhwi4"; - sgr-iosevka-fixed = "04lirldlmjlvz8q33xb2886d1jqaj1a7a94mnrm1ikw2gzbh7j1m"; - sgr-iosevka-fixed-curly = "1s4xyzlmg9s8jvpvc22bxqc6z9qn0bbgham9kp1w2nwlmlnhl712"; - sgr-iosevka-fixed-curly-slab = "01g6rk0n1xs0bv4vyqv9pwyndzk9k8cfhf0sd640zdkqi51p4raw"; - sgr-iosevka-fixed-slab = "1ipzwxs0jqk4cc8snyy9mxhak1zrj9qlicwwhhhv8pmxs2lcirgq"; - sgr-iosevka-fixed-ss01 = "1vpfgj496yzn5n8zb5hxzlx0kh0yfh27v2naz4zi4gci0k58mj4g"; - sgr-iosevka-fixed-ss02 = "122id78h9lvnm4abflng5572zjdn52wqci9jq88gh5iyk02kja6b"; - sgr-iosevka-fixed-ss03 = "0wa4q1zqp75ja5m34wy3zmx5in225ldr0ah23y7l9kh3x67lfykd"; - sgr-iosevka-fixed-ss04 = "11dxlc3r1gn3psf4bpsiwr283zjpc63d8fgswwbh5d6swk9nxm7v"; - sgr-iosevka-fixed-ss05 = "0jw57byz8rbdc5h1ig5d4kpjklqrm6880sx0z06gw97z3p4aqmb1"; - sgr-iosevka-fixed-ss06 = "0saxvswnrszi3kirv5j1pp96n9fhnqwrmsc8naqdgq342rcy13w5"; - sgr-iosevka-fixed-ss07 = "0bsrpfbcjf2g8vd6f6sv6yxvdi9s6wdjckbjb3m64mdgv25lpdwv"; - sgr-iosevka-fixed-ss08 = "1l5k2y0h4h3fsk2ac7akym4rash6bb63bj9vhh3f9igq062dk10a"; - sgr-iosevka-fixed-ss09 = "09s1x6q7lx4y0462m0ac3jp8jfy4x2sc2irfmxcz2rl5px2smgdg"; - sgr-iosevka-fixed-ss10 = "0j8h200gw60rzknxyg7nvcg9cw1nhvgy3n6n70lf3b8jnp5splzd"; - sgr-iosevka-fixed-ss11 = "0cgxy8gq5wak1a7z3j013l1kadph45ckl865dlkw5jnmndz7a684"; - sgr-iosevka-fixed-ss12 = "1y9grhh3ami6qwdm8a6r7m671n7c9bnxp7qgmk7qxgb8jax31qcp"; - sgr-iosevka-fixed-ss13 = "1a9in4ybl9vjyvxab0hdbjnq46rg3yx9gyalj6x8y3mxsfij0wh2"; - sgr-iosevka-fixed-ss14 = "0wc3yw6rf05wdh8kzz6af1apirvyspkb8bav4pbdxahsy1asij58"; - sgr-iosevka-fixed-ss15 = "1b7ns68lx267y9rwlv47yl0y48nvwyzqdpgpwdfwkmpl6vd9kmnn"; - sgr-iosevka-fixed-ss16 = "07h4zvcll7324r4l7kwwk13874hmjs7vdiiffbjwhi403vbiw1an"; - sgr-iosevka-fixed-ss17 = "1rjb0c3yvww8n3sam49ynj2f7h0xgbdsznk7xbj4sk5pkx3l5zr5"; - sgr-iosevka-fixed-ss18 = "0s39p9khjidasizg1ps3k87ldlkpy3cxy5l6r0c2bkvnfz63k66n"; - sgr-iosevka-slab = "10gx0hlr2iywj3nksc70idjha9wja3fw9fl8yvkmnpbqaxlrlzm8"; - sgr-iosevka-ss01 = "1fzxzx9ky4zrbv3zbjh7c57k8dm949xz356a4jk1lpbmwyd0gry4"; - sgr-iosevka-ss02 = "1qk9f257pq2r4jfilrh02viwgy80kqga4czpc1mvwwbqfalz2lg9"; - sgr-iosevka-ss03 = "0cj2xgpfcxdj4sh2sdp6cvbg08s6c8gvg0h01ylrqnazxddfv1xr"; - sgr-iosevka-ss04 = "02q2xqv1qvdijn53p3nbz2swn39yk2pp5ndq1wkakm5j3w5n52f9"; - sgr-iosevka-ss05 = "0y4f8zkzvxq512ns4qzbq5hnd6zzwdjlc1p2iify0f4m491msx5n"; - sgr-iosevka-ss06 = "154jzvb44h1njzkzsk9x6mk7g9sa5jr7kqjv26ylm0ax0i039ax2"; - sgr-iosevka-ss07 = "08025i39hkinrd0sq0yj3d9dc3fqhv5qfdvxaqg3wp89p5jz2q2q"; - sgr-iosevka-ss08 = "1hj80l9k1qi4cnw5dqfp431z3yiyqvrhby9f4ny84ppkpihp60xk"; - sgr-iosevka-ss09 = "0pl1fz70nx0ls0l4zr8j111flf2mh54miavb0422r2dzprvqaviq"; - sgr-iosevka-ss10 = "1wb03i26g36n6qgzkyza3sbdbgpari5sw0m4qm7yaz3c2f91ic69"; - sgr-iosevka-ss11 = "1mz1mg0pc3nidsl5pb6kvdmmga62fj8x77x0n1xjzcz2iwvdd616"; - sgr-iosevka-ss12 = "0g3i88rhax9am4nfjzq91kdkj1k6vzszia7g79hzsw8nfyrd1i52"; - sgr-iosevka-ss13 = "1jcg4y52xbig8npjd7jbjxqdr9nsbwh120mh9sjy9vvq3hxdsbqh"; - sgr-iosevka-ss14 = "1am7j9ymxgmyb50qziyd3xkal1f82cnx4m21gd2rqxijpa12x1r3"; - sgr-iosevka-ss15 = "0zpwz51xdbckldgycgbmrqf3g9wssanmb2z554n1vbmc5whhwkpp"; - sgr-iosevka-ss16 = "19jzkq3xj0cncs4mk11z8q8mmf6h75i0x2nj4ikcvk01mlrss6s8"; - sgr-iosevka-ss17 = "1zn0xh0h997afjsj6n97bmxanxk441iw6mcdliavfs9l6lj1zhns"; - sgr-iosevka-ss18 = "147w89y3p9s2qanm4wwxv3plpif50fs85hzhhdz23jin5zvh5lz2"; - sgr-iosevka-term = "01aqqniw3r2njv4fc114iymjzp9k5mdl7c5dyxypm71sdlpcjxqj"; - sgr-iosevka-term-curly = "0rh0k1svfsan04q50ihhf2xf2fa8isggpqmfps77q1xrbih9miyc"; - sgr-iosevka-term-curly-slab = "0ys2apprdz1awf6nad6phv2k2kf0qfigb22j930y1gya9vshxqx1"; - sgr-iosevka-term-slab = "0qbiwsllyim81ayh0whrkzc1nq06x9g7hnv8haxh91jg9nf327vw"; - sgr-iosevka-term-ss01 = "0mdgh9hdnz752d7sxv91ayi6lyp6czs6gq21dqigk3wmkgwaraz2"; - sgr-iosevka-term-ss02 = "0zxynyzbngng6ymajd7yf5pmagdzxnr19vnpbmqkvhjnsjmhqpcd"; - sgr-iosevka-term-ss03 = "192fjh0kc8jh0z8y7l74g41jvqfnax5p2shnn0ch1h824vraklvd"; - sgr-iosevka-term-ss04 = "0fjmy0wl8hh38gbhf5h6m064la1dp68lyfimmxvjpf1s2c3g5szd"; - sgr-iosevka-term-ss05 = "0w57k1kjn91srngy297fywi1wnc64bwyymclk0w704sqpx04jv4n"; - sgr-iosevka-term-ss06 = "0n2ifw444z606qm9w4il6inmf5zmbkhrk2wvldfx5bsgv2pfxnjd"; - sgr-iosevka-term-ss07 = "1wwky8pichvr467ypgxrxyfqgr27hqkpmx7c35fzka9c0kap483q"; - sgr-iosevka-term-ss08 = "117c54z898rmsclm23hn4x2wvhypc2vmncrq2mvkqck0wawkwaxw"; - sgr-iosevka-term-ss09 = "0lahhifnar8f716xq63xjhibay7cfqgaa7drxvz4pqxmzijv6r2r"; - sgr-iosevka-term-ss10 = "0fp149a4dn7wgdsms70k162g60jgdg5ric93rhxnkn83x3d5jam1"; - sgr-iosevka-term-ss11 = "16pvy63b194vig5vxy15ylmyl5422vrj9adqqwl82r0l9aqpkqlw"; - sgr-iosevka-term-ss12 = "1gldv3srnm7zx9gkyizi6gvf34b7z7xg17qk77882jczsv95hyh1"; - sgr-iosevka-term-ss13 = "0aznbica0yc4vhp4bp84dflfd6jhzw8lsakknfn8dz10kj1qq7vc"; - sgr-iosevka-term-ss14 = "0x73vwywxj7j6qg3armbhm6rjy308j1rk1fhjfriv51hnkm6ylz2"; - sgr-iosevka-term-ss15 = "0px9y25bx75ppsdaq0rfddd9ljxwa3fv5296kvvkw3mwd0ralflx"; - sgr-iosevka-term-ss16 = "1bmnf7z8v4mbcq97lj2qkf722ww1n500jgv2zgs36vxc22zjjrvk"; - sgr-iosevka-term-ss17 = "0lp5qz8j9xc8n959lm4sbfkjhm3ib79qnv69a57nkv5a10ddk20r"; - sgr-iosevka-term-ss18 = "0jkp6zjx9ih5m4pa95a2rn7j1wx4hvnxg2j24cib9dixr7sc81b6"; + iosevka = "1g8x2bjhnhiq46mx02rhp0wphi7rj21m1nh2gx6rxly2ybms3pnw"; + iosevka-aile = "1hvrzycsilvjl3a90n2sk5sznkjvrn9r6yqaad397rbd309w46ai"; + iosevka-curly = "0df15zbjs9xpqm5032vmjmnp4ay545bs4i8xr6rd37slb8a8x2bf"; + iosevka-curly-slab = "0n57gz1v12l01khy3y0i0yd4w88jz6izwl4iav4679qjfhhd206c"; + iosevka-etoile = "1mq1mqxkj5y3r9xwjy7pbrvnv72zkj2hnh48kac0xr414yrqql3n"; + iosevka-slab = "0srnbwxj03is9d8q0y0k55dr35s747p8xbiz7xany5piljl68f42"; + iosevka-ss01 = "1rm514g3x510dcpn9hn98kl2pv4h9rxmkgp2wvxxhg3s47x0462n"; + iosevka-ss02 = "0p8h1khzxsi4c6wmwri9vvbcv2qy4nksnhmyhksb0b8yw22s9iyk"; + iosevka-ss03 = "1rsw5gx5l5mi8ljvgrrir4bnhy8mvx3rkr9d4vba8wzvvqvc74nv"; + iosevka-ss04 = "02rcdfrnhqdjlks26968mxsrdyfalk3h985bf9vi03sf9nqmmfpz"; + iosevka-ss05 = "1qn323iawpvjqhmx6s7i8irjqkxq9yya5dxp87m452hq9zm2jynq"; + iosevka-ss06 = "0zyg2afzmzdm7gd2c9i9vp751xapajabjm85sri3mcyvgkbcxqai"; + iosevka-ss07 = "1qfalhxl2vxflwn3f73bdq5q1p8zblmswdfw5mrl3b5nzy8y40nw"; + iosevka-ss08 = "0idj19nk7mq6z4yphmxa09c5azgxyi38zlq7y872s0dl9j2qbi5f"; + iosevka-ss09 = "1zwwlb9c34q36kflc6r4wygv3rpkd7y6n1xpkql02w6rb1gp7nd9"; + iosevka-ss10 = "0j01j7frkv2ldz3hqn65r3b56yn63fchhhkghs95v4cln27qzmxx"; + iosevka-ss11 = "0imwzcxh7cqmqcsdlg5nay12jql8dq1hk0h7a0i1igrn3fflga5g"; + iosevka-ss12 = "0z5smyxx5szz5ky4lxmscf44a5pzkjm590cihmcnjw3nxiw84bs1"; + iosevka-ss13 = "0pyq12n7h1adhs5rbkrx9b64rpwvd9nj8vjmwzf3qmdc39bx6rfv"; + iosevka-ss14 = "0v3aipgvw1ygs6v839cw17arm5iag57aqdkr35n0wx3yl5h3v9wg"; + iosevka-ss15 = "0vhwi4b2nmshx7lh5d4fr3swfx58sxwn6w38kvp5p27jp68azbbz"; + iosevka-ss16 = "1rzrd0swjaacbjpxniglkkwsn4dfhvb8f70g8nigc2mah3md62gp"; + iosevka-ss17 = "184acjrqdlw38lzizwxp02lwmc8jznrb55krlvrxkd2lkj4r6gni"; + iosevka-ss18 = "0sza6q6yisjsk5gkkj1z7qbrhpvqv18nykgdwqraa3im66bkl1v9"; + sgr-iosevka = "1n1i12d9891il20ry3vkv5503d9j541w17imh09dbn5r0lrjr40r"; + sgr-iosevka-aile = "0y1nx1xk7fn8dj5jc6zyva593vdxngjc61j717jlqh855fpz5v04"; + sgr-iosevka-curly = "03x2w2arkbhnpl3rlsdgpldqnfrd14q55kf5rf5lsrnmdndg706s"; + sgr-iosevka-curly-slab = "0vncsw3k56cqzpp5rpllz4azklib0vq7rah0ssz2syh43zffsyw3"; + sgr-iosevka-etoile = "0plk2c7ckxm0f7aa9wd1qpi3dfb2gap0222jhx906clx04kb6bp0"; + sgr-iosevka-fixed = "147qjfqwdr0l29ljbn0c73m2wg1vm9qdn5fjika8z1wy7mbrmbsl"; + sgr-iosevka-fixed-curly = "1222ms9kpgcah531ik7h9qkprpq4dd98p41xrsxad3hvr4aa6x05"; + sgr-iosevka-fixed-curly-slab = "1fcg0afhan0ym15c10qikfa4hadgzj0aabymac0qq74l5dn8lmx7"; + sgr-iosevka-fixed-slab = "174xgxrwy50gnm53qhr9mf5cwkbwgalw6ypbz6r68fhyk70dbjvx"; + sgr-iosevka-fixed-ss01 = "16wpj0yvkavhlvz5xzfa5mr219wlynqlfg1am1y1b9w647ypx6q6"; + sgr-iosevka-fixed-ss02 = "1ya9riiiphv6fmirg5r0va06xvcgq8j41vmibqrzld7sjk26yrll"; + sgr-iosevka-fixed-ss03 = "1l6dc7sl5a9p076a7jp2lfwrn1xh0rlp8v3d9k5m9gjghr62b288"; + sgr-iosevka-fixed-ss04 = "1fmbdjgkvaw30x9wycdfzk9n9c1a2vznx8fnxc3xjps4xw5vd4h3"; + sgr-iosevka-fixed-ss05 = "1f66q69wgqxqzkf5r54cjqg66lnfpk7w9lf1hk59v3vmxjxy39xh"; + sgr-iosevka-fixed-ss06 = "1lfjnjn3k6wj03gxpvzc73zj98iy0x447pigxln911ai3v2mcmz5"; + sgr-iosevka-fixed-ss07 = "0567x6rvikpn2cn9prrym0rlw5swa4rb7wihmhpgal64ygysipq4"; + sgr-iosevka-fixed-ss08 = "0b81a3841c2fdfrpsiq8cyly9mzrk0974na53b505wasj5jvikqb"; + sgr-iosevka-fixed-ss09 = "1p5w7m5r11m94icyv8fnwzmpnsih9s8p8iq8hg6iasawqzh60ll3"; + sgr-iosevka-fixed-ss10 = "0c0dhi2c84km1vhbiifv95x4yf03jz12jax2vvc68hhi3w4gmg68"; + sgr-iosevka-fixed-ss11 = "10jp3i36sv4jl2887g1ir1dc2gy1iyhzf2f396jchi5dadzfpgwj"; + sgr-iosevka-fixed-ss12 = "14pq3l6241ylpxlx2n483g1ghlhqahk8dla0frvb572k0bvl4vh5"; + sgr-iosevka-fixed-ss13 = "0js73rildzz24v4alj2xfl5n5wvmlxk18qzdchzrb78lq6bifvvd"; + sgr-iosevka-fixed-ss14 = "0f47d6khi5kr10xlm61pbwr1xk5kqgj82abcaxmvbf5c3jj3v1lr"; + sgr-iosevka-fixed-ss15 = "1nkyfmx4ps8mbnz7ap0vzgwgrxm6nbi4fhvalr6w2dk521inyfn7"; + sgr-iosevka-fixed-ss16 = "0fykkgksdmni80v3q513xwxnay9l73viwj9qbn4bc58ljzd5hffr"; + sgr-iosevka-fixed-ss17 = "09n1vl8m2drg5zs05hvdp7yy47a9s927a8ndxqsa34klanz7c04j"; + sgr-iosevka-fixed-ss18 = "1rmfnnsi9c6alifhnfa4yc9gfgk687zxhrsyrjizwg9r19b2k34m"; + sgr-iosevka-slab = "1nffh7iy3gn5v2yqilq57x6nvk25jh9jmbdmdfyra19nwfn601ja"; + sgr-iosevka-ss01 = "1nwl7psz11jnyldry3wa3wfki28wghqq8f7vz8gmmcvv98caga80"; + sgr-iosevka-ss02 = "1clk233v4ycfqmbv7whmbvm2l1qr1kf75kdca1r4c5y4wjmsh1ap"; + sgr-iosevka-ss03 = "1lxn8hgz0qxs39d1jvr855h8zi3dv1k56v99q0ivrnp5y7aclia5"; + sgr-iosevka-ss04 = "03nz6864i5s6gpjy7jjj52062ivd57wh90j6p8x4lj72479fwfsy"; + sgr-iosevka-ss05 = "1bfgdnc44vmj3hxifz0kb5bfbv3bj9dglp4l7p781chi0m9yrmm8"; + sgr-iosevka-ss06 = "1zcqq2kv080xsfll6zap3hm2l0kx6sr378iq7qrfpavmfifc3rk8"; + sgr-iosevka-ss07 = "1phy7gdx5j5rww54mmzvi5f401lxqxxrwmh0hrhl0bvsxybhdcgm"; + sgr-iosevka-ss08 = "1wyznlzpbv8vb1sny4f1v8x4azfbcp2ajml4aram9k9cx3zkvd8s"; + sgr-iosevka-ss09 = "0q4sla496pdhfv4v15y5ax0h4pr4n47bfrvs27lq26x4p1fhgwdg"; + sgr-iosevka-ss10 = "1iyr4vfs2dp26vi26libv5k18mvdnfzmwmvzdczkh8cyc9hwp36d"; + sgr-iosevka-ss11 = "083pfql4nlq2847csqskb2qxrsnlvfwz198ybnfd97lxa1zczj6k"; + sgr-iosevka-ss12 = "08isy55m7dqpyhbzf5jkamnr8c135850dwpqp380g991h5sp3vnm"; + sgr-iosevka-ss13 = "1vjv198pkvnnxxcbyc5fy54ld4phf52nhybqc9hyf8d7806wrvyn"; + sgr-iosevka-ss14 = "1y4iclzcfb2q0172xag3zqabw03q89jqb7asi0x9zkrhcd1i512y"; + sgr-iosevka-ss15 = "1zxxn6s418gpx2ndknqdwp132p0sr3smsqhavpl5kw5cxrgxa9q6"; + sgr-iosevka-ss16 = "132xmf4rlsa3d0j2s9hmfih6s32wm1na0hs72h7padnh6c7di3rl"; + sgr-iosevka-ss17 = "1bb94ladk0qvzmvb2gc1561xfy7ddgqkqgcgigkkhdab7cfw0cxq"; + sgr-iosevka-ss18 = "15rrngd4qnzqk06whczsmfdf5c1k3nm4m8ga691i1rjxwc5dwycc"; + sgr-iosevka-term = "09m74mqczkm0pirahlisdw2mafyzq7wpzplyqg51221x2m01px7z"; + sgr-iosevka-term-curly = "19ralig26akrabclnniwvimqkcrd0agcwyxakinb7qcbm8p4x30x"; + sgr-iosevka-term-curly-slab = "01zwrlkrp840ah5fclxxl17vckcx4wnv3vwlz6nch2igy965k6qs"; + sgr-iosevka-term-slab = "0520d21x04fvc2b3aa6kzdhwvf24s8yd8vkbl400i0x78gyrlnzv"; + sgr-iosevka-term-ss01 = "0q64vcp4djk0mdfc05a9bz0nqc2a7dr0gdvj2d2kfpbqsg4i32qq"; + sgr-iosevka-term-ss02 = "0h8a4wc5ck1p7gaf1r08h4irj10kqbpm2jkb2p63gybi9gp6ivwg"; + sgr-iosevka-term-ss03 = "0608yhvkbv1hkdj7c347r9q7wbm9bvy6lnhhs6gb0ndkx596pnzm"; + sgr-iosevka-term-ss04 = "1yfpkczgfjfr52ilinzi2dfyw11mmsilxjpl9r9yh0fxmr48c976"; + sgr-iosevka-term-ss05 = "1brrfhkj7wlyhfdfhafkqw8kgsfy7fsi7567ayxii5b05wn9g6mr"; + sgr-iosevka-term-ss06 = "0vksv1k9wvyfiifxnajvmi8b5mx8w72d80y3r9ic7rz36l0rbl3x"; + sgr-iosevka-term-ss07 = "0n5hz3zdp7flbr2xh4yddwkxvpcd0v55m274w15s9q6wln0knwhy"; + sgr-iosevka-term-ss08 = "1qknqr11imcrr0iqpa9qpf70m7505wl81k48igdyqgmimgksrlji"; + sgr-iosevka-term-ss09 = "1j53n5fv2y97bj7n4kx8h8v5isflbmgdqh0hz58ilp06v6rd6j5i"; + sgr-iosevka-term-ss10 = "1bzi39n4x4qa7vyhv5yh875n8gbyjkiaqfhj2xh8pj88b8064cw0"; + sgr-iosevka-term-ss11 = "0xxyh1zxy1jdy0b110f7rallhf0vicsw0snyh3bf3v0mnkimk0y4"; + sgr-iosevka-term-ss12 = "1hpbpqnkd4jzcqkg424y3d6i6nn5gyqlpqsfxrvfvx4igmm75vs5"; + sgr-iosevka-term-ss13 = "12fg2j5xw6vcpczc5kgq6q29cq579l1wyv5ag9r4kxqg541s3frl"; + sgr-iosevka-term-ss14 = "02qkmzr5kn5p69nqk59j6431313apy861yphbzpy56k4g80j0gy4"; + sgr-iosevka-term-ss15 = "0pcb91b8iic6blsgz0sw5hv2d9add355dizpvhc6m8rmp6l5pnqq"; + sgr-iosevka-term-ss16 = "081g07cav6k36k78bmdrx0z9jj2xzx3p1midzsxgsqp3ns2qxk7s"; + sgr-iosevka-term-ss17 = "1bx7mx75344i4807aq1xk0rw03hnv24wn3kj247hv3b1lxx14285"; + sgr-iosevka-term-ss18 = "068vy78d710aszk5s9kwf56rxg17qm8pphd329cmwknxsyan139g"; } diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 53fc456d758..af0e7033135 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,9 +1,9 @@ { fetchzip }: fetchzip { - name = "lmodern-2.004.5"; + name = "lmodern-2.005"; - url = "mirror://debian/pool/main/l/lmodern/lmodern_2.004.5.orig.tar.gz"; + url = "mirror://debian/pool/main/l/lmodern/lmodern_2.005.orig.tar.gz"; postFetch = '' tar xzvf $downloadedFile @@ -11,13 +11,13 @@ fetchzip { mkdir -p $out/texmf-dist/ mkdir -p $out/share/fonts/ - cp -r lmodern-2.004.5/* $out/texmf-dist/ - cp -r lmodern-2.004.5/fonts/{opentype,type1} $out/share/fonts/ + cp -r lmodern-2.005/* $out/texmf-dist/ + cp -r lmodern-2.005/fonts/{opentype,type1} $out/share/fonts/ ln -s -r $out/texmf* $out/share/ ''; - sha256 = "11f10qnp8a435lhh19zc2znlf9q4isynmvjmvr63g5n5fhvhc192"; + sha256 = "sha256-ySdKUt8o5FqmpdnYSzbGJ1f9t8VmKYXqPt53e1/E/FA="; meta = { description = "Latin Modern font"; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 9c9996db39e..248d076b997 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -5,12 +5,12 @@ , fetchurl , cairo , nixosTests -, python3 , pkg-config , pngquant , which , imagemagick , zopfli +, buildPackages }: let @@ -130,8 +130,8 @@ in noto-fonts-emoji = let version = "2.034"; emojiPythonEnv = - python3.withPackages (p: with p; [ fonttools nototools ]); - in stdenv.mkDerivation { + buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); + in stdenvNoCC.mkDerivation { pname = "noto-fonts-emoji"; inherit version; @@ -142,13 +142,17 @@ in sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; }; - nativeBuildInputs = [ + depsBuildBuild = [ + buildPackages.stdenv.cc + pkg-config cairo + ]; + + nativeBuildInputs = [ imagemagick zopfli pngquant which - pkg-config emojiPythonEnv ]; @@ -159,14 +163,6 @@ in # python requirements using python.withPackages sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile - # Remove check for missing zopfli, it doesn't - # work and we guarantee its presence already. - sed -i '/ifdef MISSING_ZOPFLI/,+2d' Makefile - sed -i '/ifeq (,$(shell which $(ZOPFLIPNG)))/,+4d' Makefile - - sed -i '/ZOPFLIPNG = zopflipng/d' Makefile - echo "ZOPFLIPNG = ${zopfli}/bin/zopflipng" >> Makefile - # Make the build verbose so it won't get culled by Hydra thinking that # it somehow got stuck doing nothing. sed -i 's;\t@;\t;' Makefile diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 17b87ada227..efd58b348dc 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, libarchive }: let - version = "0.35.9"; + version = "0.36.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-zG1VVI7QRQMC4MBA3otD26LUvnkUxaxt6UkiweY0l1w="; + sha256 = "sha256-ENBF7dVFp9lrGGRwNIB0Yg7y1F5XbVivgD2e9pLZQwQ="; recursiveHash = true; downloadToTemp = true; diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix new file mode 100644 index 00000000000..879f5083e23 --- /dev/null +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -0,0 +1,30 @@ +{ lib, 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 { + name = "source-sans-pro-${version}"; + + url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + + 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 + ''; + + sha256 = "sha256-uWr/dFyLF65v0o6+oN/3RQoe4ziPspzGB1rgiBkoTYY="; + + meta = with lib; { + homepage = "https://adobe-fonts.github.io/source-sans/"; + description = "Sans serif font family for user interface environments"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix new file mode 100644 index 00000000000..a4d472d6085 --- /dev/null +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -0,0 +1,30 @@ +{ lib, 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 + 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"; + + 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 + ''; + + sha256 = "sha256-rYWk8D41QMuuSP+cQMk8ttT7uX3a7gBk4OqjA7K9udk="; + + meta = with lib; { + homepage = "https://adobe-fonts.github.io/source-serif/"; + description = "Typeface for setting text in many sizes, weights, and languages. Designed to complement Source Sans"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 45450a7c20f..b78880824c7 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.62"; + version = "0.63.1"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "sha256-I0E2zYbfEFBEIBNC7nnJb+hOaBgGZkAIg08YpA8awso="; + sha256 = "sha256-z/1Y2eJMrQ+43UIt4HWcLwjYs+hfCY/g4iRxJ+yBAqw="; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 44c3a231246..6de709344b1 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,18 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "14.0.01"; + version = "14.0.02"; ttf = fetchurl { - url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - sha256 = "19algkm4nnixmzshc25rjgh8gfccqinallgi86wgvkcwcmn6ccn6"; + # Unfortunately the 14.0.02 TTF file is not available on the GNU mirror. + # Restore this for next version: "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; + url = "https://unifoundry.com/pub/unifont/${pname}-${version}/font-builds/${pname}-${version}.ttf"; + sha256 = "1c8rdk3xg6j8lrzxddd73jppfgpk253jdkch63rr7n2d7ljp9gc3"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "1aj29pswi6qwpvjwncv5w3ndwy2nzli0200i6dx6f80036z8nz9i"; + sha256 = "0hcl1zihm91xwvh5ds01sybgs0j8zsrrhn4wlz5j6ji99rh797jr"; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 902aba0caa2..92e274fe8ff 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "14.0.01"; + version = "14.0.02"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "0sb3m2qg0ri7zmxhjvrq8n0jmxxjx8rrx9rpibh5f5fbfkibq4gm"; + sha256 = "0p1c2kkg20jqddy828yj6sxfwgv8k5gxwmg0cybalrjb0s09kcs8"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index b2c4f1faa3c..b8885298c08 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "vazir-fonts"; - version = "30.1.0"; + version = "32.0.0"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; ''; - sha256 = "sha256-J1l6rBFgaXFtGnK0pH7GbaYTt5TI/OevjZrXmaEgkB4="; + sha256 = "sha256-Uy8hgBtCcTLwXu9FkLN1WavUfP74Jf53ChxVGS3UBVM="; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-font"; diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 8df63a75ad8..01572e79761 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-kUgNj7KuxsQ/BvQ0ORl3xzEm9gv69+2PS0Bgv8i/S9U="; + sha256 = "sha256-3TKjd2Lblb+/zFq7rkdgnD1dJU3kis7QZi7Ui74IWzA="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 79ca07dd5b5..2a5d60898bb 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "22.02.06"; + version = "22.03.01"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-a+h5DMxVM1TPVx8yuKwRzjjnBLnIWMCCKG+BPg1Hq5Y="; + sha256 = "sha256-adSoFKvemirQtxoS6KrQvXxtIOKFZ73PTktVXytblbM="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 550b11c7ac8..d335911c246 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "22.02.06"; + version = "22.03.01"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-dKBNB1udRysDe3HbUh2qudQDeLgS/wmSnY3nAWnmjQo="; + sha256 = "sha256-VCXHInaxn5BKY9Yth6DjoKa/JS2WVjvwAfRMiL2r1B0="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 9da7178e80a..9b0a2537f63 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20220204"; + version = "20220302"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-DYz2fnn1ZfX09NQcRXmGTYY95K5wOWhlmJeDjEvN1vY="; + sha256 = "sha256-X92an2jGRgZ/Q3cr6Q729DA2hs/2y34HoRpB1rxk0hI="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index d19dcba69fd..dcff587dd35 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -4,6 +4,7 @@ , gtk3 , hicolor-icon-theme , jdupes +, gitUpdater , allColorVariants ? false , circularFolder ? false , colorVariants ? [] # default is standard @@ -16,13 +17,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-02-08"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "08a1jhirvn2x9hhjr0lqqqayhsf446cddapprxpsnsn9q6x2j2gp"; + sha256 = "vQeWGZmurvT/UQJ1dx6t+ZeKdJ1Oq9TdHBADw64x18g="; }; nativeBuildInputs = [ @@ -50,16 +51,18 @@ stdenvNoCC.mkDerivation rec { ${lib.optionalString circularFolder "-c"} \ ${if allColorVariants then "-a" else builtins.toString colorVariants} - jdupes -L -r $out/share/icons + jdupes --link-soft --recurse $out/share runHook postInstall ''; + passthru.updateScript = gitUpdater {inherit pname version; }; + meta = with lib; { description = "Flat and colorful personality icon theme"; homepage = "https://github.com/vinceliuice/Tela-circle-icon-theme"; license = licenses.gpl3Only; - platforms = platforms.unix; + platforms = platforms.linux; # darwin use case-insensitive filesystems that cause hash mismatches maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index f7f5f64bfd7..525e96de8e9 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,28 +2,45 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.15"; + version = "3.16"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "0r88j00shmhayfq8avswaxsaj1my1vq540rg0srma29862vrjpfk"; + hash = "sha256-FPN9EIwXtz0b1tUZ/AOWK2zj2nfd5+POGmRC52mSzcA="; }; + # List of file formats to package. + _types = [ "html" "json" "jsonld" "rdfa" "rdfnt" "rdfturtle" "rdfxml" "template" "text" ]; + + outputs = [ "out" ] ++ _types; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + installPhase = '' runHook preInstall - install -vDt $out/json json/licenses.json + mkdir -pv $out + for t in $_types + do + _outpath=''${!t} + mkdir -pv $_outpath + cp -ar $t $_outpath && echo "$t format installed" + done runHook postInstall ''; + dontFixup = true; + meta = with lib; { description = "Various data formats for the SPDX License List"; homepage = "https://github.com/spdx/license-list-data"; license = licenses.cc0; - maintainers = with maintainers; [ oxzi ]; + maintainers = with maintainers; [ oxzi c0bw3b ]; platforms = platforms.all; }; } diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 52662b190a7..78c93b05033 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "BINDIR=$(bin)/bin" "ZICDIR=$(bin)/bin" "ETCDIR=$(TMPDIR)/etc" - "TZDEFAULT=$(TMPDIR)/etc" + "TZDEFAULT=tzdefault-to-remove" "LIBDIR=$(dev)/lib" "MANDIR=$(man)/share/man" "AWK=awk" @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { postInstall = '' rm $out/share/zoneinfo-posix + rm $out/share/zoneinfo/tzdefault-to-remove mkdir $out/share/zoneinfo/posix ( cd $out/share/zoneinfo/posix; ln -s ../* .; rm posix ) mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index df190fd9ef8..b92014b30e0 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202202170030"; + version = "202203100039"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "ebc49c1ccbe7f267778ab42dbfa01d7ff8a5241c"; - sha256 = "sha256-CxV7jKNeaSW7lVBKKr7Ih2XAehnFcapkyDogd5V32Zk="; + rev = "564c2c8de36d3680a1d5f209d6bb05e4f3f70dfc"; + sha256 = "sha256-JPpzIppgKQox8T6VC/kzhpLy+YAcuHdH5L6zqciOXow="; }; installPhase = '' diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix index 1f84a6fd1ee..193c9a60b9f 100644 --- a/pkgs/data/soundfonts/fluid/default.nix +++ b/pkgs/data/soundfonts/fluid/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "Fluid-3"; + pname = "Fluid"; + version = "3"; src = fetchurl { url = "https://ftp.osuosl.org/pub/musescore/soundfont/fluid-soundfont.tar.gz"; diff --git a/pkgs/data/soundfonts/ydp-grand/default.nix b/pkgs/data/soundfonts/ydp-grand/default.nix index 3b44b712139..635b445f611 100644 --- a/pkgs/data/soundfonts/ydp-grand/default.nix +++ b/pkgs/data/soundfonts/ydp-grand/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "ydp-grand"; + pname = "ydp-grand"; version = "unstable-2016-08-04"; src = fetchurl { diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index 59b2714285e..fec900a2d7e 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20220215"; + version = "20220310"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-J9PAHQ/MbdDuX16ioQQnzZpIZs/NJVkJjLL4nfaeNkU="; + sha256 = "sha256-fKkqMGb1UopjM7hTTury1I3oD5AlHqKP+WLmgAZIQxo="; }; dontBuild = true; diff --git a/pkgs/data/themes/gnome-breeze/default.nix b/pkgs/data/themes/gnome-breeze/default.nix index 09f9ecd197a..38733590a34 100644 --- a/pkgs/data/themes/gnome-breeze/default.nix +++ b/pkgs/data/themes/gnome-breeze/default.nix @@ -1,12 +1,16 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "gnome-breeze-20160526"; - src = fetchgit { - url = "https://github.com/dirruk1/gnome-breeze"; - sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm"; + pname = "gnome-breeze"; + version = "unstable-2016-05-26"; + + src = fetchFromGitHub { + owner = "dirruk1"; + repo = "gnome-breeze"; rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221"; + sha256 = "sha256-lQYVOhFBDOYT+glUHleuymGTfHEE5bIyqUFnS/EDc0I="; }; + installPhase = '' mkdir -p $out/share/themes cp -r Breeze* $out/share/themes @@ -14,12 +18,12 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = { + meta = with lib; { description = "A GTK theme built to match KDE's breeze theme"; homepage = "https://github.com/dirruk1/gnome-breeze"; - license = lib.licenses.lgpl2; - maintainers = with lib.maintainers; [ bennofs ]; - platforms = lib.platforms.all; + license = licenses.lgpl2; + maintainers = with maintainers; [ bennofs ]; + platforms = platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/data/themes/layan-kde/default.nix b/pkgs/data/themes/layan-kde/default.nix new file mode 100644 index 00000000000..40cd6c055bf --- /dev/null +++ b/pkgs/data/themes/layan-kde/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromGitHub +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "layan-kde"; + version = "2022-02-13"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "09z90g13l26v23nwr8n5bapwldp3hhdrdikynvm4vvb7qsvb4vrp"; + }; + + postPatch = '' + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.local' $out \ + --replace '$HOME/.config' $out/share + ''; + + installPhase = '' + runHook preInstall + + name= ./install.sh --dest $out/share/themes + + mkdir -p $out/share/sddm/themes + cp -a sddm/Layan* $out/share/sddm/themes/ + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater {inherit pname version; }; + + meta = with lib; { + description = "A flat Design theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/Layan-kde"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index a2a518d3f0a..d250de15ca9 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -7,70 +7,70 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2022-01-08"; + version = "unstable-2022-02-26"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "85086324c2a8fa7ca538b85ad0681e03733b2c86"; - sha256 = "sha256-p1nr71iJZm+2123WF67NkunBX2dR4ruK2Afqd7XdeGc="; + rev = "0da58e462e8ba6c71245d13fbddac950b72018ae"; + sha256 = "sha256-w7e3DqQV4L/OvntKHJA4+3Dj6dRnlH73SxvW770QIyU="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "46c9e6665963ccb54938d7730e520bd8c52f4307"; - sha256 = "sha256-uFnNLshyKOvzaij7tEKb0fw0j3/GGfzznAf/aaKx7XI="; + rev = "9daf11acf3419e2f23d0993ce862a1c944fb8519"; + sha256 = "sha256-zGgw6THLX7q19BDsllPUrWqQcL6FYAewcyqjQdXzLzg="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "da5c930386427fce65ea185f164709c8a20e362f"; - sha256 = "sha256-Ee9ymuMWs2ZgU+8FVLaviGtHMT4Sz5NWLaEGln2Z4V0="; + rev = "a40819bd00160f987cdf254ce8c34eabebecf0eb"; + sha256 = "sha256-rSNLdxTfvzTFzI5723WIGRS+NZ8iqUOUliDpkznZrwE="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "fd85fb2712ac1192e35c92149b75bfc3c440b1c7"; - sha256 = "sha256-6WUQBeNq7EKNkYcCt/fUYloue90gxfp8bDYawkQQ6ss="; + rev = "4e69cf6e1798938ab7c5795940c663d866ce8201"; + sha256 = "sha256-p8VaKeKxEiYX4oVqWoyschAq0j/LvPq9yD/awaHKRZw="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "259e30ce13566214c7594b038dd2c240648a07a0"; - sha256 = "sha256-F6hC6XbT9yJl6SW9qJNlwmmBcvOrOS5yPCQALZFhgbM="; + rev = "866629583187b914725f05683125fde7f6c280f1"; + sha256 = "sha256-TQ4G5W87zpTrLU+f+eb5VHwaWuKSbItXCgXSL33U8As="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "2a27051d87558dfa595fb94eff34241d3a1b8c30"; - sha256 = "sha256-JIld6GVtr1tz02Do2Ft92qtza6iGrPapasd6jmMFG6k="; + rev = "f3702ae02e3caaf74eab0ef9156af9f2a476021b"; + sha256 = "sha256-drXRfZxCrH2vAXjZSAjWEHcQrehxnM0WLkgbh+cFJhI="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0bea76aed39bb2a2669278b8403c4129aa47be0f"; - sha256 = "sha256-OXmz6uHXh1zl93sgv5WEwARkEUCr4PRh0/mJyMLXpnk="; + rev = "4cf3e5c30ebd17a3d53ab0337c191e304feff7b5"; + sha256 = "sha256-LTCJ7AyABQDTDkjuqcXaKXePFwOpmXeKaW2mWYah4ao="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "8fe52b6c276a7e548e87a558db6734cf9f003b06"; - sha256 = "sha256-/IxlBvMLAK+mGRyaa7bTv/oZS24nSNeE5GsyJIeN6UU="; + rev = "72cbd567212b21ea20769fe244c148f799435536"; + sha256 = "sha256-qNIyr+Eo0dzPVh9PxDCHv0e6pswACbf9nLhAG75YEYc="; name = "Nordic-Polar-standard-buttons"; }) ]; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 64bd3eb5eeb..eb62da715ce 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "21.10.2"; + version = "22.04.1"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "sha256-VN/jgKGM2Th+2nv91vEz47kmQiBx8xAiEVbtXwhZg6U="; + sha256 = "sha256-5mB5eTIPw4CqYSQm675MKbRwsYLpg+5WJrLDkbc6nKs="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 71b661f1265..77650e71ebe 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -18,10 +18,10 @@ let }; in stdenv.mkDerivation rec { version = "2.3.2"; - name = "cde-${version}"; + pname = "cde"; src = fetchurl { - url = "mirror://sourceforge/cdesktopenv/${name}.tar.gz"; + url = "mirror://sourceforge/cdesktopenv/cde-${version}.tar.gz"; sha256 = "029rljhi5r483x8rzdpl8625z0wx8r7k2m0364nbw66h5pig9lbx"; }; diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index 32a7a2fb343..cdcf0d69a33 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-todo"; - version = "unstable-2022-02-01"; + version = "unstable-2022-03-11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-todo"; - rev = "2cd071ad35efdef72038730d658f013dd0fc7daa"; - sha256 = "FMG9ju+LsglAvbBhdgDF+2ZxB633EwnatwCFgW+VOTk="; + rev = "07791399742366b4e3a6897430054d91df4594b4"; + sha256 = "821KgxkkW4T6bdGuttAz9ao/WStM1QEfn4hY/b0d0jI="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 28406e41284..d7001853fa6 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "41.3"; + version = "41.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M0awH5vcjy1f/qkvEQoJDGSjYklCtbVDqtRZKp3jO7A="; + sha256 = "/yRSQPIwkivsMqTXsKHZGyR6g9E0hPmbdANdUesjITA="; }; patches = lib.optionals withPantheon [ @@ -130,6 +130,8 @@ stdenv.mkDerivation rec { "-Dps=enabled" ] ++ lib.optionals (!withLibsecret) [ "-Dkeyring=disabled" + ] ++ lib.optionals (!supportMultimedia) [ + "-Dmultimedia=disabled" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 2b36373e2bf..9e02b80d9f7 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -255,8 +255,6 @@ lib.makeScope pkgs.newScope (self: with self; { gitg = callPackage ./misc/gitg { }; - libgnome-games-support = callPackage ./misc/libgnome-games-support { }; - gnome-applets = callPackage ./misc/gnome-applets { }; gnome-flashback = callPackage ./misc/gnome-flashback { }; @@ -283,6 +281,8 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19 + bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26 evolution_data_server = throw "The ‘gnome.evolution_data_server’ alias was removed on 2022-01-13. Please use ‘gnome.evolution-data-server’ directly."; # added 2018-02-25 geocode_glib = throw "The ‘gnome.geocode_glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2018-02-25 @@ -300,7 +300,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_themes_standard = throw "The ‘gnome.gnome_themes_standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-standard’ directly."; # added 2018-02-25 gnome-tweak-tool = throw "The ‘gnome.gnome-tweak-tool’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-tweaks’ directly."; # added 2018-03-21 gsettings_desktop_schemas = throw "The ‘gnome.gsettings_desktop_schemas’ alias was removed on 2022-01-13. Please use ‘gnome.gsettings-desktop-schemas’ directly."; # added 2018-02-25 - libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-games-support’ directly."; # added 2018-03-14 + libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘pkgs.libgnome-games-support’ directly."; # added 2018-03-14 libgnome_keyring = throw "The ‘gnome.libgnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-keyring’ directly."; # added 2018-02-25 rarian = throw "The ‘gnome.rarian’ alias was removed on 2022-01-13. Please use ‘pkgs.rarian’ directly."; # added 2018-04-25 networkmanager_fortisslvpn = throw "The ‘gnome.networkmanager_fortisslvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-fortisslvpn’ directly."; # added 2018-02-25 diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index d0df6634240..7bc997a4bf1 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "23"; + version = "24"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-i/sXAZhNbbVbKdCJ3k9kRAEY9iC5iSNq4YtjiiOqHTM="; + sha256 = "sha256-GbZt6JC+uAPkb4GU1Q7WRJ6Pf95Uh48cYwvoTgLimHs="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/extensions.json b/pkgs/desktops/gnome/extensions/extensions.json index 2c43c1402a1..adf110fcd6b 100644 --- a/pkgs/desktops/gnome/extensions/extensions.json +++ b/pkgs/desktops/gnome/extensions/extensions.json @@ -22,7 +22,7 @@ , {"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": "17", "sha256": "1xbm8d4669j727fw3cm5lmdkfq46xwavsiivr7s9l0nnmnafjzbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHA6Ly93d3cuY3ZpbmUucGx1cy5jb20vZmF2b3JpdGVzL2luZGV4Lmh0bWwiLAogICJ1dWlkIjogImZhdm9yaXRlc0BjdmluZS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"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=="}}} , {"uuid": "Fuzzy_Clock@dallagi", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/202/fuzzy-clock/", "shell_version_map": {"38": {"version": "9", "sha256": "1cga3192balji63zmbbyixb4r53j48zhil4hnv57l3b25k4rmk0i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWxsYWdpL2dub21lLXNoZWxsLWZ1enp5LWNsb2NrIiwKICAidXVpZCI6ICJGdXp6eV9DbG9ja0BkYWxsYWdpIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"uuid": "PersianCalendar@oxygenws.com", "name": "Persian Calendar", "pname": "persian-calendar", "description": "Shows Persian date in the top panel.\n\nIt shows:\n1- Persian calendar\n2- It can show, today is a holiday or not!\n3- Show notification onDayChanged!\n4- Date converter between Persian, Gregorian and Lunar Hijri\n5- Events:\n5-1- Official solar events.\n5-2- Official lunar events.\n5-3- Official international events.\n5-4- Traditional Persian events.\n5-5- Persian personages.\n\nPlease \"rate\" here and \"star\" the project in GitHub.\nPlease open an issue in GitHub if you've found something or have an idea!", "link": "https://extensions.gnome.org/extension/240/persian-calendar/", "shell_version_map": {"38": {"version": "73", "sha256": "14p27d2h58jam7h97y06safsc2c8rwmjy74nak5w9cv7s0wx4kar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiA3Mwp9"}, "40": {"version": "90", "sha256": "08h7jz5i9kx53bfsqirfyk1a2kp30lwqivkcr4wi9lx99byygyfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vbWlkL1BlcnNpYW4tQ2FsZW5kYXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJQZXJzaWFuQ2FsZW5kYXJAb3h5Z2Vud3MuY29tIiwKICAidmVyc2lvbiI6IDkwCn0="}, "41": {"version": "90", "sha256": "08h7jz5i9kx53bfsqirfyk1a2kp30lwqivkcr4wi9lx99byygyfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vbWlkL1BlcnNpYW4tQ2FsZW5kYXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJQZXJzaWFuQ2FsZW5kYXJAb3h5Z2Vud3MuY29tIiwKICAidmVyc2lvbiI6IDkwCn0="}}} +, {"uuid": "PersianCalendar@oxygenws.com", "name": "Persian Calendar", "pname": "persian-calendar", "description": "Shows Persian date in the top panel.\n\nIt shows:\n1- Persian calendar\n2- It can show, today is a holiday or not!\n3- Show notification onDayChanged!\n4- Date converter between Persian, Gregorian and Lunar Hijri\n5- Events:\n5-1- Official solar events.\n5-2- Official lunar events.\n5-3- Official international events.\n5-4- Traditional Persian events.\n5-5- Persian personages.\n\nPlease \"rate\" here and \"star\" the project in GitHub.\nPlease open an issue in GitHub if you've found something or have an idea!", "link": "https://extensions.gnome.org/extension/240/persian-calendar/", "shell_version_map": {"38": {"version": "73", "sha256": "14p27d2h58jam7h97y06safsc2c8rwmjy74nak5w9cv7s0wx4kar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiA3Mwp9"}, "40": {"version": "92", "sha256": "1cjiy8gswqlc95277yszihy8nr3n5w33amy1167fyfl1gfsr0k6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiA5Mgp9"}, "41": {"version": "92", "sha256": "1cjiy8gswqlc95277yszihy8nr3n5w33amy1167fyfl1gfsr0k6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiA5Mgp9"}}} , {"uuid": "kimpanel@kde.org", "name": "Input Method Panel", "pname": "kimpanel", "description": "Input Method Panel using KDE's kimpanel protocol for Gnome-Shell", "link": "https://extensions.gnome.org/extension/261/kimpanel/", "shell_version_map": {"38": {"version": "59", "sha256": "0rh2in9cm9khvmhhzyyw98z6bwvv95v59zcapkjpd7kbs38hqdw2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5neHQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbXBhbmVsIiwKICAidXVpZCI6ICJraW1wYW5lbEBrZGUub3JnIiwKICAidmVyc2lvbiI6IDU5Cn0="}, "40": {"version": "69", "sha256": "0dyaxcfj2jcmy253b5hmi8kfrz9x3faqm7akyf7aawk2c047y21k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNjkKfQ=="}, "41": {"version": "69", "sha256": "0dyaxcfj2jcmy253b5hmi8kfrz9x3faqm7akyf7aawk2c047y21k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNjkKfQ=="}}} , {"uuid": "impatience@gfxmonk.net", "name": "Impatience", "pname": "impatience", "description": "Speed up the gnome-shell animation speed", "link": "https://extensions.gnome.org/extension/277/impatience/", "shell_version_map": {"40": {"version": "17", "sha256": "10zjxf8swp3n34q3mdid4ni109r1274c2iyd8nmwzyzsi11a14dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "10zjxf8swp3n34q3mdid4ni109r1274c2iyd8nmwzyzsi11a14dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "windowoverlay-icons@sustmidown.centrum.cz", "name": "WindowOverlay Icons", "pname": "windowoverlay-icons", "description": "Add application icons to window overview", "link": "https://extensions.gnome.org/extension/302/windowoverlay-icons/", "shell_version_map": {"38": {"version": "37", "sha256": "108a5i5v62a9i61av5pib3b0hcpmb6pw3np7c29jfngs25n14wd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhcHBsaWNhdGlvbiBpY29ucyB0byB3aW5kb3cgb3ZlcnZpZXciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aW5kb3dvdmVybGF5LWljb25zIiwKICAibmFtZSI6ICJXaW5kb3dPdmVybGF5IEljb25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd292ZXJsYXktaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdXN0bWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd292ZXJsYXktaWNvbnMiLAogICJ1dWlkIjogIndpbmRvd292ZXJsYXktaWNvbnNAc3VzdG1pZG93bi5jZW50cnVtLmN6IiwKICAidmVyc2lvbiI6IDM3Cn0="}}} @@ -44,11 +44,11 @@ , {"uuid": "launch-new-instance@gnome-shell-extensions.gcampax.github.com", "name": "Launch new instance", "pname": "launch-new-instance", "description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/600/launch-new-instance/", "shell_version_map": {"38": {"version": "29", "sha256": "0qb1ajjwm076zxsd314n7f5vl72ih7j4h9y84bqwb9cxa53mp4g4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsYXVuY2gtbmV3LWluc3RhbmNlQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "40": {"version": "31", "sha256": "0c667wdrpfd8bh2wygglzk1bp63z6xvknhj2rhw8v3vlmhpn8994", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAibGF1bmNoLW5ldy1pbnN0YW5jZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"}, "41": {"version": "33", "sha256": "1z2kjrqaziw5v5sig92kng302w3pdkkkcl7dlhwjqlgfhkhpdxlm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} , {"uuid": "window-list@gnome-shell-extensions.gcampax.github.com", "name": "Window List", "pname": "window-list", "description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/602/window-list/", "shell_version_map": {"38": {"version": "34", "sha256": "06jww5sv3a32plbvnl1xch10y19q807dx6zn6z5gwpvq8n0nvnx3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldpbmRvdyBMaXN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvdy1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "40": {"version": "41", "sha256": "16vf0b3wqr5s6fqxqlz3ly28nkvsv3ygvfk1sqxgrpqnw823x8bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}, "41": {"version": "42", "sha256": "1jhgnzlrpnbhqx4rkr9nf7yrwdbc9h6n46aindfpp7kdgv2spymi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}}} , {"uuid": "MultiClock@mibus.org", "name": "MultiClock", "pname": "multiclock", "description": "A clock for showing a second timezone in the panel.", "link": "https://extensions.gnome.org/extension/605/multiclock/", "shell_version_map": {"40": {"version": "8", "sha256": "1pp1cnmpix668mrywpv6mkyb45lw7f6cwibjl6bc7cgb01hkzd53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY2xvY2sgZm9yIHNob3dpbmcgYSBzZWNvbmQgdGltZXpvbmUgaW4gdGhlIHBhbmVsLiIsCiAgIm5hbWUiOiAiTXVsdGlDbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5taWJ1c011bHRpQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWJ1cy9NdWx0aUNsb2NrIiwKICAidXVpZCI6ICJNdWx0aUNsb2NrQG1pYnVzLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "appindicatorsupport@rgcjonas.gmail.com", "name": "AppIndicator and KStatusNotifierItem Support", "pname": "appindicator-support", "description": "Adds AppIndicator, KStatusNotifierItem and legacy Tray icons support to the Shell", "link": "https://extensions.gnome.org/extension/615/appindicator-support/", "shell_version_map": {"38": {"version": "41", "sha256": "0d2pvcw13wr7jbwjds4byxnq3q9vqm2r6fs5plcgl2dp787kmxi2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}, "40": {"version": "41", "sha256": "0d2pvcw13wr7jbwjds4byxnq3q9vqm2r6fs5plcgl2dp787kmxi2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}, "41": {"version": "41", "sha256": "0d2pvcw13wr7jbwjds4byxnq3q9vqm2r6fs5plcgl2dp787kmxi2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}}} +, {"uuid": "appindicatorsupport@rgcjonas.gmail.com", "name": "AppIndicator and KStatusNotifierItem Support", "pname": "appindicator-support", "description": "Adds AppIndicator, KStatusNotifierItem and legacy Tray icons support to the Shell", "link": "https://extensions.gnome.org/extension/615/appindicator-support/", "shell_version_map": {"38": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "40": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "41": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}}} , {"uuid": "bitcoin-markets@ottoallmendinger.github.com", "name": "Bitcoin Markets", "pname": "bitcoin-markets", "description": "Display info on various crypto-currency exchanges.", "link": "https://extensions.gnome.org/extension/648/bitcoin-markets/", "shell_version_map": {"38": {"version": "57", "sha256": "1dbrkr49gi93nps610afvw2q68d1ialkhxsxd0waa8xgwjxwzyxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjU3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1iaXRjb2luLW1hcmtldHMvIiwKICAidXVpZCI6ICJiaXRjb2luLW1hcmtldHNAb3R0b2FsbG1lbmRpbmdlci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="}, "40": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}, "41": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}}} , {"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": "65", "sha256": "0kb7crng8lmkcjjxzd7ma2x0x43rg4j5ygvvpiq5z2j15rx8bcg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGlsaW5nIHdpbmRvdyBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBKdXN0IG1vdmUgYSB3aW5kb3cgdG8gdGhlIGVkZ2VzIG9mIHRoZSBzY3JlZW4gdG8gY3JlYXRlIGEgdGlsaW5nLCBvdGhlcndpc2UgbW92ZSBhIHdpbmRvdyBvdmVyIGFub3RoZXIgb25lLCBob2xkaW5nIGRvd24gdGhlIENvbnRyb2wga2V5LiBHcm91cGVkIHdpbmRvd3MgbWluaW1pemUsIHJlc2l6ZSwgcmFpc2UgYW5kIGNoYW5nZSB3b3Jrc3BhY2UgdG9nZXRoZXIuIE1vdmUgb3IgbWF4aW1pemUgYSB3aW5kb3cgdG8gcmVtb3ZlIGl0IGZyb20gdGhlIGdyb3VwLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsdGlsZSIsCiAgIm5hbWUiOiAiU2hlbGxUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsdGlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbWFzYWIvc2hlbGx0aWxlIiwKICAidXVpZCI6ICJTaGVsbFRpbGVAZW1hc2FiLml0IiwKICAidmVyc2lvbiI6IDY1Cn0="}}} , {"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": "27", "sha256": "159iiyw0sblq8jwkm1qfcakgdy3rvk07vzz8q6yj2davp64wpg5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJsdW5hcmNhbEBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "159iiyw0sblq8jwkm1qfcakgdy3rvk07vzz8q6yj2davp64wpg5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJsdW5hcmNhbEBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiAyNwp9"}}} -, {"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": "41", "sha256": "0irmbbj7jd628agq80f4ms8skawjvsi9a7izair11knydhkab944", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}, "40": {"version": "41", "sha256": "0irmbbj7jd628agq80f4ms8skawjvsi9a7izair11knydhkab944", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}, "41": {"version": "41", "sha256": "0irmbbj7jd628agq80f4ms8skawjvsi9a7izair11knydhkab944", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}}} +, {"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": "41", "sha256": "04zs03xbidfkhr8l0pi4p7jmri9z7sg729739jmv17lvi3nb0k8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0mZ3Q7ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLSZndDsgIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}, "40": {"version": "41", "sha256": "04zs03xbidfkhr8l0pi4p7jmri9z7sg729739jmv17lvi3nb0k8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0mZ3Q7ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLSZndDsgIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}, "41": {"version": "41", "sha256": "04zs03xbidfkhr8l0pi4p7jmri9z7sg729739jmv17lvi3nb0k8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0mZ3Q7ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLSZndDsgIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}}} , {"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": "29", "sha256": "022pkhylbxwcppsfgs0znk6pr7j160w7l7dm517ksip59zifa7mk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyOQp9"}, "41": {"version": "29", "sha256": "022pkhylbxwcppsfgs0znk6pr7j160w7l7dm517ksip59zifa7mk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyOQp9"}}} , {"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": "Configuring 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": "109qlcckx5z8fwndpr86r2bfggyh4akmi6lqi0ki7gr9bfigdqnv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyaW5nIHdoZXJlIG9uIHRoZSAobWFpbikgc2NyZWVuIG5vdGlmaWNhdGlvbnMgd2lsbCBhcHBlYXIsIGluc3RlYWQgb2YganVzdCBhYm92ZSB0aGUgbWVzc2FnZSB0cmF5IiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJQYW5lbCBPU0QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qZW5zbG9keS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtb3NkIiwKICAidXVpZCI6ICJwYW5lbC1vc2RAYmVyZW5kLmRlLnNjaG91d2VyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}, "40": {"version": "40", "sha256": "0hskvmdnqjihixaxhb7a7apsx0203zmymm5j6ncb2al928p795yx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyaW5nIHdoZXJlIG9uIHRoZSAobWFpbikgc2NyZWVuIG5vdGlmaWNhdGlvbnMgd2lsbCBhcHBlYXIsIGluc3RlYWQgb2YganVzdCBhYm92ZSB0aGUgbWVzc2FnZSB0cmF5IiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJQYW5lbCBPU0QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vamVuc2xvZHkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBhbmVsLW9zZCIsCiAgInV1aWQiOiAicGFuZWwtb3NkQGJlcmVuZC5kZS5zY2hvdXdlci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}}} @@ -94,11 +94,11 @@ , {"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="}}} , {"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": "13", "sha256": "0wfwy67r53ilp96yig70nf75a4bxd7cmn8gbnqlpin8virv66kfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "0wfwy67r53ilp96yig70nf75a4bxd7cmn8gbnqlpin8virv66kfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "0wfwy67r53ilp96yig70nf75a4bxd7cmn8gbnqlpin8virv66kfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEzCn0="}}} -, {"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": "25", "sha256": "012y9z4hj9iqm5k89g7z6q99agz94p6jdwr4bhw2nkv5balx0x4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9oYXJkZGlza2xlZCIsCiAgInV1aWQiOiAiaGFyZGRpc2tsZWRAYmlqaWRyb2lkLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "012y9z4hj9iqm5k89g7z6q99agz94p6jdwr4bhw2nkv5balx0x4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9oYXJkZGlza2xlZCIsCiAgInV1aWQiOiAiaGFyZGRpc2tsZWRAYmlqaWRyb2lkLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "012y9z4hj9iqm5k89g7z6q99agz94p6jdwr4bhw2nkv5balx0x4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9oYXJkZGlza2xlZCIsCiAgInV1aWQiOiAiaGFyZGRpc2tsZWRAYmlqaWRyb2lkLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}}} +, {"uuid": "harddiskled@bijidroid.gmail.com", "name": "Harddisk LED", "pname": "harddisk-led", "description": "Show harddisk activity (IO speed read/write and LED). Click to change modes", "link": "https://extensions.gnome.org/extension/988/harddisk-led/", "shell_version_map": {"38": {"version": "29", "sha256": "0yzvkbbkhzqlq6kdnfmfv9p7ypybmz6hyy6ksgya63ql084780j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBtb2RlcyIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL2hhcmRkaXNrbGVkIiwKICAidXVpZCI6ICJoYXJkZGlza2xlZEBiaWppZHJvaWQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "40": {"version": "29", "sha256": "0yzvkbbkhzqlq6kdnfmfv9p7ypybmz6hyy6ksgya63ql084780j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBtb2RlcyIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL2hhcmRkaXNrbGVkIiwKICAidXVpZCI6ICJoYXJkZGlza2xlZEBiaWppZHJvaWQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "41": {"version": "29", "sha256": "0yzvkbbkhzqlq6kdnfmfv9p7ypybmz6hyy6ksgya63ql084780j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBtb2RlcyIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL2hhcmRkaXNrbGVkIiwKICAidXVpZCI6ICJoYXJkZGlza2xlZEBiaWppZHJvaWQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}}} , {"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": "33", "sha256": "0lg2k9p033w9dff5g16xai9rvjmw85qvhrx17dw8f228nfm93fik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qYXlzdHJpY3Rvci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nIiwKICAidXVpZCI6ICJzeW5jdGhpbmdpY29uQGpheS5zdHJpY3RAcG9zdGVvLmRlIiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "33", "sha256": "0lg2k9p033w9dff5g16xai9rvjmw85qvhrx17dw8f228nfm93fik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qYXlzdHJpY3Rvci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nIiwKICAidXVpZCI6ICJzeW5jdGhpbmdpY29uQGpheS5zdHJpY3RAcG9zdGVvLmRlIiwKICAidmVyc2lvbiI6IDMzCn0="}}} , {"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=="}}} , {"uuid": "windowIsReady_Remover@nunofarruca@gmail.com", "name": "Window Is Ready - Notification Remover", "pname": "window-is-ready-notification-remover", "description": "Removes window is ready Notification", "link": "https://extensions.gnome.org/extension/1007/window-is-ready-notification-remover/", "shell_version_map": {"38": {"version": "13", "sha256": "1wxhdbvra0sc22wja9pcrsj5q4ny4iy4d7axlqh7yvm00zp72f3g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "1wxhdbvra0sc22wja9pcrsj5q4ny4iy4d7axlqh7yvm00zp72f3g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "1wxhdbvra0sc22wja9pcrsj5q4ny4iy4d7axlqh7yvm00zp72f3g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "arch-update@RaphaelRochet", "name": "Arch Linux Updates Indicator", "pname": "archlinux-updates-indicator", "description": "Update indicator for Arch Linux and GNOME Shell.\n** Note : you now need to install the package pacman-contrib to use the checkupdates script. **\n Can support AUR or other distros by changing command used to check for and apply updates.", "link": "https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "shell_version_map": {"38": {"version": "39", "sha256": "15s0cs41h01kb8dx231ww06rxalmz7cr173z7pm9sfkvs2106dhl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy4iLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMSIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "40": {"version": "46", "sha256": "0kgl4q52s44fy8d0psq27yd78jx35y4dmw43yzcipx3c9yik7964", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy4iLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogNDYKfQ=="}, "41": {"version": "46", "sha256": "0kgl4q52s44fy8d0psq27yd78jx35y4dmw43yzcipx3c9yik7964", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy4iLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogNDYKfQ=="}}} +, {"uuid": "arch-update@RaphaelRochet", "name": "Arch Linux Updates Indicator", "pname": "archlinux-updates-indicator", "description": "Update indicator for Arch Linux and GNOME Shell.\n** Note : you now need to install the package pacman-contrib to use the checkupdates script. **\n Can support AUR or other distros by changing command used to check for and apply updates.\n See README about Gnome42 Console", "link": "https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "shell_version_map": {"38": {"version": "39", "sha256": "0cm66wacw6qpf0lpd38hnic1ydjg11za6pq1bprpm5r3sdl7bmhg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lNDIgQ29uc29sZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4xIiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiAzOQp9"}, "40": {"version": "47", "sha256": "1c7fl0s2izqfw74fnnw44qrsd56l0vj51bd5lk9l3mfcxi6c2sk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lNDIgQ29uc29sZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "41": {"version": "47", "sha256": "1c7fl0s2izqfw74fnnw44qrsd56l0vj51bd5lk9l3mfcxi6c2sk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lNDIgQ29uc29sZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogNDcKfQ=="}}} , {"uuid": "dynamic-panel-transparency@rockon999.github.io", "name": "Dynamic Panel Transparency", "pname": "dynamic-panel-transparency", "description": "Miss dynamic panel transparency in 3.32 and up? Try the original dynamic panel with much more customization! This extension will fade your top panel to nothingness when there are no maximized windows present! Never again will the panel be abruptly darkened.\n\nMay be incompatible with some extensions that make extensive changes to the panel.\n\nIf your theme isn't working correctly with this extension enable 'Remove Excessive Panel Styling' in the Background section of preferences. This particularly impacts the default *Ubuntu* theme!", "link": "https://extensions.gnome.org/extension/1011/dynamic-panel-transparency/", "shell_version_map": {"38": {"version": "34", "sha256": "10w5kvmspy4rp4jnwx0rj2crbdyi1lxv81vhi8zx490fhwgmlkvl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pc3MgZHluYW1pYyBwYW5lbCB0cmFuc3BhcmVuY3kgaW4gMy4zMiBhbmQgdXA/IFRyeSB0aGUgb3JpZ2luYWwgZHluYW1pYyBwYW5lbCB3aXRoIG11Y2ggbW9yZSBjdXN0b21pemF0aW9uISBUaGlzIGV4dGVuc2lvbiB3aWxsIGZhZGUgeW91ciB0b3AgcGFuZWwgdG8gbm90aGluZ25lc3Mgd2hlbiB0aGVyZSBhcmUgbm8gbWF4aW1pemVkIHdpbmRvd3MgcHJlc2VudCEgTmV2ZXIgYWdhaW4gd2lsbCB0aGUgcGFuZWwgYmUgYWJydXB0bHkgZGFya2VuZWQuXG5cbk1heSBiZSBpbmNvbXBhdGlibGUgd2l0aCBzb21lIGV4dGVuc2lvbnMgdGhhdCBtYWtlIGV4dGVuc2l2ZSBjaGFuZ2VzIHRvIHRoZSBwYW5lbC5cblxuSWYgeW91ciB0aGVtZSBpc24ndCB3b3JraW5nIGNvcnJlY3RseSB3aXRoIHRoaXMgZXh0ZW5zaW9uIGVuYWJsZSAnUmVtb3ZlIEV4Y2Vzc2l2ZSBQYW5lbCBTdHlsaW5nJyBpbiB0aGUgQmFja2dyb3VuZCBzZWN0aW9uIG9mIHByZWZlcmVuY2VzLiBUaGlzIHBhcnRpY3VsYXJseSBpbXBhY3RzIHRoZSBkZWZhdWx0ICpVYnVudHUqIHRoZW1lISIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5IiwKICAibmFtZSI6ICJEeW5hbWljIFBhbmVsIFRyYW5zcGFyZW5jeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V3bHNoL2R5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5LyIsCiAgInV1aWQiOiAiZHluYW1pYy1wYW5lbC10cmFuc3BhcmVuY3lAcm9ja29uOTk5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzNAp9"}, "40": {"version": "35", "sha256": "1znc564xd7n4k2klfc0kkip6hmadqdsa50p0sq0717h407m9p0vx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pc3MgZHluYW1pYyBwYW5lbCB0cmFuc3BhcmVuY3kgaW4gMy4zMiBhbmQgdXA/IFRyeSB0aGUgb3JpZ2luYWwgZHluYW1pYyBwYW5lbCB3aXRoIG11Y2ggbW9yZSBjdXN0b21pemF0aW9uISBUaGlzIGV4dGVuc2lvbiB3aWxsIGZhZGUgeW91ciB0b3AgcGFuZWwgdG8gbm90aGluZ25lc3Mgd2hlbiB0aGVyZSBhcmUgbm8gbWF4aW1pemVkIHdpbmRvd3MgcHJlc2VudCEgTmV2ZXIgYWdhaW4gd2lsbCB0aGUgcGFuZWwgYmUgYWJydXB0bHkgZGFya2VuZWQuXG5cbk1heSBiZSBpbmNvbXBhdGlibGUgd2l0aCBzb21lIGV4dGVuc2lvbnMgdGhhdCBtYWtlIGV4dGVuc2l2ZSBjaGFuZ2VzIHRvIHRoZSBwYW5lbC5cblxuSWYgeW91ciB0aGVtZSBpc24ndCB3b3JraW5nIGNvcnJlY3RseSB3aXRoIHRoaXMgZXh0ZW5zaW9uIGVuYWJsZSAnUmVtb3ZlIEV4Y2Vzc2l2ZSBQYW5lbCBTdHlsaW5nJyBpbiB0aGUgQmFja2dyb3VuZCBzZWN0aW9uIG9mIHByZWZlcmVuY2VzLiBUaGlzIHBhcnRpY3VsYXJseSBpbXBhY3RzIHRoZSBkZWZhdWx0ICpVYnVudHUqIHRoZW1lISIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5IiwKICAibmFtZSI6ICJEeW5hbWljIFBhbmVsIFRyYW5zcGFyZW5jeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ld2xzaC9keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeS8iLAogICJ1dWlkIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5QHJvY2tvbjk5OS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"uuid": "icinga-checker@sosulski.net", "name": "Icinga checker", "pname": "icinga-checker", "description": "Icinga/Nagios checker", "link": "https://extensions.gnome.org/extension/1029/icinga-checker/", "shell_version_map": {"38": {"version": "12", "sha256": "194vk0i02zvsxaxw9iq63xjhdld729vrq8wwbl6i0p89xp1mcqcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImljaW5nYS1jaGVja2VyQHNvc3Vsc2tpLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "194vk0i02zvsxaxw9iq63xjhdld729vrq8wwbl6i0p89xp1mcqcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImljaW5nYS1jaGVja2VyQHNvc3Vsc2tpLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "194vk0i02zvsxaxw9iq63xjhdld729vrq8wwbl6i0p89xp1mcqcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImljaW5nYS1jaGVja2VyQHNvc3Vsc2tpLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "taskwhisperer-extension@infinicode.de", "name": "TaskWhisperer", "pname": "taskwhisperer", "description": "Taskwhisperer is a extension for TaskWarrior Application https://taskwarrior.org. It is to display upcoming tasks and task details as well as to create and modify them.\n", "link": "https://extensions.gnome.org/extension/1039/taskwhisperer/", "shell_version_map": {"38": {"version": "20", "sha256": "067z3j2px4rz5yspfjx2s6p5j4l1svxllclahnf3zmv1nlbhzq8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUYXNrV2hpc3BlcmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvdGFza3doaXNwZXJlciIsCiAgInV1aWQiOiAidGFza3doaXNwZXJlci1leHRlbnNpb25AaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "067z3j2px4rz5yspfjx2s6p5j4l1svxllclahnf3zmv1nlbhzq8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUYXNrV2hpc3BlcmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvdGFza3doaXNwZXJlciIsCiAgInV1aWQiOiAidGFza3doaXNwZXJlci1leHRlbnNpb25AaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}}} @@ -111,12 +111,12 @@ , {"uuid": "applications-overview-tooltip@RaphaelRochet", "name": "Applications Overview Tooltip", "pname": "applications-overview-tooltip", "description": "Shows a tooltip over applications icons on applications overview with application name and/or description.", "link": "https://extensions.gnome.org/extension/1071/applications-overview-tooltip/", "shell_version_map": {"38": {"version": "11", "sha256": "0alvg0l46hls3jz3a5ic21fgbjbg0kv0nn0pkknzsgjfw5mmwz69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwIiwKICAidXVpZCI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcEBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "14", "sha256": "1vv5hvmg987vp8rdyvfff089h99m8xqrhyfbrgbipgy7862yf6lq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJ1dWlkIjogImFwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "1vv5hvmg987vp8rdyvfff089h99m8xqrhyfbrgbipgy7862yf6lq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJ1dWlkIjogImFwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "TwitchLive_Panel@extensions.maweki.de", "name": "TwitchLive Panel", "pname": "twitchlive-panel", "description": "A panel showing whether your favorite Twitch.tv streamers are streaming.\n\nCycles through the online streamers if multiples are configured. Click on the panel and then on streamer's name to launch the stream with a custom command (your browser or some other application).\n\nNeeds curl and mogrify to fully support streamer logos. For an extension version compatible with shell version 3.30 or earlier visit our github page.", "link": "https://extensions.gnome.org/extension/1078/twitchlive-panel/", "shell_version_map": {"40": {"version": "37", "sha256": "0g1s5f3si8hlgf3m033c1c9fxydhs3wcykf4rr1pkzd54q6a8vq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4gRm9yIGFuIGV4dGVuc2lvbiB2ZXJzaW9uIGNvbXBhdGlibGUgd2l0aCBzaGVsbCB2ZXJzaW9uIDMuMzAgb3IgZWFybGllciB2aXNpdCBvdXIgZ2l0aHViIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHdpdGNobGl2ZSIsCiAgIm5hbWUiOiAiVHdpdGNoTGl2ZSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2l0Y2hsaXZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdla2kvdHdpdGNobGl2ZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlR3aXRjaExpdmVfUGFuZWxAZXh0ZW5zaW9ucy5tYXdla2kuZGUiLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "41": {"version": "37", "sha256": "0g1s5f3si8hlgf3m033c1c9fxydhs3wcykf4rr1pkzd54q6a8vq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4gRm9yIGFuIGV4dGVuc2lvbiB2ZXJzaW9uIGNvbXBhdGlibGUgd2l0aCBzaGVsbCB2ZXJzaW9uIDMuMzAgb3IgZWFybGllciB2aXNpdCBvdXIgZ2l0aHViIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHdpdGNobGl2ZSIsCiAgIm5hbWUiOiAiVHdpdGNoTGl2ZSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2l0Y2hsaXZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdla2kvdHdpdGNobGl2ZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlR3aXRjaExpdmVfUGFuZWxAZXh0ZW5zaW9ucy5tYXdla2kuZGUiLAogICJ2ZXJzaW9uIjogMzcKfQ=="}}} , {"uuid": "cpufreq@konkor", "name": "cpufreq", "pname": "cpufreq", "description": "System Monitor and Power Manager.\n\nThis is a lightweight system monitor and power management tool. It needs root permission to able changing governors.\n\nFeatures:\n⚫ Compatible with many hardware architectures;\n⚫ CPU Frequency monitoring;\n⚫ CPU Governor management;\n⚫ CPU Frequency speed limits;\n⚫ CPU Boost supporting;\n⚫ CPU Core Power on/off;\n⚫ Saving/Restoring settings...\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1082/cpufreq/", "shell_version_map": {"38": {"version": "51", "sha256": "1i6lwb82j21qx38gxy1rdv2bgn2rh6qf9hswasbf26g9k3ay3w1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL2NwdWZyZXEiLAogICJ1dWlkIjogImNwdWZyZXFAa29ua29yIiwKICAidmVyc2lvbiI6IDUxCn0="}, "40": {"version": "51", "sha256": "1i6lwb82j21qx38gxy1rdv2bgn2rh6qf9hswasbf26g9k3ay3w1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL2NwdWZyZXEiLAogICJ1dWlkIjogImNwdWZyZXFAa29ua29yIiwKICAidmVyc2lvbiI6IDUxCn0="}, "41": {"version": "51", "sha256": "1i6lwb82j21qx38gxy1rdv2bgn2rh6qf9hswasbf26g9k3ay3w1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL2NwdWZyZXEiLAogICJ1dWlkIjogImNwdWZyZXFAa29ua29yIiwKICAidmVyc2lvbiI6IDUxCn0="}}} -, {"uuid": "simplenetspeed@biji.extension", "name": "Simple net speed", "pname": "simple-net-speed", "description": "Simply showing network speed. Left click to change modes:\n\n1. Total net speed in bits per second\n2. Total net speed in Bytes per second\n3. Up & down speed in bits per second\n4. Up & down speed in Bytes per second\n5. Total of downloaded in Bytes (Right click to reset counter)\n\nMiddle click to change font size", "link": "https://extensions.gnome.org/extension/1085/simple-net-speed/", "shell_version_map": {"38": {"version": "23", "sha256": "16g6203q6d8il018rf8zhh6gziybpczc6r5v5289kz0i343bmkfj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "40": {"version": "23", "sha256": "16g6203q6d8il018rf8zhh6gziybpczc6r5v5289kz0i343bmkfj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "16g6203q6d8il018rf8zhh6gziybpczc6r5v5289kz0i343bmkfj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyMwp9"}}} +, {"uuid": "simplenetspeed@biji.extension", "name": "Simple net speed", "pname": "simple-net-speed", "description": "Simply showing network speed. Left click to change modes:\n\n1. Total net speed in bits per second\n2. Total net speed in Bytes per second\n3. Up & down speed in bits per second\n4. Up & down speed in Bytes per second\n5. Total of downloaded in Bytes (Right click to reset counter)\n\nMiddle click to change font size", "link": "https://extensions.gnome.org/extension/1085/simple-net-speed/", "shell_version_map": {"38": {"version": "25", "sha256": "1lvz86mafjpsjwypy24py369wwf5pbrgqgx1yg9yiwxy9jzsqy9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "1lvz86mafjpsjwypy24py369wwf5pbrgqgx1yg9yiwxy9jzsqy9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "1lvz86mafjpsjwypy24py369wwf5pbrgqgx1yg9yiwxy9jzsqy9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"uuid": "gnome-shell-go-to-last-workspace@github.com", "name": "Go To Last Workspace", "pname": "go-to-last-workspace", "description": "Quickly toggle between two workspaces with one key", "link": "https://extensions.gnome.org/extension/1089/go-to-last-workspace/", "shell_version_map": {"38": {"version": "7", "sha256": "19jyrfhniz65xfrwzpph4i33mwpbfshy5bc79vxd5fy4qa0p6scp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmphbi9nbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2VAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "19jyrfhniz65xfrwzpph4i33mwpbfshy5bc79vxd5fy4qa0p6scp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmphbi9nbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2VAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "KeepAwake@jepfa.de", "name": "Keep awake!", "pname": "keep-awake", "description": "Keep your computer awake! Forbid your computer to activate sceensaver, turn off the screen or suspend when it is idle for a while. Click the indicator icon (in the taskbar) once to keep your computer awake for the session. Click again to enable persistance of this setting between restarts (indicated by a small lock icon on the indicator). Switch off by clicking again.", "link": "https://extensions.gnome.org/extension/1097/keep-awake/", "shell_version_map": {"38": {"version": "6", "sha256": "1lmwq4ng14jvpzd3fnwc8bilvyigya46d8il8m16g1596p3hikdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgRm9yYmlkIHlvdXIgY29tcHV0ZXIgdG8gYWN0aXZhdGUgc2NlZW5zYXZlciwgdHVybiBvZmYgdGhlIHNjcmVlbiBvciBzdXNwZW5kIHdoZW4gaXQgaXMgaWRsZSBmb3IgYSB3aGlsZS4gQ2xpY2sgdGhlIGluZGljYXRvciBpY29uIChpbiB0aGUgdGFza2Jhcikgb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBzZXNzaW9uLiBDbGljayBhZ2FpbiB0byBlbmFibGUgcGVyc2lzdGFuY2Ugb2YgdGhpcyBzZXR0aW5nIGJldHdlZW4gcmVzdGFydHMgKGluZGljYXRlZCBieSBhIHNtYWxsIGxvY2sgaWNvbiBvbiB0aGUgaW5kaWNhdG9yKS4gU3dpdGNoIG9mZiBieSBjbGlja2luZyBhZ2Fpbi4iLAogICJuYW1lIjogIktlZXAgYXdha2UhIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plbnNwZmFobC9LZWVwQXdha2UiLAogICJ1dWlkIjogIktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "todolist@tomMoral.org", "name": "Section Todo List", "pname": "section-todo-list", "description": "Manage todo list with an applet\n\n* Add and remove task on your list in different sections.\n* Click an item to rename it.\n* Access the extension using Hot-Key (default: Ctrl+Space)\n", "link": "https://extensions.gnome.org/extension/1104/section-todo-list/", "shell_version_map": {"38": {"version": "11", "sha256": "02b5gccsx6ifgv2jyrniwagdf09jg7lvwzwlgm11qbrv7w7bn0qp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuIiwKICAibmFtZSI6ICJTZWN0aW9uIFRvZG8gTGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21Nb3JhbC9Ub0RvTGlzdCIsCiAgInV1aWQiOiAidG9kb2xpc3RAdG9tTW9yYWwub3JnIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "02b5gccsx6ifgv2jyrniwagdf09jg7lvwzwlgm11qbrv7w7bn0qp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuIiwKICAibmFtZSI6ICJTZWN0aW9uIFRvZG8gTGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21Nb3JhbC9Ub0RvTGlzdCIsCiAgInV1aWQiOiAidG9kb2xpc3RAdG9tTW9yYWwub3JnIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "add-username-toppanel@brendaw.com", "name": "Add Username to Top Panel", "pname": "add-username-to-top-panel", "description": "Simply add your username to topbar panel aggregate menu", "link": "https://extensions.gnome.org/extension/1108/add-username-to-top-panel/", "shell_version_map": {"38": {"version": "4", "sha256": "1b2p8924id4shzpvj58958r7j422ppkw7bsfmng9sq25k3w4xvb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUiLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1b2p8924id4shzpvj58958r7j422ppkw7bsfmng9sq25k3w4xvb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUiLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1b2p8924id4shzpvj58958r7j422ppkw7bsfmng9sq25k3w4xvb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUiLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "Hide_Clock@grantmcwilliams.com", "name": "Hide Clock", "pname": "hide-clock", "description": "Hides the Gnome title bar clock. \nThis is useful for anyone recording their desktop as it allows you to edit the video without the titlebar clock jumping time.\nNow supports Gnome 40.", "link": "https://extensions.gnome.org/extension/1110/hide-clock/", "shell_version_map": {"38": {"version": "3", "sha256": "1niax4lw42nvp99wbxiydassgrzsx0pkkxrnbvim0n2b8bizg8rx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBHbm9tZSB0aXRsZSBiYXIgY2xvY2suIFxuVGhpcyBpcyB1c2VmdWwgZm9yIGFueW9uZSByZWNvcmRpbmcgdGhlaXIgZGVza3RvcCBhcyBpdCBhbGxvd3MgeW91IHRvIGVkaXQgdGhlIHZpZGVvIHdpdGhvdXQgdGhlIHRpdGxlYmFyIGNsb2NrIGp1bXBpbmcgdGltZS5cbk5vdyBzdXBwb3J0cyBHbm9tZSA0MC4iLAogICJuYW1lIjogIkhpZGUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQ2xvY2tAZ3JhbnRtY3dpbGxpYW1zLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1niax4lw42nvp99wbxiydassgrzsx0pkkxrnbvim0n2b8bizg8rx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBHbm9tZSB0aXRsZSBiYXIgY2xvY2suIFxuVGhpcyBpcyB1c2VmdWwgZm9yIGFueW9uZSByZWNvcmRpbmcgdGhlaXIgZGVza3RvcCBhcyBpdCBhbGxvd3MgeW91IHRvIGVkaXQgdGhlIHZpZGVvIHdpdGhvdXQgdGhlIHRpdGxlYmFyIGNsb2NrIGp1bXBpbmcgdGltZS5cbk5vdyBzdXBwb3J0cyBHbm9tZSA0MC4iLAogICJuYW1lIjogIkhpZGUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQ2xvY2tAZ3JhbnRtY3dpbGxpYW1zLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "Hide_Clock@grantmcwilliams.com", "name": "Hide Clock", "pname": "hide-clock", "description": "Hide title bar clock", "link": "https://extensions.gnome.org/extension/1110/hide-clock/", "shell_version_map": {"38": {"version": "4", "sha256": "0vxlc72gzin16xl5h6i0ixlmm6x9ahp3w3phyg0jk8b0q7qdflzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGl0bGUgYmFyIGNsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiSGlkZV9DbG9ja0BncmFudG1jd2lsbGlhbXMuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0vxlc72gzin16xl5h6i0ixlmm6x9ahp3w3phyg0jk8b0q7qdflzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGl0bGUgYmFyIGNsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiSGlkZV9DbG9ja0BncmFudG1jd2lsbGlhbXMuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0vxlc72gzin16xl5h6i0ixlmm6x9ahp3w3phyg0jk8b0q7qdflzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGl0bGUgYmFyIGNsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiSGlkZV9DbG9ja0BncmFudG1jd2lsbGlhbXMuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "gnome-shell-screenshot@ttll.de", "name": "Screenshot Tool", "pname": "screenshot-tool", "description": "Conveniently create, copy, store and upload screenshots. Please log out and log in again after updating.", "link": "https://extensions.gnome.org/extension/1112/screenshot-tool/", "shell_version_map": {"38": {"version": "56", "sha256": "1ga2ray64aq1d1vn0rsscfxjiidbiln3vx42rn9i4q2a59b00znq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY1NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNTYKfQ=="}, "40": {"version": "66", "sha256": "1vy5649vznq9g2aarl61570f8fql1akv7pwwkzsa90z2f787b32k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdC8iLAogICJ1dWlkIjogImdub21lLXNoZWxsLXNjcmVlbnNob3RAdHRsbC5kZSIsCiAgInZlcnNpb24iOiA2Ngp9"}, "41": {"version": "66", "sha256": "1vy5649vznq9g2aarl61570f8fql1akv7pwwkzsa90z2f787b32k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdC8iLAogICJ1dWlkIjogImdub21lLXNoZWxsLXNjcmVlbnNob3RAdHRsbC5kZSIsCiAgInZlcnNpb24iOiA2Ngp9"}}} , {"uuid": "nothing-to-say@extensions.gnome.wouter.bolsterl.ee", "name": "Nothing to say", "pname": "nothing-to-say", "description": "Unmute the microphone only when you have something to say.", "link": "https://extensions.gnome.org/extension/1113/nothing-to-say/", "shell_version_map": {"38": {"version": "8", "sha256": "12ngc4dv1ijbvihqn2rjn77bal0gdhdq4cxf1zv5lr2ckz0ishm4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "14", "sha256": "1rh7gbjhxpv63xg1v3jm0108zygycz8vb2jjjab46a4rkcd0xd0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "1rh7gbjhxpv63xg1v3jm0108zygycz8vb2jjjab46a4rkcd0xd0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"uuid": "workspace-switch-wraparound@theychx.org", "name": "Workspace Switch Wraparound", "pname": "workspace-switch-wraparound", "description": "When switching workspaces, going down from the bottom workspace switches to the top workspace. Likewise, up from the top workspace goes to the bottom workspace.", "link": "https://extensions.gnome.org/extension/1116/workspace-switch-wraparound/", "shell_version_map": {"38": {"version": "7", "sha256": "1zc92s0pffsd6mwsmpy8s8gici0q1wzd5s1vwjld4y1cy34kp2ad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "1zc92s0pffsd6mwsmpy8s8gici0q1wzd5s1vwjld4y1cy34kp2ad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} @@ -133,7 +133,7 @@ , {"uuid": "calculator-button@amivaleo", "name": "Calculator Button", "pname": "calculator-button", "description": "A button to easily open gnome-calculator.\n Credits to extensions.gnome.org/extension/939/display-button/\n\nv10:\n1 - added support for gnome 3.38\n2 - added support for flatpak version of gnome-calculator", "link": "https://extensions.gnome.org/extension/1168/calculator-button/", "shell_version_map": {"38": {"version": "10", "sha256": "1c6b53im6xj4yaf4skvchvgipxfjs2yh3i5r75cw9avnw7imnwk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYnV0dG9uIHRvIGVhc2lseSBvcGVuIGdub21lLWNhbGN1bGF0b3IuXG4gQ3JlZGl0cyB0byBleHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vOTM5L2Rpc3BsYXktYnV0dG9uL1xuXG52MTA6XG4xIC0gYWRkZWQgc3VwcG9ydCBmb3IgZ25vbWUgMy4zOFxuMiAtIGFkZGVkIHN1cHBvcnQgZm9yIGZsYXRwYWsgdmVyc2lvbiBvZiBnbm9tZS1jYWxjdWxhdG9yIiwKICAibmFtZSI6ICJDYWxjdWxhdG9yIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL0NhbGN1bGF0b3ItQnV0dG9uIiwKICAidXVpZCI6ICJjYWxjdWxhdG9yLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "screenshotlocations.timur@linux.com", "name": "Screenshot Locations", "pname": "screenshot-locations", "description": "Change the default GNOME screenshot directory", "link": "https://extensions.gnome.org/extension/1179/screenshot-locations/", "shell_version_map": {"38": {"version": "7", "sha256": "0ymb4m8fgxgi964fdfdqwgjw95qbcm906zgqmyqxgd4ggip3mn47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Rsb2NhdGlvbnMuZGF0YS5ncmVzb3VyY2UiLAogICJkZXNjcmlwdGlvbiI6ICJDaGFuZ2UgdGhlIGRlZmF1bHQgR05PTUUgc2NyZWVuc2hvdCBkaXJlY3RvcnkiLAogICJuYW1lIjogIlNjcmVlbnNob3QgTG9jYXRpb25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Rsb2NhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL2tpeXVpL2dub21lLXNoZWxsLXNjcmVlbnNob3Rsb2NhdGlvbnMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzY3JlZW5zaG90bG9jYXRpb25zLnRpbXVyQGxpbnV4LmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "8", "sha256": "0cxsq1zzmgn6q32wbdfw9hai62li92dwvwnzq2pdbskp9qm6v7nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgZGVmYXVsdCBHTk9NRSBzY3JlZW5zaG90IGRpcmVjdG9yeSIsCiAgImdldHRleHQtZG9tYWluIjogInNjcmVlbnNob3Rsb2NhdGlvbnMudGltdXJAbGludXguY29tIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IExvY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW5zaG90bG9jYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9jb2RlYmVyZy5vcmcva2l5dWkvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdGxvY2F0aW9ucy1leHRlbnNpb24iLAogICJ1dWlkIjogInNjcmVlbnNob3Rsb2NhdGlvbnMudGltdXJAbGludXguY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "utcclock@injcristianrojas.github.com", "name": "UTCClock", "pname": "utcclock", "description": "UTC clock for the top bar. For GNOME 40+", "link": "https://extensions.gnome.org/extension/1183/utcclock/", "shell_version_map": {"38": {"version": "24", "sha256": "1gmj8479a7yvxb3yh76yjs9n7bav3qp4fkr9hg7197qch0rirhlr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIuIEZvciBHTk9NRSA0MCsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL1VUQ0Nsb2NrIiwKICAidXVpZCI6ICJ1dGNjbG9ja0BpbmpjcmlzdGlhbnJvamFzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "40": {"version": "27", "sha256": "0jgrbsn2aqq5zxm553v16ydyzmbwa4ymqfr93mgz1br52clnjj2k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIuIEZvciBHTk9NRSA0MCsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2luamNyaXN0aWFucm9qYXMvVVRDQ2xvY2siLAogICJ1dWlkIjogInV0Y2Nsb2NrQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "0jgrbsn2aqq5zxm553v16ydyzmbwa4ymqfr93mgz1br52clnjj2k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIuIEZvciBHTk9NRSA0MCsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2luamNyaXN0aWFucm9qYXMvVVRDQ2xvY2siLAogICJ1dWlkIjogInV0Y2Nsb2NrQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}}} -, {"uuid": "show-desktop-button@amivaleo", "name": "Show Desktop Button", "pname": "show-desktop-button", "description": "Minimize/unminimize all open windows with a single click.", "link": "https://extensions.gnome.org/extension/1194/show-desktop-button/", "shell_version_map": {"38": {"version": "17", "sha256": "15cym2gka8g10bvprnxf6s0jbwchscw81fh9pvjybqmb9kc8ivvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "20", "sha256": "0izr04779cl9yy8b6spjjxagp3il9pnxk77rsvk5wqdlkr4k0k3y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0izr04779cl9yy8b6spjjxagp3il9pnxk77rsvk5wqdlkr4k0k3y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDIwCn0="}}} +, {"uuid": "show-desktop-button@amivaleo", "name": "Show Desktop Button", "pname": "show-desktop-button", "description": "Minimize/unminimize all open windows with a single click.", "link": "https://extensions.gnome.org/extension/1194/show-desktop-button/", "shell_version_map": {"38": {"version": "17", "sha256": "15cym2gka8g10bvprnxf6s0jbwchscw81fh9pvjybqmb9kc8ivvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "22", "sha256": "0qq16yhii9cbcp09cc1mw5a565nbw7bq5hb2jdgp9lnq2ym0c5rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "0qq16yhii9cbcp09cc1mw5a565nbw7bq5hb2jdgp9lnq2ym0c5rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDIyCn0="}}} , {"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": "31", "sha256": "1w3njadkxjnp6b2jsrfd46xla8hak0m2kipa9vii6wsy80czw59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VsaW52ZW50aW9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1uYXNhLWFwb2QiLAogICJ1dWlkIjogIm5hc2FfYXBvZEBlbGludmVudGlvbi5vdmgiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "41": {"version": "31", "sha256": "1w3njadkxjnp6b2jsrfd46xla8hak0m2kipa9vii6wsy80czw59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VsaW52ZW50aW9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1uYXNhLWFwb2QiLAogICJ1dWlkIjogIm5hc2FfYXBvZEBlbGludmVudGlvbi5vdmgiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}}} , {"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=="}}} @@ -186,16 +186,16 @@ , {"uuid": "showtime@xenlism.github.io", "name": "Showtime - Desktop Widget", "pname": "showtime", "description": "Date &amp;amp;amp;amp;amp;amp; Clock Desktop Widget\n\nMove Widget by Press Super + Drag Widget\nhttps://github.com/xenlism/showtime", "link": "https://extensions.gnome.org/extension/1429/showtime/", "shell_version_map": {"38": {"version": "4", "sha256": "12k6spjhg2ykgh5x3mily0dps450pyj9vyv1bay5w919y9swplaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRhdGUgJmFtcDthbXA7YW1wO2FtcDthbXA7YW1wO2FtcDsgQ2xvY2sgRGVza3RvcCBXaWRnZXRcblxuTW92ZSBXaWRnZXQgYnkgUHJlc3MgU3VwZXIgKyBEcmFnIFdpZGdldFxuaHR0cHM6Ly9naXRodWIuY29tL3hlbmxpc20vc2hvd3RpbWUiLAogICJuYW1lIjogIlNob3d0aW1lICAtIERlc2t0b3AgV2lkZ2V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3d0aW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVubGlzbS9zaG93dGltZSIsCiAgInV1aWQiOiAic2hvd3RpbWVAeGVubGlzbS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "5", "sha256": "0p10as2k6lkh3vj5860hvmj98by18ih8r2k7y36iqrxqpl3s8fd4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRhdGUgJmFtcDthbXA7YW1wO2FtcDthbXA7YW1wO2FtcDsgQ2xvY2sgRGVza3RvcCBXaWRnZXRcblxuTW92ZSBXaWRnZXQgYnkgUHJlc3MgU3VwZXIgKyBEcmFnIFdpZGdldFxuaHR0cHM6Ly9naXRodWIuY29tL3hlbmxpc20vc2hvd3RpbWUiLAogICJuYW1lIjogIlNob3d0aW1lICAtIERlc2t0b3AgV2lkZ2V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3d0aW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hlbmxpc20vc2hvd3RpbWUiLAogICJ1dWlkIjogInNob3d0aW1lQHhlbmxpc20uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "Current_screen_only_for_Alternate_Tab@bourcereau.fr", "name": "Current screen only on window switcher", "pname": "current-screen-only-for-alternate-tab", "description": "Limits the windows shown on the switcher to those of the current monitor", "link": "https://extensions.gnome.org/extension/1437/current-screen-only-for-alternate-tab/", "shell_version_map": {"40": {"version": "8", "sha256": "0x4idd6ba55qxsnx8fplgamdjj0f2hmv2sv2vbn3m3wavd4n0w27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpbWl0cyB0aGUgd2luZG93cyBzaG93biBvbiB0aGUgc3dpdGNoZXIgdG8gdGhvc2Ugb2YgdGhlIGN1cnJlbnQgbW9uaXRvciIsCiAgIm5hbWUiOiAiQ3VycmVudCBzY3JlZW4gb25seSBvbiB3aW5kb3cgc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21tYWkvQ3VycmVudF9zY3JlZW5fb25seV9vbl93aW5kb3dfc3dpdGNoZXIiLAogICJ1dWlkIjogIkN1cnJlbnRfc2NyZWVuX29ubHlfZm9yX0FsdGVybmF0ZV9UYWJAYm91cmNlcmVhdS5mciIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0x4idd6ba55qxsnx8fplgamdjj0f2hmv2sv2vbn3m3wavd4n0w27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpbWl0cyB0aGUgd2luZG93cyBzaG93biBvbiB0aGUgc3dpdGNoZXIgdG8gdGhvc2Ugb2YgdGhlIGN1cnJlbnQgbW9uaXRvciIsCiAgIm5hbWUiOiAiQ3VycmVudCBzY3JlZW4gb25seSBvbiB3aW5kb3cgc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21tYWkvQ3VycmVudF9zY3JlZW5fb25seV9vbl93aW5kb3dfc3dpdGNoZXIiLAogICJ1dWlkIjogIkN1cnJlbnRfc2NyZWVuX29ubHlfZm9yX0FsdGVybmF0ZV9UYWJAYm91cmNlcmVhdS5mciIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "kube_config@vvbogdanov87.gmail.com", "name": "Kube Config", "pname": "kube-config", "description": "Switches kube config context", "link": "https://extensions.gnome.org/extension/1442/kube-config/", "shell_version_map": {"40": {"version": "14", "sha256": "125gbiim4d3kpycjncvqmxqgz3i1c15kkyx2rmgkc2wpzx0gyc6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92dmJvZ2Rhbm92ODcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWt1YmVjb25maWciLAogICJ1dWlkIjogImt1YmVfY29uZmlnQHZ2Ym9nZGFub3Y4Ny5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "125gbiim4d3kpycjncvqmxqgz3i1c15kkyx2rmgkc2wpzx0gyc6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92dmJvZ2Rhbm92ODcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWt1YmVjb25maWciLAogICJ1dWlkIjogImt1YmVfY29uZmlnQHZ2Ym9nZGFub3Y4Ny5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} -, {"uuid": "transparent-window-moving@noobsai.github.com", "name": "Transparent Window Moving", "pname": "transparent-window-moving", "description": "Makes the window semi-transparent when moving or resizing", "link": "https://extensions.gnome.org/extension/1446/transparent-window-moving/", "shell_version_map": {"38": {"version": "6", "sha256": "0vllnrscjaqx77wb44803q6n3wk590dxacjfsw7ympbgqhikzc0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "9", "sha256": "1da8vldknv6v5b4wdxd9a7q9i4mla92wxj5l48g3ja8xa1rz8bgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1da8vldknv6v5b4wdxd9a7q9i4mla92wxj5l48g3ja8xa1rz8bgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"uuid": "transparent-window-moving@noobsai.github.com", "name": "Transparent Window Moving", "pname": "transparent-window-moving", "description": "Makes the window semi-transparent when moving or resizing", "link": "https://extensions.gnome.org/extension/1446/transparent-window-moving/", "shell_version_map": {"38": {"version": "6", "sha256": "0vllnrscjaqx77wb44803q6n3wk590dxacjfsw7ympbgqhikzc0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "10", "sha256": "1cygayp1kaykm7ldsdbn6qpxi80ddipvlhl6i89sca33yrwisz3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1cygayp1kaykm7ldsdbn6qpxi80ddipvlhl6i89sca33yrwisz3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "transparent-window@pbxqdown.github.com", "name": "Transparent Window", "pname": "transparent-window", "description": "Change the opacity of windows by compiz-style shortcut Alt+scroll.\nYou can customize hotkey in Preference page if Alt key doesn't work.", "link": "https://extensions.gnome.org/extension/1454/transparent-window/", "shell_version_map": {"38": {"version": "7", "sha256": "09nhn8f7d8c1kp8hgw49y0d9165ckvgn6my339k0pzga02d277a6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "miniview@thesecretaryofwar.com", "name": "Miniview", "pname": "miniview", "description": "Shows a mini preview of another window (like picture-in-picture on a TV)\n- Left-mouse drag: move preview window\n- Right-mouse drag (or ctrl + left mouse drag): resize preview window\n- Scroll wheel: change target window\n- Double click: raise target window\n- Shift + F12: toggle preview window (this can be changed or disabled in preferences)\n- Ctrl + scroll wheel: adjust opacity", "link": "https://extensions.gnome.org/extension/1459/miniview/", "shell_version_map": {"38": {"version": "13", "sha256": "0nf2jxd9kvw7nzb992730xidg7kf4iywy8yr5mj9152bi2nmblz6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgbWluaSBwcmV2aWV3IG9mIGFub3RoZXIgd2luZG93IChsaWtlIHBpY3R1cmUtaW4tcGljdHVyZSBvbiBhIFRWKVxuLSBMZWZ0LW1vdXNlIGRyYWc6IG1vdmUgcHJldmlldyB3aW5kb3dcbi0gUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuLSBTY3JvbGwgd2hlZWw6IGNoYW5nZSB0YXJnZXQgd2luZG93XG4tIERvdWJsZSBjbGljazogcmFpc2UgdGFyZ2V0IHdpbmRvd1xuLSBTaGlmdCArIEYxMjogdG9nZ2xlIHByZXZpZXcgd2luZG93ICh0aGlzIGNhbiBiZSBjaGFuZ2VkIG9yIGRpc2FibGVkIGluIHByZWZlcmVuY2VzKVxuLSBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "12", "sha256": "0p26h4dgxja8iww5mjzxzwmr2fx0hz8wphxqal14xm83k1nsl4ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgbWluaSBwcmV2aWV3IG9mIGFub3RoZXIgd2luZG93IChsaWtlIHBpY3R1cmUtaW4tcGljdHVyZSBvbiBhIFRWKVxuLSBMZWZ0LW1vdXNlIGRyYWc6IG1vdmUgcHJldmlldyB3aW5kb3dcbi0gUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuLSBTY3JvbGwgd2hlZWw6IGNoYW5nZSB0YXJnZXQgd2luZG93XG4tIERvdWJsZSBjbGljazogcmFpc2UgdGFyZ2V0IHdpbmRvd1xuLSBTaGlmdCArIEYxMjogdG9nZ2xlIHByZXZpZXcgd2luZG93ICh0aGlzIGNhbiBiZSBjaGFuZ2VkIG9yIGRpc2FibGVkIGluIHByZWZlcmVuY2VzKVxuLSBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0p26h4dgxja8iww5mjzxzwmr2fx0hz8wphxqal14xm83k1nsl4ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgbWluaSBwcmV2aWV3IG9mIGFub3RoZXIgd2luZG93IChsaWtlIHBpY3R1cmUtaW4tcGljdHVyZSBvbiBhIFRWKVxuLSBMZWZ0LW1vdXNlIGRyYWc6IG1vdmUgcHJldmlldyB3aW5kb3dcbi0gUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuLSBTY3JvbGwgd2hlZWw6IGNoYW5nZSB0YXJnZXQgd2luZG93XG4tIERvdWJsZSBjbGljazogcmFpc2UgdGFyZ2V0IHdpbmRvd1xuLSBTaGlmdCArIEYxMjogdG9nZ2xlIHByZXZpZXcgd2luZG93ICh0aGlzIGNhbiBiZSBjaGFuZ2VkIG9yIGRpc2FibGVkIGluIHByZWZlcmVuY2VzKVxuLSBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"uuid": "Vitals@CoreCoding.com", "name": "Vitals", "pname": "vitals", "description": "A glimpse into your computer's temperature, voltage, fan speed, memory usage, processor load, system resources, network speed and storage stats. This is a one stop shop to monitor all of your vital sensors. Uses asynchronous polling to provide a smooth user experience. Feature requests or bugs? Please use GitHub.", "link": "https://extensions.gnome.org/extension/1460/vitals/", "shell_version_map": {"38": {"version": "48", "sha256": "0nqnvs7zxglwhnrxac6ndjbcxgy7a5kcyyx16y5qpwk7x09y0fwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}, "40": {"version": "48", "sha256": "0nqnvs7zxglwhnrxac6ndjbcxgy7a5kcyyx16y5qpwk7x09y0fwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}, "41": {"version": "48", "sha256": "0nqnvs7zxglwhnrxac6ndjbcxgy7a5kcyyx16y5qpwk7x09y0fwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}}} -, {"uuid": "panel-date-format@keiii.github.com", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/1462/panel-date-format/", "shell_version_map": {"40": {"version": "4", "sha256": "0138as8506ql2k4v0y0qp66zbgqxxmb0g4ymcjkxyi4w9lmp9pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0138as8506ql2k4v0y0qp66zbgqxxmb0g4ymcjkxyi4w9lmp9pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "Vitals@CoreCoding.com", "name": "Vitals", "pname": "vitals", "description": "A glimpse into your computer's temperature, voltage, fan speed, memory usage, processor load, system resources, network speed and storage stats. This is a one stop shop to monitor all of your vital sensors. Uses asynchronous polling to provide a smooth user experience. Feature requests or bugs? Please use GitHub.", "link": "https://extensions.gnome.org/extension/1460/vitals/", "shell_version_map": {"38": {"version": "51", "sha256": "1ww56zlb3jrd3nlbnf0cm5vmfd2y44sp1k79ifzwp06b545kksc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"}, "40": {"version": "51", "sha256": "1ww56zlb3jrd3nlbnf0cm5vmfd2y44sp1k79ifzwp06b545kksc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"}, "41": {"version": "51", "sha256": "1ww56zlb3jrd3nlbnf0cm5vmfd2y44sp1k79ifzwp06b545kksc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"}}} +, {"uuid": "panel-date-format@keiii.github.com", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/1462/panel-date-format/", "shell_version_map": {"40": {"version": "7", "sha256": "0afqf8hkmg1fmnz0nn6jq6k7yl7vs69w0malqhf1bqfsn5w7ksdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0afqf8hkmg1fmnz0nn6jq6k7yl7vs69w0malqhf1bqfsn5w7ksdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "desktop-icons@csoriano", "name": "Desktop Icons", "pname": "desktop-icons", "description": "Add icons to the desktop", "link": "https://extensions.gnome.org/extension/1465/desktop-icons/", "shell_version_map": {"38": {"version": "19", "sha256": "01qdh1kigl3ck1mzgha1a9218lpam5b54ai72mpvr64gkaax2mcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBpY29ucyB0byB0aGUgZGVza3RvcCIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvV29ybGQvU2hlbGxFeHRlbnNpb25zL2Rlc2t0b3AtaWNvbnMiLAogICJ1dWlkIjogImRlc2t0b3AtaWNvbnNAY3Nvcmlhbm8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"uuid": "fullbattery@categulario.tk", "name": "Full Battery indicator", "pname": "full-battery-indicator", "description": "Notifies when battery is full", "link": "https://extensions.gnome.org/extension/1466/full-battery-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "rdesktop-menu@bastien.git.geekwu.org", "name": "Rdesktop launcher", "pname": "rdesktop-launcher", "description": "Add a servers status menu for quickly running rdesktop", "link": "https://extensions.gnome.org/extension/1467/rdesktop-launcher/", "shell_version_map": {"38": {"version": "13", "sha256": "10mmyanmwhk3l5q0db1lrd5qwl1yj4i6n66syi3ii8dvlwx1xg55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "10mmyanmwhk3l5q0db1lrd5qwl1yj4i6n66syi3ii8dvlwx1xg55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "10mmyanmwhk3l5q0db1lrd5qwl1yj4i6n66syi3ii8dvlwx1xg55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "tint-all@amarovita.github.com", "name": "Tint All", "pname": "tint-all", "description": "Colorize the entire gnome workspace. Amber, green, cyan, sepia and grayscale - just keep clicking extension icon. Scroll over extension icon to change fx level.", "link": "https://extensions.gnome.org/extension/1471/tint-all/", "shell_version_map": {"38": {"version": "7", "sha256": "1lflpza6kbdh4ql338vidij9c2gh2r116gfgih7lk4inkj1hqmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yaXplIHRoZSBlbnRpcmUgZ25vbWUgd29ya3NwYWNlLiBBbWJlciwgZ3JlZW4sIGN5YW4sIHNlcGlhIGFuZCBncmF5c2NhbGUgLSBqdXN0IGtlZXAgY2xpY2tpbmcgZXh0ZW5zaW9uIGljb24uIFNjcm9sbCBvdmVyIGV4dGVuc2lvbiBpY29uIHRvIGNoYW5nZSBmeCBsZXZlbC4iLAogICJuYW1lIjogIlRpbnQgQWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGludC1hbGxAYW1hcm92aXRhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1lflpza6kbdh4ql338vidij9c2gh2r116gfgih7lk4inkj1hqmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yaXplIHRoZSBlbnRpcmUgZ25vbWUgd29ya3NwYWNlLiBBbWJlciwgZ3JlZW4sIGN5YW4sIHNlcGlhIGFuZCBncmF5c2NhbGUgLSBqdXN0IGtlZXAgY2xpY2tpbmcgZXh0ZW5zaW9uIGljb24uIFNjcm9sbCBvdmVyIGV4dGVuc2lvbiBpY29uIHRvIGNoYW5nZSBmeCBsZXZlbC4iLAogICJuYW1lIjogIlRpbnQgQWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGludC1hbGxAYW1hcm92aXRhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1lflpza6kbdh4ql338vidij9c2gh2r116gfgih7lk4inkj1hqmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yaXplIHRoZSBlbnRpcmUgZ25vbWUgd29ya3NwYWNlLiBBbWJlciwgZ3JlZW4sIGN5YW4sIHNlcGlhIGFuZCBncmF5c2NhbGUgLSBqdXN0IGtlZXAgY2xpY2tpbmcgZXh0ZW5zaW9uIGljb24uIFNjcm9sbCBvdmVyIGV4dGVuc2lvbiBpY29uIHRvIGNoYW5nZSBmeCBsZXZlbC4iLAogICJuYW1lIjogIlRpbnQgQWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGludC1hbGxAYW1hcm92aXRhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "batime@martin.zurowietz.de", "name": "Battery Time", "pname": "battery-time", "description": "Show the remaining time until fully charged/discharged instead of the battery charge in percent in the panel.", "link": "https://extensions.gnome.org/extension/1475/battery-time/", "shell_version_map": {"40": {"version": "9", "sha256": "1xhh65f8h4k41f3vc90k4wwkjg9bgrihbzi0asjjaf10hvwzmfn4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYmF0aW1lIiwKICAidXVpZCI6ICJiYXRpbWVAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1xhh65f8h4k41f3vc90k4wwkjg9bgrihbzi0asjjaf10hvwzmfn4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYmF0aW1lIiwKICAidXVpZCI6ICJiYXRpbWVAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "batime@martin.zurowietz.de", "name": "Battery Time", "pname": "battery-time", "description": "Show the remaining time until fully charged/discharged instead of the battery charge in percent in the panel.", "link": "https://extensions.gnome.org/extension/1475/battery-time/", "shell_version_map": {"40": {"version": "10", "sha256": "0kfajnbkg7xgqsqhkxl111j21k3jr35yxbylip6iryyxjmsxx5bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYmF0aW1lIiwKICAidXVpZCI6ICJiYXRpbWVAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0kfajnbkg7xgqsqhkxl111j21k3jr35yxbylip6iryyxjmsxx5bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYmF0aW1lIiwKICAidXVpZCI6ICJiYXRpbWVAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "unlockDialogBackground@sun.wxg@gmail.com", "name": "Lock screen background", "pname": "unlock-dialog-background", "description": "Change lock screen background.\nIf you use Ubuntu, install package gir1.2-clutter-1.0 first.", "link": "https://extensions.gnome.org/extension/1476/unlock-dialog-background/", "shell_version_map": {"38": {"version": "18", "sha256": "1j9m4qkd0i6l4nxwpxjwvp3nh0zifpzvp0xwp4cqqlr2flb6lwps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiMy4zNi40IiwKICAgICIzLjM2LjUiLAogICAgIjMuMzYuNiIsCiAgICAiMy4zNi43IiwKICAgICIzLjM2LjgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVubG9ja0RpYWxvZ0JhY2tncm91bmQiLAogICJ1dWlkIjogInVubG9ja0RpYWxvZ0JhY2tncm91bmRAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "20", "sha256": "1gin7mpafmx8h177alhhlrjqpq5354napc0jqaj4l4f7ynzn4843", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVubG9ja0RpYWxvZ0JhY2tncm91bmQiLAogICJ1dWlkIjogInVubG9ja0RpYWxvZ0JhY2tncm91bmRAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "23", "sha256": "0j4mhrdmkwwsf52lcqbl0ln7rl3s64nb24862gahs26y4kpbaiv3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVubG9ja0RpYWxvZ0JhY2tncm91bmQiLAogICJ1dWlkIjogInVubG9ja0RpYWxvZ0JhY2tncm91bmRAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} , {"uuid": "wsmatrix@martin.zurowietz.de", "name": "Workspace Matrix", "pname": "workspace-matrix", "description": "Arrange workspaces in a two dimensional grid with workspace thumbnails.", "link": "https://extensions.gnome.org/extension/1485/workspace-matrix/", "shell_version_map": {"38": {"version": "27", "sha256": "0b76x0li5a8x42l67ykbw34k4cfmbxqvz36zighhfw4qmxsc36cr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLXdzbWF0cml4IiwKICAidXVpZCI6ICJ3c21hdHJpeEBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "40": {"version": "33", "sha256": "1pfq2sgz3h97xyqnxjzzjij3abd6132xjibhl2y3423ylwqg5xf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "1pfq2sgz3h97xyqnxjzzjij3abd6132xjibhl2y3423ylwqg5xf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} , {"uuid": "extensions-sync@elhan.io", "name": "Extensions Sync", "pname": "extensions-sync", "description": "Sync all extensions and their configurations across all gnome instances", "link": "https://extensions.gnome.org/extension/1486/extensions-sync/", "shell_version_map": {"38": {"version": "12", "sha256": "0yb0brjnqvvlqpdyh841qwh3q2d02vi1an0s93gb2b6kagy1g7zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "16", "sha256": "1bl8la3yg94mmzqh28n47kznaaivfbnxm3dwb71ddsr6gaf3n5p2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vYWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1zeW5jIiwKICAidXVpZCI6ICJleHRlbnNpb25zLXN5bmNAZWxoYW4uaW8iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1bl8la3yg94mmzqh28n47kznaaivfbnxm3dwb71ddsr6gaf3n5p2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vYWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1zeW5jIiwKICAidXVpZCI6ICJleHRlbnNpb25zLXN5bmNAZWxoYW4uaW8iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} @@ -237,7 +237,7 @@ , {"uuid": "dict@sun.wxg@gmail.com", "name": "Screen word translate", "pname": "screen-word-translate", "description": "Translate word on the screen.\nDefault web address is translate.google.com, you can add the web address for your own language. Also you can contribute your web address to my github repo.\nUse hotkey Ctrl+Alt+j to toggle the function.\nUse hotkey Ctrl+Alt+o to show popup window", "link": "https://extensions.gnome.org/extension/1849/screen-word-translate/", "shell_version_map": {"38": {"version": "32", "sha256": "0wh9d0siggr49bfcx1308xx8rxc58nadnhp3mjj53i6fvja3cx62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpY3QiLAogICJ1dWlkIjogImRpY3RAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}, "40": {"version": "38", "sha256": "19rpi2hqznwzngzw9zsar00mhmqav8v7wbij4r7cai4jgvmk8459", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGljdCIsCiAgInV1aWQiOiAiZGljdEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}, "41": {"version": "38", "sha256": "19rpi2hqznwzngzw9zsar00mhmqav8v7wbij4r7cai4jgvmk8459", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGljdCIsCiAgInV1aWQiOiAiZGljdEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}}} , {"uuid": "gamemode@christian.kellner.me", "name": "GameMode", "pname": "gamemode", "description": "Status indicator for GameMode", "link": "https://extensions.gnome.org/extension/1852/gamemode/", "shell_version_map": {"38": {"version": "6", "sha256": "05256a7rcw1db983w557cpl5vilkb0wg82xpja91j2lqnp7als5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naWNtby9nYW1lbW9kZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2RlQGNocmlzdGlhbi5rZWxsbmVyLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "05256a7rcw1db983w557cpl5vilkb0wg82xpja91j2lqnp7als5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naWNtby9nYW1lbW9kZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2RlQGNocmlzdGlhbi5rZWxsbmVyLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "05256a7rcw1db983w557cpl5vilkb0wg82xpja91j2lqnp7als5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naWNtby9nYW1lbW9kZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2RlQGNocmlzdGlhbi5rZWxsbmVyLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "unredirect@vaina.lt", "name": "Disable unredirect fullscreen windows", "pname": "disable-unredirect-fullscreen-windows", "description": "Disables unredirect fullscreen windows in gnome-shell", "link": "https://extensions.gnome.org/extension/1873/disable-unredirect-fullscreen-windows/", "shell_version_map": {"38": {"version": "4", "sha256": "114536ils1avmwzqxf41q78wg50ynpiyq9kiw7smbxnx6l4pds0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIiwKICAibmFtZSI6ICJEaXNhYmxlIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJLYXppbWllcmFzIFZhaW5hIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "114536ils1avmwzqxf41q78wg50ynpiyq9kiw7smbxnx6l4pds0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIiwKICAibmFtZSI6ICJEaXNhYmxlIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJLYXppbWllcmFzIFZhaW5hIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "114536ils1avmwzqxf41q78wg50ynpiyq9kiw7smbxnx6l4pds0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIiwKICAibmFtZSI6ICJEaXNhYmxlIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJLYXppbWllcmFzIFZhaW5hIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "krypto@sereneblue", "name": "krypto", "pname": "krypto", "description": "Cryptocurrency utility", "link": "https://extensions.gnome.org/extension/1913/krypto/", "shell_version_map": {"38": {"version": "5", "sha256": "0pmga4iqpm0i853lgqfhvnkxhji8m79pk9hgf24lvbpv8alkxzz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "16", "sha256": "076lym2yg4q5zhais0s1p0gwkavx1a4b1hak80qg6xx7w0xndsrd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "076lym2yg4q5zhais0s1p0gwkavx1a4b1hak80qg6xx7w0xndsrd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAxNgp9"}}} +, {"uuid": "krypto@sereneblue", "name": "krypto", "pname": "krypto", "description": "Cryptocurrency utility", "link": "https://extensions.gnome.org/extension/1913/krypto/", "shell_version_map": {"38": {"version": "5", "sha256": "0pmga4iqpm0i853lgqfhvnkxhji8m79pk9hgf24lvbpv8alkxzz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "17", "sha256": "0s6xv3ndjj2bhliyp9rxkxk3sqbbiff1x886ca03j5f8ywcg7x7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "0s6xv3ndjj2bhliyp9rxkxk3sqbbiff1x886ca03j5f8ywcg7x7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "cmus-status@yagreg7.gmail.com", "name": "cmus status", "pname": "cmus-status", "description": "Shows cmus status", "link": "https://extensions.gnome.org/extension/1934/cmus-status/", "shell_version_map": {"38": {"version": "8", "sha256": "1a6b10kirzbjlllcnffznjlljicah172kpvs0p8rmwhcpn88i8hx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGNtdXMgc3RhdHVzIiwKICAibmFtZSI6ICJjbXVzIHN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbXVzLXN0YXR1cy5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dyZWdUaGVNYWRNb25rL2dub21lLWNtdXMtc3RhdHVzIiwKICAidXVpZCI6ICJjbXVzLXN0YXR1c0B5YWdyZWc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "10", "sha256": "0a1g8l2w46nky88db7vjpv3iz87jk967vfm3vnvi7rw9wqphkn9z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGNtdXMgc3RhdHVzIiwKICAibmFtZSI6ICJjbXVzIHN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbXVzLXN0YXR1cy5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3JlZ1RoZU1hZE1vbmsvZ25vbWUtY211cy1zdGF0dXMiLAogICJ1dWlkIjogImNtdXMtc3RhdHVzQHlhZ3JlZzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0a1g8l2w46nky88db7vjpv3iz87jk967vfm3vnvi7rw9wqphkn9z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGNtdXMgc3RhdHVzIiwKICAibmFtZSI6ICJjbXVzIHN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbXVzLXN0YXR1cy5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3JlZ1RoZU1hZE1vbmsvZ25vbWUtY211cy1zdGF0dXMiLAogICJ1dWlkIjogImNtdXMtc3RhdHVzQHlhZ3JlZzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "no-title-bar@jonaspoehler.de", "name": "No Title Bar - Forked", "pname": "no-title-bar-forked", "description": "No Title Bar removes the title bar from non-GTK applications and moves the window title and buttons to the top panel.\n\nTitlebars are also hidden for Wayland-native clients that don't use CSD. Some of the options may be incompatible with this. For issues on Wayland please visit github!\n\nThis is a fork of https://extensions.gnome.org/extension/1267/no-title-bar/ with added compatibility for Gnome 3.32+.\n\nThis extension depends on some Xorg utilities. To install them:\n\n⚫ Debian/Ubuntu: apt install x11-utils\n⚫ Fedora/RHEL: dnf install xorg-x11-utils\n⚫ Arch: pacman -S xorg-xprop", "link": "https://extensions.gnome.org/extension/2015/no-title-bar-forked/", "shell_version_map": {"38": {"version": "5", "sha256": "0kch8yra13813gg3wa90lm57skqshmj3j1147lrqwhl9va9rk4q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIFRpdGxlIEJhciByZW1vdmVzIHRoZSB0aXRsZSBiYXIgZnJvbSBub24tR1RLIGFwcGxpY2F0aW9ucyBhbmQgbW92ZXMgdGhlIHdpbmRvdyB0aXRsZSBhbmQgYnV0dG9ucyB0byB0aGUgdG9wIHBhbmVsLlxuXG5UaXRsZWJhcnMgYXJlIGFsc28gaGlkZGVuIGZvciBXYXlsYW5kLW5hdGl2ZSBjbGllbnRzIHRoYXQgZG9uJ3QgdXNlIENTRC4gU29tZSBvZiB0aGUgb3B0aW9ucyBtYXkgYmUgaW5jb21wYXRpYmxlIHdpdGggdGhpcy4gRm9yIGlzc3VlcyBvbiBXYXlsYW5kIHBsZWFzZSB2aXNpdCBnaXRodWIhXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyNjcvbm8tdGl0bGUtYmFyLyB3aXRoIGFkZGVkIGNvbXBhdGliaWxpdHkgZm9yIEdub21lIDMuMzIrLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcblxuXHUyNmFiIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuXHUyNmFiIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuXHUyNmFiIEFyY2g6IHBhY21hbiAtUyB4b3JnLXhwcm9wIiwKICAibmFtZSI6ICJObyBUaXRsZSBCYXIgLSBGb3JrZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb2VobGVyai9uby10aXRsZS1iYXIiLAogICJ1dWlkIjogIm5vLXRpdGxlLWJhckBqb25hc3BvZWhsZXIuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "6", "sha256": "1plnj999qynsfvab6s01rfrdvw6m0s19b4zirhmlqrpax9vjl3zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIFRpdGxlIEJhciByZW1vdmVzIHRoZSB0aXRsZSBiYXIgZnJvbSBub24tR1RLIGFwcGxpY2F0aW9ucyBhbmQgbW92ZXMgdGhlIHdpbmRvdyB0aXRsZSBhbmQgYnV0dG9ucyB0byB0aGUgdG9wIHBhbmVsLlxuXG5UaXRsZWJhcnMgYXJlIGFsc28gaGlkZGVuIGZvciBXYXlsYW5kLW5hdGl2ZSBjbGllbnRzIHRoYXQgZG9uJ3QgdXNlIENTRC4gU29tZSBvZiB0aGUgb3B0aW9ucyBtYXkgYmUgaW5jb21wYXRpYmxlIHdpdGggdGhpcy4gRm9yIGlzc3VlcyBvbiBXYXlsYW5kIHBsZWFzZSB2aXNpdCBnaXRodWIhXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyNjcvbm8tdGl0bGUtYmFyLyB3aXRoIGFkZGVkIGNvbXBhdGliaWxpdHkgZm9yIEdub21lIDMuMzIrLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcblxuXHUyNmFiIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuXHUyNmFiIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuXHUyNmFiIEFyY2g6IHBhY21hbiAtUyB4b3JnLXhwcm9wIiwKICAibmFtZSI6ICJObyBUaXRsZSBCYXIgLSBGb3JrZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9laGxlcmovbm8tdGl0bGUtYmFyIiwKICAidXVpZCI6ICJuby10aXRsZS1iYXJAam9uYXNwb2VobGVyLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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": "24", "sha256": "1g8c9pz8i35kap730ly0h3lzz2qrzc9057zw9mpcwqkqkp6v1aw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9TaG93LUFwcGxpY2F0aW9uLVZpZXctV2hlbi1Xb3Jrc3BhY2UtRW1wdHkiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNAp9"}, "40": {"version": "24", "sha256": "1g8c9pz8i35kap730ly0h3lzz2qrzc9057zw9mpcwqkqkp6v1aw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9TaG93LUFwcGxpY2F0aW9uLVZpZXctV2hlbi1Xb3Jrc3BhY2UtRW1wdHkiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "1g8c9pz8i35kap730ly0h3lzz2qrzc9057zw9mpcwqkqkp6v1aw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9TaG93LUFwcGxpY2F0aW9uLVZpZXctV2hlbi1Xb3Jrc3BhY2UtRW1wdHkiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNAp9"}}} @@ -248,12 +248,12 @@ , {"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="}}} , {"uuid": "spotify-ad-block@danigm.net", "name": "Mute spotify ads", "pname": "mute-spotify-ads", "description": "Mute spotify ads", "link": "https://extensions.gnome.org/extension/2176/mute-spotify-ads/", "shell_version_map": {"38": {"version": "12", "sha256": "1hlayym3nnj5i547ffr1vcpjvzjqpzsmz7diqwgii99xr0qqy8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "1hlayym3nnj5i547ffr1vcpjvzjqpzsmz7diqwgii99xr0qqy8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1hlayym3nnj5i547ffr1vcpjvzjqpzsmz7diqwgii99xr0qqy8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"uuid": "noannoyance@daase.net", "name": "NoAnnoyance v2", "pname": "noannoyance", "description": "Another extension, that removes the 'Window is ready' notification and puts the window into focus. In contrast to all the other extensions, this uses ES6 syntax and is actively maintained.", "link": "https://extensions.gnome.org/extension/2182/noannoyance/", "shell_version_map": {"38": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}}} +, {"uuid": "noannoyance@daase.net", "name": "NoAnnoyance v2", "pname": "noannoyance", "description": "Another extension, that removes the 'Window is ready' notification and puts the window into focus. In contrast to all the other extensions, this uses ES6 syntax and is actively maintained.", "link": "https://extensions.gnome.org/extension/2182/noannoyance/", "shell_version_map": {"38": {"version": "12", "sha256": "1wr1wxmaxb569m3wsfdhs0jdpq1zqx3bkk6dgn9iswbbr060bnd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "12", "sha256": "1wr1wxmaxb569m3wsfdhs0jdpq1zqx3bkk6dgn9iswbbr060bnd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "1wr1wxmaxb569m3wsfdhs0jdpq1zqx3bkk6dgn9iswbbr060bnd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"uuid": "vim-altTab@kokong.info", "name": "VIM Alt-Tab", "pname": "vim-alt-tab", "description": "Add the ability to switch between windows and applications using vim-like keypresses (h, j, k, l)", "link": "https://extensions.gnome.org/extension/2212/vim-alt-tab/", "shell_version_map": {"38": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "easy_docker_containers@red.software.systems", "name": "Easy Docker Containers", "pname": "easy-docker-containers", "description": "A GNOME Shell extension (GNOME Panel applet) to be able to generally control your available Docker containers.", "link": "https://extensions.gnome.org/extension/2224/easy-docker-containers/", "shell_version_map": {"38": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "nightthemeswitcher@romainvigier.fr", "name": "Night Theme Switcher", "pname": "night-theme-switcher", "description": "Make your desktop easy on the eye, day and night.\n\nAutomatically toggle the color scheme between light and dark, switch backgrounds and run custom commands at sunset and sunrise.\n\nSupports Night Light, Location Services, manual schedule and on-demand switch modes.", "link": "https://extensions.gnome.org/extension/2236/night-theme-switcher/", "shell_version_map": {"38": {"version": "46", "sha256": "0x3mggffn6ydfkv09gwq62wgkm8zga214616jp60mpwp4ly0xphm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA0Ngp9"}, "40": {"version": "51", "sha256": "1pnljdl2syh0lv2ih2ps2im2pnyzkwsbzsvv3f8q7zf669jxca9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNTEKfQ=="}, "41": {"version": "55", "sha256": "151lwn6qlh1b91f9c58s7xw5jd7ygvqpr68299qqgn7hvjg0qh6z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNTUKfQ=="}}} +, {"uuid": "nightthemeswitcher@romainvigier.fr", "name": "Night Theme Switcher", "pname": "night-theme-switcher", "description": "Make your desktop easy on the eye, day and night.\n\nAutomatically toggle the color scheme between light and dark, switch backgrounds and run custom commands at sunset and sunrise.\n\nSupports Night Light, Location Services, manual schedule and on-demand switch modes.\n", "link": "https://extensions.gnome.org/extension/2236/night-theme-switcher/", "shell_version_map": {"38": {"version": "46", "sha256": "138rih3y78qppl5mg86509d6y49s41g3lj74zb5sy6wszv7pv7fi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy5cbiIsCiAgImdldHRleHQtZG9tYWluIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJuYW1lIjogIk5pZ2h0IFRoZW1lIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9uaWdodHRoZW1lc3dpdGNoZXIucm9tYWludmlnaWVyLmZyIiwKICAidXVpZCI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "40": {"version": "51", "sha256": "0q71z47bszijdg00d5mq3sc9ziliik4iqzm4qg22gc9cyz95c9v4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy5cbiIsCiAgImdldHRleHQtZG9tYWluIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJuYW1lIjogIk5pZ2h0IFRoZW1lIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA1MQp9"}, "41": {"version": "55", "sha256": "1946qhpgyxf73czkqjs9b2ggj93ibgxvi9drj0d71gyws3j7h2l3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy5cbiIsCiAgImdldHRleHQtZG9tYWluIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJuYW1lIjogIk5pZ2h0IFRoZW1lIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA1NQp9"}}} , {"uuid": "binaryclock@vancha.march", "name": "binaryclock", "pname": "binaryclock", "description": "adds a binary clock to the gnome bar", "link": "https://extensions.gnome.org/extension/2284/binaryclock/", "shell_version_map": {"38": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"}}} -, {"uuid": "lgbutton@glerro.gnome.gitlab.io", "name": "Looking Glass Button", "pname": "looking-glass-button", "description": "Toggle the Looking Glass visibility by clicking on a panel icon.", "link": "https://extensions.gnome.org/extension/2296/looking-glass-button/", "shell_version_map": {"38": {"version": "7", "sha256": "01sbrsfvxwvzgxd5cdvrzb6gl573hw30hy50ihqy43hari95jk8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "01sbrsfvxwvzgxd5cdvrzb6gl573hw30hy50ihqy43hari95jk8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "01sbrsfvxwvzgxd5cdvrzb6gl573hw30hy50ihqy43hari95jk8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "lgbutton@glerro.gnome.gitlab.io", "name": "Looking Glass Button", "pname": "looking-glass-button", "description": "Toggle the Looking Glass visibility by clicking on a panel icon.\n\nAnd from version 4 left clicking on the icon show a menu with new features like Restart Gnome Shell (not available on Wayland), Reload Theme, Open Extension Folder and Open Theme Folder (the last two require that xdg-open is installed).\n\nVersion 4 also drop the compatibility with Gnome Shell 3.30.", "link": "https://extensions.gnome.org/extension/2296/looking-glass-button/", "shell_version_map": {"38": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "tp_wattmeter@gistart", "name": "tp_wattmeter", "pname": "tp_wattmeter", "description": "Shows battery power consumption of ThinkPad laptops", "link": "https://extensions.gnome.org/extension/2308/tp_wattmeter/", "shell_version_map": {"40": {"version": "4", "sha256": "1v8rw7msfy2d8nwnppdpci62sl6iw8973z5gsl8024awl27ni38z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcyIsCiAgIm5hbWUiOiAidHBfd2F0dG1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2LjAiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naXN0YXJ0L3RwX3dhdHRtZXRlciIsCiAgInV1aWQiOiAidHBfd2F0dG1ldGVyQGdpc3RhcnQiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "Denon_AVR_controler@sylter.fr", "name": "Denon AVR controler", "pname": "denon-avr-controler", "description": "Control a Denon audio video receiver through the network.\n- on/off switch\n- volume adjustment", "link": "https://extensions.gnome.org/extension/2371/denon-avr-controler/", "shell_version_map": {"38": {"version": "4", "sha256": "0c8ky3v70arnblix717jz9fsksr42673as9nmzfyh2p2h1zm03wq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYSBEZW5vbiBhdWRpbyB2aWRlbyByZWNlaXZlciB0aHJvdWdoIHRoZSBuZXR3b3JrLlxuLSBvbi9vZmYgc3dpdGNoXG4tIHZvbHVtZSBhZGp1c3RtZW50IiwKICAibmFtZSI6ICJEZW5vbiBBVlIgY29udHJvbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2ZyYW1hZ2l0Lm9yZy9zeWx0ZXIvZGVub24tYXZyLWNvbnRyb2xlciIsCiAgInV1aWQiOiAiRGVub25fQVZSX2NvbnRyb2xlckBzeWx0ZXIuZnIiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "hide-universal-access@akiirui.github.io", "name": "Hide Universal Access", "pname": "hide-universal-access", "description": "Hide Universal Access icon from the status bar", "link": "https://extensions.gnome.org/extension/2398/hide-universal-access/", "shell_version_map": {"38": {"version": "10", "sha256": "08sjlxfw19905lbxc8jkb3z8m5kqq7gfxcd57w64wb5xhpwrf379", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWtpaXJ1aS9oaWRlLXVuaXZlcnNhbC1hY2Nlc3MiLAogICJ1dWlkIjogImhpZGUtdW5pdmVyc2FsLWFjY2Vzc0Bha2lpcnVpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "08sjlxfw19905lbxc8jkb3z8m5kqq7gfxcd57w64wb5xhpwrf379", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWtpaXJ1aS9oaWRlLXVuaXZlcnNhbC1hY2Nlc3MiLAogICJ1dWlkIjogImhpZGUtdW5pdmVyc2FsLWFjY2Vzc0Bha2lpcnVpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "08sjlxfw19905lbxc8jkb3z8m5kqq7gfxcd57w64wb5xhpwrf379", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWtpaXJ1aS9oaWRlLXVuaXZlcnNhbC1hY2Nlc3MiLAogICJ1dWlkIjogImhpZGUtdW5pdmVyc2FsLWFjY2Vzc0Bha2lpcnVpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} @@ -272,13 +272,13 @@ , {"uuid": "nbfcindicator@mgokcaykdev.gmail.com", "name": "Nbfc Indicator", "pname": "nbfc-indicator", "description": "Notebook Fan Control Indicator for Gnome Shell", "link": "https://extensions.gnome.org/extension/2624/nbfc-indicator/", "shell_version_map": {"40": {"version": "7", "sha256": "0hp7giwdcsk8p442q0x9214dv59ziyjswli6mccyb8v814k3p8ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGVib29rIEZhbiBDb250cm9sIEluZGljYXRvciBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYmZjaW5kaWNhdG9yIiwKICAibmFtZSI6ICJOYmZjIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYmZjaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01Hb2tjYXlLL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtbmJmY2luZGljYXRvciIsCiAgInV1aWQiOiAibmJmY2luZGljYXRvckBtZ29rY2F5a2Rldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "user-id-in-top-panel@fthx", "name": "User id in top panel", "pname": "user-id-in-top-panel", "description": "Add ( user name :: user id @ host ) in top panel.", "link": "https://extensions.gnome.org/extension/2633/user-id-in-top-panel/", "shell_version_map": {"38": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "hide-minimized@danigm.net", "name": "Hide minimized", "pname": "hide-minimized", "description": "Hide minimized in overview", "link": "https://extensions.gnome.org/extension/2639/hide-minimized/", "shell_version_map": {"38": {"version": "4", "sha256": "0v2vrm3p5czzvs2kc8dh3h1ijh7i8x6z2b9gdvqbfny45g7blfaa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0v2vrm3p5czzvs2kc8dh3h1ijh7i8x6z2b9gdvqbfny45g7blfaa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0v2vrm3p5czzvs2kc8dh3h1ijh7i8x6z2b9gdvqbfny45g7blfaa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "display-brightness-ddcutil@themightydeity.github.com", "name": "Brightness control using ddcutil", "pname": "brightness-control-using-ddcutil", "description": "Brightness control for all the monitors detected by ddcutil\nThis tool uses ddcutil as backend for communication with your display.\n\nUpdate 2022-Feb-07: Possibility to have Only \"All\" slider \nUpdated 2022-Jan-05: There are multiple ways of listing the control sliders, either in top bar or in system menu, with or without value labels.\n\nRead setup instructions from: https://github.com/daitj/gnome-display-brightness-ddcutil/blob/master/README.md", "link": "https://extensions.gnome.org/extension/2645/brightness-control-using-ddcutil/", "shell_version_map": {"38": {"version": "10", "sha256": "048i421k0y0ifj77w44hfz0ysd9bly2c91syiqnyhasqxhpnwkp3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZSAyMDIyLUZlYi0wNzogUG9zc2liaWxpdHkgdG8gaGF2ZSBPbmx5IFwiQWxsXCIgc2xpZGVyIFxuVXBkYXRlZCAyMDIyLUphbi0wNTogVGhlcmUgYXJlIG11bHRpcGxlIHdheXMgb2YgbGlzdGluZyB0aGUgY29udHJvbCBzbGlkZXJzLCBlaXRoZXIgaW4gdG9wIGJhciBvciBpbiBzeXN0ZW0gbWVudSwgd2l0aCBvciB3aXRob3V0IHZhbHVlIGxhYmVscy5cblxuUmVhZCBzZXR1cCBpbnN0cnVjdGlvbnMgZnJvbTogaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsL2Jsb2IvbWFzdGVyL1JFQURNRS5tZCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "25", "sha256": "1qaflr9xbpx85vrzv7m8nbaz9ys2iaq2cwziznhb802wbf2j77lc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZSAyMDIyLUZlYi0wNzogUG9zc2liaWxpdHkgdG8gaGF2ZSBPbmx5IFwiQWxsXCIgc2xpZGVyIFxuVXBkYXRlZCAyMDIyLUphbi0wNTogVGhlcmUgYXJlIG11bHRpcGxlIHdheXMgb2YgbGlzdGluZyB0aGUgY29udHJvbCBzbGlkZXJzLCBlaXRoZXIgaW4gdG9wIGJhciBvciBpbiBzeXN0ZW0gbWVudSwgd2l0aCBvciB3aXRob3V0IHZhbHVlIGxhYmVscy5cblxuUmVhZCBzZXR1cCBpbnN0cnVjdGlvbnMgZnJvbTogaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsL2Jsb2IvbWFzdGVyL1JFQURNRS5tZCIsCiAgImdldHRleHQtZG9tYWluIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAibmFtZSI6ICJCcmlnaHRuZXNzIGNvbnRyb2wgdXNpbmcgZGRjdXRpbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "1qaflr9xbpx85vrzv7m8nbaz9ys2iaq2cwziznhb802wbf2j77lc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZSAyMDIyLUZlYi0wNzogUG9zc2liaWxpdHkgdG8gaGF2ZSBPbmx5IFwiQWxsXCIgc2xpZGVyIFxuVXBkYXRlZCAyMDIyLUphbi0wNTogVGhlcmUgYXJlIG11bHRpcGxlIHdheXMgb2YgbGlzdGluZyB0aGUgY29udHJvbCBzbGlkZXJzLCBlaXRoZXIgaW4gdG9wIGJhciBvciBpbiBzeXN0ZW0gbWVudSwgd2l0aCBvciB3aXRob3V0IHZhbHVlIGxhYmVscy5cblxuUmVhZCBzZXR1cCBpbnN0cnVjdGlvbnMgZnJvbTogaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsL2Jsb2IvbWFzdGVyL1JFQURNRS5tZCIsCiAgImdldHRleHQtZG9tYWluIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAibmFtZSI6ICJCcmlnaHRuZXNzIGNvbnRyb2wgdXNpbmcgZGRjdXRpbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} +, {"uuid": "display-brightness-ddcutil@themightydeity.github.com", "name": "Brightness control using ddcutil", "pname": "brightness-control-using-ddcutil", "description": "Brightness control for all the monitors detected by ddcutil\nThis tool uses ddcutil as backend for communication with your display.\n\nUpdated 2022-Jan-05: There are multiple ways of listing the control sliders, either in top bar or in system menu, with or without value labels.\n\nRead setup instructions from: https://github.com/daitj/gnome-display-brightness-ddcutil/blob/master/README.md", "link": "https://extensions.gnome.org/extension/2645/brightness-control-using-ddcutil/", "shell_version_map": {"38": {"version": "10", "sha256": "0r8l1iipfxrsmmch0pgi9jpxk58cqn93igs1cp8sx73l1cxr5ik4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJuYW1lIjogIkJyaWdodG5lc3MgY29udHJvbCB1c2luZyBkZGN1dGlsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "28", "sha256": "0bb27sraknlqbdpavf0hrwcz4kl4bmrkc70491g9fbfhvr37jyq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "41": {"version": "28", "sha256": "0bb27sraknlqbdpavf0hrwcz4kl4bmrkc70491g9fbfhvr37jyq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI4Cn0="}}} , {"uuid": "timezones@masquerade-circus.net", "name": "Timezones extension", "pname": "timezones-extension", "description": "Show multiple clocks in the panel. For those who need more than one additional clock.", "link": "https://extensions.gnome.org/extension/2657/timezones-extension/", "shell_version_map": {"38": {"version": "2", "sha256": "0vkqwrn0kvmng003h26zvzd5ym4h971hvcspb5iq7042lhxxc2hf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFzcXVlcmFkZS1DaXJjdXMvZ25vbWUtdGltZXpvbmVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "0vkqwrn0kvmng003h26zvzd5ym4h971hvcspb5iq7042lhxxc2hf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFzcXVlcmFkZS1DaXJjdXMvZ25vbWUtdGltZXpvbmVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0vkqwrn0kvmng003h26zvzd5ym4h971hvcspb5iq7042lhxxc2hf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFzcXVlcmFkZS1DaXJjdXMvZ25vbWUtdGltZXpvbmVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "transparent-panel@fthx", "name": "Ubuntu-like Panel", "pname": "transparent-panel", "description": "Panel: transparent, straight, reduced height, non-bold fonts. Nothing more.\n\nLooks roughly like Ubuntu session's panel (Yaru). You can easily modify the transparency level through the CSS stylesheet in the extensions's folder.", "link": "https://extensions.gnome.org/extension/2660/transparent-panel/", "shell_version_map": {"40": {"version": "3", "sha256": "042cbxdvh4nxv72dd6ikm37brgb2wc1yaxsznyavjwr53awjbbzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "042cbxdvh4nxv72dd6ikm37brgb2wc1yaxsznyavjwr53awjbbzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "mounter@heartmire", "name": "Mounter", "pname": "mounter", "description": "Mount and umount fstab entries with 'noauto,user' options.\n\n/etc/fstab example that will be picked up and listed by the extension:\n192.168.1.1:/mnt/data/users/martin /mnt/server-martin nfs noauto,user,noatime,rw 0 0\n\nToggle the menu with the shortcut: CTRL + ALT + m", "link": "https://extensions.gnome.org/extension/2666/mounter/", "shell_version_map": {"38": {"version": "5", "sha256": "13nxnpiv8f9bzxqgv3iinb92ib9zk3jmmx273acs25lcjcw8v6l0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdW50IGFuZCB1bW91bnQgZnN0YWIgZW50cmllcyB3aXRoICdub2F1dG8sdXNlcicgb3B0aW9ucy5cblxuL2V0Yy9mc3RhYiBleGFtcGxlIHRoYXQgd2lsbCBiZSBwaWNrZWQgdXAgYW5kIGxpc3RlZCBieSB0aGUgZXh0ZW5zaW9uOlxuMTkyLjE2OC4xLjE6L21udC9kYXRhL3VzZXJzL21hcnRpbiAgL21udC9zZXJ2ZXItbWFydGluICBuZnMgIG5vYXV0byx1c2VyLG5vYXRpbWUscncgIDAgIDBcblxuVG9nZ2xlIHRoZSBtZW51IHdpdGggdGhlIHNob3J0Y3V0OiBDVFJMICsgQUxUICsgbSIsCiAgIm5hbWUiOiAiTW91bnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tb3VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW91bnRlciIsCiAgInV1aWQiOiAibW91bnRlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "13nxnpiv8f9bzxqgv3iinb92ib9zk3jmmx273acs25lcjcw8v6l0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdW50IGFuZCB1bW91bnQgZnN0YWIgZW50cmllcyB3aXRoICdub2F1dG8sdXNlcicgb3B0aW9ucy5cblxuL2V0Yy9mc3RhYiBleGFtcGxlIHRoYXQgd2lsbCBiZSBwaWNrZWQgdXAgYW5kIGxpc3RlZCBieSB0aGUgZXh0ZW5zaW9uOlxuMTkyLjE2OC4xLjE6L21udC9kYXRhL3VzZXJzL21hcnRpbiAgL21udC9zZXJ2ZXItbWFydGluICBuZnMgIG5vYXV0byx1c2VyLG5vYXRpbWUscncgIDAgIDBcblxuVG9nZ2xlIHRoZSBtZW51IHdpdGggdGhlIHNob3J0Y3V0OiBDVFJMICsgQUxUICsgbSIsCiAgIm5hbWUiOiAiTW91bnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tb3VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW91bnRlciIsCiAgInV1aWQiOiAibW91bnRlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "13nxnpiv8f9bzxqgv3iinb92ib9zk3jmmx273acs25lcjcw8v6l0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdW50IGFuZCB1bW91bnQgZnN0YWIgZW50cmllcyB3aXRoICdub2F1dG8sdXNlcicgb3B0aW9ucy5cblxuL2V0Yy9mc3RhYiBleGFtcGxlIHRoYXQgd2lsbCBiZSBwaWNrZWQgdXAgYW5kIGxpc3RlZCBieSB0aGUgZXh0ZW5zaW9uOlxuMTkyLjE2OC4xLjE6L21udC9kYXRhL3VzZXJzL21hcnRpbiAgL21udC9zZXJ2ZXItbWFydGluICBuZnMgIG5vYXV0byx1c2VyLG5vYXRpbWUscncgIDAgIDBcblxuVG9nZ2xlIHRoZSBtZW51IHdpdGggdGhlIHNob3J0Y3V0OiBDVFJMICsgQUxUICsgbSIsCiAgIm5hbWUiOiAiTW91bnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tb3VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW91bnRlciIsCiAgInV1aWQiOiAibW91bnRlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "simple-task-bar@fthx", "name": "Simple Task Bar", "pname": "simple-task-bar", "description": "*** Superseeded by https://extensions.gnome.org/extension/4000/babar. ***\n\nTask bar in the top panel, tasks on all workspaces.\n\n Basic actions, nothing more : activate, minimize, switch, per-desktop overview. Some settings through GNOME Extensions manager, thanks @leleat.\n\n This extension can hide the Activities button and makes the Places Menu extension's label become a folder icon.\n\n This extension is *light* and should *not interfere* with GNOME Shell behaviour+logic. If you want more, please consider installing Dash to Panel.", "link": "https://extensions.gnome.org/extension/2672/simple-task-bar/", "shell_version_map": {"38": {"version": "33", "sha256": "0rsvfymmnljqikarihmgs2fdi14pclfdhwrsz06zxzxd6nvmj4x1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIioqKiBTdXBlcnNlZWRlZCBieSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80MDAwL2JhYmFyLiAqKipcblxuVGFzayBiYXIgaW4gdGhlIHRvcCBwYW5lbCwgdGFza3Mgb24gYWxsIHdvcmtzcGFjZXMuXG5cbiBCYXNpYyBhY3Rpb25zLCBub3RoaW5nIG1vcmUgOiBhY3RpdmF0ZSwgbWluaW1pemUsIHN3aXRjaCwgcGVyLWRlc2t0b3Agb3ZlcnZpZXcuIFNvbWUgc2V0dGluZ3MgdGhyb3VnaCBHTk9NRSBFeHRlbnNpb25zIG1hbmFnZXIsIHRoYW5rcyBAbGVsZWF0LlxuXG4gVGhpcyBleHRlbnNpb24gY2FuIGhpZGUgdGhlIEFjdGl2aXRpZXMgYnV0dG9uIGFuZCBtYWtlcyB0aGUgUGxhY2VzIE1lbnUgZXh0ZW5zaW9uJ3MgbGFiZWwgYmVjb21lIGEgZm9sZGVyIGljb24uXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyAqbGlnaHQqIGFuZCBzaG91bGQgKm5vdCBpbnRlcmZlcmUqIHdpdGggR05PTUUgU2hlbGwgYmVoYXZpb3VyK2xvZ2ljLiBJZiB5b3Ugd2FudCBtb3JlLCBwbGVhc2UgY29uc2lkZXIgaW5zdGFsbGluZyBEYXNoIHRvIFBhbmVsLiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRhc2sgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zaW1wbGUtdGFzay1iYXIiLAogICJ1dWlkIjogInNpbXBsZS10YXNrLWJhckBmdGh4IiwKICAidmVyc2lvbiI6IDMzCn0="}}} , {"uuid": "minimize-shelf@etenil", "name": "Minimize Shelf", "pname": "minimize-shelf", "description": "Minimize shelf in the top panel, with minimized windows of the current workspace.\nThis extension is light and should not interfere with GNOME Shell behaviour+logic.", "link": "https://extensions.gnome.org/extension/2735/minimize-shelf/", "shell_version_map": {"40": {"version": "10", "sha256": "0kslw9nikb6nza9axvw0salkdx2nx1bpgfrlznprw7xf43x2dqyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuVGhpcyBleHRlbnNpb24gaXMgbGlnaHQgYW5kIHNob3VsZCBub3QgaW50ZXJmZXJlIHdpdGggR05PTUUgU2hlbGwgYmVoYXZpb3VyK2xvZ2ljLiIsCiAgIm5hbWUiOiAiTWluaW1pemUgU2hlbGYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXRpc3Rlby9taW5pbWl6ZS1zaGVsZiIsCiAgInV1aWQiOiAibWluaW1pemUtc2hlbGZAZXRlbmlsIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0kslw9nikb6nza9axvw0salkdx2nx1bpgfrlznprw7xf43x2dqyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuVGhpcyBleHRlbnNpb24gaXMgbGlnaHQgYW5kIHNob3VsZCBub3QgaW50ZXJmZXJlIHdpdGggR05PTUUgU2hlbGwgYmVoYXZpb3VyK2xvZ2ljLiIsCiAgIm5hbWUiOiAiTWluaW1pemUgU2hlbGYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXRpc3Rlby9taW5pbWl6ZS1zaGVsZiIsCiAgInV1aWQiOiAibWluaW1pemUtc2hlbGZAZXRlbmlsIiwKICAidmVyc2lvbiI6IDEwCn0="}}} -, {"uuid": "remove-alt-tab-delay@daase.net", "name": "Remove Alt+Tab Delay v2", "pname": "remove-alttab-delay-v2", "description": "Another extension that removes the 0.15 second popup delay in switcher pop-ups. This extension is actively maintained. It fixes at least this known issue: https://gitlab.gnome.org/GNOME/mutter/issues/888.", "link": "https://extensions.gnome.org/extension/2741/remove-alttab-delay-v2/", "shell_version_map": {"38": {"version": "6", "sha256": "02s82kndphmhx5vxldh08ig04jzhyg4dw73fi2j7vxs1hg9drv9a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL3JlbW92ZS1hbHQtdGFiLWRlbGF5IiwKICAidXVpZCI6ICJyZW1vdmUtYWx0LXRhYi1kZWxheUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "02s82kndphmhx5vxldh08ig04jzhyg4dw73fi2j7vxs1hg9drv9a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL3JlbW92ZS1hbHQtdGFiLWRlbGF5IiwKICAidXVpZCI6ICJyZW1vdmUtYWx0LXRhYi1kZWxheUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "02s82kndphmhx5vxldh08ig04jzhyg4dw73fi2j7vxs1hg9drv9a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL3JlbW92ZS1hbHQtdGFiLWRlbGF5IiwKICAidXVpZCI6ICJyZW1vdmUtYWx0LXRhYi1kZWxheUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "remove-alt-tab-delay@daase.net", "name": "Remove Alt+Tab Delay v2", "pname": "remove-alttab-delay-v2", "description": "Another extension that removes the 0.15 second popup delay in switcher pop-ups. This extension is actively maintained. It fixes at least this known issue: https://gitlab.gnome.org/GNOME/mutter/issues/888.", "link": "https://extensions.gnome.org/extension/2741/remove-alttab-delay-v2/", "shell_version_map": {"38": {"version": "7", "sha256": "0zzckr3w5547ja42pq4gyfqkvd7xfnh5pwsbdqbxrdjd5d0sh7rv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9yZW1vdmUtYWx0LXRhYi1kZWxheSIsCiAgInV1aWQiOiAicmVtb3ZlLWFsdC10YWItZGVsYXlAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0zzckr3w5547ja42pq4gyfqkvd7xfnh5pwsbdqbxrdjd5d0sh7rv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9yZW1vdmUtYWx0LXRhYi1kZWxheSIsCiAgInV1aWQiOiAicmVtb3ZlLWFsdC10YWItZGVsYXlAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0zzckr3w5547ja42pq4gyfqkvd7xfnh5pwsbdqbxrdjd5d0sh7rv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9yZW1vdmUtYWx0LXRhYi1kZWxheSIsCiAgInV1aWQiOiAicmVtb3ZlLWFsdC10YWItZGVsYXlAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "corona-tracker@lachhebo.github.io", "name": "corona-tracker", "pname": "corona-tracker", "description": "A GNOME Shell extension (GNOME Panel applet) to notify you every day with information about the COVID-19 virus spread.", "link": "https://extensions.gnome.org/extension/2767/corona-tracker/", "shell_version_map": {"38": {"version": "14", "sha256": "12mnlkh2l23wdx6m28x332lhqd0yq16zhfnmdhk6bzma7wq73sxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIG5vdGlmeSB5b3UgZXZlcnkgZGF5IHdpdGggaW5mb3JtYXRpb24gYWJvdXQgdGhlIENPVklELTE5IHZpcnVzIHNwcmVhZC4iLAogICJuYW1lIjogImNvcm9uYS10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhY2hoZWJvL2Nvcm9uYS10cmFja2VyIiwKICAidXVpZCI6ICJjb3JvbmEtdHJhY2tlckBsYWNoaGViby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "14", "sha256": "12mnlkh2l23wdx6m28x332lhqd0yq16zhfnmdhk6bzma7wq73sxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIG5vdGlmeSB5b3UgZXZlcnkgZGF5IHdpdGggaW5mb3JtYXRpb24gYWJvdXQgdGhlIENPVklELTE5IHZpcnVzIHNwcmVhZC4iLAogICJuYW1lIjogImNvcm9uYS10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhY2hoZWJvL2Nvcm9uYS10cmFja2VyIiwKICAidXVpZCI6ICJjb3JvbmEtdHJhY2tlckBsYWNoaGViby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "gnome-trash@gnome-trash.b00f.gitlab.com", "name": "Gnome Trash - UNMAINTAINED", "pname": "gnome-trash", "description": "MOVED HERE:\n\nhttps://github.com/b00f/gnome-trash", "link": "https://extensions.gnome.org/extension/2773/gnome-trash/", "shell_version_map": {"38": {"version": "13", "sha256": "1z7da74nvl4wvy6ckv55xkl3sc5qzcv6lz5k6bdfa0xcshifhl6h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1PVkVEIEhFUkU6XG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdHJhc2giLAogICJuYW1lIjogIkdub21lIFRyYXNoIC0gVU5NQUlOVEFJTkVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYjAwZi9nbm9tZS10cmFzaCIsCiAgInV1aWQiOiAiZ25vbWUtdHJhc2hAZ25vbWUtdHJhc2guYjAwZi5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "customgestures@raushankumar27.github.com", "name": "Custom 3 Finger Gestures", "pname": "custom-3-finger-gestures", "description": "3 Finger touchpad gestures into gnome-shell", "link": "https://extensions.gnome.org/extension/2781/custom-3-finger-gestures/", "shell_version_map": {"38": {"version": "7", "sha256": "1a51rlf5fjlzlm2y3cv1ncf4glqa48rkpi0z1b8hd5m1fzgdx6m9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIjMgRmluZ2VyIHRvdWNocGFkIGdlc3R1cmVzIGludG8gZ25vbWUtc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b21nZXN0dXJlcyIsCiAgIm5hbWUiOiAiQ3VzdG9tIDMgRmluZ2VyIEdlc3R1cmVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbWdlc3R1cmVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1c2hhbmt1bWFyMjcvY3VzdG9tZ2VzdHVyZSIsCiAgInV1aWQiOiAiY3VzdG9tZ2VzdHVyZXNAcmF1c2hhbmt1bWFyMjcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} @@ -304,12 +304,12 @@ , {"uuid": "ControlBlurEffectOnLockScreen@pratap.fastmail.fm", "name": "Control Blur Effect On Lock Screen", "pname": "control-blur-effect-on-lock-screen", "description": "Control the Blur Effect On Lock Screen.", "link": "https://extensions.gnome.org/extension/2935/control-blur-effect-on-lock-screen/", "shell_version_map": {"38": {"version": "14", "sha256": "176qxx2zykzzjq2xf8sf1c83r1skaxa2mzmp51v8bq3vbbxp0wij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "17", "sha256": "1n8442n54hwjx1z4qww5mvb3w5v322d9zc78wm0kx378p4s3shsq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0NvbnRyb2xfQmx1cl9FZmZlY3RfT25fTG9ja19TY3JlZW4iLAogICJ1dWlkIjogIkNvbnRyb2xCbHVyRWZmZWN0T25Mb2NrU2NyZWVuQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "1n8442n54hwjx1z4qww5mvb3w5v322d9zc78wm0kx378p4s3shsq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0NvbnRyb2xfQmx1cl9FZmZlY3RfT25fTG9ja19TY3JlZW4iLAogICJ1dWlkIjogIkNvbnRyb2xCbHVyRWZmZWN0T25Mb2NrU2NyZWVuQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxNwp9"}}} , {"uuid": "compiz-alike-windows-effect@hermes83.github.com", "name": "Compiz alike windows effect", "pname": "compiz-alike-windows-effect", "description": "Wobbly windows effect inspired by the Compiz ones\n\nNB\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)\n\n-----------------------------------\n ALTERNATIVE\n-----------------------------------\nalternative extension to obtain an effect more similar to the original:\nhttps://extensions.gnome.org/extension/3210/compiz-windows-effect/", "link": "https://extensions.gnome.org/extension/2950/compiz-alike-windows-effect/", "shell_version_map": {"38": {"version": "22", "sha256": "0zkc9lcirqg224m46jjz2vapfg4lg9x7s0h0kvv57rfmkhrxcgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvYmJseSB3aW5kb3dzIGVmZmVjdCBpbnNwaXJlZCBieSB0aGUgQ29tcGl6IG9uZXNcblxuTkJcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIEFMVEVSTkFUSVZFXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuYWx0ZXJuYXRpdmUgZXh0ZW5zaW9uIHRvIG9idGFpbiBhbiBlZmZlY3QgbW9yZSBzaW1pbGFyIHRvIHRoZSBvcmlnaW5hbDpcbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzMyMTAvY29tcGl6LXdpbmRvd3MtZWZmZWN0LyIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIHdpbmRvd3MgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2Utd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "22", "sha256": "0zkc9lcirqg224m46jjz2vapfg4lg9x7s0h0kvv57rfmkhrxcgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvYmJseSB3aW5kb3dzIGVmZmVjdCBpbnNwaXJlZCBieSB0aGUgQ29tcGl6IG9uZXNcblxuTkJcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIEFMVEVSTkFUSVZFXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuYWx0ZXJuYXRpdmUgZXh0ZW5zaW9uIHRvIG9idGFpbiBhbiBlZmZlY3QgbW9yZSBzaW1pbGFyIHRvIHRoZSBvcmlnaW5hbDpcbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzMyMTAvY29tcGl6LXdpbmRvd3MtZWZmZWN0LyIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIHdpbmRvd3MgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2Utd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "0zkc9lcirqg224m46jjz2vapfg4lg9x7s0h0kvv57rfmkhrxcgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvYmJseSB3aW5kb3dzIGVmZmVjdCBpbnNwaXJlZCBieSB0aGUgQ29tcGl6IG9uZXNcblxuTkJcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIEFMVEVSTkFUSVZFXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuYWx0ZXJuYXRpdmUgZXh0ZW5zaW9uIHRvIG9idGFpbiBhbiBlZmZlY3QgbW9yZSBzaW1pbGFyIHRvIHRoZSBvcmlnaW5hbDpcbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzMyMTAvY29tcGl6LXdpbmRvd3MtZWZmZWN0LyIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIHdpbmRvd3MgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2Utd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}}} , {"uuid": "light-dict@tuberry.github.io", "name": "Light Dict", "pname": "light-dict", "description": "Lightweight extension for on-the-fly manipulation to primary selections, especially optimized for Dictionary lookups.\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/2959/light-dict/", "shell_version_map": {"38": {"version": "47", "sha256": "1l36l9qmcz7c6i81w5fv083bg01qsgz681c2lan8f87hqdipl4r7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsaWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2xpZ2h0LWRpY3QiLAogICJ1dWlkIjogImxpZ2h0LWRpY3RAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "40": {"version": "58", "sha256": "0x3rk3p2vlyd2n23jlmwqfc1akbbjfhyn9w1v44byw1nfc3b0n8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1OAp9"}, "41": {"version": "65", "sha256": "1hjaw62pxrpgismg6dhxqp04qhk1d4xkwlgzymmra7d428qjnxf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2NQp9"}}} -, {"uuid": "InternetSpeedMeter@alshakib.dev", "name": "Internet Speed Meter", "pname": "internet-speed-meter", "description": "Simple and minimal internet speed meter extension for gnome shell", "link": "https://extensions.gnome.org/extension/2980/internet-speed-meter/", "shell_version_map": {"38": {"version": "9", "sha256": "1m8nlhk6zixbi3i081fcafdp07swfsrqjs2z81ghi7kj93hmj8vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "9", "sha256": "1m8nlhk6zixbi3i081fcafdp07swfsrqjs2z81ghi7kj93hmj8vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1m8nlhk6zixbi3i081fcafdp07swfsrqjs2z81ghi7kj93hmj8vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"uuid": "InternetSpeedMeter@alshakib.dev", "name": "Internet Speed Meter", "pname": "internet-speed-meter", "description": "Simple and minimal internet speed meter extension for gnome shell", "link": "https://extensions.gnome.org/extension/2980/internet-speed-meter/", "shell_version_map": {"38": {"version": "10", "sha256": "0q6cdiswixzg0j5ndjmqcxv6jznzsgjh0zplgsnfw42n2mzvmw32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "0q6cdiswixzg0j5ndjmqcxv6jznzsgjh0zplgsnfw42n2mzvmw32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0q6cdiswixzg0j5ndjmqcxv6jznzsgjh0zplgsnfw42n2mzvmw32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "IP-Finder@linxgem33.com", "name": "IP Finder", "pname": "ip-finder", "description": "Displays useful information about your public IP Address\n\nIP Finder displays information about your public IP address, hostname, country, AS Block, as well as a map tile of your Geolocation and country flag, this extension is Also Useful for informational purposes to monitor VPN changes and public network IP Addresses.\n\n=====================\nIP Finder can monitor in real time\n=====================\n*Wireguard connections\n*OpenVPN connections\n*IPV4/6 connections\n*Proxy connections\n*VPN vendor applications\n*Manual static IP changes\n\n====================\nIP Finder has added security\n====================\nNewly developed revised code base using open technologies and using API's for Public IP and Map Tile image locations using GET requests over HTTPS for a added layer of encrypted Security, Please see source code for more details.\n\n====================\nCompatible GNOME shell - 3.36 and newer.", "link": "https://extensions.gnome.org/extension/2983/ip-finder/", "shell_version_map": {"38": {"version": "7", "sha256": "0qnmmg8q6xdv0rg90rzimqzsnggnsq2x8nmz998x59q2ik67kqgq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzXG5cbklQIEZpbmRlciBkaXNwbGF5cyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBhZGRyZXNzLCBob3N0bmFtZSwgY291bnRyeSwgQVMgQmxvY2ssIGFzIHdlbGwgYXMgIGEgbWFwIHRpbGUgb2YgeW91ciBHZW9sb2NhdGlvbiBhbmQgY291bnRyeSBmbGFnLCAgdGhpcyBleHRlbnNpb24gaXMgQWxzbyBVc2VmdWwgZm9yIGluZm9ybWF0aW9uYWwgcHVycG9zZXMgdG8gbW9uaXRvciBWUE4gY2hhbmdlcyBhbmQgcHVibGljIG5ldHdvcmsgSVAgQWRkcmVzc2VzLlxuXG49PT09PT09PT09PT09PT09PT09PT1cbklQIEZpbmRlciBjYW4gbW9uaXRvciBpbiByZWFsIHRpbWVcbj09PT09PT09PT09PT09PT09PT09PVxuKldpcmVndWFyZCBjb25uZWN0aW9uc1xuKk9wZW5WUE4gY29ubmVjdGlvbnNcbipJUFY0LzYgY29ubmVjdGlvbnNcbipQcm94eSBjb25uZWN0aW9uc1xuKlZQTiB2ZW5kb3IgYXBwbGljYXRpb25zXG4qTWFudWFsIHN0YXRpYyBJUCBjaGFuZ2VzXG5cbj09PT09PT09PT09PT09PT09PT09XG5JUCBGaW5kZXIgaGFzIGFkZGVkIHNlY3VyaXR5XG49PT09PT09PT09PT09PT09PT09PVxuTmV3bHkgZGV2ZWxvcGVkIHJldmlzZWQgY29kZSBiYXNlIHVzaW5nIG9wZW4gdGVjaG5vbG9naWVzIGFuZCB1c2luZyBBUEkncyBmb3IgUHVibGljIElQIGFuZCBNYXAgVGlsZSBpbWFnZSBsb2NhdGlvbnMgdXNpbmcgR0VUIHJlcXVlc3RzIG92ZXIgSFRUUFMgZm9yIGEgYWRkZWQgbGF5ZXIgb2YgZW5jcnlwdGVkICBTZWN1cml0eSwgUGxlYXNlIHNlZSBzb3VyY2UgY29kZSBmb3IgbW9yZSBkZXRhaWxzLlxuXG49PT09PT09PT09PT09PT09PT09PVxuQ29tcGF0aWJsZSBHTk9NRSBzaGVsbCAtIDMuMzYgYW5kIG5ld2VyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wdWJsaWMtaXAtYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0xpbnhHZW0zMy9JUC1GaW5kZXIiLAogICJ1dWlkIjogIklQLUZpbmRlckBsaW54Z2VtMzMuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "9", "sha256": "1iglj9l7c69ics43r675w4azc7x680n21vfr6jkdha8j47a79sn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzXG5cbklQIEZpbmRlciBkaXNwbGF5cyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBhZGRyZXNzLCBob3N0bmFtZSwgY291bnRyeSwgQVMgQmxvY2ssIGFzIHdlbGwgYXMgIGEgbWFwIHRpbGUgb2YgeW91ciBHZW9sb2NhdGlvbiBhbmQgY291bnRyeSBmbGFnLCAgdGhpcyBleHRlbnNpb24gaXMgQWxzbyBVc2VmdWwgZm9yIGluZm9ybWF0aW9uYWwgcHVycG9zZXMgdG8gbW9uaXRvciBWUE4gY2hhbmdlcyBhbmQgcHVibGljIG5ldHdvcmsgSVAgQWRkcmVzc2VzLlxuXG49PT09PT09PT09PT09PT09PT09PT1cbklQIEZpbmRlciBjYW4gbW9uaXRvciBpbiByZWFsIHRpbWVcbj09PT09PT09PT09PT09PT09PT09PVxuKldpcmVndWFyZCBjb25uZWN0aW9uc1xuKk9wZW5WUE4gY29ubmVjdGlvbnNcbipJUFY0LzYgY29ubmVjdGlvbnNcbipQcm94eSBjb25uZWN0aW9uc1xuKlZQTiB2ZW5kb3IgYXBwbGljYXRpb25zXG4qTWFudWFsIHN0YXRpYyBJUCBjaGFuZ2VzXG5cbj09PT09PT09PT09PT09PT09PT09XG5JUCBGaW5kZXIgaGFzIGFkZGVkIHNlY3VyaXR5XG49PT09PT09PT09PT09PT09PT09PVxuTmV3bHkgZGV2ZWxvcGVkIHJldmlzZWQgY29kZSBiYXNlIHVzaW5nIG9wZW4gdGVjaG5vbG9naWVzIGFuZCB1c2luZyBBUEkncyBmb3IgUHVibGljIElQIGFuZCBNYXAgVGlsZSBpbWFnZSBsb2NhdGlvbnMgdXNpbmcgR0VUIHJlcXVlc3RzIG92ZXIgSFRUUFMgZm9yIGEgYWRkZWQgbGF5ZXIgb2YgZW5jcnlwdGVkICBTZWN1cml0eSwgUGxlYXNlIHNlZSBzb3VyY2UgY29kZSBmb3IgbW9yZSBkZXRhaWxzLlxuXG49PT09PT09PT09PT09PT09PT09PVxuQ29tcGF0aWJsZSBHTk9NRSBzaGVsbCAtIDMuMzYgYW5kIG5ld2VyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wdWJsaWMtaXAtYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0lQLUZpbmRlciIsCiAgInV1aWQiOiAiSVAtRmluZGVyQGxpbnhnZW0zMy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1iglj9l7c69ics43r675w4azc7x680n21vfr6jkdha8j47a79sn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzXG5cbklQIEZpbmRlciBkaXNwbGF5cyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBhZGRyZXNzLCBob3N0bmFtZSwgY291bnRyeSwgQVMgQmxvY2ssIGFzIHdlbGwgYXMgIGEgbWFwIHRpbGUgb2YgeW91ciBHZW9sb2NhdGlvbiBhbmQgY291bnRyeSBmbGFnLCAgdGhpcyBleHRlbnNpb24gaXMgQWxzbyBVc2VmdWwgZm9yIGluZm9ybWF0aW9uYWwgcHVycG9zZXMgdG8gbW9uaXRvciBWUE4gY2hhbmdlcyBhbmQgcHVibGljIG5ldHdvcmsgSVAgQWRkcmVzc2VzLlxuXG49PT09PT09PT09PT09PT09PT09PT1cbklQIEZpbmRlciBjYW4gbW9uaXRvciBpbiByZWFsIHRpbWVcbj09PT09PT09PT09PT09PT09PT09PVxuKldpcmVndWFyZCBjb25uZWN0aW9uc1xuKk9wZW5WUE4gY29ubmVjdGlvbnNcbipJUFY0LzYgY29ubmVjdGlvbnNcbipQcm94eSBjb25uZWN0aW9uc1xuKlZQTiB2ZW5kb3IgYXBwbGljYXRpb25zXG4qTWFudWFsIHN0YXRpYyBJUCBjaGFuZ2VzXG5cbj09PT09PT09PT09PT09PT09PT09XG5JUCBGaW5kZXIgaGFzIGFkZGVkIHNlY3VyaXR5XG49PT09PT09PT09PT09PT09PT09PVxuTmV3bHkgZGV2ZWxvcGVkIHJldmlzZWQgY29kZSBiYXNlIHVzaW5nIG9wZW4gdGVjaG5vbG9naWVzIGFuZCB1c2luZyBBUEkncyBmb3IgUHVibGljIElQIGFuZCBNYXAgVGlsZSBpbWFnZSBsb2NhdGlvbnMgdXNpbmcgR0VUIHJlcXVlc3RzIG92ZXIgSFRUUFMgZm9yIGEgYWRkZWQgbGF5ZXIgb2YgZW5jcnlwdGVkICBTZWN1cml0eSwgUGxlYXNlIHNlZSBzb3VyY2UgY29kZSBmb3IgbW9yZSBkZXRhaWxzLlxuXG49PT09PT09PT09PT09PT09PT09PVxuQ29tcGF0aWJsZSBHTk9NRSBzaGVsbCAtIDMuMzYgYW5kIG5ld2VyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wdWJsaWMtaXAtYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0lQLUZpbmRlciIsCiAgInV1aWQiOiAiSVAtRmluZGVyQGxpbnhnZW0zMy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "runcat@kolesnikov.se", "name": "RunCat", "pname": "runcat", "description": "The cat tells you the CPU usage by running speed", "link": "https://extensions.gnome.org/extension/2986/runcat/", "shell_version_map": {"38": {"version": "17", "sha256": "19fkadmqndwpw5q5ab4mym7whc0cfs2vl6xh533z7p2rg2hxfslx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "17", "sha256": "19fkadmqndwpw5q5ab4mym7whc0cfs2vl6xh533z7p2rg2hxfslx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "19fkadmqndwpw5q5ab4mym7whc0cfs2vl6xh533z7p2rg2hxfslx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "bowser-gnome@kronosoul.xyz", "name": "Bowser Gnome Extension", "pname": "bowser-gnome-extension", "description": "Create rules to open specific websites in specific web browsers for links clicked in any application on your computer. (emails, chat etc)", "link": "https://extensions.gnome.org/extension/2989/bowser-gnome-extension/", "shell_version_map": {"38": {"version": "10", "sha256": "0y41xz4j24lc50ai8dcvl1l773ral59ixcpvkjq1l82x7baq60pk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwuQm93c2VyIiwKICAiZGVzY3JpcHRpb24iOiAiQ3JlYXRlIHJ1bGVzIHRvIG9wZW4gc3BlY2lmaWMgd2Vic2l0ZXMgaW4gc3BlY2lmaWMgd2ViIGJyb3dzZXJzIGZvciBsaW5rcyBjbGlja2VkIGluIGFueSBhcHBsaWNhdGlvbiBvbiB5b3VyIGNvbXB1dGVyLiAoZW1haWxzLCBjaGF0IGV0YykiLAogICJleHRlbnNpb24taWQiOiAiYm93c2VyLWdub21lIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYm93c2VyLWdub21lIiwKICAibmFtZSI6ICJCb3dzZXIgR25vbWUgRXh0ZW5zaW9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFkbWluQGtyb25vc291bC54eXoiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL0Jvd3Nlci8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9Cb3dzZXIvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJvd3NlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL2Jvd3Nlci1nbm9tZSIsCiAgInV1aWQiOiAiYm93c2VyLWdub21lQGtyb25vc291bC54eXoiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "ideapad@laurento.frittella", "name": "IdeaPad", "pname": "ideapad", "description": "Lenovo IdeaPad goodies for Gnome Shell\n\nAt the moment the extension only provides an easy and user-friendly way to toggle battery conservation mode available on Levono Ideapad laptops and visually get its current state.\n\nConfiguration needed! Please check the instruction on the homepage.", "link": "https://extensions.gnome.org/extension/2992/ideapad/", "shell_version_map": {"38": {"version": "10", "sha256": "0qmgvdhv1s16av3n1nhr366mkx0zci6z9h60yfkk88yk17k3d244", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYXVyZW50by9nbm9tZS1zaGVsbC1leHRlbnNpb24taWRlYXBhZCIsCiAgInV1aWQiOiAiaWRlYXBhZEBsYXVyZW50by5mcml0dGVsbGEiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "0qmgvdhv1s16av3n1nhr366mkx0zci6z9h60yfkk88yk17k3d244", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYXVyZW50by9nbm9tZS1zaGVsbC1leHRlbnNpb24taWRlYXBhZCIsCiAgInV1aWQiOiAiaWRlYXBhZEBsYXVyZW50by5mcml0dGVsbGEiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0qmgvdhv1s16av3n1nhr366mkx0zci6z9h60yfkk88yk17k3d244", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYXVyZW50by9nbm9tZS1zaGVsbC1leHRlbnNpb24taWRlYXBhZCIsCiAgInV1aWQiOiAiaWRlYXBhZEBsYXVyZW50by5mcml0dGVsbGEiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} -, {"uuid": "system-monitor-next@paradoxxx.zero.gmail.com", "name": "system-monitor-next", "pname": "system-monitor-next", "description": "Display system information in GNOME Shell status bar, such as memory, CPU, disk and battery usages, network rates…\n\nThis fork of paradoxxxzero/gnome-shell-system-monitor-applet is for packaging purposes only. This extension is built and updated continuously with the upstream master branch.\n\nThis is preferable for users on bleeding edge distributions that prefer not to wait for a stable release from the main repo. Of course, since we're releasing directly from master some instability is inevitable.\n\nIf you get an error after updating, try restarting Gnome Shell with Alt-F2 then 'r'.", "link": "https://extensions.gnome.org/extension/3010/system-monitor-next/", "shell_version_map": {"40": {"version": "38", "sha256": "0ppfn202x8s97yjd40xkm66pvf4fjddyil720xdpghriggxg5xpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21nYWxncy9nbm9tZS1zaGVsbC1zeXN0ZW0tbW9uaXRvci1hcHBsZXQiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yLW5leHRAcGFyYWRveHh4Lnplcm8uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}, "41": {"version": "38", "sha256": "0ppfn202x8s97yjd40xkm66pvf4fjddyil720xdpghriggxg5xpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21nYWxncy9nbm9tZS1zaGVsbC1zeXN0ZW0tbW9uaXRvci1hcHBsZXQiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yLW5leHRAcGFyYWRveHh4Lnplcm8uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}}} +, {"uuid": "system-monitor-next@paradoxxx.zero.gmail.com", "name": "system-monitor-next", "pname": "system-monitor-next", "description": "Display system information in GNOME Shell status bar, such as memory, CPU, disk and battery usages, network rates…\n\nThis fork of paradoxxxzero/gnome-shell-system-monitor-applet is for packaging purposes only. This extension is built and updated continuously with the upstream master branch.\n\nThis is preferable for users on bleeding edge distributions that prefer not to wait for a stable release from the main repo. Of course, since we're releasing directly from master some instability is inevitable.\n\nIf you get an error after updating, try restarting Gnome Shell with Alt-F2 then 'r'.", "link": "https://extensions.gnome.org/extension/3010/system-monitor-next/", "shell_version_map": {"40": {"version": "39", "sha256": "1nbn2h4izwbbajpyx65n8rhvcpc56irdz6736pg2apzkmkvhqqj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZ2FsZ3MvZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvci1uZXh0QHBhcmFkb3h4eC56ZXJvLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}, "41": {"version": "39", "sha256": "1nbn2h4izwbbajpyx65n8rhvcpc56irdz6736pg2apzkmkvhqqj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZ2FsZ3MvZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvci1uZXh0QHBhcmFkb3h4eC56ZXJvLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}}} , {"uuid": "user-theme-x@tuberry.github.io", "name": "User Themes X", "pname": "user-themes-x", "description": "Customizable user-theme with user stylesheet and dark theme auto-switch support\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3019/user-themes-x/", "shell_version_map": {"38": {"version": "21", "sha256": "08992jny17mbw3gvlfwzgis1ld3wfkkd5fwdyq2c4s6l412fr0mz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogInVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "40": {"version": "24", "sha256": "12scyi48nfbrl2bvhq4rwdcj7vyvpdc86sa8iw1fg3y0cw6vlvq6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogInVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3VzZXItdGhlbWUteCIsCiAgInV1aWQiOiAidXNlci10aGVtZS14QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "25", "sha256": "101y4msarf1dglh0g4wybz4dx8zsz2yg8ny2q5rz3xy1cjj8ac5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11c2VyLXRoZW1lLXgiLAogICJuYW1lIjogIlVzZXIgVGhlbWVzIFgiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS91c2VyLXRoZW1lLXgiLAogICJ1dWlkIjogInVzZXItdGhlbWUteEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"uuid": "app_view_text@fawtytoo", "name": "Application View Text", "pname": "application-view-text", "description": "The text in the Application view can be hard to read on a light coloured background. This extension makes the text bolder with a drop shadow.\nAlso improves the visibility of the app running dot.", "link": "https://extensions.gnome.org/extension/3028/application-view-text/", "shell_version_map": {"38": {"version": "7", "sha256": "1dnf1rqg27y1c50sfmqcnswac93lkgml1hdaalq6lfzm8pbnpx0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB0ZXh0IGluIHRoZSBBcHBsaWNhdGlvbiB2aWV3IGNhbiBiZSBoYXJkIHRvIHJlYWQgb24gYSBsaWdodCBjb2xvdXJlZCBiYWNrZ3JvdW5kLiBUaGlzIGV4dGVuc2lvbiBtYWtlcyB0aGUgdGV4dCBib2xkZXIgd2l0aCBhIGRyb3Agc2hhZG93LlxuQWxzbyBpbXByb3ZlcyB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgYXBwIHJ1bm5pbmcgZG90LiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb24gVmlldyBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwX3ZpZXdfdGV4dEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1dnf1rqg27y1c50sfmqcnswac93lkgml1hdaalq6lfzm8pbnpx0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB0ZXh0IGluIHRoZSBBcHBsaWNhdGlvbiB2aWV3IGNhbiBiZSBoYXJkIHRvIHJlYWQgb24gYSBsaWdodCBjb2xvdXJlZCBiYWNrZ3JvdW5kLiBUaGlzIGV4dGVuc2lvbiBtYWtlcyB0aGUgdGV4dCBib2xkZXIgd2l0aCBhIGRyb3Agc2hhZG93LlxuQWxzbyBpbXByb3ZlcyB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgYXBwIHJ1bm5pbmcgZG90LiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb24gVmlldyBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwX3ZpZXdfdGV4dEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1dnf1rqg27y1c50sfmqcnswac93lkgml1hdaalq6lfzm8pbnpx0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB0ZXh0IGluIHRoZSBBcHBsaWNhdGlvbiB2aWV3IGNhbiBiZSBoYXJkIHRvIHJlYWQgb24gYSBsaWdodCBjb2xvdXJlZCBiYWNrZ3JvdW5kLiBUaGlzIGV4dGVuc2lvbiBtYWtlcyB0aGUgdGV4dCBib2xkZXIgd2l0aCBhIGRyb3Agc2hhZG93LlxuQWxzbyBpbXByb3ZlcyB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgYXBwIHJ1bm5pbmcgZG90LiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb24gVmlldyBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwX3ZpZXdfdGV4dEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "vpn-snx-indicator@als.kz", "name": "VPN and SNX Indicator", "pname": "vpn-and-snx-indicator", "description": "A status indicator for a VPN and SNX(Check Point) connection.", "link": "https://extensions.gnome.org/extension/3049/vpn-and-snx-indicator/", "shell_version_map": {"38": {"version": "8", "sha256": "1mns39frrabpfdvmc7jcqxrlxs1mnjimdwa69hv5lawf0r498h9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgYSBWUE4gYW5kIFNOWChDaGVjayBQb2ludCkgY29ubmVjdGlvbi4iLAogICJuYW1lIjogIlZQTiBhbmQgU05YIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L3Zwbi1pbmRpY2F0b3Itc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ2cG4tc254LWluZGljYXRvckBhbHMua3oiLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "1mns39frrabpfdvmc7jcqxrlxs1mnjimdwa69hv5lawf0r498h9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgYSBWUE4gYW5kIFNOWChDaGVjayBQb2ludCkgY29ubmVjdGlvbi4iLAogICJuYW1lIjogIlZQTiBhbmQgU05YIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L3Zwbi1pbmRpY2F0b3Itc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ2cG4tc254LWluZGljYXRvckBhbHMua3oiLAogICJ2ZXJzaW9uIjogOAp9"}}} @@ -319,9 +319,9 @@ , {"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": "10", "sha256": "05gi4r8wq8bnb1b5476w5h737swg0rdkm7fq1g2l2c9hg0h9r007", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "05gi4r8wq8bnb1b5476w5h737swg0rdkm7fq1g2l2c9hg0h9r007", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "05gi4r8wq8bnb1b5476w5h737swg0rdkm7fq1g2l2c9hg0h9r007", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "eye-extended@als.kz", "name": "Eye and Mouse Extended", "pname": "eye-extended", "description": "Adds an eye to the indicator bar that follows your cursor \nYou can also display the mouse indicator, perhaps it will help you with the problem of displaying the mouse cursor in Skype", "link": "https://extensions.gnome.org/extension/3139/eye-extended/", "shell_version_map": {"38": {"version": "9", "sha256": "1y2bgk2kww0g3f1d93s1w15g5xihjbipq40wr08f41jr8l53v9ay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZSIsCiAgImdldHRleHQtZG9tYWluIjogIkV5ZUV4dGVuZGVkIiwKICAibmFtZSI6ICJFeWUgYW5kIE1vdXNlIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImt6LmFscy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMCIsCiAgICAiMy4zOC4wIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "9", "sha256": "1y2bgk2kww0g3f1d93s1w15g5xihjbipq40wr08f41jr8l53v9ay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZSIsCiAgImdldHRleHQtZG9tYWluIjogIkV5ZUV4dGVuZGVkIiwKICAibmFtZSI6ICJFeWUgYW5kIE1vdXNlIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImt6LmFscy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMCIsCiAgICAiMy4zOC4wIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1y2bgk2kww0g3f1d93s1w15g5xihjbipq40wr08f41jr8l53v9ay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZSIsCiAgImdldHRleHQtZG9tYWluIjogIkV5ZUV4dGVuZGVkIiwKICAibmFtZSI6ICJFeWUgYW5kIE1vdXNlIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImt6LmFscy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMCIsCiAgICAiMy4zOC4wIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"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="}}} -, {"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", "link": "https://extensions.gnome.org/extension/3193/blur-my-shell/", "shell_version_map": {"38": {"version": "22", "sha256": "03vvxjdk7dfzx1crr5axp9qf4gg9lsh043zddcir8sj64m3mkz2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "27", "sha256": "0v0m4gy46wlv33vz2kxi69mdjmny262p2pb4qj3zshkcqh03mswz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1ibHVyLW15LXNoZWxsIiwKICAidXVpZCI6ICJibHVyLW15LXNoZWxsQGF1bmV0eCIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "0v0m4gy46wlv33vz2kxi69mdjmny262p2pb4qj3zshkcqh03mswz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1ibHVyLW15LXNoZWxsIiwKICAidXVpZCI6ICJibHVyLW15LXNoZWxsQGF1bmV0eCIsCiAgInZlcnNpb24iOiAyNwp9"}}} +, {"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", "link": "https://extensions.gnome.org/extension/3193/blur-my-shell/", "shell_version_map": {"38": {"version": "22", "sha256": "03vvxjdk7dfzx1crr5axp9qf4gg9lsh043zddcir8sj64m3mkz2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "28", "sha256": "1b1vz0ixns3ssbfkyijjvmdf29j1sqig58wdsmixfgsl48ql9d56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "41": {"version": "28", "sha256": "1b1vz0ixns3ssbfkyijjvmdf29j1sqig58wdsmixfgsl48ql9d56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} , {"uuid": "escape-overview@raelgc", "name": "ESCape Overview", "pname": "escape-overview", "description": "Close the Overview with a single ESC press when searchbox is empty.\n\nThe default gnome-shell behaviour is, during first ESC press, clean the searchbox, then second ESC press get back to Activities overview and then third ESC press will finally close the overview.", "link": "https://extensions.gnome.org/extension/3204/escape-overview/", "shell_version_map": {"38": {"version": "4", "sha256": "1yzba3d57s57wvviyr1gm1k5l15lnm7krhdcq6gv8gd5c80l3f02", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFlbGdjL2VzY2FwZS1vdmVydmlldyIsCiAgInV1aWQiOiAiZXNjYXBlLW92ZXJ2aWV3QHJhZWxnYyIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1yzba3d57s57wvviyr1gm1k5l15lnm7krhdcq6gv8gd5c80l3f02", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFlbGdjL2VzY2FwZS1vdmVydmlldyIsCiAgInV1aWQiOiAiZXNjYXBlLW92ZXJ2aWV3QHJhZWxnYyIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1yzba3d57s57wvviyr1gm1k5l15lnm7krhdcq6gv8gd5c80l3f02", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFlbGdjL2VzY2FwZS1vdmVydmlldyIsCiAgInV1aWQiOiAiZXNjYXBlLW92ZXJ2aWV3QHJhZWxnYyIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "compiz-windows-effect@hermes83.github.com", "name": "Compiz windows effect", "pname": "compiz-windows-effect", "description": "Compiz wobbly windows effect thanks to libanimation engine.\n\nThe use of the \"js engine\" option NOT requires any external library, orherwise you need to install the LIBANIMATION library patched for Gnome Shell: \nhttps://github.com/hermes83/libanimation\n\nNB:\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)\n\n-----------------------------------\n Video\n-----------------------------------\nhttps://youtu.be/G8bAVIB9A7A", "link": "https://extensions.gnome.org/extension/3210/compiz-windows-effect/", "shell_version_map": {"38": {"version": "10", "sha256": "0s2pprlc0wi2ln45c6bj9gzh6rg3bkc1dxn85dq1c7r4h6ib14x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LXdpbmRvd3MtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "0s2pprlc0wi2ln45c6bj9gzh6rg3bkc1dxn85dq1c7r4h6ib14x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LXdpbmRvd3MtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0s2pprlc0wi2ln45c6bj9gzh6rg3bkc1dxn85dq1c7r4h6ib14x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LXdpbmRvd3MtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"uuid": "compiz-windows-effect@hermes83.github.com", "name": "Compiz windows effect", "pname": "compiz-windows-effect", "description": "Compiz wobbly windows effect thanks to libanimation engine.\n\nThe use of the \"js engine\" option NOT requires any external library, orherwise you need to install the LIBANIMATION library patched for Gnome Shell: \nhttps://github.com/hermes83/libanimation\n\nNB:\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)\n\n-----------------------------------\n Video\n-----------------------------------\nhttps://youtu.be/G8bAVIB9A7A", "link": "https://extensions.gnome.org/extension/3210/compiz-windows-effect/", "shell_version_map": {"38": {"version": "12", "sha256": "10jdlgjbk2xa1qkk7hq4g17lbjdp5bk3pxwrf5irfdjix05l1zpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "10jdlgjbk2xa1qkk7hq4g17lbjdp5bk3pxwrf5irfdjix05l1zpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "10jdlgjbk2xa1qkk7hq4g17lbjdp5bk3pxwrf5irfdjix05l1zpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "EndSessionTimer@pratap.fastmail.fm", "name": "End Session Timer", "pname": "end-session-timer", "description": "Set End Session Timer between 5 to 60 Seconds", "link": "https://extensions.gnome.org/extension/3216/end-session-timer/", "shell_version_map": {"38": {"version": "7", "sha256": "0c3wfx1iksb67fq3hm8cprhwb2f6xykkr4fv4y4drf78f15sh5gm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBFbmQgU2Vzc2lvbiBUaW1lciBiZXR3ZWVuIDUgdG8gNjAgU2Vjb25kcyIsCiAgIm5hbWUiOiAiRW5kIFNlc3Npb24gVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiRW5kU2Vzc2lvblRpbWVyQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "8", "sha256": "0mm9g2ldl2lw52plx3hpbaniqlci1c10q9blkbdpwcmyv53z1dq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBFbmQgU2Vzc2lvbiBUaW1lciBiZXR3ZWVuIDUgdG8gNjAgU2Vjb25kcyIsCiAgIm5hbWUiOiAiRW5kIFNlc3Npb24gVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkVuZFNlc3Npb25UaW1lckBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "block-caribou-36@lxylxy123456.ercli.dev", "name": "Block Caribou 36", "pname": "block-caribou-36", "description": "Blocks caribou (the on screen keyboard) from popping up when you use a touchscreen. Even if it's disabled in the accessibility services menu. Continuation of keringar's work. Tested on GNOME Shell version 3.36 - 41 on Fedora 32 - 35. For a higher version see https://github.com/lxylxy123456/cariboublocker#installing-on-high-gnome-shell-version .", "link": "https://extensions.gnome.org/extension/3222/block-caribou-36/", "shell_version_map": {"40": {"version": "4", "sha256": "1bnkwdsmsjr7x9cx31lfzs3dnfqzmdy8cq1zc26hgpvchd02ac60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDEgb24gRmVkb3JhIDMyIC0gMzUuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x4eWx4eTEyMzQ1Ni9jYXJpYm91YmxvY2tlciIsCiAgInV1aWQiOiAiYmxvY2stY2FyaWJvdS0zNkBseHlseHkxMjM0NTYuZXJjbGkuZGV2IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1bnkwdsmsjr7x9cx31lfzs3dnfqzmdy8cq1zc26hgpvchd02ac60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDEgb24gRmVkb3JhIDMyIC0gMzUuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x4eWx4eTEyMzQ1Ni9jYXJpYm91YmxvY2tlciIsCiAgInV1aWQiOiAiYmxvY2stY2FyaWJvdS0zNkBseHlseHkxMjM0NTYuZXJjbGkuZGV2IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"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": "4", "sha256": "1qb3qwjndl08g7r7lgdzszcxlqsx5rb749y8hg1qdzyp48nifj8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5tYXhpbWl6ZS1nbm9tZS1leHQiLAogICJ1dWlkIjogInVubWF4aW1pemVfZG91YmxlX2NsaWNrQGdvbnphLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1qb3qwjndl08g7r7lgdzszcxlqsx5rb749y8hg1qdzyp48nifj8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5tYXhpbWl6ZS1nbm9tZS1leHQiLAogICJ1dWlkIjogInVubWF4aW1pemVfZG91YmxlX2NsaWNrQGdvbnphLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1qb3qwjndl08g7r7lgdzszcxlqsx5rb749y8hg1qdzyp48nifj8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5tYXhpbWl6ZS1nbm9tZS1leHQiLAogICJ1dWlkIjogInVubWF4aW1pemVfZG91YmxlX2NsaWNrQGdvbnphLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} @@ -339,20 +339,20 @@ , {"uuid": "ascii_emoji_buckets@HarshKhandeparkar", "name": "ASCII Emoji Buckets", "pname": "ascii-emoji-buckets", "description": "Buckets of ASCII emojis for your messaging pleasure. A fork of Emoji Buckets.", "link": "https://extensions.gnome.org/extension/3408/ascii-emoji-buckets/", "shell_version_map": {"38": {"version": "9", "sha256": "1srqsjzcywywlhapaca41v4pc99w503m5532g6cc6qwz9f2r4w5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1Y2tldHMgb2YgQVNDSUkgZW1vamlzIGZvciB5b3VyIG1lc3NhZ2luZyBwbGVhc3VyZS4gQSBmb3JrIG9mIEVtb2ppIEJ1Y2tldHMuIiwKICAibmFtZSI6ICJBU0NJSSBFbW9qaSBCdWNrZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzY2lpLWVtb2ppLWJ1Y2tldHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hhcnNoS2hhbmRlcGFya2FyL2dub21lLWFzY2lpLWVtb2ppLWJ1Y2tldHMiLAogICJ1dWlkIjogImFzY2lpX2Vtb2ppX2J1Y2tldHNASGFyc2hLaGFuZGVwYXJrYXIiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "user-stylesheet@tomaszgasior.pl", "name": "User style sheet & font", "pname": "user-stylesheet-font", "description": "Load custom style sheet from ~/.config/gnome-shell/gnome-shell.css. Use GTK font family and font size from GNOME Tweaks in GNOME Shell.", "link": "https://extensions.gnome.org/extension/3414/user-stylesheet-font/", "shell_version_map": {"38": {"version": "4", "sha256": "1ibmhj1ixw063r7p8fwnanf4k21k8vxmll78ydqia5gdwkv79i8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "1ibmhj1ixw063r7p8fwnanf4k21k8vxmll78ydqia5gdwkv79i8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1ibmhj1ixw063r7p8fwnanf4k21k8vxmll78ydqia5gdwkv79i8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "wg-indicator@dpf12110.gmail.com", "name": "WG Indicator", "pname": "wg-indicator", "description": "A status indicator for Wireguard connections.", "link": "https://extensions.gnome.org/extension/3418/wg-indicator/", "shell_version_map": {"40": {"version": "13", "sha256": "126n9gbvh1yshbvx74af01f7jyrjr4p0299x9ki171d1f40djrvs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgV2lyZWd1YXJkIGNvbm5lY3Rpb25zLiIsCiAgIm5hbWUiOiAiV0cgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjEiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N5bmMxMjExL3dnLWluZGljYXRvciIsCiAgInV1aWQiOiAid2ctaW5kaWNhdG9yQGRwZjEyMTEwLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "126n9gbvh1yshbvx74af01f7jyrjr4p0299x9ki171d1f40djrvs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgV2lyZWd1YXJkIGNvbm5lY3Rpb25zLiIsCiAgIm5hbWUiOiAiV0cgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjEiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N5bmMxMjExL3dnLWluZGljYXRvciIsCiAgInV1aWQiOiAid2ctaW5kaWNhdG9yQGRwZjEyMTEwLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "flypie@schneegans.github.com", "name": "Fly-Pie", "pname": "fly-pie", "description": "A marking menu which can be used to launch applications, simulate hotkeys, open URLs and much more.", "link": "https://extensions.gnome.org/extension/3433/fly-pie/", "shell_version_map": {"38": {"version": "13", "sha256": "0spqd46cyzlazg29rdnpkqcyiqyrkx610265hdf2whbh5y5cmvpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRmx5LVBpZSIsCiAgInV1aWQiOiAiZmx5cGllQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "0spqd46cyzlazg29rdnpkqcyiqyrkx610265hdf2whbh5y5cmvpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRmx5LVBpZSIsCiAgInV1aWQiOiAiZmx5cGllQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "0spqd46cyzlazg29rdnpkqcyiqyrkx610265hdf2whbh5y5cmvpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRmx5LVBpZSIsCiAgInV1aWQiOiAiZmx5cGllQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"uuid": "flypie@schneegans.github.com", "name": "Fly-Pie", "pname": "fly-pie", "description": "A marking menu which can be used to launch applications, simulate hotkeys, open URLs and much more.", "link": "https://extensions.gnome.org/extension/3433/fly-pie/", "shell_version_map": {"38": {"version": "14", "sha256": "09bhaqjrjmdgabqiagsqc1166hjniq5yhfla1glhn6pr8ymhyh4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0ZseS1QaWUiLAogICJ1dWlkIjogImZseXBpZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "14", "sha256": "09bhaqjrjmdgabqiagsqc1166hjniq5yhfla1glhn6pr8ymhyh4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0ZseS1QaWUiLAogICJ1dWlkIjogImZseXBpZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "09bhaqjrjmdgabqiagsqc1166hjniq5yhfla1glhn6pr8ymhyh4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0ZseS1QaWUiLAogICJ1dWlkIjogImZseXBpZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "jiggle@jeffchannell.com", "name": "Jiggle", "pname": "jiggle", "description": "Jiggle is a Gnome Shell extension that highlights the cursor position when the mouse is moved rapidly.", "link": "https://extensions.gnome.org/extension/3438/jiggle/", "shell_version_map": {"38": {"version": "8", "sha256": "0f5zwvcqz648sn11nl49r0ki6zy5c2hp4imgba0dlc02fags7pxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkppZ2dsZSBpcyBhIEdub21lIFNoZWxsIGV4dGVuc2lvbiB0aGF0IGhpZ2hsaWdodHMgdGhlIGN1cnNvciBwb3NpdGlvbiB3aGVuIHRoZSBtb3VzZSBpcyBtb3ZlZCByYXBpZGx5LiIsCiAgIm5hbWUiOiAiSmlnZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2LjMiLAogICAgIjMuMzguMSIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plZmZjaGFubmVsbC9qaWdnbGUiLAogICJ1dWlkIjogImppZ2dsZUBqZWZmY2hhbm5lbGwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "0f5zwvcqz648sn11nl49r0ki6zy5c2hp4imgba0dlc02fags7pxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkppZ2dsZSBpcyBhIEdub21lIFNoZWxsIGV4dGVuc2lvbiB0aGF0IGhpZ2hsaWdodHMgdGhlIGN1cnNvciBwb3NpdGlvbiB3aGVuIHRoZSBtb3VzZSBpcyBtb3ZlZCByYXBpZGx5LiIsCiAgIm5hbWUiOiAiSmlnZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2LjMiLAogICAgIjMuMzguMSIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plZmZjaGFubmVsbC9qaWdnbGUiLAogICJ1dWlkIjogImppZ2dsZUBqZWZmY2hhbm5lbGwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "showtime-horizontal@xenlism.github.io", "name": "Showtime Horizontal - Desktop Widget", "pname": "showtime-horizontal", "description": "Horizontal Style Date & Clock Widget base on Budgie Desktop Widget", "link": "https://extensions.gnome.org/extension/3442/showtime-horizontal/", "shell_version_map": {"38": {"version": "5", "sha256": "1rdf1alxfyi29wnz2bzm20j9k5q8sn3a6d4si841cjbhmvqdcqhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvcml6b250YWwgU3R5bGUgRGF0ZSAmYW1wOyBDbG9jayBXaWRnZXQgYmFzZSBvbiBCdWRnaWUgRGVza3RvcCBXaWRnZXQiLAogICJleHRlbnNpb24taWQiOiAic2hvd3RpbWUtaG9yaXpvbnRhbCIsCiAgIm5hbWUiOiAiU2hvd3RpbWUgSG9yaXpvbnRhbCAtIERlc2t0b3AgV2lkZ2V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3d0aW1lLWhvcml6b250YWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94ZW5saXNtL3Nob3d0aW1lIiwKICAidXVpZCI6ICJzaG93dGltZS1ob3Jpem9udGFsQHhlbmxpc20uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "6", "sha256": "1zy7lkkmcjxkc30hys98s0xlmi93cyc6jz6qx7zfv1v7w03iw3ld", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvcml6b250YWwgU3R5bGUgRGF0ZSAmYW1wOyBDbG9jayBXaWRnZXQgYmFzZSBvbiBCdWRnaWUgRGVza3RvcCBXaWRnZXQiLAogICJleHRlbnNpb24taWQiOiAic2hvd3RpbWUtaG9yaXpvbnRhbCIsCiAgIm5hbWUiOiAiU2hvd3RpbWUgSG9yaXpvbnRhbCAtIERlc2t0b3AgV2lkZ2V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3d0aW1lLWhvcml6b250YWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVubGlzbS9zaG93dGltZSIsCiAgInV1aWQiOiAic2hvd3RpbWUtaG9yaXpvbnRhbEB4ZW5saXNtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "display-switcher@iyadk.com", "name": "Display Switcher 2", "pname": "display-switcher", "description": "This extension allows you to toggle between display modes quickly using Super + I. You can switch between Extended, Primary, Clone, and Secondary Only modes quickly. Selecting Extended mode multiple times will flip your secondary monitor's relative position to the primary (to the left or right of it). This extension was originally developed by Lucas Diedrich - https://extensions.gnome.org/extension/1030/display-switcher/ and has been adapted to support Gnome Shell's v3.36.", "link": "https://extensions.gnome.org/extension/3459/display-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "13vb68xfmcx525yk2vgfny6xvi06nzv103an5zab90hvmj6ggzlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyB5b3UgdG8gdG9nZ2xlIGJldHdlZW4gZGlzcGxheSBtb2RlcyBxdWlja2x5IHVzaW5nIFN1cGVyICsgSS4gIFlvdSBjYW4gc3dpdGNoIGJldHdlZW4gRXh0ZW5kZWQsIFByaW1hcnksIENsb25lLCBhbmQgU2Vjb25kYXJ5IE9ubHkgbW9kZXMgcXVpY2tseS4gIFNlbGVjdGluZyBFeHRlbmRlZCBtb2RlIG11bHRpcGxlIHRpbWVzIHdpbGwgZmxpcCB5b3VyIHNlY29uZGFyeSBtb25pdG9yJ3MgcmVsYXRpdmUgcG9zaXRpb24gdG8gdGhlIHByaW1hcnkgKHRvIHRoZSBsZWZ0IG9yIHJpZ2h0IG9mIGl0KS4gIFRoaXMgZXh0ZW5zaW9uIHdhcyBvcmlnaW5hbGx5IGRldmVsb3BlZCBieSBMdWNhcyBEaWVkcmljaCAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEwMzAvZGlzcGxheS1zd2l0Y2hlci8gYW5kIGhhcyBiZWVuIGFkYXB0ZWQgdG8gc3VwcG9ydCBHbm9tZSBTaGVsbCdzIHYzLjM2LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNwbGF5LXN3aXRjaGVyIiwKICAibmFtZSI6ICJEaXNwbGF5IFN3aXRjaGVyIDIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTHVjYXMgRGllZHJpY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2l5YWRrYW5kYWxhZnQvZ25vbWUtZGlzcGxheS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZGlzcGxheS1zd2l0Y2hlckBpeWFkay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "panel-date-format@atareao.es", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/3465/panel-date-format/", "shell_version_map": {"40": {"version": "5", "sha256": "1x6f55d650mnw57fds70bdy9n2h5v7hmb43fsah33m4h4rk1svnc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJleHRlbnNpb24taWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAYXRhcmVhby5lcyIsCiAgImdldHRleHQtZG9tYWluIjogInBhbmVsLWRhdGUtZm9ybWF0QGF0YXJlYW8uZXMiLAogICJpY29uIjogInBhbmVsLWRhdGUtZm9ybWF0IiwKICAibmFtZSI6ICJQYW5lbCBEYXRlIEZvcm1hdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGF0YXJlYW8uZXMiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "myHiddenTopBar@lendoK.github.com", "name": "myHiddenTopBar", "pname": "myhiddentopbar", "description": "really hides the toppanel", "link": "https://extensions.gnome.org/extension/3481/myhiddentopbar/", "shell_version_map": {"38": {"version": "2", "sha256": "1vrj1ih0rvds9xng0i4n2cah9akm2j2vhma3a7zjyvljxmw82w5x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlYWxseSBoaWRlcyB0aGUgdG9wcGFuZWwiLAogICJuYW1lIjogIm15SGlkZGVuVG9wQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm15SGlkZGVuVG9wQmFyQGxlbmRvSy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "3", "sha256": "0fl9rcdxn2l2lpc8fhcbvzm9lx0i12674kk15rpgbzfj8xn26qkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlYWxseSBoaWRlcyB0aGUgdG9wcGFuZWwiLAogICJuYW1lIjogIm15SGlkZGVuVG9wQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm15SGlkZGVuVG9wQmFyQGxlbmRvSy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "5", "sha256": "01b5d3bza10mcy0dj662dp1lk2if7pl71q3cfr7zwyk1fkkraizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlYWxseSBoaWRlcyB0aGUgdG9wcGFuZWwiLAogICJuYW1lIjogIm15SGlkZGVuVG9wQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJteUhpZGRlblRvcEJhckBsZW5kb0suZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "big-avatar@gustavoperedo.org", "name": "Big Avatar", "pname": "big-avatar", "description": "Adds your user avatar and name to the menu panel. Big thanks to: db0x and 'I like 'em curvy' extension developer", "link": "https://extensions.gnome.org/extension/3488/big-avatar/", "shell_version_map": {"38": {"version": "6", "sha256": "1p278iaqfl39kimk3041wvzvmgag8dr2q1bmka3n7srkd2n71vlf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciB1c2VyIGF2YXRhciBhbmQgbmFtZSB0byB0aGUgbWVudSBwYW5lbC4gQmlnIHRoYW5rcyB0bzogZGIweCBhbmQgJ0kgbGlrZSAnZW0gY3VydnknIGV4dGVuc2lvbiBkZXZlbG9wZXIiLAogICJleHRlbnNpb24taWQiOiAiYmlnLWF2YXRhciIsCiAgIm5hbWUiOiAiQmlnIEF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaWctYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VzdGF2b1BlcmVkby9CaWctQXZhdGFyLUdub21lLVNoZWxsLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlnLWF2YXRhckBndXN0YXZvcGVyZWRvLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "11", "sha256": "1ajh11619r8v6mvkmv142ivykd5b20jx64ca8fxhicfn6i6di923", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciB1c2VyIGF2YXRhciBhbmQgbmFtZSB0byB0aGUgbWVudSBwYW5lbC4gQmlnIHRoYW5rcyB0bzogZGIweCBhbmQgJ0kgbGlrZSAnZW0gY3VydnknIGV4dGVuc2lvbiBkZXZlbG9wZXIiLAogICJleHRlbnNpb24taWQiOiAiYmlnLWF2YXRhciIsCiAgIm5hbWUiOiAiQmlnIEF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaWctYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0d1c3Rhdm9QZXJlZG8vQmlnLUF2YXRhci1Hbm9tZS1TaGVsbC1FeHRlbnNpb24iLAogICJ1dWlkIjogImJpZy1hdmF0YXJAZ3VzdGF2b3BlcmVkby5vcmciLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} -, {"uuid": "volume-mixer@evermiss.net", "name": "Application Volume Mixer", "pname": "application-volume-mixer", "description": "Control volume output per-application", "link": "https://extensions.gnome.org/extension/3499/application-volume-mixer/", "shell_version_map": {"38": {"version": "8", "sha256": "0xwgp3j91nryv7sk68hkrxpfk29hgsy9c3pgv61hhjykas7jsbv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXltaW5kc3Rvcm0vZ25vbWUtdm9sdW1lLW1peGVyIiwKICAidXVpZCI6ICJ2b2x1bWUtbWl4ZXJAZXZlcm1pc3MubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "0xwgp3j91nryv7sk68hkrxpfk29hgsy9c3pgv61hhjykas7jsbv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXltaW5kc3Rvcm0vZ25vbWUtdm9sdW1lLW1peGVyIiwKICAidXVpZCI6ICJ2b2x1bWUtbWl4ZXJAZXZlcm1pc3MubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0xwgp3j91nryv7sk68hkrxpfk29hgsy9c3pgv61hhjykas7jsbv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXltaW5kc3Rvcm0vZ25vbWUtdm9sdW1lLW1peGVyIiwKICAidXVpZCI6ICJ2b2x1bWUtbWl4ZXJAZXZlcm1pc3MubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"uuid": "volume-mixer@evermiss.net", "name": "Application Volume Mixer", "pname": "application-volume-mixer", "description": "Control volume output per-application", "link": "https://extensions.gnome.org/extension/3499/application-volume-mixer/", "shell_version_map": {"38": {"version": "10", "sha256": "1rw73vgim4lkliy7prn3mfyc2jzk0yi72maf74iybk9kqpyiv5wp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL215bWluZHN0b3JtL2dub21lLXZvbHVtZS1taXhlciIsCiAgInV1aWQiOiAidm9sdW1lLW1peGVyQGV2ZXJtaXNzLm5ldCIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "1rw73vgim4lkliy7prn3mfyc2jzk0yi72maf74iybk9kqpyiv5wp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL215bWluZHN0b3JtL2dub21lLXZvbHVtZS1taXhlciIsCiAgInV1aWQiOiAidm9sdW1lLW1peGVyQGV2ZXJtaXNzLm5ldCIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1rw73vgim4lkliy7prn3mfyc2jzk0yi72maf74iybk9kqpyiv5wp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL215bWluZHN0b3JtL2dub21lLXZvbHVtZS1taXhlciIsCiAgInV1aWQiOiAidm9sdW1lLW1peGVyQGV2ZXJtaXNzLm5ldCIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "creative-control@sau.li", "name": "Creative Sound Blaster control", "pname": "creative-sound-blaster-control", "description": "Control Creative Sound Blaster", "link": "https://extensions.gnome.org/extension/3505/creative-sound-blaster-control/", "shell_version_map": {"38": {"version": "2", "sha256": "0pqps21c2p8fqndy9hd77j979h0wjbw0yzbmv6jmwk7rskv6zysg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "day-night-wallpaper@swapnilmadavi.github.io", "name": "Day Night Wallpaper", "pname": "day-night-wallpaper", "description": "Set separate wallpapers for day and night time.", "link": "https://extensions.gnome.org/extension/3512/day-night-wallpaper/", "shell_version_map": {"38": {"version": "2", "sha256": "082wrffxsa6qnp120ghlvhkb3isnnf9qizxfk6bbgqbzcvsax059", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBzZXBhcmF0ZSB3YWxscGFwZXJzIGZvciBkYXkgYW5kIG5pZ2h0IHRpbWUuIiwKICAibmFtZSI6ICJEYXkgTmlnaHQgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRheS1uaWdodC13YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd2FwbmlsbWFkYXZpL2RheS1uaWdodC13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkYXktbmlnaHQtd2FsbHBhcGVyQHN3YXBuaWxtYWRhdmkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "transparent-shell@siroj42.github.io", "name": "Transparent Shell", "pname": "transparent-shell", "description": "Make the main shell components (Top bar, dash, search box) transparent.", "link": "https://extensions.gnome.org/extension/3518/transparent-shell/", "shell_version_map": {"38": {"version": "6", "sha256": "109c5w2p7w9arfy4wrqmyyi7vd5fwdr8n2cz250bpxiij6zq140k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgc2VhcmNoIGJveCkgdHJhbnNwYXJlbnQuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1Npcm9qNDIvZ25vbWUtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXNoZWxsIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1zaGVsbEBzaXJvajQyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "7", "sha256": "0nzx401vvzn8n9xnkd13v5jim0l7zd01p1lf0lbgydrr8gh67i95", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgc2VhcmNoIGJveCkgdHJhbnNwYXJlbnQuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "true-color-invert@jackkenney", "name": "True Color Invert", "pname": "true-color-invert", "description": "Inverts the color of individual windows so they are hue-preserved.\nDefault shortcut is Super+I", "link": "https://extensions.gnome.org/extension/3530/true-color-invert/", "shell_version_map": {"38": {"version": "8", "sha256": "0l8sz8w8l6cmkn19sg34gmbh79sx49jdx1gk8xzh7yyxgqxhayzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFja2tlbm5leS9nbm9tZS10cnVlLWNvbG9yLWludmVydCIsCiAgInV1aWQiOiAidHJ1ZS1jb2xvci1pbnZlcnRAamFja2tlbm5leSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "0l8sz8w8l6cmkn19sg34gmbh79sx49jdx1gk8xzh7yyxgqxhayzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFja2tlbm5leS9nbm9tZS10cnVlLWNvbG9yLWludmVydCIsCiAgInV1aWQiOiAidHJ1ZS1jb2xvci1pbnZlcnRAamFja2tlbm5leSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0l8sz8w8l6cmkn19sg34gmbh79sx49jdx1gk8xzh7yyxgqxhayzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFja2tlbm5leS9nbm9tZS10cnVlLWNvbG9yLWludmVydCIsCiAgInV1aWQiOiAidHJ1ZS1jb2xvci1pbnZlcnRAamFja2tlbm5leSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "gitlab-extension@infinicode.de", "name": "GitLab Extension", "pname": "gitlab-extension", "description": "GitLab extension utilizes the official GitLab API to provide a comfortable overview about your projects, commits & pipelines.\n", "link": "https://extensions.gnome.org/extension/3535/gitlab-extension/", "shell_version_map": {"38": {"version": "4", "sha256": "04hclkbj95alqv9lq5qa5dnf7wb8ssd08q0lzd9wxzw95hiqcvwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdExhYiBleHRlbnNpb24gdXRpbGl6ZXMgdGhlIG9mZmljaWFsIEdpdExhYiBBUEkgdG8gcHJvdmlkZSBhIGNvbWZvcnRhYmxlIG92ZXJ2aWV3IGFib3V0IHlvdXIgcHJvamVjdHMsIGNvbW1pdHMgJiBwaXBlbGluZXMuXG4iLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkdpdExhYiBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2luYXRpYy9naXRsYWItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRsYWItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "04hclkbj95alqv9lq5qa5dnf7wb8ssd08q0lzd9wxzw95hiqcvwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdExhYiBleHRlbnNpb24gdXRpbGl6ZXMgdGhlIG9mZmljaWFsIEdpdExhYiBBUEkgdG8gcHJvdmlkZSBhIGNvbWZvcnRhYmxlIG92ZXJ2aWV3IGFib3V0IHlvdXIgcHJvamVjdHMsIGNvbW1pdHMgJiBwaXBlbGluZXMuXG4iLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkdpdExhYiBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2luYXRpYy9naXRsYWItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRsYWItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "downfall@torculus.github.com", "name": "DownFall", "pname": "downfall", "description": "Moves text of your choice across the screen. Can simulate leaves, snow, fireworks, ufos, and more!", "link": "https://extensions.gnome.org/extension/3539/downfall/", "shell_version_map": {"38": {"version": "18", "sha256": "0x271szv8gjkzh04sp3gif6y5yxs6rvhxnwa3q3j7bxhlwscjx7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "18", "sha256": "0x271szv8gjkzh04sp3gif6y5yxs6rvhxnwa3q3j7bxhlwscjx7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "18", "sha256": "0x271szv8gjkzh04sp3gif6y5yxs6rvhxnwa3q3j7bxhlwscjx7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} +, {"uuid": "downfall@torculus.github.com", "name": "DownFall", "pname": "downfall", "description": "Moves text of your choice across the screen. Can simulate leaves, snow, fireworks, ufos, and more!", "link": "https://extensions.gnome.org/extension/3539/downfall/", "shell_version_map": {"38": {"version": "19", "sha256": "0dmkjqmn2x7bg7fndq4fdvllhpzd3in39z2ykm1g6f0zyv4gq2i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvcmN1bHVzL0Rvd25GYWxsIiwKICAidXVpZCI6ICJkb3duZmFsbEB0b3JjdWx1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "0dmkjqmn2x7bg7fndq4fdvllhpzd3in39z2ykm1g6f0zyv4gq2i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvcmN1bHVzL0Rvd25GYWxsIiwKICAidXVpZCI6ICJkb3duZmFsbEB0b3JjdWx1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "0dmkjqmn2x7bg7fndq4fdvllhpzd3in39z2ykm1g6f0zyv4gq2i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvcmN1bHVzL0Rvd25GYWxsIiwKICAidXVpZCI6ICJkb3duZmFsbEB0b3JjdWx1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"uuid": "time-awareness@gnome-extensions.kapranoff.ru", "name": "Time Awareness", "pname": "time-awareness", "description": "Tracks the time you have been actively using your computer", "link": "https://extensions.gnome.org/extension/3556/time-awareness/", "shell_version_map": {"38": {"version": "7", "sha256": "0a9a7524ddwb2hxf3q5amgbd57fy17m994vj3gbkddk7mp8m06a7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3NyLmh0L35rYXBwYS9nbm9tZS1zaGVsbC10aW1lLWF3YXJlbmVzcy8iLAogICJ1dWlkIjogInRpbWUtYXdhcmVuZXNzQGdub21lLWV4dGVuc2lvbnMua2FwcmFub2ZmLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0a9a7524ddwb2hxf3q5amgbd57fy17m994vj3gbkddk7mp8m06a7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3NyLmh0L35rYXBwYS9nbm9tZS1zaGVsbC10aW1lLWF3YXJlbmVzcy8iLAogICJ1dWlkIjogInRpbWUtYXdhcmVuZXNzQGdub21lLWV4dGVuc2lvbnMua2FwcmFub2ZmLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0a9a7524ddwb2hxf3q5amgbd57fy17m994vj3gbkddk7mp8m06a7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3NyLmh0L35rYXBwYS9nbm9tZS1zaGVsbC10aW1lLWF3YXJlbmVzcy8iLAogICJ1dWlkIjogInRpbWUtYXdhcmVuZXNzQGdub21lLWV4dGVuc2lvbnMua2FwcmFub2ZmLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "mullvadindicator@pobega.github.com", "name": "Mullvad Indicator", "pname": "mullvad-indicator", "description": "Mullvad connection status indicator", "link": "https://extensions.gnome.org/extension/3560/mullvad-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "05vcb7g51byvnk7bzajb1i7knj4zwjiksia97wabk41a2bagc4jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9iZWdhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdWxsdmFkLWluZGljYXRvciIsCiAgInV1aWQiOiAibXVsbHZhZGluZGljYXRvckBwb2JlZ2EuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "05vcb7g51byvnk7bzajb1i7knj4zwjiksia97wabk41a2bagc4jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9iZWdhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdWxsdmFkLWluZGljYXRvciIsCiAgInV1aWQiOiAibXVsbHZhZGluZGljYXRvckBwb2JlZ2EuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "05vcb7g51byvnk7bzajb1i7knj4zwjiksia97wabk41a2bagc4jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9iZWdhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdWxsdmFkLWluZGljYXRvciIsCiAgInV1aWQiOiAibXVsbHZhZGluZGljYXRvckBwb2JlZ2EuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "task-widget@juozasmiskinis.gitlab.io", "name": "Task Widget", "pname": "task-widget", "description": "Display tasks next to the calendar widget.\n\nVisit our Wiki page for more information and troubleshooting.", "link": "https://extensions.gnome.org/extension/3569/task-widget/", "shell_version_map": {"38": {"version": "11", "sha256": "0bn43w6smfihr220k6abazq6lwd5qc3xyrl9crh9m6m09c0x7hln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMSwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}, "40": {"version": "11", "sha256": "0bn43w6smfihr220k6abazq6lwd5qc3xyrl9crh9m6m09c0x7hln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMSwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}, "41": {"version": "11", "sha256": "0bn43w6smfihr220k6abazq6lwd5qc3xyrl9crh9m6m09c0x7hln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMSwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}}} @@ -363,7 +363,7 @@ , {"uuid": "wireguard-indicator@atareao.es", "name": "WireGuard Indicator", "pname": "wireguard-indicator", "description": "Manage WireGuard VPN from Desktop", "link": "https://extensions.gnome.org/extension/3612/wireguard-indicator/", "shell_version_map": {"40": {"version": "6", "sha256": "0qddl83x30y6jqm4nyjk6faklmv7cii2czmgmagcyllgkh0simav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL3dpcmVndWFyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogIndpcmVndWFyZC1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "shamsi-calendar@gnome.scr.ir", "name": "Iranian Persian Calendar", "pname": "shamsi-calendar", "description": "تقویم هجری شمسی،قمری و میلادی در میزکار گنوم لینوکس\nقابلیت نمایش اوقات شرعی و پخش اذان\nدرج تعطیلیها و مناسبتهای رسمی تقویم\nزبان کاملاً فارسی\nتاریخ قمری هلالی ایران\nسازگار با اکثر نسخههای گنوم\nدر حال توسعه...\n\nShows Persian + Islamic + Gregorian date in the panel of gnome.\n\nIt shows:\n1- Persian calendar\n2- It can show, today is holiday or not!\n3- Show notification onDayChanged!\n4- Date converter between Persian, Gregorian and Lunar Hijri(Islamic)\n5- Show calendar Events.\n6- Show PrayTimes and play sound (Azan).\n\nPlease \"rate\" here and \"star\" project in GitHub.\nPlease open an issue in GitHub if you found something or have an idea!\nگزارش مشکلات:\nhttps://github.com/SCR-IR/gnome-shamsi-calendar/issues", "link": "https://extensions.gnome.org/extension/3618/shamsi-calendar/", "shell_version_map": {"38": {"version": "16", "sha256": "1aqhj1lmwqy6wlbd105bl85grs749q4hilsz253n45s25jjzw5p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Njci1pci9nbm9tZS1zaGFtc2ktY2FsZW5kYXIiLAogICJ1dWlkIjogInNoYW1zaS1jYWxlbmRhckBnbm9tZS5zY3IuaXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "16", "sha256": "1aqhj1lmwqy6wlbd105bl85grs749q4hilsz253n45s25jjzw5p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Njci1pci9nbm9tZS1zaGFtc2ktY2FsZW5kYXIiLAogICJ1dWlkIjogInNoYW1zaS1jYWxlbmRhckBnbm9tZS5zY3IuaXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1aqhj1lmwqy6wlbd105bl85grs749q4hilsz253n45s25jjzw5p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Njci1pci9nbm9tZS1zaGFtc2ktY2FsZW5kYXIiLAogICJ1dWlkIjogInNoYW1zaS1jYWxlbmRhckBnbm9tZS5zY3IuaXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"uuid": "tunnel-indicator@atareao.es", "name": "Tunnel Indicator", "pname": "tunnel-indicator", "description": "Manage SSH Tunnels from Desktop", "link": "https://extensions.gnome.org/extension/3622/tunnel-indicator/", "shell_version_map": {"40": {"version": "2", "sha256": "0ma4a711mgjxyhy4d21p2m7wvbnmmwlfdsf6xk9i36ranjcqs9as", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBTU0ggVHVubmVscyBmcm9tIERlc2t0b3AiLAogICJleHRlbnNpb24taWQiOiAidHVubmVsLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHVubmVsLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJ0dW5uZWwtaWNvbiIsCiAgIm5hbWUiOiAiVHVubmVsIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLnR1bm5lbC1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby90dW5uZWwtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0dW5uZWwtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "arcmenu@arcmenu.com", "name": "ArcMenu", "pname": "arcmenu", "description": "Application Menu for GNOME, with various layouts to choose from!\n\nSupports GNOME shell 3.36, 3.38, 40, and 41.\n\nFor older GNOME shell versions visit https://extensions.gnome.org/extension/1228/arc-menu/\n\nCommon solutions for ERROR message:\n-Restart your GNOME session after updating ArcMenu.\n-Install one of the following packages: 'gir1.2-gmenu-3.0' or 'gnome-menus'\n\nGeneral Help:\n-Visit https://gitlab.com/arcmenu/ArcMenu/-/wikis/home\n\nPlease report all bugs or issues at https://gitlab.com/arcmenu/ArcMenu", "link": "https://extensions.gnome.org/extension/3628/arcmenu/", "shell_version_map": {"38": {"version": "17", "sha256": "0llq0zkvgxarr30s304n1ilidbwc0kx4l2impby5y2sdsvr7zafv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "23", "sha256": "1f59gpin72r5jfdqijicxrwjhsnmnxc09mmscr16d5ll5cvvkyid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "1f59gpin72r5jfdqijicxrwjhsnmnxc09mmscr16d5ll5cvvkyid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} +, {"uuid": "arcmenu@arcmenu.com", "name": "ArcMenu", "pname": "arcmenu", "description": "Application Menu for GNOME, with various layouts to choose from!\n\nSupports GNOME shell 3.36, 3.38, 40, and 41.\n\nFor older GNOME shell versions visit https://extensions.gnome.org/extension/1228/arc-menu/\n\nCommon solutions for ERROR message:\n-Restart your GNOME session after updating ArcMenu.\n-Install one of the following packages: 'gir1.2-gmenu-3.0' or 'gnome-menus'\n\nGeneral Help:\n-Visit https://gitlab.com/arcmenu/ArcMenu/-/wikis/home\n\nPlease report all bugs or issues at https://gitlab.com/arcmenu/ArcMenu", "link": "https://extensions.gnome.org/extension/3628/arcmenu/", "shell_version_map": {"38": {"version": "17", "sha256": "0llq0zkvgxarr30s304n1ilidbwc0kx4l2impby5y2sdsvr7zafv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "24", "sha256": "138ppya5gpf279lyxks0j5xl4plmfg43rp8y6037amb2ik8nca1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "41": {"version": "24", "sha256": "138ppya5gpf279lyxks0j5xl4plmfg43rp8y6037amb2ik8nca1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} , {"uuid": "fixedimelist@alynx.one", "name": "Fixed IME List", "pname": "fixed-ime-list", "description": "Make the IME list in fixed sequence instead of MRU.", "link": "https://extensions.gnome.org/extension/3663/fixed-ime-list/", "shell_version_map": {"38": {"version": "6", "sha256": "0v99flnb23cjv32wr7r077q29jvgs7j5fjx6dc6qm2n04f1qiibz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0v99flnb23cjv32wr7r077q29jvgs7j5fjx6dc6qm2n04f1qiibz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "topindicatorapp@quiro9.com", "name": "Top Indicator App", "pname": "top-indicator-app", "description": "This extension is 'appindicators' from ubuntu, renamed 'top indicator app' under the terms of the GPL v2 +. it is the extension itself that Ubuntu offers as a native experience on your system, but so you can install it in other distros since the current one in gnome-extensions is empty.I will offer stable updates when possible.", "link": "https://extensions.gnome.org/extension/3681/top-indicator-app/", "shell_version_map": {"38": {"version": "2", "sha256": "12r4fxgsgd7jn001vlzqrsd86ci62zxk0b9p3bkdqh6g5hj3la35", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzICdhcHBpbmRpY2F0b3JzJyBmcm9tIHVidW50dSwgcmVuYW1lZCAndG9wIGluZGljYXRvciBhcHAnIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR1BMIHYyICsuIGl0IGlzIHRoZSBleHRlbnNpb24gaXRzZWxmIHRoYXQgVWJ1bnR1IG9mZmVycyBhcyBhIG5hdGl2ZSBleHBlcmllbmNlIG9uIHlvdXIgc3lzdGVtLCBidXQgc28geW91IGNhbiBpbnN0YWxsIGl0IGluIG90aGVyIGRpc3Ryb3Mgc2luY2UgdGhlIGN1cnJlbnQgb25lIGluIGdub21lLWV4dGVuc2lvbnMgaXMgZW1wdHkuSSB3aWxsIG9mZmVyIHN0YWJsZSB1cGRhdGVzIHdoZW4gcG9zc2libGUuIiwKICAibmFtZSI6ICJUb3AgSW5kaWNhdG9yIEFwcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VidW50dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0b3BpbmRpY2F0b3JhcHBAcXVpcm85LmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "reorder-workspaces@jer.dev", "name": "Reorder Workspaces", "pname": "reorder-workspaces", "description": "Move workspaces up or down in the overview with Alt+Up/Alt+Down", "link": "https://extensions.gnome.org/extension/3685/reorder-workspaces/", "shell_version_map": {"38": {"version": "6", "sha256": "1f0hl2dzl75dwcv8jzx3rk1laqd9y9m32g219nvbhsmk8rjxfc31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd29ya3NwYWNlcyB1cCBvciBkb3duIGluIHRoZSBvdmVydmlldyB3aXRoIEFsdCtVcC9BbHQrRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plcmVtaWFobWVnZWwvZ25vbWUtcmVvcmRlci13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJyZW9yZGVyLXdvcmtzcGFjZXNAamVyLmRldiIsCiAgInZlcnNpb24iOiA2Cn0="}}} @@ -377,22 +377,22 @@ , {"uuid": "floating-dock@nandoferreira_prof@hotmail.com", "name": "Floating Dock", "pname": "floating-dock", "description": "A Custom Floating Dock fork, now you can change the margin and border radius of the dock.", "link": "https://extensions.gnome.org/extension/3730/floating-dock/", "shell_version_map": {"38": {"version": "1", "sha256": "0giksm5fvrj412v8xnf2hi4s0yi2mqd9prd84npv8jxkfv78y414", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm5hbmRvZmVycmVpcmFfcHJvZkBob3RtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "4", "sha256": "0ca22s5vbs6d32ppikmg0xcf5335qmighq6cpvly51q44hlqjamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0ca22s5vbs6d32ppikmg0xcf5335qmighq6cpvly51q44hlqjamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "tiling-assistant@leleat-on-github", "name": "Tiling Assistant", "pname": "tiling-assistant", "description": "Expand GNOME's 2 column tiling and add a Windows-snap-assist-inspired popup...", "link": "https://extensions.gnome.org/extension/3733/tiling-assistant/", "shell_version_map": {"38": {"version": "23", "sha256": "1b9hpll26ggwhw4f52wgflzjfqksmyfy5wyg1rpz41lr1dmva8vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L1RpbGluZy1Bc3Npc3RhbnQiLAogICJ1dWlkIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAyMwp9"}, "40": {"version": "32", "sha256": "14kvgygfia1961i4v933bg7j2l4mzy7hv7f53sc5giwpmcsj3b5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "14kvgygfia1961i4v933bg7j2l4mzy7hv7f53sc5giwpmcsj3b5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDMyCn0="}}} , {"uuid": "airpods-battery-status@ju.wtf", "name": "Airpods Battery status", "pname": "airpods-battery-status", "description": "Show Airpods battery level in top bar\n\n/!\\ Needs AirStatus to work: https://github.com/delphiki/AirStatus", "link": "https://extensions.gnome.org/extension/3736/airpods-battery-status/", "shell_version_map": {"38": {"version": "6", "sha256": "1ahvqcmcy3n8h66svryi77pm4n86qrcpkqilv5n3avv5bxn3v5d0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVscGhpa2kvZ25vbWUtYWlycG9kcy1iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYWlycG9kcy1iYXR0ZXJ5LXN0YXR1c0BqdS53dGYiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1ahvqcmcy3n8h66svryi77pm4n86qrcpkqilv5n3avv5bxn3v5d0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVscGhpa2kvZ25vbWUtYWlycG9kcy1iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYWlycG9kcy1iYXR0ZXJ5LXN0YXR1c0BqdS53dGYiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1ahvqcmcy3n8h66svryi77pm4n86qrcpkqilv5n3avv5bxn3v5d0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVscGhpa2kvZ25vbWUtYWlycG9kcy1iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYWlycG9kcy1iYXR0ZXJ5LXN0YXR1c0BqdS53dGYiLAogICJ2ZXJzaW9uIjogNgp9"}}} -, {"uuid": "hue-lights@chlumskyvaclav.gmail.com", "name": "Hue Lights", "pname": "hue-lights", "description": "This extension controls Philips Hue compatible lights using Philips Hue Bridge on your local network, it also allows controlling Philips Hue Sync Box. If you are experiencing an error on the upgrade, please log out and log in again.", "link": "https://extensions.gnome.org/extension/3737/hue-lights/", "shell_version_map": {"38": {"version": "20", "sha256": "0gsy5950fyvxxnzlgimhmvys5hr042j2078vgjm1x03xmilrpm7b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "40": {"version": "20", "sha256": "0gsy5950fyvxxnzlgimhmvys5hr042j2078vgjm1x03xmilrpm7b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0gsy5950fyvxxnzlgimhmvys5hr042j2078vgjm1x03xmilrpm7b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}}} -, {"uuid": "compiz-alike-magic-lamp-effect@hermes83.github.com", "name": "Compiz alike magic lamp effect", "pname": "compiz-alike-magic-lamp-effect", "description": "Magic lamp effect inspired by the Compiz ones\n\nNB:\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)", "link": "https://extensions.gnome.org/extension/3740/compiz-alike-magic-lamp-effect/", "shell_version_map": {"38": {"version": "10", "sha256": "1mkykm2ql888bksgw94wgvwfqlqnzr19rn629a4k6hph4b5rw5sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "1mkykm2ql888bksgw94wgvwfqlqnzr19rn629a4k6hph4b5rw5sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1mkykm2ql888bksgw94wgvwfqlqnzr19rn629a4k6hph4b5rw5sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "hue-lights@chlumskyvaclav.gmail.com", "name": "Hue Lights", "pname": "hue-lights", "description": "Glory to Ukraine! 🇺🇦 This extension controls Philips Hue compatible lights using Philips Hue Bridge on your local network, it also allows controlling Philips Hue Sync Box. If you are experiencing an error on the upgrade, please log out and log in again.", "link": "https://extensions.gnome.org/extension/3737/hue-lights/", "shell_version_map": {"38": {"version": "20", "sha256": "1iffi76fwnwxnnc08k0wwh4k2dy1lan4kdnwx54wblj04q3vcs48", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb3J5IHRvIFVrcmFpbmUhIFx1ZDgzY1x1ZGRmYVx1ZDgzY1x1ZGRlNiBUaGlzIGV4dGVuc2lvbiBjb250cm9scyBQaGlsaXBzIEh1ZSBjb21wYXRpYmxlIGxpZ2h0cyB1c2luZyBQaGlsaXBzIEh1ZSBCcmlkZ2Ugb24geW91ciBsb2NhbCBuZXR3b3JrLCBpdCBhbHNvIGFsbG93cyBjb250cm9sbGluZyBQaGlsaXBzIEh1ZSBTeW5jIEJveC4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9odWUtbGlnaHRzIiwKICAidXVpZCI6ICJodWUtbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "1iffi76fwnwxnnc08k0wwh4k2dy1lan4kdnwx54wblj04q3vcs48", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb3J5IHRvIFVrcmFpbmUhIFx1ZDgzY1x1ZGRmYVx1ZDgzY1x1ZGRlNiBUaGlzIGV4dGVuc2lvbiBjb250cm9scyBQaGlsaXBzIEh1ZSBjb21wYXRpYmxlIGxpZ2h0cyB1c2luZyBQaGlsaXBzIEh1ZSBCcmlkZ2Ugb24geW91ciBsb2NhbCBuZXR3b3JrLCBpdCBhbHNvIGFsbG93cyBjb250cm9sbGluZyBQaGlsaXBzIEh1ZSBTeW5jIEJveC4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9odWUtbGlnaHRzIiwKICAidXVpZCI6ICJodWUtbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "1iffi76fwnwxnnc08k0wwh4k2dy1lan4kdnwx54wblj04q3vcs48", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb3J5IHRvIFVrcmFpbmUhIFx1ZDgzY1x1ZGRmYVx1ZDgzY1x1ZGRlNiBUaGlzIGV4dGVuc2lvbiBjb250cm9scyBQaGlsaXBzIEh1ZSBjb21wYXRpYmxlIGxpZ2h0cyB1c2luZyBQaGlsaXBzIEh1ZSBCcmlkZ2Ugb24geW91ciBsb2NhbCBuZXR3b3JrLCBpdCBhbHNvIGFsbG93cyBjb250cm9sbGluZyBQaGlsaXBzIEh1ZSBTeW5jIEJveC4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9odWUtbGlnaHRzIiwKICAidXVpZCI6ICJodWUtbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}}} +, {"uuid": "compiz-alike-magic-lamp-effect@hermes83.github.com", "name": "Compiz alike magic lamp effect", "pname": "compiz-alike-magic-lamp-effect", "description": "Magic lamp effect inspired by the Compiz ones\n\nNB:\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)", "link": "https://extensions.gnome.org/extension/3740/compiz-alike-magic-lamp-effect/", "shell_version_map": {"38": {"version": "11", "sha256": "1ffki7rmdxrz3xr285jnlyxp1a4h6h4q17y4dj3c8p64hy145yyp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "1ffki7rmdxrz3xr285jnlyxp1a4h6h4q17y4dj3c8p64hy145yyp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1ffki7rmdxrz3xr285jnlyxp1a4h6h4q17y4dj3c8p64hy145yyp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "latency-monitor@gitlab.labsatho.me", "name": "Latency Monitor", "pname": "latency-monitor", "description": "A simple extension for displaying latency information using pings in GNOME Shell.", "link": "https://extensions.gnome.org/extension/3746/latency-monitor/", "shell_version_map": {"38": {"version": "6", "sha256": "0k2y1qrq7irkn2c72pk4c5x4fwzaxkfp3jj7qvhzih6zmkifdzcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZGlzcGxheWluZyBsYXRlbmN5IGluZm9ybWF0aW9uIHVzaW5nIHBpbmdzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiTGF0ZW5jeSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdGVuY3ktbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3dhbGthZndhbGthL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sYXRlbmN5LW1vbml0b3IiLAogICJ1dWlkIjogImxhdGVuY3ktbW9uaXRvckBnaXRsYWIubGFic2F0aG8ubWUiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "the-circles-widget@xenlism.github.io", "name": "The Circles - Desktop Widget", "pname": "the-circles-desktop-widget", "description": "Show System Infomations on Desktop as Circles Desktop Widget\n\nmore info \nhttps://www.linuxuprising.com/2020/11/display-clock-ram-and-cpu-usage-as.html", "link": "https://extensions.gnome.org/extension/3748/the-circles-desktop-widget/", "shell_version_map": {"38": {"version": "6", "sha256": "0kxync9gdjgcfq3vfhf5z0065n30jw5y5jl00hdgarsh4pkbji04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgU3lzdGVtIEluZm9tYXRpb25zIG9uIERlc2t0b3AgYXMgQ2lyY2xlcyBEZXNrdG9wIFdpZGdldFxuXG5tb3JlIGluZm8gXG5odHRwczovL3d3dy5saW51eHVwcmlzaW5nLmNvbS8yMDIwLzExL2Rpc3BsYXktY2xvY2stcmFtLWFuZC1jcHUtdXNhZ2UtYXMuaHRtbCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0aGUtY2lyY2xlcy13aWRnZXQiLAogICJuYW1lIjogIlRoZSBDaXJjbGVzIC0gRGVza3RvcCBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGhlLWNpcmNsZXMtd2lkZ2V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVubGlzbS9zaG93dGltZSIsCiAgInV1aWQiOiAidGhlLWNpcmNsZXMtd2lkZ2V0QHhlbmxpc20uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "12", "sha256": "0ngn00y97dqv667z47xahfv53dlb2asm0jbk9harlv4516jdrg0s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgU3lzdGVtIEluZm9tYXRpb25zIG9uIERlc2t0b3AgYXMgQ2lyY2xlcyBEZXNrdG9wIFdpZGdldFxuXG5tb3JlIGluZm8gXG5odHRwczovL3d3dy5saW51eHVwcmlzaW5nLmNvbS8yMDIwLzExL2Rpc3BsYXktY2xvY2stcmFtLWFuZC1jcHUtdXNhZ2UtYXMuaHRtbCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0aGUtY2lyY2xlcy13aWRnZXQiLAogICJuYW1lIjogIlRoZSBDaXJjbGVzIC0gRGVza3RvcCBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGhlLWNpcmNsZXMtd2lkZ2V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hlbmxpc20vc2hvd3RpbWUiLAogICJ1dWlkIjogInRoZS1jaXJjbGVzLXdpZGdldEB4ZW5saXNtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "overview_cleaner@gonza.com", "name": "Cleaner Overview", "pname": "cleaner-overview", "description": "Makes all the windows in the overview the same height and orders them by last recent used.", "link": "https://extensions.gnome.org/extension/3759/cleaner-overview/", "shell_version_map": {"38": {"version": "3", "sha256": "16xljs0ym9cp7lxa36ls7p4z79s7h9q7azg32pvhflylx4bsyv2c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3RvdWNocGFkLXdpbmRvdy1zd2l0Y2hlci1nbm9tZS1leHQvYmxvYi9tYXN0ZXIvdG91Y2hwYWRfd2luZG93X3N3aXRjaGVyJTQwZ29uemEuY29tL292ZXJ2aWV3Q2xlYW5lci5qcyIsCiAgInV1aWQiOiAib3ZlcnZpZXdfY2xlYW5lckBnb256YS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "16xljs0ym9cp7lxa36ls7p4z79s7h9q7azg32pvhflylx4bsyv2c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3RvdWNocGFkLXdpbmRvdy1zd2l0Y2hlci1nbm9tZS1leHQvYmxvYi9tYXN0ZXIvdG91Y2hwYWRfd2luZG93X3N3aXRjaGVyJTQwZ29uemEuY29tL292ZXJ2aWV3Q2xlYW5lci5qcyIsCiAgInV1aWQiOiAib3ZlcnZpZXdfY2xlYW5lckBnb256YS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "16xljs0ym9cp7lxa36ls7p4z79s7h9q7azg32pvhflylx4bsyv2c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3RvdWNocGFkLXdpbmRvdy1zd2l0Y2hlci1nbm9tZS1leHQvYmxvYi9tYXN0ZXIvdG91Y2hwYWRfd2luZG93X3N3aXRjaGVyJTQwZ29uemEuY29tL292ZXJ2aWV3Q2xlYW5lci5qcyIsCiAgInV1aWQiOiAib3ZlcnZpZXdfY2xlYW5lckBnb256YS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "battery-status@atareao.es", "name": "Battery Status", "pname": "battery-status", "description": "Get information about your battery status", "link": "https://extensions.gnome.org/extension/3763/battery-status/", "shell_version_map": {"40": {"version": "5", "sha256": "0mg30q1cgzmf70ikbm623fflhz392xkan0d8cpslnmkgx0z6nczv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "distinct@sireliah.com", "name": "Distinct Windows", "pname": "distinct-windows", "description": "Visually differentiate windows with colors and symbols", "link": "https://extensions.gnome.org/extension/3769/distinct-windows/", "shell_version_map": {"38": {"version": "4", "sha256": "1iqga92l9mk3ykf8bdy9igvqfx9k78jasdmqsrrz9zcz33d7k4h7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc3VhbGx5IGRpZmZlcmVudGlhdGUgd2luZG93cyB3aXRoIGNvbG9ycyBhbmQgc3ltYm9scyIsCiAgIm5hbWUiOiAiRGlzdGluY3QgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NpcmVsaWFoL2Rpc3RpbmN0LXdpbmRvd3MiLAogICJ1dWlkIjogImRpc3RpbmN0QHNpcmVsaWFoLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "miniCal2@breiq", "name": "Minimalist Calendar 2", "pname": "minimalist-calendar-2", "description": "Remove event list and clock/calendar app buttons from the calendar window.", "link": "https://extensions.gnome.org/extension/3775/minimalist-calendar-2/", "shell_version_map": {"38": {"version": "1", "sha256": "1nh10ik3zk3r4jr31mr8nw8nnamgj3mk1f3im06657wv18x9wvam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBldmVudCBsaXN0IGFuZCBjbG9jay9jYWxlbmRhciBhcHAgYnV0dG9ucyBmcm9tIHRoZSBjYWxlbmRhciB3aW5kb3cuIiwKICAibmFtZSI6ICJNaW5pbWFsaXN0IENhbGVuZGFyIDIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibWluaUNhbDJAYnJlaXEiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "ddterm@amezin.github.com", "name": "ddterm", "pname": "ddterm", "description": "Another drop down terminal extension for GNOME Shell. With tabs. Works on Wayland natively", "link": "https://extensions.gnome.org/extension/3780/ddterm/", "shell_version_map": {"38": {"version": "25", "sha256": "09f6v6xm88za18a8ravly6rvixpy8q1xdl9z0466shnkwdcfbqwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1lemluL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "09f6v6xm88za18a8ravly6rvixpy8q1xdl9z0466shnkwdcfbqwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1lemluL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "09f6v6xm88za18a8ravly6rvixpy8q1xdl9z0466shnkwdcfbqwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1lemluL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}}} +, {"uuid": "ddterm@amezin.github.com", "name": "ddterm", "pname": "ddterm", "description": "Another drop down terminal extension for GNOME Shell. With tabs. Works on Wayland natively", "link": "https://extensions.gnome.org/extension/3780/ddterm/", "shell_version_map": {"38": {"version": "28", "sha256": "1fn7rzqwqpcc46c1yz7swz7gg9x8x04wzqcc0xscgyqcfhg64p98", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}, "40": {"version": "28", "sha256": "1fn7rzqwqpcc46c1yz7swz7gg9x8x04wzqcc0xscgyqcfhg64p98", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}, "41": {"version": "28", "sha256": "1fn7rzqwqpcc46c1yz7swz7gg9x8x04wzqcc0xscgyqcfhg64p98", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}}} , {"uuid": "favorites-only-dash@nahuelwexd.github.io", "name": "Favorites-only Dash", "pname": "favorites-only-dash", "description": "Show only favorite apps on Dash", "link": "https://extensions.gnome.org/extension/3789/favorites-only-dash/", "shell_version_map": {"38": {"version": "1", "sha256": "110h019563j33gksaq5fs0z71sz1mslq1sbsmhk9mj3qggd9vs65", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgb25seSBmYXZvcml0ZSBhcHBzIG9uIERhc2giLAogICJuYW1lIjogIkZhdm9yaXRlcy1vbmx5IERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZmF2b3JpdGVzLW9ubHktZGFzaEBuYWh1ZWx3ZXhkLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "notification-timeout@chlumskyvaclav.gmail.com", "name": "Notification Timeout", "pname": "notification-timeout", "description": "This extension allows configuring the same timeout for all notifications. It also allows ignoring the idle state.", "link": "https://extensions.gnome.org/extension/3795/notification-timeout/", "shell_version_map": {"38": {"version": "4", "sha256": "14hns3mw3rk6az31pck3rnsj74n98swaiv1ky57d0gs9409zha6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "14hns3mw3rk6az31pck3rnsj74n98swaiv1ky57d0gs9409zha6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "14hns3mw3rk6az31pck3rnsj74n98swaiv1ky57d0gs9409zha6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "podman-as-docker@alberto.yomerengues.xyz", "name": "Podman and Docker", "pname": "podman-as-docker", "description": "podman extension as docker\nIn order to get it work on podman, you just need to create an alias\nSimply put: alias docker=podman\nand install podman-docker", "link": "https://extensions.gnome.org/extension/3799/podman-as-docker/", "shell_version_map": {"38": {"version": "1", "sha256": "18bkd6z5hm6zidh7xv8v3jvj36lmxzx4dar7nwa7nq3p51km6crz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInBvZG1hbiBleHRlbnNpb24gYXMgZG9ja2VyXG5JbiBvcmRlciB0byBnZXQgaXQgd29yayBvbiBwb2RtYW4sIHlvdSBqdXN0IG5lZWQgdG8gY3JlYXRlIGFuIGFsaWFzXG5TaW1wbHkgcHV0OiBhbGlhcyBkb2NrZXI9cG9kbWFuXG5hbmQgaW5zdGFsbCBwb2RtYW4tZG9ja2VyIiwKICAibmFtZSI6ICJQb2RtYW4gYW5kIERvY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJwb2RtYW4tYXMtZG9ja2VyQGFsYmVydG8ueW9tZXJlbmd1ZXMueHl6IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"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": "8", "sha256": "1rriknzx54f4wlfjm6wrcy9s86vchi5n3p3qp8lx52dsv36a22an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "1rriknzx54f4wlfjm6wrcy9s86vchi5n3p3qp8lx52dsv36a22an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"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": "5", "sha256": "1h12bhqac4zyvsj6xbjr7hnyah3bnbbx0r8ihblkw5l7a67ix1ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1h12bhqac4zyvsj6xbjr7hnyah3bnbbx0r8ihblkw5l7a67ix1ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"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- Always Show Workspace Switcher on Dynamic Workspaces (40, 41)\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 Visibility\n- Background Menu Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- GNOME Shell Theme Override\n- Hot Corner (3.36, 3.38, 40)\n- Keyboard Layout Visibility\n- Notification Banner Position\n- OSD Visibility\n- Panel Arrow Visibility(3.36, 3.38)\n- Panel Button Padding Size\n- Panel Height\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- Ripple Box\n- Search Visibility\n- Startup Status(40, 41)\n- System Menu (Aggregate Menu) Visibility\n- Window Demands Attention Focus\n- Window Picker Caption Visibility\n- Window Picker Close Button Visibility\n- Window Picker Icon(40, 41)\n- Workspace Background Corner Size in Overview(40, 41)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41)\n- Workspace Switcher Size (40, 41)\n- Workspace Switcher Visibility\n- Workspace Wraparound", "link": "https://extensions.gnome.org/extension/3843/just-perfection/", "shell_version_map": {"38": {"version": "18", "sha256": "15qv09ji5fh887hgazcxhb8z4m4n60h8p379zfns03h3918bbmrx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kIiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "18", "sha256": "15qv09ji5fh887hgazcxhb8z4m4n60h8p379zfns03h3918bbmrx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kIiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "41": {"version": "18", "sha256": "15qv09ji5fh887hgazcxhb8z4m4n60h8p379zfns03h3918bbmrx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kIiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} +, {"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- Always Show Workspace Switcher on Dynamic Workspaces (40, 41)\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 Visibility\n- Background Menu Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- GNOME Shell Theme Override\n- Hot Corner (3.36, 3.38, 40)\n- Keyboard Layout Visibility\n- Notification Banner 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- Ripple Box\n- Search Visibility\n- Startup Status(40, 41)\n- System Menu (Aggregate 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)\n- Workspace Background Corner Size in Overview(40, 41)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41)\n- Workspace Switcher Size (40, 41)\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": "19", "sha256": "03rw7lwzd481ynrgc3vhnhjnw7vyrjcfn80cy7af8dmvlqcx0299", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNiwgMy4zOCwgNDAsIDQxKVxuLSBQYW5lbCBWaXNpYmlsaXR5XG4tIFBhbmVsIFZpc2liaWxpdHkgaW4gT3ZlcnZpZXdcbi0gUG93ZXIgSWNvbiBWaXNpYmlsaXR5XG4tIFJpcHBsZSBCb3hcbi0gU2VhcmNoIFZpc2liaWxpdHlcbi0gU3RhcnR1cCBTdGF0dXMoNDAsIDQxKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "40": {"version": "19", "sha256": "03rw7lwzd481ynrgc3vhnhjnw7vyrjcfn80cy7af8dmvlqcx0299", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNiwgMy4zOCwgNDAsIDQxKVxuLSBQYW5lbCBWaXNpYmlsaXR5XG4tIFBhbmVsIFZpc2liaWxpdHkgaW4gT3ZlcnZpZXdcbi0gUG93ZXIgSWNvbiBWaXNpYmlsaXR5XG4tIFJpcHBsZSBCb3hcbi0gU2VhcmNoIFZpc2liaWxpdHlcbi0gU3RhcnR1cCBTdGF0dXMoNDAsIDQxKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "41": {"version": "19", "sha256": "03rw7lwzd481ynrgc3vhnhjnw7vyrjcfn80cy7af8dmvlqcx0299", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNiwgMy4zOCwgNDAsIDQxKVxuLSBQYW5lbCBWaXNpYmlsaXR5XG4tIFBhbmVsIFZpc2liaWxpdHkgaW4gT3ZlcnZpZXdcbi0gUG93ZXIgSWNvbiBWaXNpYmlsaXR5XG4tIFJpcHBsZSBCb3hcbi0gU2VhcmNoIFZpc2liaWxpdHlcbi0gU3RhcnR1cCBTdGF0dXMoNDAsIDQxKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"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": "12", "sha256": "1rskz8llic5g8cix4mb6iha9v789fg6yn2i25zj0ywb9qn063ld5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhciIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1iYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "1rskz8llic5g8cix4mb6iha9v789fg6yn2i25zj0ywb9qn063ld5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhciIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1iYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1rskz8llic5g8cix4mb6iha9v789fg6yn2i25zj0ywb9qn063ld5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhciIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1iYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"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"}}} @@ -405,7 +405,7 @@ , {"uuid": "sticky-r-terminal@fthx", "name": "Sticky R Terminal", "pname": "sticky-r-terminal", "description": "Toggle a sticky R terminal window. Your R window will always be in foreground while you use another app.\n\nYou can easily change it to default another terminal app or another app. Some other settings. See comments in extension.js file. Same extension only running a terminal: https://extensions.gnome.org/extension/3915/sticky-terminal . You can use it with R if this extension does not work for your R installation setup.\n\nKeywords: stat, stats, statistics, statistical, r-cran.", "link": "https://extensions.gnome.org/extension/3916/sticky-r-terminal/", "shell_version_map": {"38": {"version": "1", "sha256": "17x84g6fb785jmcl5jz41nw4rgzaad48mc5zllh5b3a485731f0s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBhIHN0aWNreSBSIHRlcm1pbmFsIHdpbmRvdy4gWW91ciBSIHdpbmRvdyB3aWxsIGFsd2F5cyBiZSBpbiBmb3JlZ3JvdW5kIHdoaWxlIHlvdSB1c2UgYW5vdGhlciBhcHAuXG5cbllvdSBjYW4gZWFzaWx5IGNoYW5nZSBpdCB0byBkZWZhdWx0IGFub3RoZXIgdGVybWluYWwgYXBwIG9yIGFub3RoZXIgYXBwLiBTb21lIG90aGVyIHNldHRpbmdzLiBTZWUgY29tbWVudHMgaW4gZXh0ZW5zaW9uLmpzIGZpbGUuIFNhbWUgZXh0ZW5zaW9uIG9ubHkgcnVubmluZyBhIHRlcm1pbmFsOiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zOTE1L3N0aWNreS10ZXJtaW5hbCAuIFlvdSBjYW4gdXNlIGl0IHdpdGggUiBpZiB0aGlzIGV4dGVuc2lvbiBkb2VzIG5vdCB3b3JrIGZvciB5b3VyIFIgaW5zdGFsbGF0aW9uIHNldHVwLlxuXG5LZXl3b3Jkczogc3RhdCwgc3RhdHMsIHN0YXRpc3RpY3MsIHN0YXRpc3RpY2FsLCByLWNyYW4uIiwKICAibmFtZSI6ICJTdGlja3kgUiBUZXJtaW5hbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvc3RpY2t5LXItdGVybWluYWwiLAogICJ1dWlkIjogInN0aWNreS1yLXRlcm1pbmFsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "onedrive@diegobazzanella.com", "name": "One Drive", "pname": "one-drive", "description": "One Drive extension", "link": "https://extensions.gnome.org/extension/3919/one-drive/", "shell_version_map": {"38": {"version": "4", "sha256": "0h37rr9hw6azrlf465ngl7w7miii9bm4sh33wkr0x8q51rz62ydd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24iLAogICJuYW1lIjogIk9uZSBEcml2ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RiYXp6YS9vbmVEcml2ZSIsCiAgInV1aWQiOiAib25lZHJpdmVAZGllZ29iYXp6YW5lbGxhLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "snowy@exposedcat", "name": "Snowy", "pname": "snowy", "description": "Make you festive mood with falling snow on your GNOME DE system", "link": "https://extensions.gnome.org/extension/3921/snowy/", "shell_version_map": {"40": {"version": "12", "sha256": "17y10r06dmfilbax4f55jxn2xxsjfbykrijxc4b96p3szi69110r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0V4cG9zZWRDYXQvc25vd3kiLAogICJ1dWlkIjogInNub3d5QGV4cG9zZWRjYXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "17y10r06dmfilbax4f55jxn2xxsjfbykrijxc4b96p3szi69110r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0V4cG9zZWRDYXQvc25vd3kiLAogICJ1dWlkIjogInNub3d5QGV4cG9zZWRjYXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} -, {"uuid": "focus@scaryrawr.github.io", "name": "Focus", "pname": "focus", "description": "Transparent inactive windows", "link": "https://extensions.gnome.org/extension/3924/focus/", "shell_version_map": {"38": {"version": "6", "sha256": "1ks47h0m50hssq5m25586lv5fa3yhwhdnb1jxgkfnb547k6qxb6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NhcnlyYXdyL2dub21lLWZvY3VzIiwKICAidXVpZCI6ICJmb2N1c0BzY2FyeXJhd3IuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "1ks47h0m50hssq5m25586lv5fa3yhwhdnb1jxgkfnb547k6qxb6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NhcnlyYXdyL2dub21lLWZvY3VzIiwKICAidXVpZCI6ICJmb2N1c0BzY2FyeXJhd3IuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "focus@scaryrawr.github.io", "name": "Focus", "pname": "focus", "description": "Transparent inactive windows", "link": "https://extensions.gnome.org/extension/3924/focus/", "shell_version_map": {"38": {"version": "7", "sha256": "01sh4wxnizgszwggrkp5l5j7iiayrz1wys06hnrq03014kgkd829", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY2FyeXJhd3IvZ25vbWUtZm9jdXMiLAogICJ1dWlkIjogImZvY3VzQHNjYXJ5cmF3ci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "01sh4wxnizgszwggrkp5l5j7iiayrz1wys06hnrq03014kgkd829", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY2FyeXJhd3IvZ25vbWUtZm9jdXMiLAogICJ1dWlkIjogImZvY3VzQHNjYXJ5cmF3ci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "01sh4wxnizgszwggrkp5l5j7iiayrz1wys06hnrq03014kgkd829", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY2FyeXJhd3IvZ25vbWUtZm9jdXMiLAogICJ1dWlkIjogImZvY3VzQHNjYXJ5cmF3ci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "autoselectheadset@josephlbarnett.github.com", "name": "Auto select headset", "pname": "auto-select-headset", "description": "Auto selects headsets when possible instead of showing a dialog", "link": "https://extensions.gnome.org/extension/3928/auto-select-headset/", "shell_version_map": {"38": {"version": "3", "sha256": "097q3xgkm5g75vjy76v9y8q7n5jb1wvxv2ffvj1f0nk0ag7y909d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "097q3xgkm5g75vjy76v9y8q7n5jb1wvxv2ffvj1f0nk0ag7y909d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "toggle-night-light@cansozbir.github.io", "name": "Toggle Night Light", "pname": "toggle-night-light", "description": "This extension lets you toggle night-light from the top-bar by clicking it.", "link": "https://extensions.gnome.org/extension/3933/toggle-night-light/", "shell_version_map": {"38": {"version": "5", "sha256": "1r7mjixc2r8p5cmgk94sbj7gsx9xfx5sfnaxa01prqrpd3pqlhzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYW5zb3piaXIvZ25vbWUtc2hlbGwtdG9nZ2xlLW5pZ2h0LWxpZ2h0LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9nZ2xlLW5pZ2h0LWxpZ2h0QGNhbnNvemJpci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1r7mjixc2r8p5cmgk94sbj7gsx9xfx5sfnaxa01prqrpd3pqlhzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYW5zb3piaXIvZ25vbWUtc2hlbGwtdG9nZ2xlLW5pZ2h0LWxpZ2h0LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9nZ2xlLW5pZ2h0LWxpZ2h0QGNhbnNvemJpci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1r7mjixc2r8p5cmgk94sbj7gsx9xfx5sfnaxa01prqrpd3pqlhzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYW5zb3piaXIvZ25vbWUtc2hlbGwtdG9nZ2xlLW5pZ2h0LWxpZ2h0LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9nZ2xlLW5pZ2h0LWxpZ2h0QGNhbnNvemJpci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "adwaita-theme-switcher@fthx", "name": "Adwaita Theme Switcher", "pname": "adwaita-theme-switcher", "description": "Button in panel: switch between Adwaita dark and light themes.", "link": "https://extensions.gnome.org/extension/3936/adwaita-theme-switcher/", "shell_version_map": {"38": {"version": "4", "sha256": "0015j3vqwvb0fs2n90lz0i66f23nr7mmvqzgwnsah46x8lkm2kpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gQWR3YWl0YSBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIiwKICAibmFtZSI6ICJBZHdhaXRhIFRoZW1lIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Fkd2FpdGEtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogImFkd2FpdGEtdGhlbWUtc3dpdGNoZXJAZnRoeCIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "0015j3vqwvb0fs2n90lz0i66f23nr7mmvqzgwnsah46x8lkm2kpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gQWR3YWl0YSBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIiwKICAibmFtZSI6ICJBZHdhaXRhIFRoZW1lIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Fkd2FpdGEtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogImFkd2FpdGEtdGhlbWUtc3dpdGNoZXJAZnRoeCIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0015j3vqwvb0fs2n90lz0i66f23nr7mmvqzgwnsah46x8lkm2kpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gQWR3YWl0YSBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIiwKICAibmFtZSI6ICJBZHdhaXRhIFRoZW1lIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Fkd2FpdGEtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogImFkd2FpdGEtdGhlbWUtc3dpdGNoZXJAZnRoeCIsCiAgInZlcnNpb24iOiA0Cn0="}}} @@ -415,9 +415,9 @@ , {"uuid": "persistent-email-notifications@fthx", "name": "Persistent Email Notifications", "pname": "persistent-email-notifications", "description": "Never hide a new mail notification, except if you close it.\n\nVery very light extension. Email clients supported: Thunderbird, Evolution, Geary, Mailspring, TypeApp, BlueMail. Please ask for another email client if needed.", "link": "https://extensions.gnome.org/extension/3951/persistent-email-notifications/", "shell_version_map": {"38": {"version": "3", "sha256": "06m6fhs50vlrwkgdk6cvkcl5f155a1w8szs1g9pzryf8mmldgmdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbWFpbCBub3RpZmljYXRpb24sIGV4Y2VwdCBpZiB5b3UgY2xvc2UgaXQuXG5cblZlcnkgdmVyeSBsaWdodCBleHRlbnNpb24uIEVtYWlsIGNsaWVudHMgc3VwcG9ydGVkOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZywgVHlwZUFwcCwgQmx1ZU1haWwuIFBsZWFzZSBhc2sgZm9yIGFub3RoZXIgZW1haWwgY2xpZW50IGlmIG5lZWRlZC4iLAogICJuYW1lIjogIlBlcnNpc3RlbnQgRW1haWwgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3BlcnNpc3RlbnQtZW1haWwtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAicGVyc2lzdGVudC1lbWFpbC1ub3RpZmljYXRpb25zQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "06m6fhs50vlrwkgdk6cvkcl5f155a1w8szs1g9pzryf8mmldgmdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbWFpbCBub3RpZmljYXRpb24sIGV4Y2VwdCBpZiB5b3UgY2xvc2UgaXQuXG5cblZlcnkgdmVyeSBsaWdodCBleHRlbnNpb24uIEVtYWlsIGNsaWVudHMgc3VwcG9ydGVkOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZywgVHlwZUFwcCwgQmx1ZU1haWwuIFBsZWFzZSBhc2sgZm9yIGFub3RoZXIgZW1haWwgY2xpZW50IGlmIG5lZWRlZC4iLAogICJuYW1lIjogIlBlcnNpc3RlbnQgRW1haWwgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3BlcnNpc3RlbnQtZW1haWwtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAicGVyc2lzdGVudC1lbWFpbC1ub3RpZmljYXRpb25zQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "horizontal-workspace-indicator@tty2.io", "name": "Workspace indicator", "pname": "workspace-indicator", "description": "Workspace indicator shows the amount of opened workspaces and highlights the current one using unicode characters.\n\nYou can use it as an indicator only but widget is clickable. Left button click: move to left, right click: move right.\n\nYou can change the widgets position with preferences. The widget can be pinned to right corner (status area) default, center (data time area) and left corner (activities area).\n\nThere could be an error with the extension after update. The solution is to logout and login again.", "link": "https://extensions.gnome.org/extension/3952/workspace-indicator/", "shell_version_map": {"38": {"version": "9", "sha256": "1zzgxr6iq8c3drpd2n9hqly5pv827qpfy2kbjyzzzgxcvz5002df", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cbllvdSBjYW4gY2hhbmdlIHRoZSB3aWRnZXRzIHBvc2l0aW9uIHdpdGggcHJlZmVyZW5jZXMuIFRoZSB3aWRnZXQgY2FuIGJlIHBpbm5lZCB0byByaWdodCBjb3JuZXIgKHN0YXR1cyBhcmVhKSBkZWZhdWx0LCBjZW50ZXIgKGRhdGEgdGltZSBhcmVhKSBhbmQgbGVmdCBjb3JuZXIgKGFjdGl2aXRpZXMgYXJlYSkuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "11", "sha256": "1y2ykdqcifhmps9lqpcpkpp8a7vfs5n48y9y9cm0pflxn6zzdqsb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cbllvdSBjYW4gY2hhbmdlIHRoZSB3aWRnZXRzIHBvc2l0aW9uIHdpdGggcHJlZmVyZW5jZXMuIFRoZSB3aWRnZXQgY2FuIGJlIHBpbm5lZCB0byByaWdodCBjb3JuZXIgKHN0YXR1cyBhcmVhKSBkZWZhdWx0LCBjZW50ZXIgKGRhdGEgdGltZSBhcmVhKSBhbmQgbGVmdCBjb3JuZXIgKGFjdGl2aXRpZXMgYXJlYSkuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1y2ykdqcifhmps9lqpcpkpp8a7vfs5n48y9y9cm0pflxn6zzdqsb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cbllvdSBjYW4gY2hhbmdlIHRoZSB3aWRnZXRzIHBvc2l0aW9uIHdpdGggcHJlZmVyZW5jZXMuIFRoZSB3aWRnZXQgY2FuIGJlIHBpbm5lZCB0byByaWdodCBjb3JuZXIgKHN0YXR1cyBhcmVhKSBkZWZhdWx0LCBjZW50ZXIgKGRhdGEgdGltZSBhcmVhKSBhbmQgbGVmdCBjb3JuZXIgKGFjdGl2aXRpZXMgYXJlYSkuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "kitchentimer@blackjackshellac.ca", "name": "Kitchen Timer", "pname": "kitchen-timer", "description": "General purpose timer extension for Gnome Shell\n\nPlease report issues on github\n\nIf updating the extension reports an ERROR, it should work after the next reboot or if you logout and login again.", "link": "https://extensions.gnome.org/extension/3955/kitchen-timer/", "shell_version_map": {"38": {"version": "28", "sha256": "0k1ahswl2ipjz1v1z1j96lndbk26rgfr2ra2g78lvzjiv6j42sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYWwgcHVycG9zZSB0aW1lciBleHRlbnNpb24gZm9yIEdub21lIFNoZWxsXG5cblBsZWFzZSByZXBvcnQgaXNzdWVzIG9uIGdpdGh1YlxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IsIGl0IHNob3VsZCB3b3JrIGFmdGVyIHRoZSBuZXh0IHJlYm9vdCBvciBpZiB5b3UgbG9nb3V0IGFuZCBsb2dpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJraXRjaGVuLXRpbWVyLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogIktpdGNoZW4gVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2l0Y2hlbi10aW1lci1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMva2l0Y2hlblRpbWVyIiwKICAidXVpZCI6ICJraXRjaGVudGltZXJAYmxhY2tqYWNrc2hlbGxhYy5jYSIsCiAgInZlcnNpb24iOiAyOAp9"}, "40": {"version": "28", "sha256": "0k1ahswl2ipjz1v1z1j96lndbk26rgfr2ra2g78lvzjiv6j42sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYWwgcHVycG9zZSB0aW1lciBleHRlbnNpb24gZm9yIEdub21lIFNoZWxsXG5cblBsZWFzZSByZXBvcnQgaXNzdWVzIG9uIGdpdGh1YlxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IsIGl0IHNob3VsZCB3b3JrIGFmdGVyIHRoZSBuZXh0IHJlYm9vdCBvciBpZiB5b3UgbG9nb3V0IGFuZCBsb2dpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJraXRjaGVuLXRpbWVyLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogIktpdGNoZW4gVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2l0Y2hlbi10aW1lci1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMva2l0Y2hlblRpbWVyIiwKICAidXVpZCI6ICJraXRjaGVudGltZXJAYmxhY2tqYWNrc2hlbGxhYy5jYSIsCiAgInZlcnNpb24iOiAyOAp9"}}} -, {"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": "3", "sha256": "0jxh2wcckwnijgabg9k7b7mi785j63pjkbjya4pbvnmiw4n4qbn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjIxLjIiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "0jxh2wcckwnijgabg9k7b7mi785j63pjkbjya4pbvnmiw4n4qbn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjIxLjIiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0jxh2wcckwnijgabg9k7b7mi785j63pjkbjya4pbvnmiw4n4qbn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjIxLjIiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"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": "11", "sha256": "188kyjh437q2vljfqaiqhssg1b7asmh0d3jmxy3507xvya6hkrgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9DemFybGllL2dub21lLWZ1enp5LWFwcC1zZWFyY2giLAogICJ1dWlkIjogImdub21lLWZ1enp5LWFwcC1zZWFyY2hAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5DemFybGllLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "188kyjh437q2vljfqaiqhssg1b7asmh0d3jmxy3507xvya6hkrgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9DemFybGllL2dub21lLWZ1enp5LWFwcC1zZWFyY2giLAogICJ1dWlkIjogImdub21lLWZ1enp5LWFwcC1zZWFyY2hAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5DemFybGllLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "188kyjh437q2vljfqaiqhssg1b7asmh0d3jmxy3507xvya6hkrgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9DemFybGllL2dub21lLWZ1enp5LWFwcC1zZWFyY2giLAogICJ1dWlkIjogImdub21lLWZ1enp5LWFwcC1zZWFyY2hAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5DemFybGllLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"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": "10", "sha256": "0i37h2jcj2j64cc3y67irmmj1g7iqz5pzcdz9y8ws702jpg0pz2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhbWFyaW9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQGZ0cGl4LmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0i37h2jcj2j64cc3y67irmmj1g7iqz5pzcdz9y8ws702jpg0pz2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhbWFyaW9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQGZ0cGl4LmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} +, {"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": "11", "sha256": "1illvhj3916g081cd42lx108fssg5m60w118ihj19qqkvpdq96gw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYW1hcmlvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtdG9wLWJhckBmdHBpeC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "1illvhj3916g081cd42lx108fssg5m60w118ihj19qqkvpdq96gw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYW1hcmlvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtdG9wLWJhckBmdHBpeC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"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": "10", "sha256": "077acz5i10jvnqc0kf0yivlzq40xz03jb9gacpr8rm9my0yvdlp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "077acz5i10jvnqc0kf0yivlzq40xz03jb9gacpr8rm9my0yvdlp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "077acz5i10jvnqc0kf0yivlzq40xz03jb9gacpr8rm9my0yvdlp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"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": {"38": {"version": "3", "sha256": "0r171an47d1fdhzwiq7kg59hasibmcvvcsv9z9xd1kh5jahzmam5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZW50ZTc2L2d1aWxsb3RpbmUvIiwKICAidXVpZCI6ICJndWlsbG90aW5lQGZvcGRvb2RsZS5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "13", "sha256": "15mva65wi2wjy3wb7l71v9qag3wrswifrh53kx6nf8dkqpqir03y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9lbnRlNzYvZ3VpbGxvdGluZS8iLAogICJ1dWlkIjogImd1aWxsb3RpbmVAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "15mva65wi2wjy3wb7l71v9qag3wrswifrh53kx6nf8dkqpqir03y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9lbnRlNzYvZ3VpbGxvdGluZS8iLAogICJ1dWlkIjogImd1aWxsb3RpbmVAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}}} @@ -432,7 +432,7 @@ , {"uuid": "desktop-lyric@tuberry", "name": "Desktop Lyric", "pname": "desktop-lyric", "description": "Show the lyric of playing songs on the desktop\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/4006/desktop-lyric/", "shell_version_map": {"38": {"version": "3", "sha256": "1fxlszj21ppdl5k2x2samggxlnay5bqly604szv1sjsnfriqzz3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVza3RvcC1seXJpYyIsCiAgIm5hbWUiOiAiRGVza3RvcCBMeXJpYyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kZXNrdG9wLWx5cmljIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9kZXNrdG9wLWx5cmljIiwKICAidXVpZCI6ICJkZXNrdG9wLWx5cmljQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "7", "sha256": "1dd8i7845fshc2d04fgzjr1chrnwsfr7qyjjki1svw36mx1qsjm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVza3RvcC1seXJpYyIsCiAgIm5hbWUiOiAiRGVza3RvcCBMeXJpYyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kZXNrdG9wLWx5cmljIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvZGVza3RvcC1seXJpYyIsCiAgInV1aWQiOiAiZGVza3RvcC1seXJpY0B0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "12", "sha256": "056cdiw7rlqpxkmca3f1aic7wr9dppvhp1z7wfxl905xn21p9pqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "alttab-mod@leleat-on-github", "name": "AltTab Mod", "pname": "alttab-mod", "description": "Alt/Super+Tab can also be navigated with WASD and hjkl. Q just closes the selected item and only the first window will be raised on app activation. Optionally, only show windows from the current workspace or monitor and remove the slight popup delay.", "link": "https://extensions.gnome.org/extension/4007/alttab-mod/", "shell_version_map": {"38": {"version": "6", "sha256": "069086j1855s0zrawx49h40l3qmzbsjl0n58wr74lxfk1s6sirww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdC9TdXBlcitUYWIgY2FuIGFsc28gYmUgbmF2aWdhdGVkIHdpdGggV0FTRCBhbmQgaGprbC4gUSBqdXN0IGNsb3NlcyB0aGUgc2VsZWN0ZWQgaXRlbSBhbmQgb25seSB0aGUgZmlyc3Qgd2luZG93IHdpbGwgYmUgcmFpc2VkIG9uIGFwcCBhY3RpdmF0aW9uLiBPcHRpb25hbGx5LCBvbmx5IHNob3cgd2luZG93cyBmcm9tIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBvciBtb25pdG9yIGFuZCByZW1vdmUgdGhlIHNsaWdodCBwb3B1cCBkZWxheS4iLAogICJuYW1lIjogIkFsdFRhYiBNb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9BbHRUYWItTW9kIiwKICAidXVpZCI6ICJhbHR0YWItbW9kQGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "7", "sha256": "1qnbga30wvsj6xny7ajvy8y6c4vm3cpwz3zkm5njr2d0qg4svsq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdC9TdXBlcitUYWIgY2FuIGFsc28gYmUgbmF2aWdhdGVkIHdpdGggV0FTRCBhbmQgaGprbC4gUSBqdXN0IGNsb3NlcyB0aGUgc2VsZWN0ZWQgaXRlbSBhbmQgb25seSB0aGUgZmlyc3Qgd2luZG93IHdpbGwgYmUgcmFpc2VkIG9uIGFwcCBhY3RpdmF0aW9uLiBPcHRpb25hbGx5LCBvbmx5IHNob3cgd2luZG93cyBmcm9tIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBvciBtb25pdG9yIGFuZCByZW1vdmUgdGhlIHNsaWdodCBwb3B1cCBkZWxheS4iLAogICJuYW1lIjogIkFsdFRhYiBNb2QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx0VGFiLW1vZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1qnbga30wvsj6xny7ajvy8y6c4vm3cpwz3zkm5njr2d0qg4svsq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdC9TdXBlcitUYWIgY2FuIGFsc28gYmUgbmF2aWdhdGVkIHdpdGggV0FTRCBhbmQgaGprbC4gUSBqdXN0IGNsb3NlcyB0aGUgc2VsZWN0ZWQgaXRlbSBhbmQgb25seSB0aGUgZmlyc3Qgd2luZG93IHdpbGwgYmUgcmFpc2VkIG9uIGFwcCBhY3RpdmF0aW9uLiBPcHRpb25hbGx5LCBvbmx5IHNob3cgd2luZG93cyBmcm9tIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBvciBtb25pdG9yIGFuZCByZW1vdmUgdGhlIHNsaWdodCBwb3B1cCBkZWxheS4iLAogICJuYW1lIjogIkFsdFRhYiBNb2QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx0VGFiLW1vZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "personalize@Selenium-H", "name": "Personalize", "pname": "personalize", "description": "Personalize the looks of GNOME Desktop.\n\nSet the theme variant, window corner curvature and select accent color.\nThe Colors section contains colors generated from the selected accent color.\nThe color generation is not accurate. However, individual colors can be customised.\n\nNot all settings are applied automatically.\nPress Refresh button on the left of the headerbar to reload the extension \n\nCurrently, only Adwaita theme is supported. Also, Adwaita and Adwaita-dark gtk-2 themes\nmust be installed for the extension to work properly. Not all widgets are themed perfectly.", "link": "https://extensions.gnome.org/extension/4010/personalize/", "shell_version_map": {"38": {"version": "1", "sha256": "1rgh2zq7086ymf0222pbrx5n8q11v3f45095w4x3ikw7k12j9s0n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiUGVyc29uYWxpemUgR05PTUUgdGhlbWUgYW5kIGN1c3RvbWl6ZSB0aGVtLiIsCiAgImRlc2NyaXB0aW9uIjogIlBlcnNvbmFsaXplIHRoZSBsb29rcyBvZiBHTk9NRSBEZXNrdG9wLlxuXG5TZXQgdGhlIHRoZW1lIHZhcmlhbnQsIHdpbmRvdyBjb3JuZXIgY3VydmF0dXJlIGFuZCBzZWxlY3QgYWNjZW50IGNvbG9yLlxuVGhlIENvbG9ycyBzZWN0aW9uIGNvbnRhaW5zIGNvbG9ycyBnZW5lcmF0ZWQgZnJvbSB0aGUgc2VsZWN0ZWQgYWNjZW50IGNvbG9yLlxuVGhlIGNvbG9yIGdlbmVyYXRpb24gaXMgbm90IGFjY3VyYXRlLiBIb3dldmVyLCBpbmRpdmlkdWFsIGNvbG9ycyBjYW4gYmUgY3VzdG9taXNlZC5cblxuTm90IGFsbCBzZXR0aW5ncyBhcmUgYXBwbGllZCBhdXRvbWF0aWNhbGx5LlxuUHJlc3MgUmVmcmVzaCBidXR0b24gb24gdGhlIGxlZnQgb2YgdGhlIGhlYWRlcmJhciB0byByZWxvYWQgdGhlIGV4dGVuc2lvbiBcblxuQ3VycmVudGx5LCBvbmx5IEFkd2FpdGEgdGhlbWUgaXMgc3VwcG9ydGVkLiBBbHNvLCBBZHdhaXRhIGFuZCBBZHdhaXRhLWRhcmsgZ3RrLTIgdGhlbWVzXG5tdXN0IGJlIGluc3RhbGxlZCBmb3IgdGhlIGV4dGVuc2lvbiB0byB3b3JrIHByb3Blcmx5LiBOb3QgYWxsIHdpZGdldHMgYXJlIHRoZW1lZCBwZXJmZWN0bHkuIiwKICAibmFtZSI6ICJQZXJzb25hbGl6ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzb25hbGl6ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJzdGF0dXMiOiAiICIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2VsZW5pdW0tSC9QZXJzb25hbGl6ZSIsCiAgInV1aWQiOiAicGVyc29uYWxpemVAU2VsZW5pdW0tSCIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "gnomebedtime@ionutbortis.gmail.com", "name": "Bedtime Mode", "pname": "gnome-bedtime", "description": "Hey Gnome, it's bedtime! Converts to grayscale the entire Gnome workspace by using a smooth transition. Best to use during evening/night.\n\nThis behaviour is similar to Android's bedtime mode which converts the phone screen to grayscale. It should somewhat make your device less appealing and limit the usage of it before bedtime. On my side, at least, it still requires a fair amount of self control in order to make that happen.\n\nThe extension has a nice Settings UI where you can customize it to your liking:\n- Set an automatic schedule for turning on/off the Bedtime Mode\n- Add an On Demand button to Top Bar or System Menu to manually toggle the mode\n- Control the On Demand button visibility, appearance and position in Top Bar\n- Choose another color preset and intensity, if you prefer a different color scheme\n- Change color intensity on the fly by scrolling over the On Demand button in Top Bar\n\nMulti language support is also available, please check the GitHub page if you want to help with the translations. So far, the extension is fully translated to Spanish, Dutch, German, Romanian and English.\n\nIf you want to use a keyboard shortcut in order to toggle the Bedtime Mode then you can use this command for the shortcut:\n\nbash -c 'schema_id=org.gnome.shell.extensions.bedtime-mode; schema_dir=~/.local/share/gnome-shell/extensions/gnomebedtime@ionutbortis.gmail.com/schemas/; if [[ $(gsettings --schemadir $schema_dir get $schema_id bedtime-mode-active) == \"true\" ]]; then turn_on=false; else turn_on=true; fi; gsettings --schemadir $schema_dir set $schema_id bedtime-mode-active $turn_on;'", "link": "https://extensions.gnome.org/extension/4012/gnome-bedtime/", "shell_version_map": {"38": {"version": "7", "sha256": "1ibar09d05ggc3v4c1gndpznarnq5xx2pqx7cglg0mbhc0lbpr3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmVkdGltZS1tb2RlIiwKICAibmFtZSI6ICJCZWR0aW1lIE1vZGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1ibar09d05ggc3v4c1gndpznarnq5xx2pqx7cglg0mbhc0lbpr3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmVkdGltZS1tb2RlIiwKICAibmFtZSI6ICJCZWR0aW1lIE1vZGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1ibar09d05ggc3v4c1gndpznarnq5xx2pqx7cglg0mbhc0lbpr3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmVkdGltZS1tb2RlIiwKICAibmFtZSI6ICJCZWR0aW1lIE1vZGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "gnomebedtime@ionutbortis.gmail.com", "name": "Bedtime Mode", "pname": "gnome-bedtime", "description": "Hey Gnome, it's bedtime! Converts to grayscale the entire Gnome workspace by using a smooth transition. Best to use during evening/night.\n\nThis behaviour is similar to Android's bedtime mode which converts the phone screen to grayscale. It should somewhat make your device less appealing and limit the usage of it before bedtime. On my side, at least, it still requires a fair amount of self control in order to make that happen.\n\nThe extension has a nice Settings UI where you can customize it to your liking:\n- Set an automatic schedule for turning on/off the Bedtime Mode\n- Add an On Demand button to Top Bar or System Menu to manually toggle the mode\n- Control the On Demand button visibility, appearance and position in Top Bar\n- Choose another color preset and intensity, if you prefer a different color scheme\n- Change color intensity on the fly by scrolling over the On Demand button in Top Bar\n\nMulti language support is also available, please check the GitHub page if you want to help with the translations. So far, the extension is fully translated to Spanish, Dutch, German, Romanian and English.\n\nIf you want to use a keyboard shortcut in order to toggle the Bedtime Mode then you can use this command for the shortcut:\n\nbash -c 'schema_id=org.gnome.shell.extensions.bedtime-mode; schema_dir=~/.local/share/gnome-shell/extensions/gnomebedtime@ionutbortis.gmail.com/schemas/; if [[ $(gsettings --schemadir $schema_dir get $schema_id bedtime-mode-active) == \"true\" ]]; then turn_on=false; else turn_on=true; fi; gsettings --schemadir $schema_dir set $schema_id bedtime-mode-active $turn_on;'\n", "link": "https://extensions.gnome.org/extension/4012/gnome-bedtime/", "shell_version_map": {"38": {"version": "8", "sha256": "11ay06wgi8mq4n6il16rq06pmpy70apmjw0s521bw94vpvhw64kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "11ay06wgi8mq4n6il16rq06pmpy70apmjw0s521bw94vpvhw64kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "11ay06wgi8mq4n6il16rq06pmpy70apmjw0s521bw94vpvhw64kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "spotify-controller@koolskateguy89", "name": "Spotify Controller", "pname": "spotify-controller", "description": "Control Spotify from the topbar!\n\nCredit to Marcus Heine (https://github.com/mheine) for most of the code in this extension.", "link": "https://extensions.gnome.org/extension/4013/spotify-controller/", "shell_version_map": {"38": {"version": "8", "sha256": "08wdv54rkp18b4b6152b55jqc9b0j37pr8rvh0ixl7wsdmkxga4r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "08wdv54rkp18b4b6152b55jqc9b0j37pr8rvh0ixl7wsdmkxga4r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "transparentwindows.mdirshad07", "name": "Transparent Window", "pname": "transparent-window", "description": "Change the opacity of windows by compiz-style shortcut Alt+scroll.\nYou can customize hotkey in Preference page if Alt key doesn't work.", "link": "https://extensions.gnome.org/extension/4016/transparent-window/", "shell_version_map": {"38": {"version": "2", "sha256": "12d8ad0s3b2cd8gczsa2l2x5wf3rag9xfr12ljw2jlrzf99vnr70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BieHFkb3duL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC13aW5kb3ciLAogICJ1dWlkIjogInRyYW5zcGFyZW50d2luZG93cy5tZGlyc2hhZDA3IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "wandering-pixel@justinrdonnelly.github.com", "name": "Wandering Pixel", "pname": "wandering-pixel", "description": "Slide 1 pixel back and forth in the top bar as a workaround for various bugs in GNOME Shell and/or Mutter.", "link": "https://extensions.gnome.org/extension/4028/wandering-pixel/", "shell_version_map": {"38": {"version": "4", "sha256": "03hq51krmqm43vkrm3fpvy5da0y75wfpkjhfnch1cz5y3112d13q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWRlIDEgcGl4ZWwgYmFjayBhbmQgZm9ydGggaW4gdGhlIHRvcCBiYXIgYXMgYSB3b3JrYXJvdW5kIGZvciB2YXJpb3VzIGJ1Z3MgaW4gR05PTUUgU2hlbGwgYW5kL29yIE11dHRlci4iLAogICJuYW1lIjogIldhbmRlcmluZyBQaXhlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVzdGlucmRvbm5lbGx5L3dhbmRlcmluZy1waXhlbCIsCiAgInV1aWQiOiAid2FuZGVyaW5nLXBpeGVsQGp1c3RpbnJkb25uZWxseS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "03hq51krmqm43vkrm3fpvy5da0y75wfpkjhfnch1cz5y3112d13q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWRlIDEgcGl4ZWwgYmFjayBhbmQgZm9ydGggaW4gdGhlIHRvcCBiYXIgYXMgYSB3b3JrYXJvdW5kIGZvciB2YXJpb3VzIGJ1Z3MgaW4gR05PTUUgU2hlbGwgYW5kL29yIE11dHRlci4iLAogICJuYW1lIjogIldhbmRlcmluZyBQaXhlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVzdGlucmRvbm5lbGx5L3dhbmRlcmluZy1waXhlbCIsCiAgInV1aWQiOiAid2FuZGVyaW5nLXBpeGVsQGp1c3RpbnJkb25uZWxseS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "03hq51krmqm43vkrm3fpvy5da0y75wfpkjhfnch1cz5y3112d13q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWRlIDEgcGl4ZWwgYmFjayBhbmQgZm9ydGggaW4gdGhlIHRvcCBiYXIgYXMgYSB3b3JrYXJvdW5kIGZvciB2YXJpb3VzIGJ1Z3MgaW4gR05PTUUgU2hlbGwgYW5kL29yIE11dHRlci4iLAogICJuYW1lIjogIldhbmRlcmluZyBQaXhlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVzdGlucmRvbm5lbGx5L3dhbmRlcmluZy1waXhlbCIsCiAgInV1aWQiOiAid2FuZGVyaW5nLXBpeGVsQGp1c3RpbnJkb25uZWxseS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} @@ -450,34 +450,34 @@ , {"uuid": "geary-tray-icon@taylantatli.github.com", "name": "Geary Tray Icon", "pname": "geary-tray-icon", "description": "Show a tray icon for Geary\n\nhttps://github.com/TaylanTatli/geary-tray-icon", "link": "https://extensions.gnome.org/extension/4073/geary-tray-icon/", "shell_version_map": {"38": {"version": "1", "sha256": "11kv47pz5p69j10r23zf8ls3fmanldx7diwsy34fhyxqfxjcd614", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSB0cmF5IGljb24gZm9yIEdlYXJ5XG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9UYXlsYW5UYXRsaS9nZWFyeS10cmF5LWljb24iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnZWFyeS10cmF5LWljb25AdGF5bGFudGF0bGkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "shell-restarter@koolskateguy89.github.io", "name": "Shell Restarter", "pname": "shell-restarter", "description": "Tired of pressing Alt+F2+R?\nWell you can restart GNOME Shell with just the press of a button! (May or may not work on Wayland)", "link": "https://extensions.gnome.org/extension/4075/shell-restarter/", "shell_version_map": {"38": {"version": "5", "sha256": "19v3sxbsrk0cskq7cikwz6w95m8q2v56hyrkwj595c8m8i0x6i1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpcmVkIG9mIHByZXNzaW5nIEFsdCtGMitSP1xuV2VsbCB5b3UgY2FuIHJlc3RhcnQgR05PTUUgU2hlbGwgd2l0aCBqdXN0IHRoZSBwcmVzcyBvZiBhIGJ1dHRvbiEgKE1heSBvciBtYXkgbm90IHdvcmsgb24gV2F5bGFuZCkiLAogICJuYW1lIjogIlNoZWxsIFJlc3RhcnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaGVsbC1yZXN0YXJ0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29vbHNrYXRlZ3V5ODkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNoZWxsLXJlc3RhcnRlciIsCiAgInV1aWQiOiAic2hlbGwtcmVzdGFydGVyQGtvb2xza2F0ZWd1eTg5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "19v3sxbsrk0cskq7cikwz6w95m8q2v56hyrkwj595c8m8i0x6i1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpcmVkIG9mIHByZXNzaW5nIEFsdCtGMitSP1xuV2VsbCB5b3UgY2FuIHJlc3RhcnQgR05PTUUgU2hlbGwgd2l0aCBqdXN0IHRoZSBwcmVzcyBvZiBhIGJ1dHRvbiEgKE1heSBvciBtYXkgbm90IHdvcmsgb24gV2F5bGFuZCkiLAogICJuYW1lIjogIlNoZWxsIFJlc3RhcnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaGVsbC1yZXN0YXJ0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29vbHNrYXRlZ3V5ODkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNoZWxsLXJlc3RhcnRlciIsCiAgInV1aWQiOiAic2hlbGwtcmVzdGFydGVyQGtvb2xza2F0ZWd1eTg5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "iqair@wotmshuaisi_github", "name": "Iqair Gnome Extension", "pname": "iqair-gnome-extension", "description": "Gnome extension for tracking air quality in real-time. data provider: https://iqair.com/. to get an API token: https://www.iqair.com/us/dashboard/api", "link": "https://extensions.gnome.org/extension/4082/iqair-gnome-extension/", "shell_version_map": {"38": {"version": "6", "sha256": "150rn9gk6nzba30g38bjpgjyqr2a25cysg6fd6p1is92w8lknls4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "12", "sha256": "0iz36hq4m8xxn26sar69dwd32n8y78097yj2fwrclcgs5n131d4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0iz36hq4m8xxn26sar69dwd32n8y78097yj2fwrclcgs5n131d4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"uuid": "bigSur-StatusArea@ordissimo.com", "name": "Big Sur Status Area", "pname": "big-sur-status-area", "description": "Move the Power/Network/Volume/User/Date/Notifications menus to the status area. It is a fork of :https://github.com/Fausto-Korpsvart/Big-Sur-StatusArea", "link": "https://extensions.gnome.org/extension/4085/big-sur-status-area/", "shell_version_map": {"38": {"version": "25", "sha256": "0dg2fg98l0wxr4hgaz2lwb30p93asbm5693svm8kq51v3g3wpdw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PcmRpc3NpbW8vQmlnLVN1ci1TdGF0dXNBcmVhIiwKICAidXVpZCI6ICJiaWdTdXItU3RhdHVzQXJlYUBvcmRpc3NpbW8uY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "36", "sha256": "0516845q04p2jpq3ljbd6wn4y1vzq1x9qrs6ygkiqkg0q6apshg9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}, "41": {"version": "36", "sha256": "0516845q04p2jpq3ljbd6wn4y1vzq1x9qrs6ygkiqkg0q6apshg9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}}} +, {"uuid": "bigSur-StatusArea@ordissimo.com", "name": "Big Sur Status Area", "pname": "big-sur-status-area", "description": "Move the Power/Network/Volume/User/Date/Notifications menus to the status area. It is a fork of :https://github.com/Fausto-Korpsvart/Big-Sur-StatusArea", "link": "https://extensions.gnome.org/extension/4085/big-sur-status-area/", "shell_version_map": {"38": {"version": "25", "sha256": "0dg2fg98l0wxr4hgaz2lwb30p93asbm5693svm8kq51v3g3wpdw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PcmRpc3NpbW8vQmlnLVN1ci1TdGF0dXNBcmVhIiwKICAidXVpZCI6ICJiaWdTdXItU3RhdHVzQXJlYUBvcmRpc3NpbW8uY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "37", "sha256": "0ak7h8y2ivzj188nkn37bfj6y2sfpilby8xxvfizhn8vqvid45bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "41": {"version": "37", "sha256": "0ak7h8y2ivzj188nkn37bfj6y2sfpilby8xxvfizhn8vqvid45bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}}} , {"uuid": "disable-touch-osk@pardus.org.tr", "name": "disable-touch-osk", "pname": "disable-touch-osk", "description": "Disable on screen keyboard for touchscreens", "link": "https://extensions.gnome.org/extension/4087/disable-touch-osk/", "shell_version_map": {"38": {"version": "3", "sha256": "10ljbjbswzn9y30n2h39iiz673hhmazr2h14lhhws05m71xvbbfy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgb24gc2NyZWVuIGtleWJvYXJkIGZvciB0b3VjaHNjcmVlbnMiLAogICJuYW1lIjogImRpc2FibGUtdG91Y2gtb3NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5wYXJkdXMub3JnLnRyLyIsCiAgInV1aWQiOiAiZGlzYWJsZS10b3VjaC1vc2tAcGFyZHVzLm9yZy50ciIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "mprispanel@kennedn.msn.com", "name": "MPRIS Panel Player", "pname": "mpris-panel-player", "description": "Implements playback controls for MPRIS enabled players in panel.", "link": "https://extensions.gnome.org/extension/4088/mpris-panel-player/", "shell_version_map": {"40": {"version": "4", "sha256": "1kk8y8l1ybknja58xh1smavja97rkrp8l5xx7aqy7xn4fl1ghjis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcGxlbWVudHMgcGxheWJhY2sgY29udHJvbHMgZm9yIE1QUklTIGVuYWJsZWQgcGxheWVycyBpbiBwYW5lbC4iLAogICJuYW1lIjogIk1QUklTIFBhbmVsIFBsYXllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VubmVkbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXByaXNwYW5lbCIsCiAgInV1aWQiOiAibXByaXNwYW5lbEBrZW5uZWRuLm1zbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1kk8y8l1ybknja58xh1smavja97rkrp8l5xx7aqy7xn4fl1ghjis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcGxlbWVudHMgcGxheWJhY2sgY29udHJvbHMgZm9yIE1QUklTIGVuYWJsZWQgcGxheWVycyBpbiBwYW5lbC4iLAogICJuYW1lIjogIk1QUklTIFBhbmVsIFBsYXllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VubmVkbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXByaXNwYW5lbCIsCiAgInV1aWQiOiAibXByaXNwYW5lbEBrZW5uZWRuLm1zbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "right_click_for_apps@briansayre", "name": "Right Click for Apps", "pname": "right-click-for-apps", "description": "Allows you to right-click the Activities button to reveal the application menu.", "link": "https://extensions.gnome.org/extension/4090/right-click-for-apps/", "shell_version_map": {"38": {"version": "1", "sha256": "1rzx8ksl48badrwyqxwbgvfgf48z642mdwl57aq280ng61nrndaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB5b3UgdG8gcmlnaHQtY2xpY2sgdGhlIEFjdGl2aXRpZXMgYnV0dG9uIHRvIHJldmVhbCB0aGUgYXBwbGljYXRpb24gbWVudS4iLAogICJuYW1lIjogIlJpZ2h0IENsaWNrIGZvciBBcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJpYW5zYXlyZS9SaWdodC1DbGljay1Gb3ItQXBwcyIsCiAgInV1aWQiOiAicmlnaHRfY2xpY2tfZm9yX2FwcHNAYnJpYW5zYXlyZSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "devbar@ludvigbostrom", "name": "DevBar", "pname": "devbar", "description": "This extension helps you keep track of your development workflow.", "link": "https://extensions.gnome.org/extension/4091/devbar/", "shell_version_map": {"38": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "notifications_to_file@fawtytoo", "name": "Notifications To File", "pname": "notifications-to-file", "description": "Notifications are appended to a file in $HOME/.notifications/ with one file created per day.\nEntries show the following information:\nTimestamp\nWhether the banner was shown\nThe urgency\nThe title\nBanner text", "link": "https://extensions.gnome.org/extension/4093/notifications-to-file/", "shell_version_map": {"38": {"version": "3", "sha256": "09idm84il85jsciz1fsrj66jj59dyx8mkcms627smb77jz0928py", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgVG8gRmlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "09idm84il85jsciz1fsrj66jj59dyx8mkcms627smb77jz0928py", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgVG8gRmlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "09idm84il85jsciz1fsrj66jj59dyx8mkcms627smb77jz0928py", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgVG8gRmlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "change_desktop_background_when_empty@fawtytoo", "name": "Change Desktop Background When Workspace Empty", "pname": "change-desktop-background-when-workspace-empty", "description": "Changes the desktop background 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.\nNo folder needs to be set explicitly, as it will use the folder that the current background is in.", "link": "https://extensions.gnome.org/extension/4096/change-desktop-background-when-workspace-empty/", "shell_version_map": {"38": {"version": "13", "sha256": "09ynllxj1r4s9dh782srigzpnjzda49wlr2lj71k2g2w807vdv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjaGFuZ2VfZGVza3RvcF9iYWNrZ3JvdW5kX3doZW5fZW1wdHlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "09ynllxj1r4s9dh782srigzpnjzda49wlr2lj71k2g2w807vdv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjaGFuZ2VfZGVza3RvcF9iYWNrZ3JvdW5kX3doZW5fZW1wdHlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "09ynllxj1r4s9dh782srigzpnjzda49wlr2lj71k2g2w807vdv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjaGFuZ2VfZGVza3RvcF9iYWNrZ3JvdW5kX3doZW5fZW1wdHlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} -, {"uuid": "translate-clipboard@lsnow.github.io", "name": "Translate clipboard", "pname": "translate-clipboard", "description": "Translate clipboard text", "link": "https://extensions.gnome.org/extension/4097/translate-clipboard/", "shell_version_map": {"38": {"version": "1", "sha256": "071x3q6y7s8qx4i3lis79g5nc68ld8ln5q8qgc713nvjgfsg05hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "14", "sha256": "0lfy2dxyw36r7vnyxk541yqbazlc0v65ki5l3x5s32r5fkhx6svs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "0lfy2dxyw36r7vnyxk541yqbazlc0v65ki5l3x5s32r5fkhx6svs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} +, {"uuid": "translate-clipboard@lsnow.github.io", "name": "Translate clipboard", "pname": "translate-clipboard", "description": "Translate clipboard text", "link": "https://extensions.gnome.org/extension/4097/translate-clipboard/", "shell_version_map": {"38": {"version": "1", "sha256": "071x3q6y7s8qx4i3lis79g5nc68ld8ln5q8qgc713nvjgfsg05hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "15", "sha256": "0src5bifp77iiznszp9j0xygfarsm2qa0rwy4axvbag9bs3ym42v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "0src5bifp77iiznszp9j0xygfarsm2qa0rwy4axvbag9bs3ym42v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "no-overview@fthx", "name": "No overview at start-up", "pname": "no-overview", "description": "No overview at start-up. For GNOME Shell 40+.", "link": "https://extensions.gnome.org/extension/4099/no-overview/", "shell_version_map": {"40": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "notification-position@drugo.dev", "name": "Notification Banner Position", "pname": "notification-banner-position", "description": "Changes position of the notification banner from the default to the right side of the screen.", "link": "https://extensions.gnome.org/extension/4105/notification-banner-position/", "shell_version_map": {"38": {"version": "5", "sha256": "0svmx8767hpbmmvm2m90ksqbxqij5f3k5bamz05p73czqk58dizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "0svmx8767hpbmmvm2m90ksqbxqij5f3k5bamz05p73czqk58dizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "0svmx8767hpbmmvm2m90ksqbxqij5f3k5bamz05p73czqk58dizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "volume_scroller@trflynn89.pm.me", "name": "Volume Scroller", "pname": "volume-scroller", "description": "Scroll up or down in the Top Bar to adjust volume.", "link": "https://extensions.gnome.org/extension/4109/volume-scroller/", "shell_version_map": {"38": {"version": "5", "sha256": "035gkl1g3k3jqmksgmh2aip3v4k8kkbc6gdnndg6lnhz6czn9c12", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "035gkl1g3k3jqmksgmh2aip3v4k8kkbc6gdnndg6lnhz6czn9c12", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "Mock-Universal-Menu@zacharygough", "name": "Mock Universal Menu", "pname": "mock-universal-menu", "description": "Creates a Mock Apple Menu (THIS DOES NOTHING WHEN CLICKED)", "link": "https://extensions.gnome.org/extension/4111/mock-universal-menu/", "shell_version_map": {"40": {"version": "5", "sha256": "0irq4aamfdvnsjcb9cj4grp7z0s2rg5dv349v095ss7n7jxcmdx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYSBNb2NrIEFwcGxlIE1lbnUgKFRISVMgRE9FUyBOT1RISU5HIFdIRU4gQ0xJQ0tFRCkiLAogICJuYW1lIjogIk1vY2sgVW5pdmVyc2FsIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phbnktWmFjaGFyeTEvTW9jay1Vbml2ZXJzYWwtTWVudSIsCiAgInV1aWQiOiAiTW9jay1Vbml2ZXJzYWwtTWVudUB6YWNoYXJ5Z291Z2giLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0irq4aamfdvnsjcb9cj4grp7z0s2rg5dv349v095ss7n7jxcmdx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYSBNb2NrIEFwcGxlIE1lbnUgKFRISVMgRE9FUyBOT1RISU5HIFdIRU4gQ0xJQ0tFRCkiLAogICJuYW1lIjogIk1vY2sgVW5pdmVyc2FsIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phbnktWmFjaGFyeTEvTW9jay1Vbml2ZXJzYWwtTWVudSIsCiAgInV1aWQiOiAiTW9jay1Vbml2ZXJzYWwtTWVudUB6YWNoYXJ5Z291Z2giLAogICJ2ZXJzaW9uIjogNQp9"}}} -, {"uuid": "customize-ibus@hollowman.ml", "name": "Customize IBus", "pname": "customize-ibus", "description": "Full customization of appearance, behavior, system tray and input source indicator for IBus\n\nSupport Customization of:\n* Candidate Box Orientation\n* Candidate Box Animation\n* Right-click Candidate Box to Switch the Input Mode or Open the Tray Menu\n* Scroll on Candidate Box to Switch among Pages or Candidates\n* Fix Candidate Box to Not Follow the Caret and Set Fixed Position\n* Candidate Box Font\n* Input Mode Remember and Auto-switch by APP\n* Change Candidate Box Opacity\n* Fix IME List Order\n* Drag Candidate Box to Reposition\n* Show or Hide Candidate Box Page Buttons\n* System Tray Menus and Interaction Settings\n* * Show or Hide Tray Icon\n* * Directly Click Tray Icon to Switch Input Mode\n* * Add Additional Menu\n* Input Source Indicator Appearance and Interaction Settings\n* * Enable Indicator\n* * Only Indicate when Switching Input Mode\n* * Only Indicate when Using ASCII Input Mode\n* * Not Indicate when Using Single Mode IME\n* * Right-click Indicator to Hide\n* * Scroll on Indicator to Switch Input Mode\n* * Indicator Animation\n* * Customize Font\n* * Left-click Indicator to Drag to Move Indicator or Switch Input Mode\n* * Change Opacity\n* * Enable Indicator Show Delay and Configure Showing Timeout\n* * Enable Auto-hide Indicator and Configure Auto-hide Timeout\n* Theme (Stylesheet Provided or Extracted from GNOME Shell Themes, Refer to Help Instructions in Extension for More)\n* Candidate Box Background and its Displaying Style\n* Theme and Background Picture Follow GNOME Night Light Mode\n\nUser Guide: https://hollowmansblog.wordpress.com/2021/08/21/customize-ibus-user-guide/\n\n深度定制 IBus 的外观、行为、系统托盘以及输入指示\n\n支持自定义：\n* 候选框方向\n* 候选框动画\n* 右键单击候选框以切换输入源或打开任务栏菜单\n* 候选框上滚动以切换页面或候选词\n* 固定候选框使其不跟随光标以及设定固定位置\n* 候选框字体\n* 输入模式根据应用记忆并自动切换\n* 更改候选框透明度\n* 固定输入法列表顺序\n* 拖拽移动候选框\n* 显示或隐藏候选框调页按钮\n* 系统任务栏托盘显示和交互设置\n* * 显示或隐藏托盘图标\n* * 直接点击托盘图标切换输入源\n* * 添加额外菜单\n* 输入源指示器及其显示和交互设置\n* * 启用指示器\n* * 仅在切换输入法时指示\n* * 仅在英文输入时指示\n* * 使用单模式输入法时不指示\n* * 右击指示器来将其隐藏\n* * 指示器上滚动来切换输入源\n* * 指示器显示动画\n* * 自定义字体\n* * 左击指示器以拖拽移动或者切换输入源\n* * 更改透明度\n* * 启用延时显示以及配置显示时延\n* * 启用自动隐藏以及配置自动隐藏时延\n* 皮肤样式主题（提供的或者从GNOME Shell主题中提取的样式表，参见扩展的帮助部分来获取更多指导）\n* 候选框背景图片及其显示样式\n* 主题和背景图片跟随GNOME夜灯\n\n使用指南：https://blog.csdn.net/qq_18572023/article/details/116331601", "link": "https://extensions.gnome.org/extension/4112/customize-ibus/", "shell_version_map": {"38": {"version": "80", "sha256": "0w4mgjin6s5h8bc50830nd0b34hvij6vzsmp4ppw52ghnb46813p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5AaG9sbG93bWFuLm1sIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4MAp9"}, "40": {"version": "80", "sha256": "0w4mgjin6s5h8bc50830nd0b34hvij6vzsmp4ppw52ghnb46813p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5AaG9sbG93bWFuLm1sIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4MAp9"}, "41": {"version": "80", "sha256": "0w4mgjin6s5h8bc50830nd0b34hvij6vzsmp4ppw52ghnb46813p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5AaG9sbG93bWFuLm1sIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4MAp9"}}} +, {"uuid": "customize-ibus@hollowman.ml", "name": "Customize IBus", "pname": "customize-ibus", "description": "Full customization of appearance, behavior, system tray and input source indicator for IBus\n\nSupport Customization of:\n* Candidate Box Orientation\n* Candidate Box Animation\n* Right-click Candidate Box to Switch the Input Mode or Open the Tray Menu\n* Scroll on Candidate Box to Switch among Pages or Candidates\n* Fix Candidate Box to Not Follow the Caret and Set Fixed Position\n* Candidate Box Font\n* Input Mode Remember and Auto-switch by APP\n* Change Candidate Box Opacity\n* Fix IME List Order\n* Drag Candidate Box to Reposition\n* Show or Hide Candidate Box Page Buttons\n* System Tray Menus and Interaction Settings\n* * Show or Hide Tray Icon\n* * Directly Click Tray Icon to Switch Input Mode\n* * Add Additional Menu\n* Input Source Indicator Appearance and Interaction Settings\n* * Enable Indicator\n* * Only Indicate when Switching Input Mode\n* * Only Indicate when Using ASCII Input Mode\n* * Not Indicate when Using Single Mode IME\n* * Right-click Indicator to Hide\n* * Scroll on Indicator to Switch Input Mode\n* * Indicator Animation\n* * Customize Font\n* * Left-click Indicator to Drag to Move Indicator or Switch Input Mode\n* * Change Opacity\n* * Enable Indicator Show Delay and Configure Showing Timeout\n* * Enable Auto-hide Indicator and Configure Auto-hide Timeout\n* Theme (Stylesheet Provided or Extracted from GNOME Shell Themes, Refer to Help Instructions in Extension for More)\n* Candidate Box Background and its Displaying Style\n* Theme and Background Picture Follow GNOME Night Light Mode\n\nUser Guide: https://hollowmansblog.wordpress.com/2021/08/21/customize-ibus-user-guide/\n\n深度定制 IBus 的外观、行为、系统托盘以及输入指示\n\n支持自定义：\n* 候选框方向\n* 候选框动画\n* 右键单击候选框以切换输入源或打开任务栏菜单\n* 候选框上滚动以切换页面或候选词\n* 固定候选框使其不跟随光标以及设定固定位置\n* 候选框字体\n* 输入模式根据应用记忆并自动切换\n* 更改候选框透明度\n* 固定输入法列表顺序\n* 拖拽移动候选框\n* 显示或隐藏候选框调页按钮\n* 系统任务栏托盘显示和交互设置\n* * 显示或隐藏托盘图标\n* * 直接点击托盘图标切换输入源\n* * 添加额外菜单\n* 输入源指示器及其显示和交互设置\n* * 启用指示器\n* * 仅在切换输入法时指示\n* * 仅在英文输入时指示\n* * 使用单模式输入法时不指示\n* * 右击指示器来将其隐藏\n* * 指示器上滚动来切换输入源\n* * 指示器显示动画\n* * 自定义字体\n* * 左击指示器以拖拽移动或者切换输入源\n* * 更改透明度\n* * 启用延时显示以及配置显示时延\n* * 启用自动隐藏以及配置自动隐藏时延\n* 皮肤样式主题（提供的或者从GNOME Shell主题中提取的样式表，参见扩展的帮助部分来获取更多指导）\n* 候选框背景图片及其显示样式\n* 主题和背景图片跟随GNOME夜灯\n\n使用指南：https://blog.csdn.net/qq_18572023/article/details/116331601", "link": "https://extensions.gnome.org/extension/4112/customize-ibus/", "shell_version_map": {"38": {"version": "82", "sha256": "1rn0zskj5s7xp11p8sbgybghngqyf5chs469w51vn8n24k4bgdp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29wZW5TVVNFL0N1c3RvbWl6ZS1JQnVzIiwKICAidXVpZCI6ICJjdXN0b21pemUtaWJ1c0Bob2xsb3dtYW4ubWwiLAogICJ2ZXJzaW9uIjogODIKfQ=="}, "40": {"version": "82", "sha256": "1rn0zskj5s7xp11p8sbgybghngqyf5chs469w51vn8n24k4bgdp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29wZW5TVVNFL0N1c3RvbWl6ZS1JQnVzIiwKICAidXVpZCI6ICJjdXN0b21pemUtaWJ1c0Bob2xsb3dtYW4ubWwiLAogICJ2ZXJzaW9uIjogODIKfQ=="}, "41": {"version": "82", "sha256": "1rn0zskj5s7xp11p8sbgybghngqyf5chs469w51vn8n24k4bgdp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29wZW5TVVNFL0N1c3RvbWl6ZS1JQnVzIiwKICAidXVpZCI6ICJjdXN0b21pemUtaWJ1c0Bob2xsb3dtYW4ubWwiLAogICJ2ZXJzaW9uIjogODIKfQ=="}}} , {"uuid": "fildemGMenu@gonza.com", "name": "Fildem global menu", "pname": "fildem-global-menu", "description": "Global menu for Gnome", "link": "https://extensions.gnome.org/extension/4114/fildem-global-menu/", "shell_version_map": {"38": {"version": "2", "sha256": "0776vx09b1nxf6j5w9gmzg1gmzijh1mpsnfzv41svbfqyfc8zv2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGZvciBHbm9tZSIsCiAgIm5hbWUiOiAiRmlsZGVtIGdsb2JhbCBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpbGRlbS1nbG9iYWwtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL0ZpbGRlbSIsCiAgInV1aWQiOiAiZmlsZGVtR01lbnVAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0776vx09b1nxf6j5w9gmzg1gmzijh1mpsnfzv41svbfqyfc8zv2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGZvciBHbm9tZSIsCiAgIm5hbWUiOiAiRmlsZGVtIGdsb2JhbCBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpbGRlbS1nbG9iYWwtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL0ZpbGRlbSIsCiAgInV1aWQiOiAiZmlsZGVtR01lbnVAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0776vx09b1nxf6j5w9gmzg1gmzijh1mpsnfzv41svbfqyfc8zv2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGZvciBHbm9tZSIsCiAgIm5hbWUiOiAiRmlsZGVtIGdsb2JhbCBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpbGRlbS1nbG9iYWwtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL0ZpbGRlbSIsCiAgInV1aWQiOiAiZmlsZGVtR01lbnVAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "remove-panel@sulincix", "name": "RemovePanel", "pname": "removepanel", "description": "remove top panel from gnome-shell", "link": "https://extensions.gnome.org/extension/4118/removepanel/", "shell_version_map": {"38": {"version": "5", "sha256": "022cznjpi2a3ld31cjk1942cyc4r6s6k58ik5qd49xh8wl8y2b3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlbW92ZSB0b3AgcGFuZWwgZnJvbSBnbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiUmVtb3ZlUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyZW1vdmUtcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "022cznjpi2a3ld31cjk1942cyc4r6s6k58ik5qd49xh8wl8y2b3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlbW92ZSB0b3AgcGFuZWwgZnJvbSBnbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiUmVtb3ZlUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyZW1vdmUtcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "022cznjpi2a3ld31cjk1942cyc4r6s6k58ik5qd49xh8wl8y2b3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlbW92ZSB0b3AgcGFuZWwgZnJvbSBnbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiUmVtb3ZlUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyZW1vdmUtcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "bottom-triggers-activities@papjul", "name": "Bottom triggers Activities overview", "pname": "bottom-triggers-activities-overview", "description": "DEPRECATION NOTICE: No longer maintained. Please migrate to another extension such as Hot Edge https://extensions.gnome.org/extension/4222/hot-edge/\n\nAllows to toggle Activities overview when the mouse reaches the bottom edge of the screen.\nPLEASE report your bugs to the extension homepage link below. I cannot reply to you if you write a review here.\n\nThis is a fork of Dash to Dock focusing only on doing this, it adds support for Gnome Shell 40 and is mainly aimed at Gnome Shell 40 users to reduce mouse travel.\n\nI may backport fixes from upstream, but I don't intend to add any new feature and may not fix any bug if I'm not affected/cannot reproduce. However, I will accept pull requests that keep the extension in the KISS principle. It could be adding a prefs UI for toggle delay and edge(s) triggered, or supporting multiple monitors.\n\nYou can customize the following parameters from the constructor of extension.js:\n this._position = St.Side.BOTTOM;\n this._toggleDelay = 0.25;", "link": "https://extensions.gnome.org/extension/4120/bottom-triggers-activities-overview/", "shell_version_map": {"38": {"version": "2", "sha256": "1q1ahz612w2fzbvky8ydwns2kykbj2vqcr5ddyncg16lhrfzx9vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRFUFJFQ0FUSU9OIE5PVElDRTogTm8gbG9uZ2VyIG1haW50YWluZWQuIFBsZWFzZSBtaWdyYXRlIHRvIGFub3RoZXIgZXh0ZW5zaW9uIHN1Y2ggYXMgSG90IEVkZ2UgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDIyMi9ob3QtZWRnZS9cblxuQWxsb3dzIHRvIHRvZ2dsZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IHdoZW4gdGhlIG1vdXNlIHJlYWNoZXMgdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBzY3JlZW4uXG5QTEVBU0UgcmVwb3J0IHlvdXIgYnVncyB0byB0aGUgZXh0ZW5zaW9uIGhvbWVwYWdlIGxpbmsgYmVsb3cuIEkgY2Fubm90IHJlcGx5IHRvIHlvdSBpZiB5b3Ugd3JpdGUgYSByZXZpZXcgaGVyZS5cblxuVGhpcyBpcyBhIGZvcmsgb2YgRGFzaCB0byBEb2NrIGZvY3VzaW5nIG9ubHkgb24gZG9pbmcgdGhpcywgaXQgYWRkcyBzdXBwb3J0IGZvciBHbm9tZSBTaGVsbCA0MCBhbmQgaXMgbWFpbmx5IGFpbWVkIGF0IEdub21lIFNoZWxsIDQwIHVzZXJzIHRvIHJlZHVjZSBtb3VzZSB0cmF2ZWwuXG5cbkkgbWF5IGJhY2twb3J0IGZpeGVzIGZyb20gdXBzdHJlYW0sIGJ1dCBJIGRvbid0IGludGVuZCB0byBhZGQgYW55IG5ldyBmZWF0dXJlIGFuZCBtYXkgbm90IGZpeCBhbnkgYnVnIGlmIEknbSBub3QgYWZmZWN0ZWQvY2Fubm90IHJlcHJvZHVjZS4gSG93ZXZlciwgSSB3aWxsIGFjY2VwdCBwdWxsIHJlcXVlc3RzIHRoYXQga2VlcCB0aGUgZXh0ZW5zaW9uIGluIHRoZSBLSVNTIHByaW5jaXBsZS4gSXQgY291bGQgYmUgYWRkaW5nIGEgcHJlZnMgVUkgZm9yIHRvZ2dsZSBkZWxheSBhbmQgZWRnZShzKSB0cmlnZ2VyZWQsIG9yIHN1cHBvcnRpbmcgbXVsdGlwbGUgbW9uaXRvcnMuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBmb2xsb3dpbmcgcGFyYW1ldGVycyBmcm9tIHRoZSBjb25zdHJ1Y3RvciBvZiBleHRlbnNpb24uanM6XG4gICAgICAgIHRoaXMuX3Bvc2l0aW9uID0gU3QuU2lkZS5CT1RUT007XG4gICAgICAgIHRoaXMuX3RvZ2dsZURlbGF5ID0gMC4yNTsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJib3R0b210cmlnZ2Vyc2FjdGl2aXRpZXMiLAogICJuYW1lIjogIkJvdHRvbSB0cmlnZ2VycyBBY3Rpdml0aWVzIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhcGp1bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBqdWwvYm90dG9tLXRyaWdnZXJzLWFjdGl2aXRpZXMiLAogICJ1dWlkIjogImJvdHRvbS10cmlnZ2Vycy1hY3Rpdml0aWVzQHBhcGp1bCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1q1ahz612w2fzbvky8ydwns2kykbj2vqcr5ddyncg16lhrfzx9vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRFUFJFQ0FUSU9OIE5PVElDRTogTm8gbG9uZ2VyIG1haW50YWluZWQuIFBsZWFzZSBtaWdyYXRlIHRvIGFub3RoZXIgZXh0ZW5zaW9uIHN1Y2ggYXMgSG90IEVkZ2UgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDIyMi9ob3QtZWRnZS9cblxuQWxsb3dzIHRvIHRvZ2dsZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IHdoZW4gdGhlIG1vdXNlIHJlYWNoZXMgdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBzY3JlZW4uXG5QTEVBU0UgcmVwb3J0IHlvdXIgYnVncyB0byB0aGUgZXh0ZW5zaW9uIGhvbWVwYWdlIGxpbmsgYmVsb3cuIEkgY2Fubm90IHJlcGx5IHRvIHlvdSBpZiB5b3Ugd3JpdGUgYSByZXZpZXcgaGVyZS5cblxuVGhpcyBpcyBhIGZvcmsgb2YgRGFzaCB0byBEb2NrIGZvY3VzaW5nIG9ubHkgb24gZG9pbmcgdGhpcywgaXQgYWRkcyBzdXBwb3J0IGZvciBHbm9tZSBTaGVsbCA0MCBhbmQgaXMgbWFpbmx5IGFpbWVkIGF0IEdub21lIFNoZWxsIDQwIHVzZXJzIHRvIHJlZHVjZSBtb3VzZSB0cmF2ZWwuXG5cbkkgbWF5IGJhY2twb3J0IGZpeGVzIGZyb20gdXBzdHJlYW0sIGJ1dCBJIGRvbid0IGludGVuZCB0byBhZGQgYW55IG5ldyBmZWF0dXJlIGFuZCBtYXkgbm90IGZpeCBhbnkgYnVnIGlmIEknbSBub3QgYWZmZWN0ZWQvY2Fubm90IHJlcHJvZHVjZS4gSG93ZXZlciwgSSB3aWxsIGFjY2VwdCBwdWxsIHJlcXVlc3RzIHRoYXQga2VlcCB0aGUgZXh0ZW5zaW9uIGluIHRoZSBLSVNTIHByaW5jaXBsZS4gSXQgY291bGQgYmUgYWRkaW5nIGEgcHJlZnMgVUkgZm9yIHRvZ2dsZSBkZWxheSBhbmQgZWRnZShzKSB0cmlnZ2VyZWQsIG9yIHN1cHBvcnRpbmcgbXVsdGlwbGUgbW9uaXRvcnMuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBmb2xsb3dpbmcgcGFyYW1ldGVycyBmcm9tIHRoZSBjb25zdHJ1Y3RvciBvZiBleHRlbnNpb24uanM6XG4gICAgICAgIHRoaXMuX3Bvc2l0aW9uID0gU3QuU2lkZS5CT1RUT007XG4gICAgICAgIHRoaXMuX3RvZ2dsZURlbGF5ID0gMC4yNTsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJib3R0b210cmlnZ2Vyc2FjdGl2aXRpZXMiLAogICJuYW1lIjogIkJvdHRvbSB0cmlnZ2VycyBBY3Rpdml0aWVzIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhcGp1bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBqdWwvYm90dG9tLXRyaWdnZXJzLWFjdGl2aXRpZXMiLAogICJ1dWlkIjogImJvdHRvbS10cmlnZ2Vycy1hY3Rpdml0aWVzQHBhcGp1bCIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "gnome-shell-Google-search-provider@MrNinso", "name": "Google Search Provider", "pname": "google-search-provider", "description": "Add Google search to Gnome Shell Search \n TODO: \n - Add google suggestions (For now using duckduckGo suggestions)", "link": "https://extensions.gnome.org/extension/4132/google-search-provider/", "shell_version_map": {"38": {"version": "6", "sha256": "1pk1a6k21a1yj78rkwkx0r91lyjybjvfncymhl1hbzzyq0fxqy82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBHb29nbGUgc2VhcmNoIHRvIEdub21lIFNoZWxsIFNlYXJjaCBcbiBUT0RPOiBcbiAtIEFkZCBnb29nbGUgc3VnZ2VzdGlvbnMgKEZvciBub3cgdXNpbmcgZHVja2R1Y2tHbyBzdWdnZXN0aW9ucykiLAogICJuYW1lIjogIkdvb2dsZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29vZ2xlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTXJOaW5zby9nbm9tZS1zaGVsbC1nb29nbGUtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1Hb29nbGUtc2VhcmNoLXByb3ZpZGVyQE1yTmluc28iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1pk1a6k21a1yj78rkwkx0r91lyjybjvfncymhl1hbzzyq0fxqy82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBHb29nbGUgc2VhcmNoIHRvIEdub21lIFNoZWxsIFNlYXJjaCBcbiBUT0RPOiBcbiAtIEFkZCBnb29nbGUgc3VnZ2VzdGlvbnMgKEZvciBub3cgdXNpbmcgZHVja2R1Y2tHbyBzdWdnZXN0aW9ucykiLAogICJuYW1lIjogIkdvb2dsZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29vZ2xlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTXJOaW5zby9nbm9tZS1zaGVsbC1nb29nbGUtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1Hb29nbGUtc2VhcmNoLXByb3ZpZGVyQE1yTmluc28iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1pk1a6k21a1yj78rkwkx0r91lyjybjvfncymhl1hbzzyq0fxqy82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBHb29nbGUgc2VhcmNoIHRvIEdub21lIFNoZWxsIFNlYXJjaCBcbiBUT0RPOiBcbiAtIEFkZCBnb29nbGUgc3VnZ2VzdGlvbnMgKEZvciBub3cgdXNpbmcgZHVja2R1Y2tHbyBzdWdnZXN0aW9ucykiLAogICJuYW1lIjogIkdvb2dsZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29vZ2xlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTXJOaW5zby9nbm9tZS1zaGVsbC1nb29nbGUtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1Hb29nbGUtc2VhcmNoLXByb3ZpZGVyQE1yTmluc28iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "disable-menu-switching@selfmade.pl", "name": "Disable Menu Switching", "pname": "disable-menu-switching", "description": "Disable changing menu on hover another panel button.", "link": "https://extensions.gnome.org/extension/4133/disable-menu-switching/", "shell_version_map": {"40": {"version": "3", "sha256": "12879vn6knafdcphg3wwbpbram5hrw79v68z9c9d5z4f9k781ksq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "4", "sha256": "0fnzlmr12l8y689p6kclm3yd3b653jl9f1bhhy7652c1b4g515m0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "espresso@coadmunkee.github.com", "name": "Espresso", "pname": "espresso", "description": "Espresso disables the usual auto suspend and screensaver functionality and optionally Night Light with options to show an Espresso icon in the top panel, to enable Espresso when a fullscreen application is running, to restore state across reboots, to provide notifications, to enable Espresso when specific applications are running, or to pause Night Light when Espresso is enabled or only when specific applications are running.\n\nEspresso is a fork of the Caffeine extension.\n\nPlease leave feedback or report issues through the Extension Homepage", "link": "https://extensions.gnome.org/extension/4135/espresso/", "shell_version_map": {"40": {"version": "4", "sha256": "18104n3vn94c6d9gzdhlbqfqrjkn7v4s585incay49ldg91ync2i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVzcHJlc3NvIGRpc2FibGVzIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgd2l0aCBvcHRpb25zIHRvIHNob3cgYW4gRXNwcmVzc28gaWNvbiBpbiB0aGUgdG9wIHBhbmVsLCB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBhIGZ1bGxzY3JlZW4gYXBwbGljYXRpb24gaXMgcnVubmluZywgdG8gcmVzdG9yZSBzdGF0ZSBhY3Jvc3MgcmVib290cywgdG8gcHJvdmlkZSBub3RpZmljYXRpb25zLCB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBzcGVjaWZpYyBhcHBsaWNhdGlvbnMgYXJlIHJ1bm5pbmcsIG9yIHRvIHBhdXNlIE5pZ2h0IExpZ2h0IHdoZW4gRXNwcmVzc28gaXMgZW5hYmxlZCBvciBvbmx5IHdoZW4gc3BlY2lmaWMgYXBwbGljYXRpb25zIGFyZSBydW5uaW5nLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29hZG11bmtlZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZXNwcmVzc28iLAogICJ1dWlkIjogImVzcHJlc3NvQGNvYWRtdW5rZWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "18104n3vn94c6d9gzdhlbqfqrjkn7v4s585incay49ldg91ync2i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVzcHJlc3NvIGRpc2FibGVzIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgd2l0aCBvcHRpb25zIHRvIHNob3cgYW4gRXNwcmVzc28gaWNvbiBpbiB0aGUgdG9wIHBhbmVsLCB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBhIGZ1bGxzY3JlZW4gYXBwbGljYXRpb24gaXMgcnVubmluZywgdG8gcmVzdG9yZSBzdGF0ZSBhY3Jvc3MgcmVib290cywgdG8gcHJvdmlkZSBub3RpZmljYXRpb25zLCB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBzcGVjaWZpYyBhcHBsaWNhdGlvbnMgYXJlIHJ1bm5pbmcsIG9yIHRvIHBhdXNlIE5pZ2h0IExpZ2h0IHdoZW4gRXNwcmVzc28gaXMgZW5hYmxlZCBvciBvbmx5IHdoZW4gc3BlY2lmaWMgYXBwbGljYXRpb25zIGFyZSBydW5uaW5nLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29hZG11bmtlZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZXNwcmVzc28iLAogICJ1dWlkIjogImVzcHJlc3NvQGNvYWRtdW5rZWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "espresso@coadmunkee.github.com", "name": "Espresso", "pname": "espresso", "description": "Control when to disable the usual auto suspend and screensaver functionality and optionally Night Light as well. Options to show as an icon in the top panel, enable when a fullscreen app is running, restore state across reboots, provide notifications, enable when specific app are running, pause Night Light when Espresso is enabled or only when specific apps are running. Espresso also supports docking stations with options to enable when charging or when docked to external monitors.\n\nEspresso is a fork of the Caffeine extension.\n\nPlease leave feedback or report issues through the Extension Homepage", "link": "https://extensions.gnome.org/extension/4135/espresso/", "shell_version_map": {"40": {"version": "6", "sha256": "0crkisqgrqh7lgls9mh59hziajkzwn08mcpcifmd8gr95qvrdmgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgd2hlbiB0byBkaXNhYmxlIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgYXMgd2VsbC4gT3B0aW9ucyB0byBzaG93IGFzIGFuIGljb24gaW4gdGhlIHRvcCBwYW5lbCwgZW5hYmxlIHdoZW4gYSBmdWxsc2NyZWVuIGFwcCBpcyBydW5uaW5nLCByZXN0b3JlIHN0YXRlIGFjcm9zcyByZWJvb3RzLCBwcm92aWRlIG5vdGlmaWNhdGlvbnMsIGVuYWJsZSB3aGVuIHNwZWNpZmljIGFwcCBhcmUgcnVubmluZywgcGF1c2UgTmlnaHQgTGlnaHQgd2hlbiBFc3ByZXNzbyBpcyBlbmFibGVkIG9yIG9ubHkgd2hlbiBzcGVjaWZpYyBhcHBzIGFyZSBydW5uaW5nLiBFc3ByZXNzbyBhbHNvIHN1cHBvcnRzIGRvY2tpbmcgc3RhdGlvbnMgd2l0aCBvcHRpb25zIHRvIGVuYWJsZSB3aGVuIGNoYXJnaW5nIG9yIHdoZW4gZG9ja2VkIHRvIGV4dGVybmFsIG1vbml0b3JzLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0crkisqgrqh7lgls9mh59hziajkzwn08mcpcifmd8gr95qvrdmgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgd2hlbiB0byBkaXNhYmxlIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgYXMgd2VsbC4gT3B0aW9ucyB0byBzaG93IGFzIGFuIGljb24gaW4gdGhlIHRvcCBwYW5lbCwgZW5hYmxlIHdoZW4gYSBmdWxsc2NyZWVuIGFwcCBpcyBydW5uaW5nLCByZXN0b3JlIHN0YXRlIGFjcm9zcyByZWJvb3RzLCBwcm92aWRlIG5vdGlmaWNhdGlvbnMsIGVuYWJsZSB3aGVuIHNwZWNpZmljIGFwcCBhcmUgcnVubmluZywgcGF1c2UgTmlnaHQgTGlnaHQgd2hlbiBFc3ByZXNzbyBpcyBlbmFibGVkIG9yIG9ubHkgd2hlbiBzcGVjaWZpYyBhcHBzIGFyZSBydW5uaW5nLiBFc3ByZXNzbyBhbHNvIHN1cHBvcnRzIGRvY2tpbmcgc3RhdGlvbnMgd2l0aCBvcHRpb25zIHRvIGVuYWJsZSB3aGVuIGNoYXJnaW5nIG9yIHdoZW4gZG9ja2VkIHRvIGV4dGVybmFsIG1vbml0b3JzLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "salat-dz@salat-dz.com", "name": "Salat Dz", "pname": "salat-dz", "description": "Show next salat using Salat Dz API", "link": "https://extensions.gnome.org/extension/4136/salat-dz/", "shell_version_map": {"38": {"version": "1", "sha256": "1kga5w2yp375h6lj3fmzr1agg43phyj5f45d7hjv04c405d32p8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbmV4dCBzYWxhdCB1c2luZyBTYWxhdCBEeiBBUEkiLAogICJuYW1lIjogIlNhbGF0IER6IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3NhbGF0LnB5dGhvbmFueXdoZXJlLmNvbSIsCiAgInV1aWQiOiAic2FsYXQtZHpAc2FsYXQtZHouY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "user-at-host@cmm.github.com", "name": "Add user@host to top panel", "pname": "add-userhost-to-panel", "description": "Adds user@host to the top panel, on the left.\n\nNothing fancy, no support -- fork at will, the thing is very simple.", "link": "https://extensions.gnome.org/extension/4141/add-userhost-to-panel/", "shell_version_map": {"38": {"version": "6", "sha256": "0ypil2vcv0fx10gh8q3slvf2mbqf8y53mzrb2irxdbqjkn4mdnax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY21tL2dub21lLXVzZXItYXQtaG9zdCIsCiAgInV1aWQiOiAidXNlci1hdC1ob3N0QGNtbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "0ypil2vcv0fx10gh8q3slvf2mbqf8y53mzrb2irxdbqjkn4mdnax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY21tL2dub21lLXVzZXItYXQtaG9zdCIsCiAgInV1aWQiOiAidXNlci1hdC1ob3N0QGNtbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0ypil2vcv0fx10gh8q3slvf2mbqf8y53mzrb2irxdbqjkn4mdnax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY21tL2dub21lLXVzZXItYXQtaG9zdCIsCiAgInV1aWQiOiAidXNlci1hdC1ob3N0QGNtbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "vertical-overview@RensAlthuis.github.com", "name": "Vertical overview", "pname": "vertical-overview", "description": "Bringing back vertically stacked workspaces", "link": "https://extensions.gnome.org/extension/4144/vertical-overview/", "shell_version_map": {"40": {"version": "8", "sha256": "0h865ipn97k9yrj4r0qhfdj2vnwk92720ahim22sw86605ljc77z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInJlbnMuYWx0aHVpc0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC1vdmVydmlld0BSZW5zQWx0aHVpcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0h865ipn97k9yrj4r0qhfdj2vnwk92720ahim22sw86605ljc77z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInJlbnMuYWx0aHVpc0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC1vdmVydmlld0BSZW5zQWx0aHVpcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "workspace-isolated_app-switcher@lestibournes", "name": "Workspace-Isolated App-Switcher", "pname": "workspace-isolated-app-switcher", "description": "App-Switcher modification that shows only the apps that are running on the current workspace. Fork of App-Switcher Current Workspace First by fawtytoo.", "link": "https://extensions.gnome.org/extension/4145/workspace-isolated-app-switcher/", "shell_version_map": {"38": {"version": "1", "sha256": "0bcf8l1sb73f0ggvavkfjk10s67k7w4f3yr0s9inil6z8pbk7bsr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzaG93cyBvbmx5IHRoZSBhcHBzIHRoYXQgYXJlIHJ1bm5pbmcgb24gdGhlIGN1cnJlbnQgd29ya3NwYWNlLiBGb3JrIG9mIEFwcC1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCBieSBmYXd0eXRvby4iLAogICJuYW1lIjogIldvcmtzcGFjZS1Jc29sYXRlZCBBcHAtU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid29ya3NwYWNlLWlzb2xhdGVkX2FwcC1zd2l0Y2hlckBsZXN0aWJvdXJuZXMiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "kubectl@infinicode.de", "name": "Kubectl Extension", "pname": "kubectl-extension", "description": "Quick panel access to kubernetes resources utilizing kubectl CLI", "link": "https://extensions.gnome.org/extension/4147/kubectl-extension/", "shell_version_map": {"38": {"version": "4", "sha256": "1lcmkyns6s4nv9ag9h80vs4cxrjxw907b3bxzqvs7ig9s1h41rqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHBhbmVsIGFjY2VzcyB0byBrdWJlcm5ldGVzIHJlc291cmNlcyB1dGlsaXppbmcga3ViZWN0bCBDTEkiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkt1YmVjdGwgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMva3ViZWN0bC1leHRlbnNpb24iLAogICJ1dWlkIjogImt1YmVjdGxAaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1lcmkyns6s4nv9ag9h80vs4cxrjxw907b3bxzqvs7ig9s1h41rqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHBhbmVsIGFjY2VzcyB0byBrdWJlcm5ldGVzIHJlc291cmNlcyB1dGlsaXppbmcga3ViZWN0bCBDTEkiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkt1YmVjdGwgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMva3ViZWN0bC1leHRlbnNpb24iLAogICJ1dWlkIjogImt1YmVjdGxAaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "alwaysshowworkspacethumbnails@alynx.one", "name": "Always Show Workspace Thumbnails", "pname": "always-show-workspace-thumbnails", "description": "Always show workspace thumbnails even there is only one workspace.", "link": "https://extensions.gnome.org/extension/4156/always-show-workspace-thumbnails/", "shell_version_map": {"40": {"version": "3", "sha256": "08z8ij9cj198g7cw3mr9spy1pirqhxkhmqwhg2vysql9bwhc3w1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYWx3YXlzLXNob3ctd29ya3NwYWNlLXRodW1ibmFpbHMvIiwKICAidXVpZCI6ICJhbHdheXNzaG93d29ya3NwYWNldGh1bWJuYWlsc0BhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "08z8ij9cj198g7cw3mr9spy1pirqhxkhmqwhg2vysql9bwhc3w1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYWx3YXlzLXNob3ctd29ya3NwYWNlLXRodW1ibmFpbHMvIiwKICAidXVpZCI6ICJhbHdheXNzaG93d29ya3NwYWNldGh1bWJuYWlsc0BhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "gnome-ui-tune@itstime.tech", "name": "Gnome 4x UI Improvements", "pname": "gnome-40-ui-improvements", "description": "Tunes gnome 40/41's 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\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": "7", "sha256": "1da7vqkjjqix29x7j3zv6plkzs45jcfz89i5d9pfk1jsmfcph2k4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtdWktdHVuZSIsCiAgInV1aWQiOiAiZ25vbWUtdWktdHVuZUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1da7vqkjjqix29x7j3zv6plkzs45jcfz89i5d9pfk1jsmfcph2k4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtdWktdHVuZSIsCiAgInV1aWQiOiAiZ25vbWUtdWktdHVuZUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "gnome-ui-tune@itstime.tech", "name": "Gnome 4x UI Improvements", "pname": "gnome-40-ui-improvements", "description": "Tunes gnome 40/41/42's 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\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": "8", "sha256": "1fdh5gmsan5i3jqlfnmhd4df9lldxnr13ajqimmkhv22nk6mazw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxLzQyJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLXVpLXR1bmUiLAogICJ1dWlkIjogImdub21lLXVpLXR1bmVAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1fdh5gmsan5i3jqlfnmhd4df9lldxnr13ajqimmkhv22nk6mazw7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxLzQyJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLXVpLXR1bmUiLAogICJ1dWlkIjogImdub21lLXVpLXR1bmVAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"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 corners/edges or keyboard shortcuts can trigger any of dozens of built-in actions that helps you navigate and control your desktop environment or your own shell commands.\n\nThis extension is a big collection of actions that lets you navigate and control the Gnome Shell environment and windows and launch applications and scripts not only through the corners and edges of your monitors, but also using the custom keyboard shortcuts.\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.\nPlease report bugs/issues on GitHub linked below and add output from these two commands:\njournalctl /usr/bin/gnome-shell --since \"2 days ago\" | grep corners-extended\njournalctl /usr/bin/gjs --since \"2 days ago\" | grep corners-extended\n\nkeywords: 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, workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "11", "sha256": "1snd0vdl87dd3h6ri25d585n1nn0dj1rgzny8r9pkqzjpy6fm7f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGxldHMgeW91IG5hdmlnYXRlIGFuZCBjb250cm9sIHRoZSBHbm9tZSBTaGVsbCBlbnZpcm9ubWVudCBhbmQgd2luZG93cyBhbmQgbGF1bmNoIGFwcGxpY2F0aW9ucyBhbmQgc2NyaXB0cyBub3Qgb25seSB0aHJvdWdoIHRoZSBjb3JuZXJzIGFuZCBlZGdlcyBvZiB5b3VyIG1vbml0b3JzLCBidXQgYWxzbyB1c2luZyB0aGUgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cy5cblNpZ25pZmljYW50IHBhcnQgb2YgYXZhaWxhYmxlIGFjdGlvbnMgYXJlIHZpc3VhbCBhZGp1c3RtZW50cyAoY29udHJhc3QsIGJyaWdodG5lc3MsIG9wYWNpdHkpIGFuZCBjb2xvciBmaWx0ZXJzIChyZWQsIGdyZWVuLCBkZXNhdHVyYXRlLCBsaWdodG5lc3MgYW5kIGNvbG9yIGludmVyc2lvbnMpICwgaW5jbHVkaW5nIGNvcnJlY3Rpb24gZmlsdGVycyBmb3IgY29sb3JibGluZCB1c2VycyBhbmQgY2Igc2ltdWxhdGlvbiBmaWx0ZXJzIGZvciBkZXZlbG9wZXJzLlxuXG5SZXN0YXJ0IHlvdXIgR25vbWUgU2hlbGwgYWZ0ZXIgZWFjaCB1cGRhdGUgb2YgdGhlIGV4dGVuc2lvbiB0byBsb2FkIG5ldyBjb2RlLCBhbmQgcmVsb2FkIHRoaXMgc2l0ZSB0byBnZXQgcmlkIG9mIHRoZSBlcnJvciBtZXNzYWdlLCBiZWZvcmUgeW91IHBvc3QgYSBidWcgcmVwb3J0LlxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgbGlua2VkIGJlbG93IGFuZCBhZGQgb3V0cHV0IGZyb20gdGhlc2UgdHdvIGNvbW1hbmRzOlxuam91cm5hbGN0bCAvdXNyL2Jpbi9nbm9tZS1zaGVsbCAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5qb3VybmFsY3RsIC91c3IvYmluL2dqcyAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5cbmtleXdvcmRzOiBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "1snd0vdl87dd3h6ri25d585n1nn0dj1rgzny8r9pkqzjpy6fm7f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGxldHMgeW91IG5hdmlnYXRlIGFuZCBjb250cm9sIHRoZSBHbm9tZSBTaGVsbCBlbnZpcm9ubWVudCBhbmQgd2luZG93cyBhbmQgbGF1bmNoIGFwcGxpY2F0aW9ucyBhbmQgc2NyaXB0cyBub3Qgb25seSB0aHJvdWdoIHRoZSBjb3JuZXJzIGFuZCBlZGdlcyBvZiB5b3VyIG1vbml0b3JzLCBidXQgYWxzbyB1c2luZyB0aGUgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cy5cblNpZ25pZmljYW50IHBhcnQgb2YgYXZhaWxhYmxlIGFjdGlvbnMgYXJlIHZpc3VhbCBhZGp1c3RtZW50cyAoY29udHJhc3QsIGJyaWdodG5lc3MsIG9wYWNpdHkpIGFuZCBjb2xvciBmaWx0ZXJzIChyZWQsIGdyZWVuLCBkZXNhdHVyYXRlLCBsaWdodG5lc3MgYW5kIGNvbG9yIGludmVyc2lvbnMpICwgaW5jbHVkaW5nIGNvcnJlY3Rpb24gZmlsdGVycyBmb3IgY29sb3JibGluZCB1c2VycyBhbmQgY2Igc2ltdWxhdGlvbiBmaWx0ZXJzIGZvciBkZXZlbG9wZXJzLlxuXG5SZXN0YXJ0IHlvdXIgR25vbWUgU2hlbGwgYWZ0ZXIgZWFjaCB1cGRhdGUgb2YgdGhlIGV4dGVuc2lvbiB0byBsb2FkIG5ldyBjb2RlLCBhbmQgcmVsb2FkIHRoaXMgc2l0ZSB0byBnZXQgcmlkIG9mIHRoZSBlcnJvciBtZXNzYWdlLCBiZWZvcmUgeW91IHBvc3QgYSBidWcgcmVwb3J0LlxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgbGlua2VkIGJlbG93IGFuZCBhZGQgb3V0cHV0IGZyb20gdGhlc2UgdHdvIGNvbW1hbmRzOlxuam91cm5hbGN0bCAvdXNyL2Jpbi9nbm9tZS1zaGVsbCAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5qb3VybmFsY3RsIC91c3IvYmluL2dqcyAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5cbmtleXdvcmRzOiBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "1snd0vdl87dd3h6ri25d585n1nn0dj1rgzny8r9pkqzjpy6fm7f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGxldHMgeW91IG5hdmlnYXRlIGFuZCBjb250cm9sIHRoZSBHbm9tZSBTaGVsbCBlbnZpcm9ubWVudCBhbmQgd2luZG93cyBhbmQgbGF1bmNoIGFwcGxpY2F0aW9ucyBhbmQgc2NyaXB0cyBub3Qgb25seSB0aHJvdWdoIHRoZSBjb3JuZXJzIGFuZCBlZGdlcyBvZiB5b3VyIG1vbml0b3JzLCBidXQgYWxzbyB1c2luZyB0aGUgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cy5cblNpZ25pZmljYW50IHBhcnQgb2YgYXZhaWxhYmxlIGFjdGlvbnMgYXJlIHZpc3VhbCBhZGp1c3RtZW50cyAoY29udHJhc3QsIGJyaWdodG5lc3MsIG9wYWNpdHkpIGFuZCBjb2xvciBmaWx0ZXJzIChyZWQsIGdyZWVuLCBkZXNhdHVyYXRlLCBsaWdodG5lc3MgYW5kIGNvbG9yIGludmVyc2lvbnMpICwgaW5jbHVkaW5nIGNvcnJlY3Rpb24gZmlsdGVycyBmb3IgY29sb3JibGluZCB1c2VycyBhbmQgY2Igc2ltdWxhdGlvbiBmaWx0ZXJzIGZvciBkZXZlbG9wZXJzLlxuXG5SZXN0YXJ0IHlvdXIgR25vbWUgU2hlbGwgYWZ0ZXIgZWFjaCB1cGRhdGUgb2YgdGhlIGV4dGVuc2lvbiB0byBsb2FkIG5ldyBjb2RlLCBhbmQgcmVsb2FkIHRoaXMgc2l0ZSB0byBnZXQgcmlkIG9mIHRoZSBlcnJvciBtZXNzYWdlLCBiZWZvcmUgeW91IHBvc3QgYSBidWcgcmVwb3J0LlxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgbGlua2VkIGJlbG93IGFuZCBhZGQgb3V0cHV0IGZyb20gdGhlc2UgdHdvIGNvbW1hbmRzOlxuam91cm5hbGN0bCAvdXNyL2Jpbi9nbm9tZS1zaGVsbCAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5qb3VybmFsY3RsIC91c3IvYmluL2dqcyAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5cbmtleXdvcmRzOiBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"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 corners/edges or keyboard shortcuts can trigger any of dozens of built-in actions that helps you navigate and control your desktop environment or your own shell commands.\n\nThis extension is a big collection of actions that allows you navigate and control the Gnome Shell environment and windows and launch applications and scripts not only through the corners and edges of your monitors, but also using the custom keyboard shortcuts.\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.\nPlease report bugs/issues on GitHub linked below and add output from these two commands:\njournalctl /usr/bin/gnome-shell --since \"2 days ago\" | grep corners-extended\njournalctl /usr/bin/gjs --since \"2 days ago\" | grep corners-extended\n\nkeywords: 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, workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "15", "sha256": "1qmaxd7z2fwn51nhgaki07kgi0v3rmz7nx71fhg2vz4d66ypg4ff", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGFsbG93cyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgdGhlIEdub21lIFNoZWxsIGVudmlyb25tZW50IGFuZCB3aW5kb3dzIGFuZCBsYXVuY2ggYXBwbGljYXRpb25zIGFuZCBzY3JpcHRzIG5vdCBvbmx5IHRocm91Z2ggdGhlIGNvcm5lcnMgYW5kIGVkZ2VzIG9mIHlvdXIgbW9uaXRvcnMsIGJ1dCBhbHNvIHVzaW5nIHRoZSBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzLlxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIEdpdEh1YiBsaW5rZWQgYmVsb3cgYW5kIGFkZCBvdXRwdXQgZnJvbSB0aGVzZSB0d28gY29tbWFuZHM6XG5qb3VybmFsY3RsIC91c3IvYmluL2dub21lLXNoZWxsIC0tc2luY2UgXCIyIGRheXMgYWdvXCIgfCBncmVwIGNvcm5lcnMtZXh0ZW5kZWRcbmpvdXJuYWxjdGwgL3Vzci9iaW4vZ2pzIC0tc2luY2UgXCIyIGRheXMgYWdvXCIgfCBncmVwIGNvcm5lcnMtZXh0ZW5kZWRcblxua2V5d29yZHM6IG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsIC8gcHJldmlldywgbG9va2luZyBnbGFzcywgY3VzdG9tIG1lbnUsIHdpbmRvdywgd29ya3NwYWNlLCBzd2l0Y2hlciwgaGlkZSBwYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgIm5hbWUiOiAiQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "40": {"version": "15", "sha256": "1qmaxd7z2fwn51nhgaki07kgi0v3rmz7nx71fhg2vz4d66ypg4ff", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGFsbG93cyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgdGhlIEdub21lIFNoZWxsIGVudmlyb25tZW50IGFuZCB3aW5kb3dzIGFuZCBsYXVuY2ggYXBwbGljYXRpb25zIGFuZCBzY3JpcHRzIG5vdCBvbmx5IHRocm91Z2ggdGhlIGNvcm5lcnMgYW5kIGVkZ2VzIG9mIHlvdXIgbW9uaXRvcnMsIGJ1dCBhbHNvIHVzaW5nIHRoZSBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzLlxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIEdpdEh1YiBsaW5rZWQgYmVsb3cgYW5kIGFkZCBvdXRwdXQgZnJvbSB0aGVzZSB0d28gY29tbWFuZHM6XG5qb3VybmFsY3RsIC91c3IvYmluL2dub21lLXNoZWxsIC0tc2luY2UgXCIyIGRheXMgYWdvXCIgfCBncmVwIGNvcm5lcnMtZXh0ZW5kZWRcbmpvdXJuYWxjdGwgL3Vzci9iaW4vZ2pzIC0tc2luY2UgXCIyIGRheXMgYWdvXCIgfCBncmVwIGNvcm5lcnMtZXh0ZW5kZWRcblxua2V5d29yZHM6IG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsIC8gcHJldmlldywgbG9va2luZyBnbGFzcywgY3VzdG9tIG1lbnUsIHdpbmRvdywgd29ya3NwYWNlLCBzd2l0Y2hlciwgaGlkZSBwYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgIm5hbWUiOiAiQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "1qmaxd7z2fwn51nhgaki07kgi0v3rmz7nx71fhg2vz4d66ypg4ff", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGFsbG93cyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgdGhlIEdub21lIFNoZWxsIGVudmlyb25tZW50IGFuZCB3aW5kb3dzIGFuZCBsYXVuY2ggYXBwbGljYXRpb25zIGFuZCBzY3JpcHRzIG5vdCBvbmx5IHRocm91Z2ggdGhlIGNvcm5lcnMgYW5kIGVkZ2VzIG9mIHlvdXIgbW9uaXRvcnMsIGJ1dCBhbHNvIHVzaW5nIHRoZSBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzLlxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIEdpdEh1YiBsaW5rZWQgYmVsb3cgYW5kIGFkZCBvdXRwdXQgZnJvbSB0aGVzZSB0d28gY29tbWFuZHM6XG5qb3VybmFsY3RsIC91c3IvYmluL2dub21lLXNoZWxsIC0tc2luY2UgXCIyIGRheXMgYWdvXCIgfCBncmVwIGNvcm5lcnMtZXh0ZW5kZWRcbmpvdXJuYWxjdGwgL3Vzci9iaW4vZ2pzIC0tc2luY2UgXCIyIGRheXMgYWdvXCIgfCBncmVwIGNvcm5lcnMtZXh0ZW5kZWRcblxua2V5d29yZHM6IG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsIC8gcHJldmlldywgbG9va2luZyBnbGFzcywgY3VzdG9tIG1lbnUsIHdpbmRvdywgd29ya3NwYWNlLCBzd2l0Y2hlciwgaGlkZSBwYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgIm5hbWUiOiAiQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"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": "6", "sha256": "1wajx49ci9146wi10z2nvhgc1iw7mfqp8a8z5gr708f90vfy93lc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1wajx49ci9146wi10z2nvhgc1iw7mfqp8a8z5gr708f90vfy93lc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"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": "5", "sha256": "12msvdg82rj34v338vsxqimy1p35isvl4db8k1sjq23ln1b6jak2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3VwZXJ0ZXJyYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsZWFyLXRvcC1iYXIiLAogICJ1dWlkIjogImNsZWFyLXRvcC1iYXJAc3VwZXJ0ZXJyYW4ubmV0IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "12msvdg82rj34v338vsxqimy1p35isvl4db8k1sjq23ln1b6jak2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3VwZXJ0ZXJyYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsZWFyLXRvcC1iYXIiLAogICJ1dWlkIjogImNsZWFyLXRvcC1iYXJAc3VwZXJ0ZXJyYW4ubmV0IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"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": "5", "sha256": "1df0xz4m2ysqk3bk7kqjjh04qwsffwc04jgihmid4whd3n2kglk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3N5c3RlbWQtbWFuYWdlciIsCiAgInV1aWQiOiAic3lzdGVtZC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1df0xz4m2ysqk3bk7kqjjh04qwsffwc04jgihmid4whd3n2kglk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3N5c3RlbWQtbWFuYWdlciIsCiAgInV1aWQiOiAic3lzdGVtZC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1df0xz4m2ysqk3bk7kqjjh04qwsffwc04jgihmid4whd3n2kglk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3N5c3RlbWQtbWFuYWdlciIsCiAgInV1aWQiOiAic3lzdGVtZC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1Cn0="}}} @@ -488,12 +488,12 @@ , {"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": "12", "sha256": "14pjbqjgg9aksjgk6mm1hkxn08qpzxiimy5qsfcrkjp31qjldan3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFzaC10by1wbGFuayIsCiAgInV1aWQiOiAiZGFzaC10by1wbGFua0BoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "12", "sha256": "14pjbqjgg9aksjgk6mm1hkxn08qpzxiimy5qsfcrkjp31qjldan3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFzaC10by1wbGFuayIsCiAgInV1aWQiOiAiZGFzaC10by1wbGFua0BoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "14pjbqjgg9aksjgk6mm1hkxn08qpzxiimy5qsfcrkjp31qjldan3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFzaC10by1wbGFuayIsCiAgInV1aWQiOiAiZGFzaC10by1wbGFua0BoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"uuid": "rrc@ogarcia.me", "name": "Remove Rounded Corners", "pname": "remove-rounded-corners", "description": "Removes rounded corners from main panel or top bar", "link": "https://extensions.gnome.org/extension/4201/remove-rounded-corners/", "shell_version_map": {"40": {"version": "5", "sha256": "1rj9wxa0mazkr29ggwqx0r043cskpw7r4clgvpiw18psrn148c8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgcm91bmRlZCBjb3JuZXJzIGZyb20gbWFpbiBwYW5lbCBvciB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgUm91bmRlZCBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vZ2FyY2lhL3JlbW92ZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogInJyY0BvZ2FyY2lhLm1lIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1rj9wxa0mazkr29ggwqx0r043cskpw7r4clgvpiw18psrn148c8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgcm91bmRlZCBjb3JuZXJzIGZyb20gbWFpbiBwYW5lbCBvciB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgUm91bmRlZCBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vZ2FyY2lhL3JlbW92ZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogInJyY0BvZ2FyY2lhLm1lIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"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": "6", "sha256": "1gpv6d4jxsx842wjlj7g9fz870jl9fcwp0fhxbrsgp8jhk6jnpcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1gpv6d4jxsx842wjlj7g9fz870jl9fcwp0fhxbrsgp8jhk6jnpcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"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": "8", "sha256": "19fpqqmln8fmnv1g7cms63h2kiwqspknmxf3vm03as9bi8ajs47y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29sb3NzZXVtIiwKICAidXVpZCI6ICJjb2xvc3NldW1Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "19fpqqmln8fmnv1g7cms63h2kiwqspknmxf3vm03as9bi8ajs47y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29sb3NzZXVtIiwKICAidXVpZCI6ICJjb2xvc3NldW1Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"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": "14", "sha256": "0b0l1qfjkql7xzp5qkqixmdr6rmfdz7i7y319qqwn31mwslrc1nl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "0b0l1qfjkql7xzp5qkqixmdr6rmfdz7i7y319qqwn31mwslrc1nl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"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="}}} , {"uuid": "wireless-hid@chlumskyvaclav.gmail.com", "name": "Wireless HID", "pname": "wireless-hid", "description": "This extension shows the battery of the wireless keyboards, mice, and game controllers in percentages and colors. Multiple devices are supported.", "link": "https://extensions.gnome.org/extension/4228/wireless-hid/", "shell_version_map": {"38": {"version": "4", "sha256": "09qws1w9d6ik18c2fkhwfrxiallx4bq2k6wnlc7d2fvrfdm32kqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "09qws1w9d6ik18c2fkhwfrxiallx4bq2k6wnlc7d2fvrfdm32kqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "09qws1w9d6ik18c2fkhwfrxiallx4bq2k6wnlc7d2fvrfdm32kqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "better-osd@hllvc", "name": "Better OSD - Gnome 40", "pname": "better-osd-gnome-40", "description": "Customize your OSD popups. Move, resize, set delay and transparency!", "link": "https://extensions.gnome.org/extension/4231/better-osd-gnome-40/", "shell_version_map": {"40": {"version": "5", "sha256": "0z24civcgjsif2gyxkjamzx2nlxxzfnkg4fwip4jbxy5v3d090nq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "0z24civcgjsif2gyxkjamzx2nlxxzfnkg4fwip4jbxy5v3d090nq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} +, {"uuid": "better-osd@hllvc", "name": "Better OSD - Gnome 40", "pname": "better-osd-gnome-40", "description": "Customize your OSD popups. Move, resize, set delay and transparency!", "link": "https://extensions.gnome.org/extension/4231/better-osd-gnome-40/", "shell_version_map": {"40": {"version": "6", "sha256": "0945xh7a607x3f9796gi3l5zylqa8gj1pnw44hcaak5sc6zpahgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQxLjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0945xh7a607x3f9796gi3l5zylqa8gj1pnw44hcaak5sc6zpahgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQxLjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "arbttstats@gervasioperez.ar", "name": "Arbtt stats", "pname": "arbtt-stats", "description": "Show simple arbtt stats on the panel\n*** This extension requires arbtt running and configured", "link": "https://extensions.gnome.org/extension/4234/arbtt-stats/", "shell_version_map": {"38": {"version": "9", "sha256": "0x3sxg8dv9gfq1f4m9bk4rb3395rdcf0srijxqphpwjmm0nsizql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc2ltcGxlIGFyYnR0IHN0YXRzIG9uIHRoZSBwYW5lbFxuKioqIFRoaXMgZXh0ZW5zaW9uIHJlcXVpcmVzIGFyYnR0IHJ1bm5pbmcgYW5kIGNvbmZpZ3VyZWQiLAogICJuYW1lIjogIkFyYnR0IHN0YXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZXJ3b29kaW5jL2FyYnR0LXN0YXRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXJidHRzdGF0c0BnZXJ2YXNpb3BlcmV6LmFyIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "9", "sha256": "0x3sxg8dv9gfq1f4m9bk4rb3395rdcf0srijxqphpwjmm0nsizql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc2ltcGxlIGFyYnR0IHN0YXRzIG9uIHRoZSBwYW5lbFxuKioqIFRoaXMgZXh0ZW5zaW9uIHJlcXVpcmVzIGFyYnR0IHJ1bm5pbmcgYW5kIGNvbmZpZ3VyZWQiLAogICJuYW1lIjogIkFyYnR0IHN0YXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZXJ3b29kaW5jL2FyYnR0LXN0YXRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXJidHRzdGF0c0BnZXJ2YXNpb3BlcmV6LmFyIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "blur-me@nunchucks", "name": "Blur Me", "pname": "blur-me", "description": "Blur: Applications | Top Panel | Overview | Dash | More!\n\n\nCredit where it's due: Overview and dash blur are based on blur my shell", "link": "https://extensions.gnome.org/extension/4236/blur-me/", "shell_version_map": {"40": {"version": "13", "sha256": "0sdmp9q6g8xyaxvvmk47niad5csnlfpdnmx0lnlfm1dc6kchyaxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdXI6IEFwcGxpY2F0aW9ucyB8IFRvcCBQYW5lbCB8IE92ZXJ2aWV3IHwgRGFzaCB8IE1vcmUhXG5cblxuQ3JlZGl0IHdoZXJlIGl0J3MgZHVlOiBPdmVydmlldyBhbmQgZGFzaCBibHVyIGFyZSBiYXNlZCBvbiBibHVyIG15IHNoZWxsIiwKICAibmFtZSI6ICJCbHVyIE1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ja2lzc2FuZS9ibHVyLW1lIiwKICAidXVpZCI6ICJibHVyLW1lQG51bmNodWNrcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "0sdmp9q6g8xyaxvvmk47niad5csnlfpdnmx0lnlfm1dc6kchyaxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdXI6IEFwcGxpY2F0aW9ucyB8IFRvcCBQYW5lbCB8IE92ZXJ2aWV3IHwgRGFzaCB8IE1vcmUhXG5cblxuQ3JlZGl0IHdoZXJlIGl0J3MgZHVlOiBPdmVydmlldyBhbmQgZGFzaCBibHVyIGFyZSBiYXNlZCBvbiBibHVyIG15IHNoZWxsIiwKICAibmFtZSI6ICJCbHVyIE1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ja2lzc2FuZS9ibHVyLW1lIiwKICAidXVpZCI6ICJibHVyLW1lQG51bmNodWNrcyIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "gestureImprovements@gestures", "name": "Gesture Improvements", "pname": "gesture-improvements", "description": "Improve touchpad gestures for Wayland/X11\n\nThis extension adds following features:\n\n• Switch windows from current workspace using 3-finger horizontal swipe\n• Cyclic gestures between Desktop/Overview/AppGrid using 4 vertical swipe\n• Switch app-pages using 3-finger swipe gesture on AppGrid\n• Unmaximize/maximize/fullscreen/half-tiling using 3-finger vertical & horizontal gesture\n• Optional minimize a window gesture\n• Override 3-finger gesture with 4-finger for switching workspace\n• Pinch to show desktop\n• Configure speed of gestures\n• Support for X11\n \nOn X11, you need to install https://github.com/harshadgavali/gnome-x11-gesture-daemon\n\nReport any bugs/requests on GitHub (link directly below)\n", "link": "https://extensions.gnome.org/extension/4245/gesture-improvements/", "shell_version_map": {"40": {"version": "19", "sha256": "06s4igjx5r7k01yvylr0clg8j2m6sdywn00hr5xdp1a9v2r5v5ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLWdlc3R1cmUtaW1wcm92ZW1lbnRzIiwKICAidXVpZCI6ICJnZXN0dXJlSW1wcm92ZW1lbnRzQGdlc3R1cmVzIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "06s4igjx5r7k01yvylr0clg8j2m6sdywn00hr5xdp1a9v2r5v5ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLWdlc3R1cmUtaW1wcm92ZW1lbnRzIiwKICAidXVpZCI6ICJnZXN0dXJlSW1wcm92ZW1lbnRzQGdlc3R1cmVzIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} @@ -551,18 +551,18 @@ , {"uuid": "replaceActivitiesText@pratap.fastmail.fm", "name": "Replace Activities Text", "pname": "replace-activities-text", "description": "A Simple Extension to Change 'Activities' Label with Logo and Text.\nYou can Keep Either\n1. Logo or\n2. Text or\n3. Both or\n4. None at all", "link": "https://extensions.gnome.org/extension/4405/replace-activities-text/", "shell_version_map": {"38": {"version": "8", "sha256": "04adx4043d3ni510h44pi3gr0k15a4n0zwr4k5fxisr4yjl1510w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9BY3Rpdml0aWVzVGV4dCIsCiAgInV1aWQiOiAicmVwbGFjZUFjdGl2aXRpZXNUZXh0QHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "10", "sha256": "0fkpphd6ly5n7fybrla1a31sqg10cdll44ilz1vc1achphmbxlk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0FjdGl2aXRpZXNUZXh0IiwKICAidXVpZCI6ICJyZXBsYWNlQWN0aXZpdGllc1RleHRAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0fkpphd6ly5n7fybrla1a31sqg10cdll44ilz1vc1achphmbxlk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0FjdGl2aXRpZXNUZXh0IiwKICAidXVpZCI6ICJyZXBsYWNlQWN0aXZpdGllc1RleHRAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "appMenuIcon@pratap.fastmail.fm", "name": "Colored Application Menu Icon", "pname": "app-menu-icon-remove-symbolic", "description": "Remove Symbolic Icons and Saturation Effect for App Menu Icon", "link": "https://extensions.gnome.org/extension/4408/app-menu-icon-remove-symbolic/", "shell_version_map": {"38": {"version": "2", "sha256": "1ggj4c7knbsjwg7n1g7sqjz188ivlihsq8p2a8jd71iw49b917cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwTWVudUljb25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1ggj4c7knbsjwg7n1g7sqjz188ivlihsq8p2a8jd71iw49b917cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwTWVudUljb25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1ggj4c7knbsjwg7n1g7sqjz188ivlihsq8p2a8jd71iw49b917cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwTWVudUljb25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "gnome-trash@b00f.github.io", "name": "Gnome Trash", "pname": "gnome-trash", "description": "A gnome shell extension to manage your home trash. You can manage trash items from the panel and open or empty the trash.", "link": "https://extensions.gnome.org/extension/4410/gnome-trash/", "shell_version_map": {"38": {"version": "3", "sha256": "03pyala1i21izg5rl4qqh5bxk36fp8d52bs9ggrik2kav420xhhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAidXVpZCI6ICJnbm9tZS10cmFzaEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "6", "sha256": "0hkpkpxd1xpg0rsvf007wzc6s6sx1gsycl6hg69fa5bqf451r0db", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtdHJhc2giLAogICJ1dWlkIjogImdub21lLXRyYXNoQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0hkpkpxd1xpg0rsvf007wzc6s6sx1gsycl6hg69fa5bqf451r0db", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtdHJhc2giLAogICJ1dWlkIjogImdub21lLXRyYXNoQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} -, {"uuid": "advanced-alt-tab@G-dH.github.com", "name": "AATWS - Advanced Alt-Tab Window Switcher", "pname": "advanced-alttab-window-switcher", "description": "Highly customizable replacement for the Alt-Tab window/app switchers that offers 'type to search' mode, various filtering and sorting options, workspace and monitor navigation, VIM navigation hotkeys, window control and an app launcher.\nAATWS is compatible with Custom Hot Corners - Extended extension, allows to configure any mouse button and scroll wheel and can be used as a mouse controlled dock.\n\nNote that GNOME has 3 built-in window switcher popups and this extension replaces all of them. The first one is grouping windows by applications and is used as default in vanilla GNOME distributions. The second one offers window list and the third one windows of currently focused application. You can set keyboard shortcuts for all the switchers in the Gnome Settings.\n\nFollow the link below for more information and bug reports.\n\nKeywords: alttab, search, find, windows, popup delay, applications, apps, dock, monitor, thumbnail, preview, move windows, launch app, switch windows", "link": "https://extensions.gnome.org/extension/4412/advanced-alttab-window-switcher/", "shell_version_map": {"38": {"version": "10", "sha256": "0jxjhyhp2yb5cia2rgz3cmdl0j6l7qcv0xpq6kk783q6y59x5g07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQtVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIFZJTSBuYXZpZ2F0aW9uIGhvdGtleXMsIHdpbmRvdyBjb250cm9sIGFuZCBhbiBhcHAgbGF1bmNoZXIuXG5BQVRXUyBpcyBjb21wYXRpYmxlIHdpdGggQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQgZXh0ZW5zaW9uLCBhbGxvd3MgdG8gY29uZmlndXJlIGFueSBtb3VzZSBidXR0b24gYW5kIHNjcm9sbCB3aGVlbCBhbmQgY2FuIGJlIHVzZWQgYXMgYSBtb3VzZSBjb250cm9sbGVkIGRvY2suXG5cbk5vdGUgdGhhdCBHTk9NRSBoYXMgMyBidWlsdC1pbiB3aW5kb3cgc3dpdGNoZXIgcG9wdXBzIGFuZCB0aGlzIGV4dGVuc2lvbiByZXBsYWNlcyBhbGwgb2YgdGhlbS4gVGhlIGZpcnN0IG9uZSBpcyBncm91cGluZyB3aW5kb3dzIGJ5IGFwcGxpY2F0aW9ucyBhbmQgaXMgdXNlZCBhcyBkZWZhdWx0IGluIHZhbmlsbGEgR05PTUUgZGlzdHJpYnV0aW9ucy4gVGhlIHNlY29uZCBvbmUgb2ZmZXJzIHdpbmRvdyBsaXN0IGFuZCB0aGUgdGhpcmQgb25lIHdpbmRvd3Mgb2YgY3VycmVudGx5IGZvY3VzZWQgYXBwbGljYXRpb24uIFlvdSBjYW4gc2V0IGtleWJvYXJkIHNob3J0Y3V0cyBmb3IgYWxsIHRoZSBzd2l0Y2hlcnMgaW4gdGhlIEdub21lIFNldHRpbmdzLlxuXG5Gb2xsb3cgdGhlIGxpbmsgYmVsb3cgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGJ1ZyByZXBvcnRzLlxuXG5LZXl3b3JkczogYWx0dGFiLCBzZWFyY2gsIGZpbmQsIHdpbmRvd3MsIHBvcHVwIGRlbGF5LCBhcHBsaWNhdGlvbnMsIGFwcHMsIGRvY2ssIG1vbml0b3IsIHRodW1ibmFpbCwgcHJldmlldywgbW92ZSB3aW5kb3dzLCBsYXVuY2ggYXBwLCBzd2l0Y2ggd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0jxjhyhp2yb5cia2rgz3cmdl0j6l7qcv0xpq6kk783q6y59x5g07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQtVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIFZJTSBuYXZpZ2F0aW9uIGhvdGtleXMsIHdpbmRvdyBjb250cm9sIGFuZCBhbiBhcHAgbGF1bmNoZXIuXG5BQVRXUyBpcyBjb21wYXRpYmxlIHdpdGggQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQgZXh0ZW5zaW9uLCBhbGxvd3MgdG8gY29uZmlndXJlIGFueSBtb3VzZSBidXR0b24gYW5kIHNjcm9sbCB3aGVlbCBhbmQgY2FuIGJlIHVzZWQgYXMgYSBtb3VzZSBjb250cm9sbGVkIGRvY2suXG5cbk5vdGUgdGhhdCBHTk9NRSBoYXMgMyBidWlsdC1pbiB3aW5kb3cgc3dpdGNoZXIgcG9wdXBzIGFuZCB0aGlzIGV4dGVuc2lvbiByZXBsYWNlcyBhbGwgb2YgdGhlbS4gVGhlIGZpcnN0IG9uZSBpcyBncm91cGluZyB3aW5kb3dzIGJ5IGFwcGxpY2F0aW9ucyBhbmQgaXMgdXNlZCBhcyBkZWZhdWx0IGluIHZhbmlsbGEgR05PTUUgZGlzdHJpYnV0aW9ucy4gVGhlIHNlY29uZCBvbmUgb2ZmZXJzIHdpbmRvdyBsaXN0IGFuZCB0aGUgdGhpcmQgb25lIHdpbmRvd3Mgb2YgY3VycmVudGx5IGZvY3VzZWQgYXBwbGljYXRpb24uIFlvdSBjYW4gc2V0IGtleWJvYXJkIHNob3J0Y3V0cyBmb3IgYWxsIHRoZSBzd2l0Y2hlcnMgaW4gdGhlIEdub21lIFNldHRpbmdzLlxuXG5Gb2xsb3cgdGhlIGxpbmsgYmVsb3cgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGJ1ZyByZXBvcnRzLlxuXG5LZXl3b3JkczogYWx0dGFiLCBzZWFyY2gsIGZpbmQsIHdpbmRvd3MsIHBvcHVwIGRlbGF5LCBhcHBsaWNhdGlvbnMsIGFwcHMsIGRvY2ssIG1vbml0b3IsIHRodW1ibmFpbCwgcHJldmlldywgbW92ZSB3aW5kb3dzLCBsYXVuY2ggYXBwLCBzd2l0Y2ggd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0jxjhyhp2yb5cia2rgz3cmdl0j6l7qcv0xpq6kk783q6y59x5g07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQtVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIFZJTSBuYXZpZ2F0aW9uIGhvdGtleXMsIHdpbmRvdyBjb250cm9sIGFuZCBhbiBhcHAgbGF1bmNoZXIuXG5BQVRXUyBpcyBjb21wYXRpYmxlIHdpdGggQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQgZXh0ZW5zaW9uLCBhbGxvd3MgdG8gY29uZmlndXJlIGFueSBtb3VzZSBidXR0b24gYW5kIHNjcm9sbCB3aGVlbCBhbmQgY2FuIGJlIHVzZWQgYXMgYSBtb3VzZSBjb250cm9sbGVkIGRvY2suXG5cbk5vdGUgdGhhdCBHTk9NRSBoYXMgMyBidWlsdC1pbiB3aW5kb3cgc3dpdGNoZXIgcG9wdXBzIGFuZCB0aGlzIGV4dGVuc2lvbiByZXBsYWNlcyBhbGwgb2YgdGhlbS4gVGhlIGZpcnN0IG9uZSBpcyBncm91cGluZyB3aW5kb3dzIGJ5IGFwcGxpY2F0aW9ucyBhbmQgaXMgdXNlZCBhcyBkZWZhdWx0IGluIHZhbmlsbGEgR05PTUUgZGlzdHJpYnV0aW9ucy4gVGhlIHNlY29uZCBvbmUgb2ZmZXJzIHdpbmRvdyBsaXN0IGFuZCB0aGUgdGhpcmQgb25lIHdpbmRvd3Mgb2YgY3VycmVudGx5IGZvY3VzZWQgYXBwbGljYXRpb24uIFlvdSBjYW4gc2V0IGtleWJvYXJkIHNob3J0Y3V0cyBmb3IgYWxsIHRoZSBzd2l0Y2hlcnMgaW4gdGhlIEdub21lIFNldHRpbmdzLlxuXG5Gb2xsb3cgdGhlIGxpbmsgYmVsb3cgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGJ1ZyByZXBvcnRzLlxuXG5LZXl3b3JkczogYWx0dGFiLCBzZWFyY2gsIGZpbmQsIHdpbmRvd3MsIHBvcHVwIGRlbGF5LCBhcHBsaWNhdGlvbnMsIGFwcHMsIGRvY2ssIG1vbml0b3IsIHRodW1ibmFpbCwgcHJldmlldywgbW92ZSB3aW5kb3dzLCBsYXVuY2ggYXBwLCBzd2l0Y2ggd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "advanced-alt-tab@G-dH.github.com", "name": "AATWS - Advanced Alt-Tab Window Switcher", "pname": "advanced-alttab-window-switcher", "description": "Highly customizable replacement for the Alt/Super+Tab window/app switchers that offers 'type to search' mode, various filtering and sorting options, workspace and monitor navigation, configurable hotkeys for navigation and window/app control and an app launcher.\nAATWS is compatible with Custom Hot Corners - Extended extension, allows to configure any mouse button and scroll wheel and can be used as a mouse controlled 'dock'.\n\nNote that GNOME has 3 built-in window switcher popups and this extension replaces all of them. The first one is grouping windows by applications and is used as default in vanilla GNOME distributions. The second one offers window list and the third one windows of the currently focused application. You can set keyboard shortcuts for all the switchers in the Gnome Settings.\n\nFollow the link below for more information and bug reports.\n\nKeywords: alttab, search, find, window search, popup delay, applications, apps, dock, monitor, thumbnail, preview, move windows, launch app, switch, VIM.", "link": "https://extensions.gnome.org/extension/4412/advanced-alttab-window-switcher/", "shell_version_map": {"38": {"version": "12", "sha256": "05v1libn5prmmlshkiylmipkmqvyhkv986fr8fsmgapb98r000wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "05v1libn5prmmlshkiylmipkmqvyhkv986fr8fsmgapb98r000wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "05v1libn5prmmlshkiylmipkmqvyhkv986fr8fsmgapb98r000wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "improvedosk@nick-shmyrev.dev", "name": "Improved OSK", "pname": "improved-osk", "description": "Makes Gnome's onscreen keyboard more useable with e.g. more keys.\nThis extension is a fork of https://extensions.gnome.org/extension/3330/improved-onscreen-keyboard/ by SebastianLuebke.", "link": "https://extensions.gnome.org/extension/4413/improved-osk/", "shell_version_map": {"38": {"version": "7", "sha256": "06niqzicxp8i9ivznblf2qgwl924h77ld3cz8qgl4x8hl0bb6q0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "06niqzicxp8i9ivznblf2qgwl924h77ld3cz8qgl4x8hl0bb6q0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "06niqzicxp8i9ivznblf2qgwl924h77ld3cz8qgl4x8hl0bb6q0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA3Cn0="}}} -, {"uuid": "fedora-update@pepe386", "name": "Fedora Linux Updates Indicator", "pname": "fedora-linux-updates-indicator", "description": "Update indicator for Fedora Linux and GNOME Shell.", "link": "https://extensions.gnome.org/extension/4415/fedora-linux-updates-indicator/", "shell_version_map": {"40": {"version": "1", "sha256": "0sz69rs6z1fybva20xs8587bs4xaflb4frd14d729lqq5h1m8b2p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGVwZTM4Ni9mZWRvcmEtdXBkYXRlIiwKICAidXVpZCI6ICJmZWRvcmEtdXBkYXRlQHBlcGUzODYiLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "fedora-update@pepe386", "name": "Fedora Linux Updates Indicator", "pname": "fedora-linux-updates-indicator", "description": "Update indicator for Fedora Linux and GNOME Shell.", "link": "https://extensions.gnome.org/extension/4415/fedora-linux-updates-indicator/", "shell_version_map": {"40": {"version": "4", "sha256": "1pmh16ijc9p34qx7019z1imswnxzf9mbbbh7vg5i1acy2dgb3vfw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BlcGUzODYvZmVkb3JhLXVwZGF0ZSIsCiAgInV1aWQiOiAiZmVkb3JhLXVwZGF0ZUBwZXBlMzg2IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1pmh16ijc9p34qx7019z1imswnxzf9mbbbh7vg5i1acy2dgb3vfw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BlcGUzODYvZmVkb3JhLXVwZGF0ZSIsCiAgInV1aWQiOiAiZmVkb3JhLXVwZGF0ZUBwZXBlMzg2IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "readingstrip@lupantano.gihthub", "name": "Reading Strip", "pname": "reading-strip", "description": "It is a extension for Gnome-Shell with an equivalent function to a reading guide on the computer, that's really useful for people with dyslexia.", "link": "https://extensions.gnome.org/extension/4419/reading-strip/", "shell_version_map": {"40": {"version": "12", "sha256": "1xqiainrvipkw2yrzihvbghbshrw0bcxx2wc3wqaxxfa04ziiv7s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1xqiainrvipkw2yrzihvbghbshrw0bcxx2wc3wqaxxfa04ziiv7s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "gnome-clipboard@b00f.github.io", "name": "Gnome Clipboard", "pname": "gnome-clipboard", "description": "A gnome shell extension to manage your clipboard.", "link": "https://extensions.gnome.org/extension/4422/gnome-clipboard/", "shell_version_map": {"38": {"version": "8", "sha256": "1zgymry549c6pmj1c0f6gvpyyfj0z93fwbhhxa67fx3nf95gb3kv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "10", "sha256": "193n38mi38pr07cch1ma5rpkdkk6jkf37m3yfrhmndcqb6brm6i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYjAwZi9nbm9tZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogImdub21lLWNsaXBib2FyZEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "193n38mi38pr07cch1ma5rpkdkk6jkf37m3yfrhmndcqb6brm6i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYjAwZi9nbm9tZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogImdub21lLWNsaXBib2FyZEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} -, {"uuid": "thanatophobia@yatx.one", "name": "Thanatophobia", "pname": "thanatophobia", "description": "Displays your age in real time. \n\nGreat source of motivation according to terror management theory!", "link": "https://extensions.gnome.org/extension/4425/thanatophobia/", "shell_version_map": {"40": {"version": "7", "sha256": "0rk4yf62pv2mqfzmy56p5c57zjdml1953kycs78305c005ckcycc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aW9uc3ZlcnJ5ZnVsL3RoYW5hdG9waG9iaWEiLAogICJ1dWlkIjogInRoYW5hdG9waG9iaWFAeWF0eC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0rk4yf62pv2mqfzmy56p5c57zjdml1953kycs78305c005ckcycc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aW9uc3ZlcnJ5ZnVsL3RoYW5hdG9waG9iaWEiLAogICJ1dWlkIjogInRoYW5hdG9waG9iaWFAeWF0eC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "thanatophobia@yatx.one", "name": "Thanatophobia", "pname": "thanatophobia", "description": "Displays your age in real time. \r\n\r\nGreat source of motivation according to terror management theory!", "link": "https://extensions.gnome.org/extension/4425/thanatophobia/", "shell_version_map": {"40": {"version": "7", "sha256": "0r7j13mgr5fd0v3q1ncmwj7mb5wg8yrxxr0hda197728lmwq0i8x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXHJcblxyXG5HcmVhdCBzb3VyY2Ugb2YgbW90aXZhdGlvbiBhY2NvcmRpbmcgdG8gdGVycm9yIG1hbmFnZW1lbnQgdGhlb3J5ISIsCiAgIm5hbWUiOiAiVGhhbmF0b3Bob2JpYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGlvbnN2ZXJyeWZ1bC90aGFuYXRvcGhvYmlhIiwKICAidXVpZCI6ICJ0aGFuYXRvcGhvYmlhQHlhdHgub25lIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0r7j13mgr5fd0v3q1ncmwj7mb5wg8yrxxr0hda197728lmwq0i8x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXHJcblxyXG5HcmVhdCBzb3VyY2Ugb2YgbW90aXZhdGlvbiBhY2NvcmRpbmcgdG8gdGVycm9yIG1hbmFnZW1lbnQgdGhlb3J5ISIsCiAgIm5hbWUiOiAiVGhhbmF0b3Bob2JpYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGlvbnN2ZXJyeWZ1bC90aGFuYXRvcGhvYmlhIiwKICAidXVpZCI6ICJ0aGFuYXRvcGhvYmlhQHlhdHgub25lIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "typewriter-kb@zzzheka97.gmail.com", "name": "Typewriter Keyboard", "pname": "typewriter-keyboard", "description": "Add a typewriter effect to your keyboard.\n \nThis extension is based on typewriter-kb application \n(https://github.com/ZhekehZ/linux-typewriter-kb), which \nis required to run the extension, but is not part of it.\n \n-------------------------------------------\nIcons made by Freepik from www.flaticon.com", "link": "https://extensions.gnome.org/extension/4427/typewriter-keyboard/", "shell_version_map": {"38": {"version": "2", "sha256": "1zmlmijkm6sgpp00qbrwnxmd4q5dfh07g9w9nynq3ciwxs9fjnai", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "dark-side@kamil-galek.pl", "name": "Dark side of Gnome", "pname": "dark-side-of-gnome", "description": "Join the dark side with some of your apps. For now it won't work with every app.", "link": "https://extensions.gnome.org/extension/4430/dark-side-of-gnome/", "shell_version_map": {"40": {"version": "2", "sha256": "08kzwpn22qwgyrps4khwkarn4rakr1rn57wg94wpfgd9pfbgb7ri", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkpvaW4gdGhlIGRhcmsgc2lkZSB3aXRoIHNvbWUgb2YgeW91ciBhcHBzLiBGb3Igbm93IGl0IHdvbid0IHdvcmsgd2l0aCBldmVyeSBhcHAuIiwKICAibmFtZSI6ICJEYXJrIHNpZGUgb2YgR25vbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRhcmstc2lkZUBrYW1pbC1nYWxlay5wbCIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "wizlight@iabhilashjoshi", "name": "Wiz Light", "pname": "wiz-light", "description": "Control Wiz Connected Lights Through Gnome Shell\n\nRequirements:\n #Wiz enabled smart bulb\n #python3 (To install use command \"sudo apt install python3\")\n #pywizlight (To install use command \"pip3 install pywizlight\")\n\nTo Use go to the location where extension is installed (usually stored in \"~/.local/share/gnome-shell/extensions\") and change IP address in extension.js file to your smart bulb's IP address and then extension should work.", "link": "https://extensions.gnome.org/extension/4436/wiz-light/", "shell_version_map": {"38": {"version": "4", "sha256": "0pby93ivqz2ymdskyjp6ajc2c588dbpq7vjj7b7d8mc03hvkap5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgV2l6IENvbm5lY3RlZCBMaWdodHMgVGhyb3VnaCBHbm9tZSBTaGVsbFxuXG5SZXF1aXJlbWVudHM6XG4gICAgICAgICNXaXogZW5hYmxlZCBzbWFydCBidWxiXG4gICAgICAgICNweXRob24zICAoVG8gaW5zdGFsbCAgdXNlIGNvbW1hbmQgXCJzdWRvIGFwdCBpbnN0YWxsIHB5dGhvbjNcIilcbiAgICAgICAgI3B5d2l6bGlnaHQgKFRvIGluc3RhbGwgdXNlIGNvbW1hbmQgXCJwaXAzIGluc3RhbGwgcHl3aXpsaWdodFwiKVxuXG5UbyBVc2UgZ28gdG8gdGhlIGxvY2F0aW9uIHdoZXJlIGV4dGVuc2lvbiBpcyBpbnN0YWxsZWQgKHVzdWFsbHkgc3RvcmVkIGluIFwifi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9uc1wiKSBhbmQgY2hhbmdlIElQIGFkZHJlc3MgaW4gZXh0ZW5zaW9uLmpzIGZpbGUgdG8geW91ciBzbWFydCBidWxiJ3MgSVAgYWRkcmVzcyBhbmQgdGhlbiBleHRlbnNpb24gc2hvdWxkIHdvcmsuIiwKICAibmFtZSI6ICJXaXogTGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbHBoYXNwZWFyL1dpei1MaWdodCIsCiAgInV1aWQiOiAid2l6bGlnaHRAaWFiaGlsYXNoam9zaGkiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "gSnap@micahosborne", "name": "gSnap", "pname": "gsnap", "description": "Organize windows in customizable snap zones like FancyZones on windows.", "link": "https://extensions.gnome.org/extension/4442/gsnap/", "shell_version_map": {"40": {"version": "6", "sha256": "1sm3kmc4i5m9jimly95bf39p5vjl2rnavkkkiiqq0blk725fsa2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIHdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNhaG9zYm9ybmUvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "appswitcheronlyoncurrentworkspace@ermesonsampaio.com", "name": "Alt + Tab only on current workspace", "pname": "alt-tab-only-on-current-workspace", "description": "Force alt + tab to switch only in the current workspace.", "link": "https://extensions.gnome.org/extension/4443/alt-tab-only-on-current-workspace/", "shell_version_map": {"40": {"version": "3", "sha256": "1jl7gi45gz9fliggkwdg44rdqcirh6qxfkvc639vbw2sgmpbmcvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmNlIGFsdCArIHRhYiB0byBzd2l0Y2ggb25seSBpbiB0aGUgY3VycmVudCB3b3Jrc3BhY2UuIiwKICAibmFtZSI6ICJBbHQgKyBUYWIgb25seSBvbiBjdXJyZW50IHdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lcm1lc29uc2FtcGFpby9hcHAtc3dpdGNoZXItb25seS1vbi1jdXJyZW50LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiYXBwc3dpdGNoZXJvbmx5b25jdXJyZW50d29ya3NwYWNlQGVybWVzb25zYW1wYWlvLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "logomenu@aryan_k", "name": "Logo Menu", "pname": "logo-menu", "description": "Logo Menu - Menu similar to Apple's macOS menu for the GNOME Desktop\nThis extension gives a simple menu along with the ability to get the icon of your distro on top left part of the panel for a great look.\nThe Icon can be customized through settings, it has both Linux and BSD logos.\nfor more screenshots, visit GitHub.\n\nThe default Terminal and Software center can also be changed.\n\nThis extension is a fork of - https://github.com/tofutech/tofumenu\n\nThe original project is no more supported thus I made this.", "link": "https://extensions.gnome.org/extension/4451/logo-menu/", "shell_version_map": {"38": {"version": "9", "sha256": "03px2k0vx0q258jvgzfmk1gr09436wb4x4fycmv0gs9d7kr0kjpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "03px2k0vx0q258jvgzfmk1gr09436wb4x4fycmv0gs9d7kr0kjpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "03px2k0vx0q258jvgzfmk1gr09436wb4x4fycmv0gs9d7kr0kjpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"uuid": "logomenu@aryan_k", "name": "Logo Menu", "pname": "logo-menu", "description": "Logo Menu - Menu similar to Apple's macOS menu for the GNOME Desktop\nThis extension gives a simple menu along with the ability to get the icon of your distro on top left part of the panel for a great look.\nThe Icon can be customized through settings, it has both Linux and BSD logos.\nfor more screenshots, visit GitHub.\n\nThe default Terminal and Software center can also be changed.\n\nThis extension is a fork of - https://github.com/tofutech/tofumenu\n\nThe original project is no more supported thus I made this.", "link": "https://extensions.gnome.org/extension/4451/logo-menu/", "shell_version_map": {"38": {"version": "10", "sha256": "0d7xmiyj07d8sfw6fsvj5i8pjkmn5m44l0lh0hvbaxsk9h72gj00", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0d7xmiyj07d8sfw6fsvj5i8pjkmn5m44l0lh0hvbaxsk9h72gj00", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0d7xmiyj07d8sfw6fsvj5i8pjkmn5m44l0lh0hvbaxsk9h72gj00", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "rog-manager@rog", "name": "Rog Asus Manager", "pname": "rog-asus-manager", "description": "Asus ROG manager", "link": "https://extensions.gnome.org/extension/4452/rog-asus-manager/", "shell_version_map": {"38": {"version": "4", "sha256": "194k3qzjd05rki20ww0nv8001aiyp4ih9abv82g64058x8rmnff5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdXMgUk9HIG1hbmFnZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyb2ctbWFuYWdlciIsCiAgIm5hbWUiOiAiUm9nIEFzdXMgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yb2dtYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxlamFuZHJvLW1vdXJhcy9yb2ctbWFuYWdlciIsCiAgInV1aWQiOiAicm9nLW1hbmFnZXJAcm9nIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "titlebar-screenshot@jmaargh.github.com", "name": "Titlebar Screenshot", "pname": "titlebar-screenshot", "description": "Take screenshots by right-clicking on window titlebars.\n\nVarious configuration options include screenshots can be taken to the clipboard, to a file, or by opening the interactive tool.\n\nAll feedback and bug reports to Issues on the github page.", "link": "https://extensions.gnome.org/extension/4458/titlebar-screenshot/", "shell_version_map": {"38": {"version": "3", "sha256": "1vhphrjq2vyzlknfl3i7f8i3v9f8jcrpwiz26sigklmv3bmzb059", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2Ugc2NyZWVuc2hvdHMgYnkgcmlnaHQtY2xpY2tpbmcgb24gd2luZG93IHRpdGxlYmFycy5cblxuVmFyaW91cyBjb25maWd1cmF0aW9uIG9wdGlvbnMgaW5jbHVkZSBzY3JlZW5zaG90cyBjYW4gYmUgdGFrZW4gdG8gdGhlIGNsaXBib2FyZCwgdG8gYSBmaWxlLCBvciBieSBvcGVuaW5nIHRoZSBpbnRlcmFjdGl2ZSB0b29sLlxuXG5BbGwgZmVlZGJhY2sgYW5kIGJ1ZyByZXBvcnRzIHRvIElzc3VlcyBvbiB0aGUgZ2l0aHViIHBhZ2UuIiwKICAibmFtZSI6ICJUaXRsZWJhciBTY3JlZW5zaG90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpdGxlYmFyLXNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1hYXJnaC90aXRsZWJhci1zY3JlZW5zaG90LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGl0bGViYXItc2NyZWVuc2hvdEBqbWFhcmdoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1vhphrjq2vyzlknfl3i7f8i3v9f8jcrpwiz26sigklmv3bmzb059", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2Ugc2NyZWVuc2hvdHMgYnkgcmlnaHQtY2xpY2tpbmcgb24gd2luZG93IHRpdGxlYmFycy5cblxuVmFyaW91cyBjb25maWd1cmF0aW9uIG9wdGlvbnMgaW5jbHVkZSBzY3JlZW5zaG90cyBjYW4gYmUgdGFrZW4gdG8gdGhlIGNsaXBib2FyZCwgdG8gYSBmaWxlLCBvciBieSBvcGVuaW5nIHRoZSBpbnRlcmFjdGl2ZSB0b29sLlxuXG5BbGwgZmVlZGJhY2sgYW5kIGJ1ZyByZXBvcnRzIHRvIElzc3VlcyBvbiB0aGUgZ2l0aHViIHBhZ2UuIiwKICAibmFtZSI6ICJUaXRsZWJhciBTY3JlZW5zaG90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpdGxlYmFyLXNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1hYXJnaC90aXRsZWJhci1zY3JlZW5zaG90LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGl0bGViYXItc2NyZWVuc2hvdEBqbWFhcmdoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "expandable-notifications@kaan.g.inam.org", "name": "Expandable Notifications", "pname": "expandable-notifications", "description": "Makes the notifications in the notification list expandable. Using gsettings, you can choose between three modes: AUTO, ARROW and CRITICAL.\n\nAUTO will expand the notifications in the notification list automatically. \nARROW adds an arrow that lets you choose what to expand or unexpand. \nCRITICAL is similar to arrow, but expands notifications with the urgency critical automatically. \n\nFor more information and an example command to change the mode, I recommend to look at the repository.\"\n\nThe old repository has been deleted, however I reposted the extension on GitHub.", "link": "https://extensions.gnome.org/extension/4463/expandable-notifications/", "shell_version_map": {"40": {"version": "8", "sha256": "04i0hxsv41wfxg8z590mgn2klma47mgcz7qr52ca2llpd4dkrjj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC5cblxuQVVUTyB3aWxsIGV4cGFuZCB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbm90aWZpY2F0aW9uIGxpc3QgYXV0b21hdGljYWxseS4gXG5BUlJPVyBhZGRzIGFuIGFycm93IHRoYXQgbGV0cyB5b3UgY2hvb3NlIHdoYXQgdG8gZXhwYW5kIG9yIHVuZXhwYW5kLiBcbkNSSVRJQ0FMIGlzIHNpbWlsYXIgdG8gYXJyb3csIGJ1dCBleHBhbmRzIG5vdGlmaWNhdGlvbnMgd2l0aCB0aGUgdXJnZW5jeSBjcml0aWNhbCBhdXRvbWF0aWNhbGx5LiBcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGFuIGV4YW1wbGUgY29tbWFuZCB0byBjaGFuZ2UgdGhlIG1vZGUsIEkgcmVjb21tZW5kIHRvIGxvb2sgYXQgdGhlIHJlcG9zaXRvcnkuXCJcblxuVGhlIG9sZCByZXBvc2l0b3J5IGhhcyBiZWVuIGRlbGV0ZWQsIGhvd2V2ZXIgSSByZXBvc3RlZCB0aGUgZXh0ZW5zaW9uIG9uIEdpdEh1Yi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thYW5naW5hbS9leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImV4cGFuZGFibGUtbm90aWZpY2F0aW9uc0BrYWFuLmcuaW5hbS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "04i0hxsv41wfxg8z590mgn2klma47mgcz7qr52ca2llpd4dkrjj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC5cblxuQVVUTyB3aWxsIGV4cGFuZCB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbm90aWZpY2F0aW9uIGxpc3QgYXV0b21hdGljYWxseS4gXG5BUlJPVyBhZGRzIGFuIGFycm93IHRoYXQgbGV0cyB5b3UgY2hvb3NlIHdoYXQgdG8gZXhwYW5kIG9yIHVuZXhwYW5kLiBcbkNSSVRJQ0FMIGlzIHNpbWlsYXIgdG8gYXJyb3csIGJ1dCBleHBhbmRzIG5vdGlmaWNhdGlvbnMgd2l0aCB0aGUgdXJnZW5jeSBjcml0aWNhbCBhdXRvbWF0aWNhbGx5LiBcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGFuIGV4YW1wbGUgY29tbWFuZCB0byBjaGFuZ2UgdGhlIG1vZGUsIEkgcmVjb21tZW5kIHRvIGxvb2sgYXQgdGhlIHJlcG9zaXRvcnkuXCJcblxuVGhlIG9sZCByZXBvc2l0b3J5IGhhcyBiZWVuIGRlbGV0ZWQsIGhvd2V2ZXIgSSByZXBvc3RlZCB0aGUgZXh0ZW5zaW9uIG9uIEdpdEh1Yi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thYW5naW5hbS9leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImV4cGFuZGFibGUtbm90aWZpY2F0aW9uc0BrYWFuLmcuaW5hbS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}}} @@ -578,7 +578,7 @@ , {"uuid": "dark-variant@hardpixel.eu", "name": "Dark Variant", "pname": "dark-variant", "description": "Enable dark window decorations on applications. This extension is not compatible with applications that use Client Side Decorations (CSD).\n\nThis extension depends on some Xorg utilities. To install them:\n- Debian/Ubuntu: apt install x11-utils\n- Fedora/RHEL: dnf install xorg-x11-utils\n- Arch: pacman -S xorg-xprop\n\n*Settings are provided to enable/disable applications.", "link": "https://extensions.gnome.org/extension/4488/dark-variant/", "shell_version_map": {"40": {"version": "3", "sha256": "08ywrbcqzijfw9hxlxn56j0dbavq413sbf2qlf6xpc9mi825jhin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "08ywrbcqzijfw9hxlxn56j0dbavq413sbf2qlf6xpc9mi825jhin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "PrivacyMenu@stuarthayhurst", "name": "Privacy Settings Menu", "pname": "privacy-settings-menu", "description": "Add a privacy menu to the top bar for quick access to privacy settings", "link": "https://extensions.gnome.org/extension/4491/privacy-settings-menu/", "shell_version_map": {"38": {"version": "4", "sha256": "1kdkm032xz72cycaj85q1yjb7s6bv3srysp4sn69phclldyg6bhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBTZXR0aW5ncyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1kdkm032xz72cycaj85q1yjb7s6bv3srysp4sn69phclldyg6bhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBTZXR0aW5ncyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1kdkm032xz72cycaj85q1yjb7s6bv3srysp4sn69phclldyg6bhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBTZXR0aW5ncyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "hide-panel-lite@fthx", "name": "Hide Panel Lite", "pname": "hide-panel-light-version-without-hot-corner", "description": "Hide top panel except in overview.\n\nFor those who don't need a hot corner (e.g. running GNOME 40+ with three fingers gestures). Very very light extension. No options, no bugs. ;-)", "link": "https://extensions.gnome.org/extension/4496/hide-panel-light-version-without-hot-corner/", "shell_version_map": {"38": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "ssm-gnome@lgiki.net", "name": "Simple System Monitor", "pname": "simple-system-monitor", "description": "Show current CPU usage, memory usage and net speed on panel.\n\nThis is a fork of https://extensions.gnome.org/extension/4478/net-speed/.", "link": "https://extensions.gnome.org/extension/4506/simple-system-monitor/", "shell_version_map": {"38": {"version": "6", "sha256": "0xggfkx15yxjm4mpi2nxg1704j7k37xfwxmj6sklm0l3b0v1x029", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuXG5UaGlzIGlzIGEgZm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80NDc4L25ldC1zcGVlZC8uIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0xggfkx15yxjm4mpi2nxg1704j7k37xfwxmj6sklm0l3b0v1x029", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuXG5UaGlzIGlzIGEgZm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80NDc4L25ldC1zcGVlZC8uIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0xggfkx15yxjm4mpi2nxg1704j7k37xfwxmj6sklm0l3b0v1x029", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuXG5UaGlzIGlzIGEgZm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80NDc4L25ldC1zcGVlZC8uIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "ssm-gnome@lgiki.net", "name": "Simple System Monitor", "pname": "simple-system-monitor", "description": "Show current CPU usage, memory usage and net speed on panel.\nFor best experience, please use monospaced font.\n\nThis is a fork of https://extensions.gnome.org/extension/4478/net-speed/.", "link": "https://extensions.gnome.org/extension/4506/simple-system-monitor/", "shell_version_map": {"38": {"version": "7", "sha256": "034ajnkdj3npjzlj3n8glxanjnhv12904sshkbjjrx6swmklcqs3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJuYW1lIjogIlNpbXBsZSBTeXN0ZW0gTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "034ajnkdj3npjzlj3n8glxanjnhv12904sshkbjjrx6swmklcqs3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJuYW1lIjogIlNpbXBsZSBTeXN0ZW0gTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "034ajnkdj3npjzlj3n8glxanjnhv12904sshkbjjrx6swmklcqs3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJuYW1lIjogIlNpbXBsZSBTeXN0ZW0gTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "unredirect@aunetx", "name": "Disable unredirect fullscreen windows", "pname": "disable-unredirect-fullscreen-windows", "description": "Disables unredirect fullscreen windows in gnome-shell to prevent artifacts when in fullscreen.\n\nThis version makes sure the unredirect option is not re-enabled automatically by the shell.", "link": "https://extensions.gnome.org/extension/4509/disable-unredirect-fullscreen-windows/", "shell_version_map": {"40": {"version": "3", "sha256": "1mgvpzzfdzn5qsxwz5911a8qgq0r34az6xpmqr72ksx6yf13l85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHByZXZlbnQgYXJ0aWZhY3RzIHdoZW4gaW4gZnVsbHNjcmVlbi5cblxuVGhpcyB2ZXJzaW9uIG1ha2VzIHN1cmUgdGhlIHVucmVkaXJlY3Qgb3B0aW9uIGlzIG5vdCByZS1lbmFibGVkIGF1dG9tYXRpY2FsbHkgYnkgdGhlIHNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAYXVuZXR4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1mgvpzzfdzn5qsxwz5911a8qgq0r34az6xpmqr72ksx6yf13l85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHByZXZlbnQgYXJ0aWZhY3RzIHdoZW4gaW4gZnVsbHNjcmVlbi5cblxuVGhpcyB2ZXJzaW9uIG1ha2VzIHN1cmUgdGhlIHVucmVkaXJlY3Qgb3B0aW9uIGlzIG5vdCByZS1lbmFibGVkIGF1dG9tYXRpY2FsbHkgYnkgdGhlIHNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAYXVuZXR4IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "nepali-date@biplab", "name": "Nepali Date", "pname": "nepali-calendar", "description": "Shows nepali date on the panel.", "link": "https://extensions.gnome.org/extension/4518/nepali-calendar/", "shell_version_map": {"40": {"version": "11", "sha256": "1g4zdhypy553wbdq0pnxva05ab6p3dv5dp4jcw8vrf8f0kblxxa5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1g4zdhypy553wbdq0pnxva05ab6p3dv5dp4jcw8vrf8f0kblxxa5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "clock-left@mapuut", "name": "Clock Left", "pname": "clock-left", "description": "Move clock to left", "link": "https://extensions.gnome.org/extension/4526/clock-left/", "shell_version_map": {"38": {"version": "2", "sha256": "027wlahy8pwic90cyx677456miaj1kpmfw85r0y0iwr66i3k00qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImNsb2NrLWxlZnRAbWFwdXV0IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "027wlahy8pwic90cyx677456miaj1kpmfw85r0y0iwr66i3k00qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImNsb2NrLWxlZnRAbWFwdXV0IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "027wlahy8pwic90cyx677456miaj1kpmfw85r0y0iwr66i3k00qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImNsb2NrLWxlZnRAbWFwdXV0IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} @@ -587,8 +587,8 @@ , {"uuid": "toggle-mute-on-middle-click-updated@konradmb", "name": "Toggle Mute on Middle Click", "pname": "toggle-mute-on-middle-click", "description": "Toggle mute by middle-clicking the volume indicator. Updated for Gnome 40 from: https://extensions.gnome.org/extension/1473/toggle-mute-on-middle-click/", "link": "https://extensions.gnome.org/extension/4538/toggle-mute-on-middle-click/", "shell_version_map": {"40": {"version": "1", "sha256": "0ag52arddv2dypfr1bs28c6dnfq0lrccibbl6cdzjx4d26j4cv4z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBtdXRlIGJ5IG1pZGRsZS1jbGlja2luZyB0aGUgdm9sdW1lIGluZGljYXRvci4gVXBkYXRlZCBmb3IgR25vbWUgNDAgZnJvbTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTQ3My90b2dnbGUtbXV0ZS1vbi1taWRkbGUtY2xpY2svIiwKICAibmFtZSI6ICJUb2dnbGUgTXV0ZSBvbiBNaWRkbGUgQ2xpY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvZ2dsZS1tdXRlLW9uLW1pZGRsZS1jbGljay11cGRhdGVkQGtvbnJhZG1iIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "autohide-volume@unboiled.info", "name": "Autohide Volume", "pname": "autohide-volume", "description": "Autohide volume indicator when muted\n\nI'm not interested in the fact my output audio device is muted: this is how it's supposed to be. But if it's unmuted, then I want to see the icon.\n\nExcept when the mic is on, then I'm probably in a call, frantically figuring out what's wrong.", "link": "https://extensions.gnome.org/extension/4539/autohide-volume/", "shell_version_map": {"41": {"version": "1", "sha256": "1kiki2gks6jvngx62jz1mdg3xpi4npc4sv9v4mc7fz4s91ibsykr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZFxuXG5JJ20gbm90IGludGVyZXN0ZWQgaW4gdGhlIGZhY3QgbXkgb3V0cHV0IGF1ZGlvIGRldmljZSBpcyBtdXRlZDogdGhpcyBpcyBob3cgaXQncyBzdXBwb3NlZCB0byBiZS4gQnV0IGlmIGl0J3MgdW5tdXRlZCwgdGhlbiBJIHdhbnQgdG8gc2VlIHRoZSBpY29uLlxuXG5FeGNlcHQgd2hlbiB0aGUgbWljIGlzIG9uLCB0aGVuIEknbSBwcm9iYWJseSBpbiBhIGNhbGwsIGZyYW50aWNhbGx5IGZpZ3VyaW5nIG91dCB3aGF0J3Mgd3JvbmcuIiwKICAibmFtZSI6ICJBdXRvaGlkZSBWb2x1bWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "cloudflare@adam.gadmz", "name": "Cloudflare", "pname": "cloudflare", "description": "Warp Connect", "link": "https://extensions.gnome.org/extension/4542/cloudflare/", "shell_version_map": {"38": {"version": "7", "sha256": "0wizvqfcsyh43786zhci4j5b8z28y95cjajvqrb51x4r489l67lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvQ2xvdWRmbGFyZV9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImNsb3VkZmxhcmVAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "0wizvqfcsyh43786zhci4j5b8z28y95cjajvqrb51x4r489l67lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvQ2xvdWRmbGFyZV9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImNsb3VkZmxhcmVAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA3Cn0="}}} -, {"uuid": "dell-command-configure-menu@vsimkus.github.io", "name": "Dell Command Configure menu", "pname": "dell-command-configure-menu", "description": "Adds submenu in gnome top-bar 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": "1hy4fhmj076xkjas49q6ls9b9nyg5pzca95094zx1kpbr75vs2k7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSB0b3AtYmFyIHRvIGFjY2VzcyBEZWxsIENvbW1hbmQgQ29uZmlndXJlIG9wdGlvbnMuXG5cbkN1cnJlbnRseSwgb25seSBiYXR0ZXJ5IGNoYXJnZSBzZXR0aW5ncyBhcmUgaW1wbGVtZW50ZWQuXG5cblRoZSBEZWxsIENvbW1hbmQgQ29uZmlndXJlIHRvb2wgbXVzdCBiZSBpbnN0YWxsZWQgc2VwYXJhdGVseSBmcm9tIERlbGwgaHR0cHM6Ly93d3cuZGVsbC5jb20vc3VwcG9ydC9rYmRvYy9lbi11ay8wMDAxNzgwMDAvZGVsbC1jb21tYW5kLWNvbmZpZ3VyZSNEb3dubG9hZHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAibmFtZSI6ICJEZWxsIENvbW1hbmQgQ29uZmlndXJlIG1lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVsbGNvbW1hbmRjb25maWd1cmVtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92c2lta3VzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnUiLAogICJ1dWlkIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudUB2c2lta3VzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "6", "sha256": "0994j96sppbirsg6d740n30zfv2n7qrpzl36xmj977y4p4fm1l3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSB0b3AtYmFyIHRvIGFjY2VzcyBEZWxsIENvbW1hbmQgQ29uZmlndXJlIG9wdGlvbnMuXG5cbkN1cnJlbnRseSwgb25seSBiYXR0ZXJ5IGNoYXJnZSBzZXR0aW5ncyBhcmUgaW1wbGVtZW50ZWQuXG5cblRoZSBEZWxsIENvbW1hbmQgQ29uZmlndXJlIHRvb2wgbXVzdCBiZSBpbnN0YWxsZWQgc2VwYXJhdGVseSBmcm9tIERlbGwgaHR0cHM6Ly93d3cuZGVsbC5jb20vc3VwcG9ydC9rYmRvYy9lbi11ay8wMDAxNzgwMDAvZGVsbC1jb21tYW5kLWNvbmZpZ3VyZSNEb3dubG9hZHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAibmFtZSI6ICJEZWxsIENvbW1hbmQgQ29uZmlndXJlIG1lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVsbGNvbW1hbmRjb25maWd1cmVtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92c2lta3VzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnUiLAogICJ1dWlkIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudUB2c2lta3VzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0994j96sppbirsg6d740n30zfv2n7qrpzl36xmj977y4p4fm1l3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSB0b3AtYmFyIHRvIGFjY2VzcyBEZWxsIENvbW1hbmQgQ29uZmlndXJlIG9wdGlvbnMuXG5cbkN1cnJlbnRseSwgb25seSBiYXR0ZXJ5IGNoYXJnZSBzZXR0aW5ncyBhcmUgaW1wbGVtZW50ZWQuXG5cblRoZSBEZWxsIENvbW1hbmQgQ29uZmlndXJlIHRvb2wgbXVzdCBiZSBpbnN0YWxsZWQgc2VwYXJhdGVseSBmcm9tIERlbGwgaHR0cHM6Ly93d3cuZGVsbC5jb20vc3VwcG9ydC9rYmRvYy9lbi11ay8wMDAxNzgwMDAvZGVsbC1jb21tYW5kLWNvbmZpZ3VyZSNEb3dubG9hZHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAibmFtZSI6ICJEZWxsIENvbW1hbmQgQ29uZmlndXJlIG1lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVsbGNvbW1hbmRjb25maWd1cmVtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92c2lta3VzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnUiLAogICJ1dWlkIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudUB2c2lta3VzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"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": "13", "sha256": "15y30c61a751rcx0gfzn80nidzm1y6xdkrssnpgnjq9xj8wf516s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "15y30c61a751rcx0gfzn80nidzm1y6xdkrssnpgnjq9xj8wf516s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "15y30c61a751rcx0gfzn80nidzm1y6xdkrssnpgnjq9xj8wf516s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"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": "7", "sha256": "03n0xyadr41s4izrckljrw04nv23izshlga8h8as9kkxcpq6msc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnNpbWt1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAidXVpZCI6ICJkZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnVAdnNpbWt1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "03n0xyadr41s4izrckljrw04nv23izshlga8h8as9kkxcpq6msc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnNpbWt1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAidXVpZCI6ICJkZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnVAdnNpbWt1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"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": "14", "sha256": "0ndp53kmg3mc5jsrjlqv22ajpmrn8r13f6nrkmmbx6x541g1h9rl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "40": {"version": "14", "sha256": "0ndp53kmg3mc5jsrjlqv22ajpmrn8r13f6nrkmmbx6x541g1h9rl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "0ndp53kmg3mc5jsrjlqv22ajpmrn8r13f6nrkmmbx6x541g1h9rl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"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": "3", "sha256": "0gc6bk4piblqmm6qhb0jicdg571b23b0mns6mqhws4glznn4ckry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2R1b25nZ2lha2hhbmhiL0tpbGxhcHBfR05PTUVfRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJraWxsYXBwQGFkYW0uZ2FkbXoiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "0gc6bk4piblqmm6qhb0jicdg571b23b0mns6mqhws4glznn4ckry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2R1b25nZ2lha2hhbmhiL0tpbGxhcHBfR05PTUVfRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJraWxsYXBwQGFkYW0uZ2FkbXoiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"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": "4", "sha256": "080ch8zg8y1ha9gq6hihjkqzymkwqarxsy3p8da8j6p6621w63y5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtaG90a2V5cy1wb3B1cCIsCiAgInV1aWQiOiAiaG90a2V5cy1wb3B1cEBwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "080ch8zg8y1ha9gq6hihjkqzymkwqarxsy3p8da8j6p6621w63y5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtaG90a2V5cy1wb3B1cCIsCiAgInV1aWQiOiAiaG90a2V5cy1wb3B1cEBwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"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="}}} @@ -616,7 +616,7 @@ , {"uuid": "cryptowatch@d0x2f.github.com", "name": "CryptoWatch", "pname": "cryptowatch", "description": "Display live crypto portfolio balances.", "link": "https://extensions.gnome.org/extension/4633/cryptowatch/", "shell_version_map": {"40": {"version": "7", "sha256": "0wrvkj0ls103wzxbx8xsl79srmg5rfy046nr1nkrf83h06dn65pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZDB4MmYvQ3J5cHRvV2F0Y2giLAogICJ1dWlkIjogImNyeXB0b3dhdGNoQGQweDJmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0wrvkj0ls103wzxbx8xsl79srmg5rfy046nr1nkrf83h06dn65pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZDB4MmYvQ3J5cHRvV2F0Y2giLAogICJ1dWlkIjogImNyeXB0b3dhdGNoQGQweDJmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "mousefollowsfocus@matthes.biz", "name": "Mouse Follows Focus", "pname": "mouse-follows-focus", "description": "Are you a power-user?\nDo you like using Super+1,2,3 to access your favorite apps?\nAre you annoyed that you have to manually move your mouse between screens because it can't keep up with your keyboard shortcuts?\nThen this extension is for you!\n\nThis simple GNOME shell extension does the opposite of the 'focus follows mouse' setting. It makes the mouse follow your keyboard focus. Whenever you focus a window, if the cursor isn't already in it, it will jump to the windows center, making it easy to interact with it.", "link": "https://extensions.gnome.org/extension/4642/mouse-follows-focus/", "shell_version_map": {"41": {"version": "4", "sha256": "1zsy76sab87s74p30sxdp1cki1w956gm0sw27anpx1z6yih50rdv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyZSB5b3UgYSBwb3dlci11c2VyP1xuRG8geW91IGxpa2UgdXNpbmcgU3VwZXIrMSwyLDMgdG8gYWNjZXNzIHlvdXIgZmF2b3JpdGUgYXBwcz9cbkFyZSB5b3UgYW5ub3llZCB0aGF0IHlvdSBoYXZlIHRvIG1hbnVhbGx5IG1vdmUgeW91ciBtb3VzZSBiZXR3ZWVuIHNjcmVlbnMgYmVjYXVzZSBpdCBjYW4ndCBrZWVwIHVwIHdpdGggeW91ciBrZXlib2FyZCBzaG9ydGN1dHM/XG5UaGVuIHRoaXMgZXh0ZW5zaW9uIGlzIGZvciB5b3UhXG5cblRoaXMgc2ltcGxlIEdOT01FIHNoZWxsIGV4dGVuc2lvbiBkb2VzIHRoZSBvcHBvc2l0ZSBvZiB0aGUgJ2ZvY3VzIGZvbGxvd3MgbW91c2UnIHNldHRpbmcuIEl0IG1ha2VzIHRoZSBtb3VzZSBmb2xsb3cgeW91ciBrZXlib2FyZCBmb2N1cy4gV2hlbmV2ZXIgeW91IGZvY3VzIGEgd2luZG93LCBpZiB0aGUgY3Vyc29yIGlzbid0IGFscmVhZHkgaW4gaXQsIGl0IHdpbGwganVtcCB0byB0aGUgd2luZG93cyBjZW50ZXIsIG1ha2luZyBpdCBlYXN5IHRvIGludGVyYWN0IHdpdGggaXQuIiwKICAibmFtZSI6ICJNb3VzZSBGb2xsb3dzIEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlb25NYXR0aGVzL21vdXNlZm9sbG93c2ZvY3VzIiwKICAidXVpZCI6ICJtb3VzZWZvbGxvd3Nmb2N1c0BtYXR0aGVzLmJpeiIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "gnome-extension-pass-search-provider.lavrov.github.com", "name": "Pass Search Provider", "pname": "pass-search-provider", "description": "Shows matching pass entries in gnome search", "link": "https://extensions.gnome.org/extension/4645/pass-search-provider/", "shell_version_map": {"40": {"version": "6", "sha256": "06msk4zds1q6jjdw6g7akbsiyfz0avwvydpykcylhhc9ribzsncn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG1hdGNoaW5nIHBhc3MgZW50cmllcyBpbiBnbm9tZSBzZWFyY2giLAogICJuYW1lIjogIlBhc3MgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdnJvdi9nbm9tZS1leHRlbnNpb24tcGFzcy1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWV4dGVuc2lvbi1wYXNzLXNlYXJjaC1wcm92aWRlci5sYXZyb3YuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "desktop-cube@schneegans.github.com", "name": "Desktop Cube", "pname": "desktop-cube", "description": "Indulge in nostalgia with useless 3D effects.", "link": "https://extensions.gnome.org/extension/4648/desktop-cube/", "shell_version_map": {"40": {"version": "7", "sha256": "03valwb8s7i1l0sl8k7h060m8wryj9dwix2wpjbzz8skrsh9vjgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "03valwb8s7i1l0sl8k7h060m8wryj9dwix2wpjbzz8skrsh9vjgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "desktop-cube@schneegans.github.com", "name": "Desktop Cube", "pname": "desktop-cube", "description": "Indulge in nostalgia with useless 3D effects.", "link": "https://extensions.gnome.org/extension/4648/desktop-cube/", "shell_version_map": {"40": {"version": "8", "sha256": "1n4kj6a6zfw7i4djslqcnrk3813kfhg7q4l4bnaxqaqjwxap5zby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1n4kj6a6zfw7i4djslqcnrk3813kfhg7q4l4bnaxqaqjwxap5zby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "notification-banner-reloaded@marcinjakubowski.github.com", "name": "Notification Banner Reloaded", "pname": "notification-banner-reloaded", "description": "Configure notification banner position and animation to your liking", "link": "https://extensions.gnome.org/extension/4651/notification-banner-reloaded/", "shell_version_map": {"40": {"version": "3", "sha256": "0bpk2s1q6r7bzq8cxyga7dy90liwhmlpga74l9zigr2m9p8kp97p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0bpk2s1q6r7bzq8cxyga7dy90liwhmlpga74l9zigr2m9p8kp97p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "gnome-extension-brightness@bruno.englert.gitlab.com", "name": "Adjust Display Brightness", "pname": "adjust-display-brightness", "description": "Simple GNOME extension to control displays' brightness via DDC. It requires ddcutil to be installed, I2C permissions for non-root users configured.", "link": "https://extensions.gnome.org/extension/4652/adjust-display-brightness/", "shell_version_map": {"40": {"version": "20", "sha256": "0ldlghrlvlifqpnjpysacahfm4v504k7vhzrvay6w36w8v0yadav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYnJ1bm8uZW5nbGVydC9nbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWJyaWdodG5lc3NAYnJ1bm8uZW5nbGVydC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0ldlghrlvlifqpnjpysacahfm4v504k7vhzrvay6w36w8v0yadav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYnJ1bm8uZW5nbGVydC9nbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWJyaWdodG5lc3NAYnJ1bm8uZW5nbGVydC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}}} , {"uuid": "date-menu-formatter@marcinjakubowski.github.com", "name": "Date Menu Formatter", "pname": "date-menu-formatter", "description": "Allows customization of the date display in the panel.\n\nMight be especially useful if you're using a horizontal panel which does not at all work well with the default date display.\n\nCHANGELOG\nVersion 5: added support for multiple Dash To Panel panels\nVersion 6: fixed issues on earlier Gnome Shell versions", "link": "https://extensions.gnome.org/extension/4655/date-menu-formatter/", "shell_version_map": {"40": {"version": "6", "sha256": "0w2qy8hr569hq66dnpq5ajii66wrmpdxhr7ws0kj992f0nlrs78i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0w2qy8hr569hq66dnpq5ajii66wrmpdxhr7ws0kj992f0nlrs78i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} @@ -636,21 +636,21 @@ , {"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": "17", "sha256": "1cwjyw4sc4i4vdm458qdnjzvmiqyz9vscicwarsd9cvik57p44f5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "1cwjyw4sc4i4vdm458qdnjzvmiqyz9vscicwarsd9cvik57p44f5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"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": "2", "sha256": "1wr4xp0jj74fjp4yjizyvy1qvmbaclk59cjjhwigxh3glkgdy8ph", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBiYWNrZ3JvdW5kLCBhbHdheXMgY2xlYXJseSB2aXNpYmxlLiIsCiAgIm5hbWUiOiAiU3RhdGljIGJhY2tncm91bmQgaW4gb3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgInV1aWQiOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1wr4xp0jj74fjp4yjizyvy1qvmbaclk59cjjhwigxh3glkgdy8ph", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBiYWNrZ3JvdW5kLCBhbHdheXMgY2xlYXJseSB2aXNpYmxlLiIsCiAgIm5hbWUiOiAiU3RhdGljIGJhY2tncm91bmQgaW4gb3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgInV1aWQiOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"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": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"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": "3", "sha256": "1byqxbbyxdqji79pjp7c5m1hrbp83sbq6rr8mmm202q1jc0hsp38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1byqxbbyxdqji79pjp7c5m1hrbp83sbq6rr8mmm202q1jc0hsp38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "dock-from-dash@fthx", "name": "Dock from Dash", "pname": "dock-from-dash", "description": "Dock for GNOME 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. Native GNOME Shell click behavior is modified: minimize if one window is open, overview if many windows are open.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "22", "sha256": "0hzllcnhrc68l4xw1yg3wvl0jssd51sarbapxs0fjyr8yiz8611z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3LiBOYXRpdmUgR05PTUUgU2hlbGwgY2xpY2sgYmVoYXZpb3IgaXMgbW9kaWZpZWQ6IG1pbmltaXplIGlmIG9uZSB3aW5kb3cgaXMgb3Blbiwgb3ZlcnZpZXcgaWYgbWFueSB3aW5kb3dzIGFyZSBvcGVuLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzIHRocm91Z2ggR2l0SHViLiIsCiAgIm5hbWUiOiAiRG9jayBmcm9tIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "0hzllcnhrc68l4xw1yg3wvl0jssd51sarbapxs0fjyr8yiz8611z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3LiBOYXRpdmUgR05PTUUgU2hlbGwgY2xpY2sgYmVoYXZpb3IgaXMgbW9kaWZpZWQ6IG1pbmltaXplIGlmIG9uZSB3aW5kb3cgaXMgb3Blbiwgb3ZlcnZpZXcgaWYgbWFueSB3aW5kb3dzIGFyZSBvcGVuLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzIHRocm91Z2ggR2l0SHViLiIsCiAgIm5hbWUiOiAiRG9jayBmcm9tIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDIyCn0="}}} +, {"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": "4", "sha256": "18im4m362yp5cv03j1acb4nqs496dz2nxxiy7zirf4qzd98hsh29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2dub21lLWF3ZXNvbWUtdGlsZXMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhd2Vzb21lLXRpbGVzQHZlbGl0YXNhbGkuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "18im4m362yp5cv03j1acb4nqs496dz2nxxiy7zirf4qzd98hsh29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2dub21lLWF3ZXNvbWUtdGlsZXMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhd2Vzb21lLXRpbGVzQHZlbGl0YXNhbGkuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"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: minimize if one window is open, overview if many windows are open.\n\n There are some variables you can easily set in extension.js code (opacity, timeouts...). There will be no preferences UI.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "28", "sha256": "1g579jnhlx1fi768f98pmp4lv1vsaw9nvg8100ba5jx3f9ckfa0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uXG5cbiBUaGVyZSBhcmUgc29tZSB2YXJpYWJsZXMgeW91IGNhbiBlYXNpbHkgc2V0IGluIGV4dGVuc2lvbi5qcyBjb2RlIChvcGFjaXR5LCB0aW1lb3V0cy4uLikuIFRoZXJlIHdpbGwgYmUgbm8gcHJlZmVyZW5jZXMgVUkuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEb2NrIGZyb20gRGFzaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "41": {"version": "28", "sha256": "1g579jnhlx1fi768f98pmp4lv1vsaw9nvg8100ba5jx3f9ckfa0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uXG5cbiBUaGVyZSBhcmUgc29tZSB2YXJpYWJsZXMgeW91IGNhbiBlYXNpbHkgc2V0IGluIGV4dGVuc2lvbi5qcyBjb2RlIChvcGFjaXR5LCB0aW1lb3V0cy4uLikuIFRoZXJlIHdpbGwgYmUgbm8gcHJlZmVyZW5jZXMgVUkuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEb2NrIGZyb20gRGFzaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} , {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "Close and save open windows. And restore the saved windows. Most importantly, it supports both X11 and Wayland!\n\nFeatures:\n- Close open windows\n- Save open windows\n- Restore saved open windows\n- Restore window state, including Always on Top, Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Trash saved session\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": "11", "sha256": "0d1d0178nvcxvsay1wqm5wclfhs7a2g500xmh3khmvc981pg83j4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlIHNhdmVkIHdpbmRvd3MuIE1vc3QgaW1wb3J0YW50bHksIGl0IHN1cHBvcnRzIGJvdGggWDExIGFuZCBXYXlsYW5kIVxuXG5GZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2F2ZWQgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgd2luZG93IHN0YXRlLCBpbmNsdWRpbmcgQWx3YXlzIG9uIFRvcCwgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIiLAogICJ1dWlkIjogImFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlckBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0d1d0178nvcxvsay1wqm5wclfhs7a2g500xmh3khmvc981pg83j4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlIHNhdmVkIHdpbmRvd3MuIE1vc3QgaW1wb3J0YW50bHksIGl0IHN1cHBvcnRzIGJvdGggWDExIGFuZCBXYXlsYW5kIVxuXG5GZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2F2ZWQgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgd2luZG93IHN0YXRlLCBpbmNsdWRpbmcgQWx3YXlzIG9uIFRvcCwgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIiLAogICJ1dWlkIjogImFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlckBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "prevent-double-empty-window@silliewous.nl", "name": "Prevent double empty window", "pname": "prevent-double-empty-window", "description": "Set MIN_NUMBER_WORKSPACES to 1 so there is only one empty workspace when there are no windows open.\n\nhttps://gitlab.com/g3786/prevent-double-empty-window", "link": "https://extensions.gnome.org/extension/4711/prevent-double-empty-window/", "shell_version_map": {"40": {"version": "1", "sha256": "18f1pflvv4sw1r182rrjz2jdy1ym1ipm5lid2sm518h8c3iiabb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "display-ddc-brightness-volume@sagrland.de", "name": "Display DDC Brightness Volume", "pname": "display-ddc-brightness-volume", "description": "Control external displays' brightness and audio volume via DDC. It requires ddcutil to be installed and i2c permissions for non-root users.", "link": "https://extensions.gnome.org/extension/4712/display-ddc-brightness-volume/", "shell_version_map": {"40": {"version": "1", "sha256": "1pad0q2a04lak6601vj2qz029g86l9r5m65bf0m97b21fd46a9s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGF1ZGlvIHZvbHVtZSB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCBhbmQgaTJjIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2Vycy4iLAogICJuYW1lIjogIkRpc3BsYXkgRERDIEJyaWdodG5lc3MgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "1pad0q2a04lak6601vj2qz029g86l9r5m65bf0m97b21fd46a9s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGF1ZGlvIHZvbHVtZSB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCBhbmQgaTJjIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2Vycy4iLAogICJuYW1lIjogIkRpc3BsYXkgRERDIEJyaWdodG5lc3MgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "disable_hover@fawtytoo", "name": "Disable Hover On App & Window Switcher Popups", "pname": "disable-hover-on-app-window-switcher-popups", "description": "Prevents the mouse cursor interfering with either the App Switcher or the Window Switcher popups. For those users that like to use the keyboard only with these switchers.\nNote: It doesn't prevent mouse clicks.\n\nThese are the switcher popups that are invoked from keyboard shortcuts, e.g. Alt+Tab or Super+Tab.", "link": "https://extensions.gnome.org/extension/4714/disable-hover-on-app-window-switcher-popups/", "shell_version_map": {"38": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "countdown-timer@eexpss.gmail.com", "name": "Countdown & Timer", "pname": "countdown-timer", "description": "Countdown in minutes, or enter text containing HH:MM format to set the Timer.", "link": "https://extensions.gnome.org/extension/4720/countdown-timer/", "shell_version_map": {"40": {"version": "8", "sha256": "0p5hwymm6grn7rclpy637jxflw5h3y1fc2q8b1n3pkvj977861md", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0p5hwymm6grn7rclpy637jxflw5h3y1fc2q8b1n3pkvj977861md", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"uuid": "countdown-timer@eexpss.gmail.com", "name": "Countdown & Timer", "pname": "countdown-timer", "description": "Countdown in minutes, or enter text containing HH:MM format to set the Timer.", "link": "https://extensions.gnome.org/extension/4720/countdown-timer/", "shell_version_map": {"40": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "workspace-dry-names@benmoussatmouad.github.io", "name": "Worksapce Dry Names", "pname": "worksapce-dry-names", "description": "Workspace dry-names is a simple gnome extension that enables tags for desktop workspaces. It shows text labels on the left side of the main panel with randomly generated cities names (or an other category of names). Names can also be modified.\n\nhttps://github.com/benmoussatMouad/gnome-workspace-dry-names.git", "link": "https://extensions.gnome.org/extension/4721/worksapce-dry-names/", "shell_version_map": {"38": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "window-calls@domandoman.xyz", "name": "Window Calls", "pname": "window-calls", "description": "Add new dbus call for windows to get windows list and some of theirs properties", "link": "https://extensions.gnome.org/extension/4724/window-calls/", "shell_version_map": {"41": {"version": "2", "sha256": "02z265maw4a0rkw5y4an2j7spjqif44nxf47q5qr6cwnvmfpw6ci", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMiLAogICJuYW1lIjogIldpbmRvdyBDYWxscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2t5aWNreS93aW5kb3ctY2FsbHMiLAogICJ1dWlkIjogIndpbmRvdy1jYWxsc0Bkb21hbmRvbWFuLnh5eiIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "primary_input_on_lockscreen@sagidayan.com", "name": "Primary Input on LockScreen", "pname": "primary-input-on-lockscreen", "description": "Automatically change input layout to primary on lock screen", "link": "https://extensions.gnome.org/extension/4727/primary-input-on-lockscreen/", "shell_version_map": {"40": {"version": "2", "sha256": "0m1hk3hhr5y4i7fk3x2pc9ln6rjlq7y9fvcv3imygs3w5q1bx1ll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NhZ2lkYXlhbi9wcmltYXJ5LWlucHV0LW9uLWxvY2tzY3JlZW4iLAogICJ1dWlkIjogInByaW1hcnlfaW5wdXRfb25fbG9ja3NjcmVlbkBzYWdpZGF5YW4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0m1hk3hhr5y4i7fk3x2pc9ln6rjlq7y9fvcv3imygs3w5q1bx1ll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NhZ2lkYXlhbi9wcmltYXJ5LWlucHV0LW9uLWxvY2tzY3JlZW4iLAogICJ1dWlkIjogInByaW1hcnlfaW5wdXRfb25fbG9ja3NjcmVlbkBzYWdpZGF5YW4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "browser-tabs@com.github.harshadgavali", "name": "Browser tabs", "pname": "browser-tabs", "description": "Search provider for browser tabs\n\nSee following github link for installing browser extension and host app for searches to appear!", "link": "https://extensions.gnome.org/extension/4733/browser-tabs/", "shell_version_map": {"40": {"version": "4", "sha256": "1ag30ai0frxbw3s67ir1i5jdxpzx52b9rp47sqpnjcqw46xc97b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBwcm92aWRlciBmb3IgYnJvd3NlciB0YWJzXG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgYnJvd3NlciBleHRlbnNpb24gYW5kIGhvc3QgYXBwIGZvciBzZWFyY2hlcyB0byBhcHBlYXIhIiwKICAibmFtZSI6ICJCcm93c2VyIHRhYnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL3NlYXJjaHByb3ZpZGVyLWZvci1icm93c2VyLXRhYnMuZ2l0LyIsCiAgInV1aWQiOiAiYnJvd3Nlci10YWJzQGNvbS5naXRodWIuaGFyc2hhZGdhdmFsaSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1ag30ai0frxbw3s67ir1i5jdxpzx52b9rp47sqpnjcqw46xc97b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBwcm92aWRlciBmb3IgYnJvd3NlciB0YWJzXG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgYnJvd3NlciBleHRlbnNpb24gYW5kIGhvc3QgYXBwIGZvciBzZWFyY2hlcyB0byBhcHBlYXIhIiwKICAibmFtZSI6ICJCcm93c2VyIHRhYnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL3NlYXJjaHByb3ZpZGVyLWZvci1icm93c2VyLXRhYnMuZ2l0LyIsCiAgInV1aWQiOiAiYnJvd3Nlci10YWJzQGNvbS5naXRodWIuaGFyc2hhZGdhdmFsaSIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "smart-auto-move@khimaros.com", "name": "Smart Auto Move", "pname": "smart-auto-move", "description": "Smart Auto Move learns the size and position of your application windows and restores them to the correct place on subsequent launches. Supports Wayland.\n\nNOTE: works optimally with \"Static\" as opposed to \"Dynamic\" workspaces.", "link": "https://extensions.gnome.org/extension/4736/smart-auto-move/", "shell_version_map": {"41": {"version": "13", "sha256": "0437qsi49ylshhf5z5sb15637zldlbb9df8ijqf9mcxbj3igaydg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiB3b3JrcyBvcHRpbWFsbHkgd2l0aCBcIlN0YXRpY1wiIGFzIG9wcG9zZWQgdG8gXCJEeW5hbWljXCIgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIlNtYXJ0IEF1dG8gTW92ZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJraGltYXJvcyIsCiAgInNldHRpbmdzLXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3NtYXJ0LWF1dG8tbW92ZS8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"uuid": "smart-auto-move@khimaros.com", "name": "Smart Auto Move", "pname": "smart-auto-move", "description": "Smart Auto Move learns the size and position of your application windows and restores them to the correct place on subsequent launches. Supports Wayland.\n\nNOTE: Optimized for use with static workspaces. For more control, can be set to default IGNORE and then selectively RESTORE only desired apps.", "link": "https://extensions.gnome.org/extension/4736/smart-auto-move/", "shell_version_map": {"41": {"version": "15", "sha256": "1i5czxzkhd3h19q4din4psj6swl8s7fjlb93blz0zvj6y6mx948g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNote: the menu will be too big if your resolution is way too low like 800x600 I have no soln for this just now.", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {"40": {"version": "3", "sha256": "034dh32qhq2gzkbhfsyrsp4nh642nhp2y9lrvnnk8391185s229q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "034dh32qhq2gzkbhfsyrsp4nh642nhp2y9lrvnnk8391185s229q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "dash-from-panel@fthx", "name": "Dash from Panel", "pname": "dash-from-panel", "description": "Top dock for GNOME 40+. Hover top panel and GNOME Shell dash appears without overview.\n\n Does use native GNOME Shell Dash. Very light extension.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4741/dash-from-panel/", "shell_version_map": {"40": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "clip-translator@eexpss.gmail.com", "name": "Clip Translator", "pname": "clip-translator", "description": "Translate from Clipboard content", "link": "https://extensions.gnome.org/extension/4744/clip-translator/", "shell_version_map": {"40": {"version": "10", "sha256": "1w42d11ald1kpmv43c6v7qxvx55yv3i64nnkicfgwy6a3bdah1pr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBmcm9tIENsaXBib2FyZCBjb250ZW50IiwKICAibmFtZSI6ICJDbGlwIFRyYW5zbGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1jbGlwLXRyYW5zbGF0b3IiLAogICJ1dWlkIjogImNsaXAtdHJhbnNsYXRvckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1w42d11ald1kpmv43c6v7qxvx55yv3i64nnkicfgwy6a3bdah1pr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBmcm9tIENsaXBib2FyZCBjb250ZW50IiwKICAibmFtZSI6ICJDbGlwIFRyYW5zbGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1jbGlwLXRyYW5zbGF0b3IiLAogICJ1dWlkIjogImNsaXAtdHJhbnNsYXRvckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "clip-translator@eexpss.gmail.com", "name": "Clip Translator", "pname": "clip-translator", "description": "Translate from Clipboard content", "link": "https://extensions.gnome.org/extension/4744/clip-translator/", "shell_version_map": {"40": {"version": "13", "sha256": "1nfky8hv1yddpqbc94a3ydigni8c6h6pkcpf416a3pw2b78rxm4h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBmcm9tIENsaXBib2FyZCBjb250ZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcC10cmFuc2xhdG9yIiwKICAibmFtZSI6ICJDbGlwIFRyYW5zbGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1jbGlwLXRyYW5zbGF0b3IiLAogICJ1dWlkIjogImNsaXAtdHJhbnNsYXRvckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "1nfky8hv1yddpqbc94a3ydigni8c6h6pkcpf416a3pw2b78rxm4h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBmcm9tIENsaXBib2FyZCBjb250ZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcC10cmFuc2xhdG9yIiwKICAibmFtZSI6ICJDbGlwIFRyYW5zbGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1jbGlwLXRyYW5zbGF0b3IiLAogICJ1dWlkIjogImNsaXAtdHJhbnNsYXRvckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "hidedate@hidedate.com", "name": "Hide Date", "pname": "hide-date", "description": "hides date and clocks", "link": "https://extensions.gnome.org/extension/4747/hide-date/", "shell_version_map": {"38": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "toggleimwheel@mijorus.it", "name": "Toggle imwheel", "pname": "toggle-imwheel", "description": "This simple extension wants to mitigate the lack of a dedicated mouse wheel control on most of the modern linux distributions. Many are using imwheel as a temporary fix; however, if you are using laptop, you might want to have two different settings for the touchpad and the mouse. \n This extension will add an icon in the top bar which lets you toggle imwheel between two custom settings.\n\n\nhttps://github.com/mijorus/toggle-imwheel", "link": "https://extensions.gnome.org/extension/4748/toggle-imwheel/", "shell_version_map": {"40": {"version": "2", "sha256": "1fjqap51g7gy3jra7r1qq4j61iifx13l5lj8sw2csbvzliacsr62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBsYXB0b3AsIHlvdSBtaWdodCB3YW50IHRvIGhhdmUgdHdvIGRpZmZlcmVudCBzZXR0aW5ncyBmb3IgdGhlIHRvdWNocGFkIGFuZCB0aGUgbW91c2UuIFxuIFRoaXMgZXh0ZW5zaW9uIHdpbGwgYWRkIGFuIGljb24gaW4gdGhlIHRvcCBiYXIgd2hpY2ggbGV0cyB5b3UgdG9nZ2xlIGltd2hlZWwgYmV0d2VlbiB0d28gY3VzdG9tIHNldHRpbmdzLlxuXG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidG9nZ2xlaW13aGVlbEBtaWpvcnVzLml0IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "yakuake-extension@kde.org", "name": "Yakuake", "pname": "yakuake", "description": "A Gnome shell extension to use Yakuake on Gnome. Adds a global shortcut to show/hide yakuake and makes the console appear focussed.", "link": "https://extensions.gnome.org/extension/4757/yakuake/", "shell_version_map": {"40": {"version": "4", "sha256": "0rdrcbsscchvi8i9f6c9sjgnn4546i33l0q135jvav7c1a6bb9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0rdrcbsscchvi8i9f6c9sjgnn4546i33l0q135jvav7c1a6bb9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} @@ -658,26 +658,41 @@ , {"uuid": "speedbackground@luke.vader", "name": "Speed background", "pname": "speed-background", "description": "Increase how often Gnome will check the background.", "link": "https://extensions.gnome.org/extension/4761/speed-background/", "shell_version_map": {"41": {"version": "4", "sha256": "1dkmnkrag8fgyfdda4f9bpvsrkvx8h8xfb6wm83dyra1z8jq82fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "bottom-panel@sulincix", "name": "Bottom Panel", "pname": "bottompanel", "description": "move top panel to bottom", "link": "https://extensions.gnome.org/extension/4764/bottompanel/", "shell_version_map": {"38": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "FuzzyClock@johngoetz", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable (english) clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {"40": {"version": "2", "sha256": "18y8r6f0czadrpamrribqq6rvwa57hpdpffpy864vqp7kq6i6s0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgKGVuZ2xpc2gpIGNsb2NrIGZvciB0aGUgZ25vbWUtc2hlbGwgcGFuZWwiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "18y8r6f0czadrpamrribqq6rvwa57hpdpffpy864vqp7kq6i6s0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgKGVuZ2xpc2gpIGNsb2NrIGZvciB0aGUgZ25vbWUtc2hlbGwgcGFuZWwiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "clip-note@eexpss.gmail.com", "name": "Clip Note", "pname": "clip-note", "description": "Save clip contents to multiple notes with separate tags. Notes locate at ~/.local/share/clip-note/. Dots in filename means splited tags.", "link": "https://extensions.gnome.org/extension/4774/clip-note/", "shell_version_map": {"40": {"version": "10", "sha256": "1var5rv8waazr1h40ai4ziwjcnxni8q6w26rqqgvax7wv4dzmyh2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1var5rv8waazr1h40ai4ziwjcnxni8q6w26rqqgvax7wv4dzmyh2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"uuid": "clip-note@eexpss.gmail.com", "name": "Clip Note", "pname": "clip-note", "description": "Save clip contents to multiple notes with separate tags. Notes locate at ~/.local/share/clip-note/. Dots in filename means splited tags.", "link": "https://extensions.gnome.org/extension/4774/clip-note/", "shell_version_map": {"40": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"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": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "Adds an avatar to the panel. Controllability: shades, buttons (turn notifications on/off, sleep, off), visibility of username and hostname", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "7", "sha256": "05aff0i241qqcb4v34yhj5v1ihnxmxcvmz46si3b8yk66alzn4fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gYXZhdGFyIHRvIHRoZSBwYW5lbC4gQ29udHJvbGxhYmlsaXR5OiBzaGFkZXMsIGJ1dHRvbnMgKHR1cm4gbm90aWZpY2F0aW9ucyBvbi9vZmYsIHNsZWVwLCBvZmYpLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "Adds an avatar to the panel. Controllability: shades, buttons (turn notifications on/off, sleep, off), visibility of username and hostname", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "9", "sha256": "0xhn3yl7h3n1jdnk8r8srfwpx6xcjxpp7m65cqi36kzs3h1zq6yn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gYXZhdGFyIHRvIHRoZSBwYW5lbC4gQ29udHJvbGxhYmlsaXR5OiBzaGFkZXMsIGJ1dHRvbnMgKHR1cm4gbm90aWZpY2F0aW9ucyBvbi9vZmYsIHNsZWVwLCBvZmYpLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"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": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "Alt + Mouse control window, Detailed instructions are on the home page.", "link": "https://extensions.gnome.org/extension/4786/alt-mouse/", "shell_version_map": {"40": {"version": "7", "sha256": "0gqm6mrqffdxaad8mh7zd54qb7k4j15xlki4daiq97cw25qr6xni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdCArIE1vdXNlIGNvbnRyb2wgd2luZG93LCBEZXRhaWxlZCBpbnN0cnVjdGlvbnMgYXJlIG9uIHRoZSBob21lIHBhZ2UuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0gqm6mrqffdxaad8mh7zd54qb7k4j15xlki4daiq97cw25qr6xni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdCArIE1vdXNlIGNvbnRyb2wgd2luZG93LCBEZXRhaWxlZCBpbnN0cnVjdGlvbnMgYXJlIG9uIHRoZSBob21lIHBhZ2UuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "Alt + Mouse control window, Detailed instructions are on the home page.", "link": "https://extensions.gnome.org/extension/4786/alt-mouse/", "shell_version_map": {"40": {"version": "8", "sha256": "0v1q4y6mbr1s2k1k8jiix4k9r57h1rb6v5jpzwj6g9asfrr3p0cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdCArIE1vdXNlIGNvbnRyb2wgd2luZG93LCBEZXRhaWxlZCBpbnN0cnVjdGlvbnMgYXJlIG9uIHRoZSBob21lIHBhZ2UuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0v1q4y6mbr1s2k1k8jiix4k9r57h1rb6v5jpzwj6g9asfrr3p0cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdCArIE1vdXNlIGNvbnRyb2wgd2luZG93LCBEZXRhaWxlZCBpbnN0cnVjdGlvbnMgYXJlIG9uIHRoZSBob21lIHBhZ2UuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"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 content, dimensions, position, orientation and colors of its popup indicator.\n\n- all GNOME workspace related options at one place\n- adds ws 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- ws switcher popup appearance customization includes position on screen, timings, size, colors , orientation", "link": "https://extensions.gnome.org/extension/4788/workspace-switcher-manager/", "shell_version_map": {"38": {"version": "2", "sha256": "1zxsi1pclxm01y0mj2hs5xa6j401k9fl85d4z592667gshnr9y0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgY29udGVudCwgZGltZW5zaW9ucywgcG9zaXRpb24sIG9yaWVudGF0aW9uIGFuZCBjb2xvcnMgb2YgaXRzIHBvcHVwIGluZGljYXRvci5cblxuLSBhbGwgR05PTUUgd29ya3NwYWNlIHJlbGF0ZWQgb3B0aW9ucyBhdCBvbmUgcGxhY2Vcbi0gYWRkcyB3cyBzd2l0Y2hlciBXcmFwYXJvdWQgYW5kIElnbm9yZSBMYXN0IChlbXB0eSkgV29ya3NwYWNlIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdzIHN3aXRjaGVyIHBvcHVwIGFwcGVhcmFuY2UgY3VzdG9taXphdGlvbiBpbmNsdWRlcyBwb3NpdGlvbiBvbiBzY3JlZW4sIHRpbWluZ3MsIHNpemUsIGNvbG9ycyAsIG9yaWVudGF0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2hlciBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1zxsi1pclxm01y0mj2hs5xa6j401k9fl85d4z592667gshnr9y0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgY29udGVudCwgZGltZW5zaW9ucywgcG9zaXRpb24sIG9yaWVudGF0aW9uIGFuZCBjb2xvcnMgb2YgaXRzIHBvcHVwIGluZGljYXRvci5cblxuLSBhbGwgR05PTUUgd29ya3NwYWNlIHJlbGF0ZWQgb3B0aW9ucyBhdCBvbmUgcGxhY2Vcbi0gYWRkcyB3cyBzd2l0Y2hlciBXcmFwYXJvdWQgYW5kIElnbm9yZSBMYXN0IChlbXB0eSkgV29ya3NwYWNlIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdzIHN3aXRjaGVyIHBvcHVwIGFwcGVhcmFuY2UgY3VzdG9taXphdGlvbiBpbmNsdWRlcyBwb3NpdGlvbiBvbiBzY3JlZW4sIHRpbWluZ3MsIHNpemUsIGNvbG9ycyAsIG9yaWVudGF0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2hlciBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1zxsi1pclxm01y0mj2hs5xa6j401k9fl85d4z592667gshnr9y0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgY29udGVudCwgZGltZW5zaW9ucywgcG9zaXRpb24sIG9yaWVudGF0aW9uIGFuZCBjb2xvcnMgb2YgaXRzIHBvcHVwIGluZGljYXRvci5cblxuLSBhbGwgR05PTUUgd29ya3NwYWNlIHJlbGF0ZWQgb3B0aW9ucyBhdCBvbmUgcGxhY2Vcbi0gYWRkcyB3cyBzd2l0Y2hlciBXcmFwYXJvdWQgYW5kIElnbm9yZSBMYXN0IChlbXB0eSkgV29ya3NwYWNlIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdzIHN3aXRjaGVyIHBvcHVwIGFwcGVhcmFuY2UgY3VzdG9taXphdGlvbiBpbmNsdWRlcyBwb3NpdGlvbiBvbiBzY3JlZW4sIHRpbWluZ3MsIHNpemUsIGNvbG9ycyAsIG9yaWVudGF0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2hlciBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"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": "11", "sha256": "0dqg87ww1awi7fny6s0zns40nzd91sq506lpm839rszsgvzppsfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "0dqg87ww1awi7fny6s0zns40nzd91sq506lpm839rszsgvzppsfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} -, {"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": "3", "sha256": "1rizslyrqi1hnkdcajyq63g2azxbixmcf4y78ckh8zyciqrsxk9c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"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": "13", "sha256": "04ps81aqn3vinlqwcp5pacj77cmbrhaz6wsby0c7v9yc1cjcazvz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "04ps81aqn3vinlqwcp5pacj77cmbrhaz6wsby0c7v9yc1cjcazvz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"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.\n\nMain features:\n\n- Toggle Frequency Boost from the same place you set power profile\n- Toggle Frequency Boost regardless of the set power profile\n- Lightweight (no service is installed) 1 3\n- Option to set on boot (Persist) 2 3\n- Translation (currently only English and Bulgarian)\n\n1 Asks for permission every time user flips the switch\n2 Will prompt user for permission 5s after login, if boost needs to be changed\n3 Permission prompt can be removed by adding Polkit rules. Check extension preferences.\n\nRequirements:\n\n- GNOME >= 41 (power profiles menu doesn't exist before that)\n- power-profiles-daemon (power profiles menu doesn't show if not installed and enabled)\n- pkexec (needed to ask the user for permissions)\n\nAll tests are done on Fedora.\n\nIf you have any issues, please first check FAQ (https://gitlab.com/metal03326/gnome-frequency-boost-switch#faq) and if that doesn't help, open an issue (https://gitlab.com/metal03326/gnome-frequency-boost-switch/-/issues)", "link": "https://extensions.gnome.org/extension/4792/frequency-boost-switch/", "shell_version_map": {"41": {"version": "3", "sha256": "0cw3npc3ypp0cpzy0k2iim748dc7d4abkfmkd9cs6h27g9wgmfk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuXG5cbk1haW4gZmVhdHVyZXM6XG5cbi0gVG9nZ2xlIEZyZXF1ZW5jeSBCb29zdCBmcm9tIHRoZSBzYW1lIHBsYWNlIHlvdSBzZXQgcG93ZXIgcHJvZmlsZVxuLSBUb2dnbGUgRnJlcXVlbmN5IEJvb3N0IHJlZ2FyZGxlc3Mgb2YgdGhlIHNldCBwb3dlciBwcm9maWxlXG4tIExpZ2h0d2VpZ2h0IChubyBzZXJ2aWNlIGlzIGluc3RhbGxlZCkgMSAzXG4tIE9wdGlvbiB0byBzZXQgb24gYm9vdCAoUGVyc2lzdCkgMiAzXG4tIFRyYW5zbGF0aW9uIChjdXJyZW50bHkgb25seSBFbmdsaXNoIGFuZCBCdWxnYXJpYW4pXG5cbjEgQXNrcyBmb3IgcGVybWlzc2lvbiBldmVyeSB0aW1lIHVzZXIgZmxpcHMgdGhlIHN3aXRjaFxuMiBXaWxsIHByb21wdCB1c2VyIGZvciBwZXJtaXNzaW9uIDVzIGFmdGVyIGxvZ2luLCBpZiBib29zdCBuZWVkcyB0byBiZSBjaGFuZ2VkXG4zIFBlcm1pc3Npb24gcHJvbXB0IGNhbiBiZSByZW1vdmVkIGJ5IGFkZGluZyBQb2xraXQgcnVsZXMuIENoZWNrIGV4dGVuc2lvbiBwcmVmZXJlbmNlcy5cblxuUmVxdWlyZW1lbnRzOlxuXG4tIEdOT01FID49IDQxIChwb3dlciBwcm9maWxlcyBtZW51IGRvZXNuJ3QgZXhpc3QgYmVmb3JlIHRoYXQpXG4tIHBvd2VyLXByb2ZpbGVzLWRhZW1vbiAocG93ZXIgcHJvZmlsZXMgbWVudSBkb2Vzbid0IHNob3cgaWYgbm90IGluc3RhbGxlZCBhbmQgZW5hYmxlZClcbi0gcGtleGVjIChuZWVkZWQgdG8gYXNrIHRoZSB1c2VyIGZvciBwZXJtaXNzaW9ucylcblxuQWxsIHRlc3RzIGFyZSBkb25lIG9uIEZlZG9yYS5cblxuSWYgeW91IGhhdmUgYW55IGlzc3VlcywgcGxlYXNlIGZpcnN0IGNoZWNrIEZBUSAoaHR0cHM6Ly9naXRsYWIuY29tL21ldGFsMDMzMjYvZ25vbWUtZnJlcXVlbmN5LWJvb3N0LXN3aXRjaCNmYXEpIGFuZCBpZiB0aGF0IGRvZXNuJ3QgaGVscCwgb3BlbiBhbiBpc3N1ZSAoaHR0cHM6Ly9naXRsYWIuY29tL21ldGFsMDMzMjYvZ25vbWUtZnJlcXVlbmN5LWJvb3N0LXN3aXRjaC8tL2lzc3VlcykiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAibmFtZSI6ICJGcmVxdWVuY3kgQm9vc3QgU3dpdGNoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZyZXEtYm9vc3Qtc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ldGFsMDMzMjYvZ25vbWUtZnJlcXVlbmN5LWJvb3N0LXN3aXRjaCIsCiAgInV1aWQiOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Fork of Pop COSMIC: Binds Pop Launcher on Super-Key when Pop COSMIC Extension is disabled", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {"38": {"version": "3", "sha256": "04bln8wkn0s6di03qqxa7bzclb2p8w5ic4mbmh31ar041plzj778", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "04bln8wkn0s6di03qqxa7bzclb2p8w5ic4mbmh31ar041plzj778", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "04bln8wkn0s6di03qqxa7bzclb2p8w5ic4mbmh31ar041plzj778", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops (If available)\n\nTo check if the function is available, see if the files 'charge_control_start_threshold' and 'charge_control_end_threshold' (valid alternatives: 'charge_start_threshold' and 'charge_stop_threshold') exist in the /sys/class/power_supply/BAT0 directory, also you must have permissions to read and write (in case you do not have write permissions, the root password will be requested to modify the values).", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "3", "sha256": "0689zylxzvm6k2klwmbiwmsd4y6h4idfwa4z61zlssx8j6d40a8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzIChJZiBhdmFpbGFibGUpXG5cblRvIGNoZWNrIGlmIHRoZSBmdW5jdGlvbiBpcyBhdmFpbGFibGUsIHNlZSBpZiB0aGUgZmlsZXMgJ2NoYXJnZV9jb250cm9sX3N0YXJ0X3RocmVzaG9sZCcgYW5kICdjaGFyZ2VfY29udHJvbF9lbmRfdGhyZXNob2xkJyAodmFsaWQgYWx0ZXJuYXRpdmVzOiAnY2hhcmdlX3N0YXJ0X3RocmVzaG9sZCcgYW5kICdjaGFyZ2Vfc3RvcF90aHJlc2hvbGQnKSBleGlzdCBpbiB0aGUgL3N5cy9jbGFzcy9wb3dlcl9zdXBwbHkvQkFUMCBkaXJlY3RvcnksIGFsc28geW91IG11c3QgaGF2ZSBwZXJtaXNzaW9ucyB0byByZWFkIGFuZCB3cml0ZSAoaW4gY2FzZSB5b3UgZG8gbm90IGhhdmUgd3JpdGUgcGVybWlzc2lvbnMsIHRoZSByb290IHBhc3N3b3JkIHdpbGwgYmUgcmVxdWVzdGVkIHRvIG1vZGlmeSB0aGUgdmFsdWVzKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJuYW1lIjogIlRoaW5rcGFkIEJhdHRlcnkgVGhyZXNob2xkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops (If available)\n\nTo check if the function is available, see if the files 'charge_control_start_threshold' and 'charge_control_end_threshold' (valid alternatives: 'charge_start_threshold' and 'charge_stop_threshold') exist in the /sys/class/power_supply/BAT0 directory, also you must have permissions to read and write (in case you do not have write permissions, the root password will be requested to modify the values).", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "5", "sha256": "1pj5hxmmx91fq2bbfli5q3l3fqv677add6h1nijznj9fc9mlvxiv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzIChJZiBhdmFpbGFibGUpXG5cblRvIGNoZWNrIGlmIHRoZSBmdW5jdGlvbiBpcyBhdmFpbGFibGUsIHNlZSBpZiB0aGUgZmlsZXMgJ2NoYXJnZV9jb250cm9sX3N0YXJ0X3RocmVzaG9sZCcgYW5kICdjaGFyZ2VfY29udHJvbF9lbmRfdGhyZXNob2xkJyAodmFsaWQgYWx0ZXJuYXRpdmVzOiAnY2hhcmdlX3N0YXJ0X3RocmVzaG9sZCcgYW5kICdjaGFyZ2Vfc3RvcF90aHJlc2hvbGQnKSBleGlzdCBpbiB0aGUgL3N5cy9jbGFzcy9wb3dlcl9zdXBwbHkvQkFUMCBkaXJlY3RvcnksIGFsc28geW91IG11c3QgaGF2ZSBwZXJtaXNzaW9ucyB0byByZWFkIGFuZCB3cml0ZSAoaW4gY2FzZSB5b3UgZG8gbm90IGhhdmUgd3JpdGUgcGVybWlzc2lvbnMsIHRoZSByb290IHBhc3N3b3JkIHdpbGwgYmUgcmVxdWVzdGVkIHRvIG1vZGlmeSB0aGUgdmFsdWVzKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJuYW1lIjogIlRoaW5rcGFkIEJhdHRlcnkgVGhyZXNob2xkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"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": "2", "sha256": "12q3z5wdbbg9sa570ig5sw6qk70ykhy5zsx7ygvi2zgla52v0hq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9jay1zY3JlZW4tbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQWR2ZW5kcmFEZXN3YW50YS9sb2NrLXNjcmVlbi1tZXNzYWdlIiwKICAidXVpZCI6ICJsb2NrLXNjcmVlbi1tZXNzYWdlQGFkdmVuZHJhZGVzd2FudGEuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "12q3z5wdbbg9sa570ig5sw6qk70ykhy5zsx7ygvi2zgla52v0hq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9jay1zY3JlZW4tbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQWR2ZW5kcmFEZXN3YW50YS9sb2NrLXNjcmVlbi1tZXNzYWdlIiwKICAidXVpZCI6ICJsb2NrLXNjcmVlbi1tZXNzYWdlQGFkdmVuZHJhZGVzd2FudGEuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"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"}}} , {"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": "4", "sha256": "1cd9cci0nhpif104x7lc3i5xiqlsnlr0xg764gj0p3hrn0bf9icj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1cd9cci0nhpif104x7lc3i5xiqlsnlr0xg764gj0p3hrn0bf9icj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1cd9cci0nhpif104x7lc3i5xiqlsnlr0xg764gj0p3hrn0bf9icj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "cairo@eexpss.gmail.com", "name": "Cairo Clock", "pname": "cairo-clock", "description": "Cairo Clock", "link": "https://extensions.gnome.org/extension/4809/cairo-clock/", "shell_version_map": {"40": {"version": "2", "sha256": "0s9iln4d5vvr4n16k0jd4c2nyj1lxdzjqq45ll0sspq7pagnaw54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrIiwKICAibmFtZSI6ICJDYWlybyBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWlyb0BlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0s9iln4d5vvr4n16k0jd4c2nyj1lxdzjqq45ll0sspq7pagnaw54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrIiwKICAibmFtZSI6ICJDYWlybyBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWlyb0BlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "cairo@eexpss.gmail.com", "name": "Cairo Clock", "pname": "cairo-clock", "description": "Cairo Clock. \n Click the clock face to set the alarm, click the center circle to enable the alarm.\n Alt + click on main icon, background of icon become green, this enable Popup per hour function. \n Ctrl + click on main icon, can test the alarm effect.\n In case of alarm, the clock will swing dynamically.", "link": "https://extensions.gnome.org/extension/4809/cairo-clock/", "shell_version_map": {"40": {"version": "14", "sha256": "11bp05rjzw24gccjvkmysdjq8s8b3cdkanzfhp3yf617ndplf0ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "11bp05rjzw24gccjvkmysdjq8s8b3cdkanzfhp3yf617ndplf0ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "WallpaperSwitcher@Rishu", "name": "Wallpaper Switcher", "pname": "wallpaper-switcher", "description": "Takes in the path of the folder containing wallpapers. Changes the wallpaper after given time interval. Option to switch them randomly or sequentially.", "link": "https://extensions.gnome.org/extension/4812/wallpaper-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "12biy68q57ayqxqbr8x0m4nnibrn94kb6y2rk7ly38y0qy31096a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGluIHRoZSBwYXRoIG9mIHRoZSBmb2xkZXIgY29udGFpbmluZyB3YWxscGFwZXJzLiBDaGFuZ2VzIHRoZSB3YWxscGFwZXIgYWZ0ZXIgZ2l2ZW4gdGltZSBpbnRlcnZhbC4gT3B0aW9uIHRvIHN3aXRjaCB0aGVtIHJhbmRvbWx5IG9yIHNlcXVlbnRpYWxseS4iLAogICJuYW1lIjogIldhbGxwYXBlciBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "12biy68q57ayqxqbr8x0m4nnibrn94kb6y2rk7ly38y0qy31096a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGluIHRoZSBwYXRoIG9mIHRoZSBmb2xkZXIgY29udGFpbmluZyB3YWxscGFwZXJzLiBDaGFuZ2VzIHRoZSB3YWxscGFwZXIgYWZ0ZXIgZ2l2ZW4gdGltZSBpbnRlcnZhbC4gT3B0aW9uIHRvIHN3aXRjaCB0aGVtIHJhbmRvbWx5IG9yIHNlcXVlbnRpYWxseS4iLAogICJuYW1lIjogIldhbGxwYXBlciBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "12biy68q57ayqxqbr8x0m4nnibrn94kb6y2rk7ly38y0qy31096a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGluIHRoZSBwYXRoIG9mIHRoZSBmb2xkZXIgY29udGFpbmluZyB3YWxscGFwZXJzLiBDaGFuZ2VzIHRoZSB3YWxscGFwZXIgYWZ0ZXIgZ2l2ZW4gdGltZSBpbnRlcnZhbC4gT3B0aW9uIHRvIHN3aXRjaCB0aGVtIHJhbmRvbWx5IG9yIHNlcXVlbnRpYWxseS4iLAogICJuYW1lIjogIldhbGxwYXBlciBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "areustatus@carissimi.eu", "name": "AREU Status", "pname": "areu-status", "description": "Displays the number of ambulances that are in a mission in Lombardy, Italy", "link": "https://extensions.gnome.org/extension/4814/areu-status/", "shell_version_map": {"38": {"version": "2", "sha256": "1jycm5xgzp1ph4h9j9m5ki0rn5wabh6gwblc1bc3fn6bx1zplymy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vci1jYXJpc3NpbWkvYXJldS1zdGF0dXMtZ25vbWUiLAogICJ1dWlkIjogImFyZXVzdGF0dXNAY2FyaXNzaW1pLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1jycm5xgzp1ph4h9j9m5ki0rn5wabh6gwblc1bc3fn6bx1zplymy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vci1jYXJpc3NpbWkvYXJldS1zdGF0dXMtZ25vbWUiLAogICJ1dWlkIjogImFyZXVzdGF0dXNAY2FyaXNzaW1pLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1jycm5xgzp1ph4h9j9m5ki0rn5wabh6gwblc1bc3fn6bx1zplymy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vci1jYXJpc3NpbWkvYXJldS1zdGF0dXMtZ25vbWUiLAogICJ1dWlkIjogImFyZXVzdGF0dXNAY2FyaXNzaW1pLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "colorful-battery-indicator@aneruam", "name": "Colorful Battery Indicator", "pname": "colorful-battery-indicator", "description": "Make the color of the battery indicator change with the level of battery charge.", "link": "https://extensions.gnome.org/extension/4817/colorful-battery-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "0ypm2scrfffk6pl9plk7h8p7bnw0n29a1xyf9r4xdgb32j2fvs3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIGNvbG9yIG9mIHRoZSBiYXR0ZXJ5IGluZGljYXRvciBjaGFuZ2Ugd2l0aCB0aGUgbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UuIiwKICAibmFtZSI6ICJDb2xvcmZ1bCBCYXR0ZXJ5IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmVydWEvZ25vbWUtY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNvbG9yZnVsLWJhdHRlcnktaW5kaWNhdG9yQGFuZXJ1YW0iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0ypm2scrfffk6pl9plk7h8p7bnw0n29a1xyf9r4xdgb32j2fvs3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIGNvbG9yIG9mIHRoZSBiYXR0ZXJ5IGluZGljYXRvciBjaGFuZ2Ugd2l0aCB0aGUgbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UuIiwKICAibmFtZSI6ICJDb2xvcmZ1bCBCYXR0ZXJ5IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmVydWEvZ25vbWUtY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNvbG9yZnVsLWJhdHRlcnktaW5kaWNhdG9yQGFuZXJ1YW0iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "inactivity@fedeantuna.github.io", "name": "Inactivity", "pname": "inactivity", "description": "Hide Activities Button on the top panel.", "link": "https://extensions.gnome.org/extension/4818/inactivity/", "shell_version_map": {"41": {"version": "1", "sha256": "1qc16xhgp2wachcxw9ivf8r4nai2k0xj9vph8k0zvc0shwkpjzag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkluYWN0aXZpdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmVkZWFudHVuYS9pbmFjdGl2aXR5IiwKICAidXVpZCI6ICJpbmFjdGl2aXR5QGZlZGVhbnR1bmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"uuid": "m3u8-play@eexpss.gmail.com", "name": "M3U8 Play", "pname": "m3u8-play", "description": "M3U8 Play. Search and select to play (use `ffplay/ffmpeg`). `m3u8` files need put into `~/.local/share/m3u8-play/`", "link": "https://extensions.gnome.org/extension/4824/m3u8-play/", "shell_version_map": {"40": {"version": "4", "sha256": "047bijgx902y5v9w6njrbjn380gc8iq49nx0qrzyd8plph947c1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk0zVTggUGxheS4gU2VhcmNoIGFuZCBzZWxlY3QgdG8gcGxheSAodXNlIGBmZnBsYXkvZmZtcGVnYCkuIGBtM3U4YCBmaWxlcyBuZWVkIHB1dCBpbnRvIGB+Ly5sb2NhbC9zaGFyZS9tM3U4LXBsYXkvYCIsCiAgImdldHRleHQtZG9tYWluIjogIm0zdTgtcGxheSIsCiAgIm5hbWUiOiAiTTNVOCBQbGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtbTN1OC1wbGF5LyIsCiAgInV1aWQiOiAibTN1OC1wbGF5QGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "047bijgx902y5v9w6njrbjn380gc8iq49nx0qrzyd8plph947c1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk0zVTggUGxheS4gU2VhcmNoIGFuZCBzZWxlY3QgdG8gcGxheSAodXNlIGBmZnBsYXkvZmZtcGVnYCkuIGBtM3U4YCBmaWxlcyBuZWVkIHB1dCBpbnRvIGB+Ly5sb2NhbC9zaGFyZS9tM3U4LXBsYXkvYCIsCiAgImdldHRleHQtZG9tYWluIjogIm0zdTgtcGxheSIsCiAgIm5hbWUiOiAiTTNVOCBQbGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtbTN1OC1wbGF5LyIsCiAgInV1aWQiOiAibTN1OC1wbGF5QGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "gnome-edge-gap@necropolina", "name": "Edge Gap", "pname": "edge-gap", "description": "add a gap around the edge of your screen", "link": "https://extensions.gnome.org/extension/4827/edge-gap/", "shell_version_map": {"40": {"version": "2", "sha256": "07gih1gjap9achqd0h4wck25nfpjipdrs72sslpd597imlhlqm2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBhIGdhcCBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "07gih1gjap9achqd0h4wck25nfpjipdrs72sslpd597imlhlqm2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBhIGdhcCBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "overview-keyboard-navigation@G-dH.github.com", "name": "GS 40/41 Overview Keyboard Navigation Fix", "pname": "overview-keyboard-navigation-fix", "description": "Fix for GNOME Shell 40 and 41 that initiates keyboard navigation keys in the Overview by pressing Tab or Arrow keys. It also changes Esc key behavior in the App Grid view - Esc closes the Overview instead of activating Windows Overview.", "link": "https://extensions.gnome.org/extension/4830/overview-keyboard-navigation-fix/", "shell_version_map": {"40": {"version": "1", "sha256": "14b1fpr2xg5r0hnhfwl14f0szg38wkga2dihjcii1chxz877zlr9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBmb3IgR05PTUUgU2hlbGwgNDAgYW5kIDQxIHRoYXQgaW5pdGlhdGVzIGtleWJvYXJkIG5hdmlnYXRpb24ga2V5cyBpbiB0aGUgT3ZlcnZpZXcgYnkgcHJlc3NpbmcgVGFiIG9yIEFycm93IGtleXMuIEl0IGFsc28gY2hhbmdlcyBFc2Mga2V5IGJlaGF2aW9yIGluIHRoZSBBcHAgR3JpZCB2aWV3IC0gRXNjIGNsb3NlcyB0aGUgT3ZlcnZpZXcgaW5zdGVhZCBvZiBhY3RpdmF0aW5nIFdpbmRvd3MgT3ZlcnZpZXcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbi1maXgiLAogICJuYW1lIjogIkdTIDQwLzQxIE92ZXJ2aWV3IEtleWJvYXJkIE5hdmlnYXRpb24gRml4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1zaGVsbC1leHRlbnNpb24tb3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbiIsCiAgInV1aWQiOiAib3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "14b1fpr2xg5r0hnhfwl14f0szg38wkga2dihjcii1chxz877zlr9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBmb3IgR05PTUUgU2hlbGwgNDAgYW5kIDQxIHRoYXQgaW5pdGlhdGVzIGtleWJvYXJkIG5hdmlnYXRpb24ga2V5cyBpbiB0aGUgT3ZlcnZpZXcgYnkgcHJlc3NpbmcgVGFiIG9yIEFycm93IGtleXMuIEl0IGFsc28gY2hhbmdlcyBFc2Mga2V5IGJlaGF2aW9yIGluIHRoZSBBcHAgR3JpZCB2aWV3IC0gRXNjIGNsb3NlcyB0aGUgT3ZlcnZpZXcgaW5zdGVhZCBvZiBhY3RpdmF0aW5nIFdpbmRvd3MgT3ZlcnZpZXcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbi1maXgiLAogICJuYW1lIjogIkdTIDQwLzQxIE92ZXJ2aWV3IEtleWJvYXJkIE5hdmlnYXRpb24gRml4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1zaGVsbC1leHRlbnNpb24tb3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbiIsCiAgInV1aWQiOiAib3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "m3u8-play@eexpss.gmail.com", "name": "M3U8 Play", "pname": "m3u8-play", "description": "M3U8 Play. Search and select to play (use `ffplay/ffmpeg`). `m3u8` files need put into `~/.local/share/m3u8-play/`", "link": "https://extensions.gnome.org/extension/4824/m3u8-play/", "shell_version_map": {"40": {"version": "7", "sha256": "0b6dl4sgcp72wb4981vdpxfwv4cvnxpymijx4mwwxn0qxp4dqwa8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk0zVTggUGxheS4gU2VhcmNoIGFuZCBzZWxlY3QgdG8gcGxheSAodXNlIGBmZnBsYXkvZmZtcGVnYCkuIGBtM3U4YCBmaWxlcyBuZWVkIHB1dCBpbnRvIGB+Ly5sb2NhbC9zaGFyZS9tM3U4LXBsYXkvYCIsCiAgImdldHRleHQtZG9tYWluIjogIm0zdTgtcGxheSIsCiAgIm5hbWUiOiAiTTNVOCBQbGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtbTN1OC1wbGF5LyIsCiAgInV1aWQiOiAibTN1OC1wbGF5QGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0b6dl4sgcp72wb4981vdpxfwv4cvnxpymijx4mwwxn0qxp4dqwa8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk0zVTggUGxheS4gU2VhcmNoIGFuZCBzZWxlY3QgdG8gcGxheSAodXNlIGBmZnBsYXkvZmZtcGVnYCkuIGBtM3U4YCBmaWxlcyBuZWVkIHB1dCBpbnRvIGB+Ly5sb2NhbC9zaGFyZS9tM3U4LXBsYXkvYCIsCiAgImdldHRleHQtZG9tYWluIjogIm0zdTgtcGxheSIsCiAgIm5hbWUiOiAiTTNVOCBQbGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtbTN1OC1wbGF5LyIsCiAgInV1aWQiOiAibTN1OC1wbGF5QGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "gnome-edge-gap@necropolina", "name": "Edge Gap", "pname": "edge-gap", "description": "add configurable-width gaps around the edge of your screen", "link": "https://extensions.gnome.org/extension/4827/edge-gap/", "shell_version_map": {"40": {"version": "3", "sha256": "12shbvqdj6834lvw23s9z4f3ayhvma363yvzga0m85x0fzs6bna5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBjb25maWd1cmFibGUtd2lkdGggZ2FwcyBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "12shbvqdj6834lvw23s9z4f3ayhvma363yvzga0m85x0fzs6bna5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBjb25maWd1cmFibGUtd2lkdGggZ2FwcyBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "overview-keyboard-navigation@G-dH.github.com", "name": "Overview Keyboard Navigation Fix", "pname": "overview-keyboard-navigation-fix", "description": "Fix for GNOME Shell 40 and 41 that initiates keyboard navigation in the Activities overview and App Grid by pressing Tab or Arrow keys. It also changes Esc key behavior in the App Grid view - Esc closes the Overview instead of activating Windows Overview.", "link": "https://extensions.gnome.org/extension/4830/overview-keyboard-navigation-fix/", "shell_version_map": {"40": {"version": "2", "sha256": "12l9j8rcs61j1l375nm7dxbhhs3qw4y5i0hsdxcpq9jn7880y4f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBmb3IgR05PTUUgU2hlbGwgNDAgYW5kIDQxIHRoYXQgaW5pdGlhdGVzIGtleWJvYXJkIG5hdmlnYXRpb24gaW4gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXcgYW5kIEFwcCBHcmlkIGJ5IHByZXNzaW5nIFRhYiBvciBBcnJvdyBrZXlzLiBJdCBhbHNvIGNoYW5nZXMgRXNjIGtleSBiZWhhdmlvciBpbiB0aGUgQXBwIEdyaWQgdmlldyAtIEVzYyBjbG9zZXMgdGhlIE92ZXJ2aWV3IGluc3RlYWQgb2YgYWN0aXZhdGluZyBXaW5kb3dzIE92ZXJ2aWV3LiIsCiAgImdldHRleHQtZG9tYWluIjogIm92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb24tZml4IiwKICAibmFtZSI6ICJPdmVydmlldyBLZXlib2FyZCBOYXZpZ2F0aW9uIEZpeCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb24iLAogICJ1dWlkIjogIm92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb25ARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "12l9j8rcs61j1l375nm7dxbhhs3qw4y5i0hsdxcpq9jn7880y4f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBmb3IgR05PTUUgU2hlbGwgNDAgYW5kIDQxIHRoYXQgaW5pdGlhdGVzIGtleWJvYXJkIG5hdmlnYXRpb24gaW4gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXcgYW5kIEFwcCBHcmlkIGJ5IHByZXNzaW5nIFRhYiBvciBBcnJvdyBrZXlzLiBJdCBhbHNvIGNoYW5nZXMgRXNjIGtleSBiZWhhdmlvciBpbiB0aGUgQXBwIEdyaWQgdmlldyAtIEVzYyBjbG9zZXMgdGhlIE92ZXJ2aWV3IGluc3RlYWQgb2YgYWN0aXZhdGluZyBXaW5kb3dzIE92ZXJ2aWV3LiIsCiAgImdldHRleHQtZG9tYWluIjogIm92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb24tZml4IiwKICAibmFtZSI6ICJPdmVydmlldyBLZXlib2FyZCBOYXZpZ2F0aW9uIEZpeCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb24iLAogICJ1dWlkIjogIm92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb25ARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "all-windows-srwp@jkavery.github.io", "name": "All Windows + Save/Restore Window Positions", "pname": "all-windows-saverestore-window-positions", "description": "List open windows of all workspaces, plus Save/Restore window positions (run automatically on Suspend/Resume, a workaround for Ubuntu bug #1778983).", "link": "https://extensions.gnome.org/extension/4833/all-windows-saverestore-window-positions/", "shell_version_map": {"40": {"version": "1", "sha256": "1ppgrvmf7lxzqig02p80bh3laxx8bhq6harza82qm8djj62g6kkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzLCBwbHVzIFNhdmUvUmVzdG9yZSB3aW5kb3cgcG9zaXRpb25zIChydW4gYXV0b21hdGljYWxseSBvbiBTdXNwZW5kL1Jlc3VtZSwgYSB3b3JrYXJvdW5kIGZvciBVYnVudHUgYnVnICMxNzc4OTgzKS4iLAogICJuYW1lIjogIkFsbCBXaW5kb3dzICsgU2F2ZS9SZXN0b3JlIFdpbmRvdyBQb3NpdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamthdmVyeS9hbGwtd2luZG93cyIsCiAgInV1aWQiOiAiYWxsLXdpbmRvd3Mtc3J3cEBqa2F2ZXJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "clipboard-history@alexsaveau.dev", "name": "Clipboard History", "pname": "clipboard-history", "description": "Gnome Clipboard History is a Gnome extension that saves items you've copied into an easily accessible, searchable history panel.\n\ntags: clipboard manager", "link": "https://extensions.gnome.org/extension/4839/clipboard-history/", "shell_version_map": {"40": {"version": "8", "sha256": "14fkqp17diivwkmzs5b2h2rp7nd24vm7wckadxisxg23wd6yw5ba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuXG5cbnRhZ3M6IGNsaXBib2FyZCBtYW5hZ2VyIiwKICAibmFtZSI6ICJDbGlwYm9hcmQgSGlzdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NVUEVSQ0lMRVgvZ25vbWUtY2xpcGJvYXJkLWhpc3RvcnkiLAogICJ1dWlkIjogImNsaXBib2FyZC1oaXN0b3J5QGFsZXhzYXZlYXUuZGV2IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "14fkqp17diivwkmzs5b2h2rp7nd24vm7wckadxisxg23wd6yw5ba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuXG5cbnRhZ3M6IGNsaXBib2FyZCBtYW5hZ2VyIiwKICAibmFtZSI6ICJDbGlwYm9hcmQgSGlzdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NVUEVSQ0lMRVgvZ25vbWUtY2xpcGJvYXJkLWhpc3RvcnkiLAogICJ1dWlkIjogImNsaXBib2FyZC1oaXN0b3J5QGFsZXhzYXZlYXUuZGV2IiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"uuid": "strongdm@andybrown668.github.com", "name": "StrongDM", "pname": "strongdm", "description": "Access StrongDM resources", "link": "https://extensions.gnome.org/extension/4841/strongdm/", "shell_version_map": {"40": {"version": "1", "sha256": "0bk75y3i8f82bmv20vnhar37yni6ydlcdixc89npc9iiyj1a5mwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBTdHJvbmdETSByZXNvdXJjZXMiLAogICJuYW1lIjogIlN0cm9uZ0RNIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHlicm93bjY2OC9zdHJvbmdkbS1nbm9tZS1zaGVsbC1leHRlbnNpb24uZ2l0IiwKICAidXVpZCI6ICJzdHJvbmdkbUBhbmR5YnJvd242NjguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "pop-theme-switcher@dimitris47", "name": "Pop Theme Switcher", "pname": "pop-theme-switcher", "description": "Switch between Pop dark and light themes. It is a fork of adwaita-theme-switcher (https://github.com/fthx/adwaita-theme-switcher).", "link": "https://extensions.gnome.org/extension/4844/pop-theme-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "0z28xmqdbhvx6cvs4r2rrlyg3r22y5rldlm7dir5hjwyad1qwar2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBiZXR3ZWVuIFBvcCBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIEl0IGlzIGEgZm9yayBvZiBhZHdhaXRhLXRoZW1lLXN3aXRjaGVyIChodHRwczovL2dpdGh1Yi5jb20vZnRoeC9hZHdhaXRhLXRoZW1lLXN3aXRjaGVyKS4iLAogICJuYW1lIjogIlBvcCBUaGVtZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGltaXRyaXM0Ny9wb3AtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvcC10aGVtZS1zd2l0Y2hlckBkaW1pdHJpczQ3IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0z28xmqdbhvx6cvs4r2rrlyg3r22y5rldlm7dir5hjwyad1qwar2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBiZXR3ZWVuIFBvcCBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIEl0IGlzIGEgZm9yayBvZiBhZHdhaXRhLXRoZW1lLXN3aXRjaGVyIChodHRwczovL2dpdGh1Yi5jb20vZnRoeC9hZHdhaXRhLXRoZW1lLXN3aXRjaGVyKS4iLAogICJuYW1lIjogIlBvcCBUaGVtZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGltaXRyaXM0Ny9wb3AtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvcC10aGVtZS1zd2l0Y2hlckBkaW1pdHJpczQ3IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0z28xmqdbhvx6cvs4r2rrlyg3r22y5rldlm7dir5hjwyad1qwar2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBiZXR3ZWVuIFBvcCBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIEl0IGlzIGEgZm9yayBvZiBhZHdhaXRhLXRoZW1lLXN3aXRjaGVyIChodHRwczovL2dpdGh1Yi5jb20vZnRoeC9hZHdhaXRhLXRoZW1lLXN3aXRjaGVyKS4iLAogICJuYW1lIjogIlBvcCBUaGVtZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGltaXRyaXM0Ny9wb3AtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvcC10aGVtZS1zd2l0Y2hlckBkaW1pdHJpczQ3IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "dash-to-dock-toggle@kavoyaa.github.com", "name": "Dash to Dock Toggle", "pname": "dash-to-dock-toggle", "description": "Adds a button to top panel to switch Dash to Dock mode between \"always visible\" and \"autohide\".\n\n(Works only with the Dash-to-Dock extension)", "link": "https://extensions.gnome.org/extension/4845/dash-to-dock-toggle/", "shell_version_map": {"40": {"version": "2", "sha256": "0fy9wv78qhipsy5rqdbygi74ycgryvqm98svmpbzhbgg3rb8mdxs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdG9wIHBhbmVsIHRvIHN3aXRjaCBEYXNoIHRvIERvY2sgbW9kZSBiZXR3ZWVuIFwiYWx3YXlzIHZpc2libGVcIiBhbmQgXCJhdXRvaGlkZVwiLlxuXG4oV29ya3Mgb25seSB3aXRoIHRoZSBEYXNoLXRvLURvY2sgZXh0ZW5zaW9uKSIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIFRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrLXRvZ2dsZUBrYXZveWFhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "open@eexpss.gmail.com", "name": "Open Anywhere", "pname": "open-anywhere", "description": "Copy / Select a full path file / directory name, or incomplete path, or pure file name. Open a context menu to let you choose how to open it, or press Ctrl-Shift-O directlly.", "link": "https://extensions.gnome.org/extension/4848/open-anywhere/", "shell_version_map": {"40": {"version": "4", "sha256": "14y0i53ppagfs6xzyfa4p14rlg10p3wqjymqicdwbb2flcmg46h0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgLyBTZWxlY3QgYSBmdWxsIHBhdGggZmlsZSAvIGRpcmVjdG9yeSBuYW1lLCBvciBpbmNvbXBsZXRlIHBhdGgsIG9yIHB1cmUgZmlsZSBuYW1lLiBPcGVuIGEgY29udGV4dCBtZW51IHRvIGxldCB5b3UgY2hvb3NlIGhvdyB0byBvcGVuIGl0LCBvciBwcmVzcyBDdHJsLVNoaWZ0LU8gZGlyZWN0bGx5LiIsCiAgImdldHRleHQtZG9tYWluIjogIm9wZW4iLAogICJuYW1lIjogIk9wZW4gQW55d2hlcmUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3BlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLW9wZW4iLAogICJ1dWlkIjogIm9wZW5AZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "14y0i53ppagfs6xzyfa4p14rlg10p3wqjymqicdwbb2flcmg46h0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgLyBTZWxlY3QgYSBmdWxsIHBhdGggZmlsZSAvIGRpcmVjdG9yeSBuYW1lLCBvciBpbmNvbXBsZXRlIHBhdGgsIG9yIHB1cmUgZmlsZSBuYW1lLiBPcGVuIGEgY29udGV4dCBtZW51IHRvIGxldCB5b3UgY2hvb3NlIGhvdyB0byBvcGVuIGl0LCBvciBwcmVzcyBDdHJsLVNoaWZ0LU8gZGlyZWN0bGx5LiIsCiAgImdldHRleHQtZG9tYWluIjogIm9wZW4iLAogICJuYW1lIjogIk9wZW4gQW55d2hlcmUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3BlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLW9wZW4iLAogICJ1dWlkIjogIm9wZW5AZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "command-menu@arunk140.com", "name": "Command Menu", "pname": "command-menu", "description": "A GNOME Shell Extension to manage shortcuts in Top Bar (Inspired by Shuttle and SSHMenu). Edit the .commands.json file to add your own shortcuts.\n\nSample Config in the README - https://github.com/arunk140/gnome-command-menu/blob/main/README.md", "link": "https://extensions.gnome.org/extension/4850/command-menu/", "shell_version_map": {"40": {"version": "3", "sha256": "0sf063fkwfjnp56406hirsiadmpv79za162k80n82pl6r837qw1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudSIsCiAgInV1aWQiOiAiY29tbWFuZC1tZW51QGFydW5rMTQwLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0sf063fkwfjnp56406hirsiadmpv79za162k80n82pl6r837qw1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudSIsCiAgInV1aWQiOiAiY29tbWFuZC1tZW51QGFydW5rMTQwLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "s76-scheduler@mattjakeman.com", "name": "System76 Scheduler", "pname": "system76-scheduler", "description": "Integrates with System76 Scheduler to prioritise foreground processes.\nNote: system76-scheduler must be installed separately!\nThis extension is not affiliated with nor supported by System76.", "link": "https://extensions.gnome.org/extension/4854/system76-scheduler/", "shell_version_map": {"40": {"version": "2", "sha256": "0sa3skad3vxbiqq9cy74r6s2nfadxjnjwyl9hnp4p9qwnr5qiwhq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgd2l0aCBTeXN0ZW03NiBTY2hlZHVsZXIgdG8gcHJpb3JpdGlzZSBmb3JlZ3JvdW5kIHByb2Nlc3Nlcy5cbk5vdGU6IHN5c3RlbTc2LXNjaGVkdWxlciBtdXN0IGJlIGluc3RhbGxlZCBzZXBhcmF0ZWx5IVxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQgd2l0aCBub3Igc3VwcG9ydGVkIGJ5IFN5c3RlbTc2LiIsCiAgIm5hbWUiOiAiU3lzdGVtNzYgU2NoZWR1bGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWpha2VtYW4vczc2LXNjaGVkdWxlci1wbHVnaW4vIiwKICAidXVpZCI6ICJzNzYtc2NoZWR1bGVyQG1hdHRqYWtlbWFuLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0sa3skad3vxbiqq9cy74r6s2nfadxjnjwyl9hnp4p9qwnr5qiwhq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgd2l0aCBTeXN0ZW03NiBTY2hlZHVsZXIgdG8gcHJpb3JpdGlzZSBmb3JlZ3JvdW5kIHByb2Nlc3Nlcy5cbk5vdGU6IHN5c3RlbTc2LXNjaGVkdWxlciBtdXN0IGJlIGluc3RhbGxlZCBzZXBhcmF0ZWx5IVxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQgd2l0aCBub3Igc3VwcG9ydGVkIGJ5IFN5c3RlbTc2LiIsCiAgIm5hbWUiOiAiU3lzdGVtNzYgU2NoZWR1bGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWpha2VtYW4vczc2LXNjaGVkdWxlci1wbHVnaW4vIiwKICAidXVpZCI6ICJzNzYtc2NoZWR1bGVyQG1hdHRqYWtlbWFuLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "quarterwindows@troyready.com", "name": "Quarter Windows", "pname": "quarter-windows", "description": "Add additional window management shortcuts.\n\nSee extension homepage for list of shortcuts and commands to customize them.", "link": "https://extensions.gnome.org/extension/4857/quarter-windows/", "shell_version_map": {"41": {"version": "2", "sha256": "00yiqgswcl3psijxi46sb8bxqfxb1a9i93frb90a5292a0x7lmzi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhZGRpdGlvbmFsIHdpbmRvdyBtYW5hZ2VtZW50IHNob3J0Y3V0cy5cblxuU2VlIGV4dGVuc2lvbiBob21lcGFnZSBmb3IgbGlzdCBvZiBzaG9ydGN1dHMgYW5kIGNvbW1hbmRzIHRvIGN1c3RvbWl6ZSB0aGVtLiIsCiAgIm5hbWUiOiAiUXVhcnRlciBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb3lyZWFkeS9xdWFydGVyd2luZG93cyIsCiAgInV1aWQiOiAicXVhcnRlcndpbmRvd3NAdHJveXJlYWR5LmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "batt_consumption_wattmetter@wennaspeedy", "name": "Battery Consumption Watt Meter", "pname": "bat_consumption_wattmeter", "description": "Shows actual charging/discharging consumption (+/-) in Watt next to battery percentage level.\nEnable percentage label when disabled.\nSync reload set to 4 seconds.\nNo consumption info when battery is full.", "link": "https://extensions.gnome.org/extension/4862/bat_consumption_wattmeter/", "shell_version_map": {"40": {"version": "4", "sha256": "0sx8pszlig69wha6xj8ll4l1kwi8avxhi148fq55r0z25yz6pq27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFjdHVhbCBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRW5hYmxlIHBlcmNlbnRhZ2UgbGFiZWwgd2hlbiBkaXNhYmxlZC5cblN5bmMgcmVsb2FkIHNldCB0byA0IHNlY29uZHMuXG5ObyBjb25zdW1wdGlvbiBpbmZvIHdoZW4gYmF0dGVyeSBpcyBmdWxsLiIsCiAgIm5hbWUiOiAiQmF0dGVyeSBDb25zdW1wdGlvbiBXYXR0IE1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5uYXNwZWVkeS9iYXR0X2NvbnN1bXB0aW9uX3dhdHRtZXR0ZXIiLAogICJ1dWlkIjogImJhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlckB3ZW5uYXNwZWVkeSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0sx8pszlig69wha6xj8ll4l1kwi8avxhi148fq55r0z25yz6pq27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFjdHVhbCBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRW5hYmxlIHBlcmNlbnRhZ2UgbGFiZWwgd2hlbiBkaXNhYmxlZC5cblN5bmMgcmVsb2FkIHNldCB0byA0IHNlY29uZHMuXG5ObyBjb25zdW1wdGlvbiBpbmZvIHdoZW4gYmF0dGVyeSBpcyBmdWxsLiIsCiAgIm5hbWUiOiAiQmF0dGVyeSBDb25zdW1wdGlvbiBXYXR0IE1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5uYXNwZWVkeS9iYXR0X2NvbnN1bXB0aW9uX3dhdHRtZXR0ZXIiLAogICJ1dWlkIjogImJhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlckB3ZW5uYXNwZWVkeSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "tl@l.pnx.me", "name": "tl Integration", "pname": "pnx-time-logger", "description": "Integration for github.com/larowlan/tl", "link": "https://extensions.gnome.org/extension/4866/pnx-time-logger/", "shell_version_map": {"41": {"version": "1", "sha256": "06bf9hl0xdxmpyhh0qk2zbfhx8m2gw1fwfym9rv1znh1m9ymjr8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0aW9uIGZvciBnaXRodWIuY29tL2xhcm93bGFuL3RsIiwKICAibmFtZSI6ICJ0bCBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGxAbC5wbngubWUiLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "dollar-pkr@shoaibzs.github.com", "name": "Dollar-PKR", "pname": "dollar-pkr", "description": "(USD US Dollar) converted to (PKR Pakistan Rs). 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/4869/dollar-pkr/", "shell_version_map": {"38": {"version": "2", "sha256": "09cb6f7v3j3zfanzblj9x4wj6bpnca3v9yjfh3kjz5zl3lxy8gqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKFBLUiBQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiRG9sbGFyLVBLUiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hvYWlienMvZG9sbGFyLXBrciIsCiAgInV1aWQiOiAiZG9sbGFyLXBrckBzaG9haWJ6cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "09cb6f7v3j3zfanzblj9x4wj6bpnca3v9yjfh3kjz5zl3lxy8gqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKFBLUiBQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiRG9sbGFyLVBLUiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hvYWlienMvZG9sbGFyLXBrciIsCiAgInV1aWQiOiAiZG9sbGFyLXBrckBzaG9haWJ6cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "09cb6f7v3j3zfanzblj9x4wj6bpnca3v9yjfh3kjz5zl3lxy8gqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKFBLUiBQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiRG9sbGFyLVBLUiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hvYWlienMvZG9sbGFyLXBrciIsCiAgInV1aWQiOiAiZG9sbGFyLXBrckBzaG9haWJ6cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "dozenalclock@mble.dk", "name": "Dozenal Clock", "pname": "dozenal-clock", "description": "Converts the clock to a dozenal one", "link": "https://extensions.gnome.org/extension/4877/dozenal-clock/", "shell_version_map": {"38": {"version": "3", "sha256": "1p7bsv89k3pz16kcjldmdnsilwc3jx1v419nvn5vj7n2xg4zvk0j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnRzIHRoZSBjbG9jayB0byBhIGRvemVuYWwgb25lIiwKICAibmFtZSI6ICJEb3plbmFsIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ibGVkL2RvemVuYWwtY2xvY2stZ25vbWUiLAogICJ1dWlkIjogImRvemVuYWxjbG9ja0BtYmxlLmRrIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "1p7bsv89k3pz16kcjldmdnsilwc3jx1v419nvn5vj7n2xg4zvk0j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnRzIHRoZSBjbG9jayB0byBhIGRvemVuYWwgb25lIiwKICAibmFtZSI6ICJEb3plbmFsIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ibGVkL2RvemVuYWwtY2xvY2stZ25vbWUiLAogICJ1dWlkIjogImRvemVuYWxjbG9ja0BtYmxlLmRrIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1p7bsv89k3pz16kcjldmdnsilwc3jx1v419nvn5vj7n2xg4zvk0j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnRzIHRoZSBjbG9jayB0byBhIGRvemVuYWwgb25lIiwKICAibmFtZSI6ICJEb3plbmFsIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ibGVkL2RvemVuYWwtY2xvY2stZ25vbWUiLAogICJ1dWlkIjogImRvemVuYWxjbG9ja0BtYmxlLmRrIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "wattmeter-forked@clementherve.fr", "name": "wattmeter-forked", "pname": "wattmeter-forked", "description": "A fork of the Wattmeter extension by blackBriar, compatible with gnome 40. Original version: https://extensions.gnome.org/extension/1867/wattmeter/", "link": "https://extensions.gnome.org/extension/4886/wattmeter-forked/", "shell_version_map": {"40": {"version": "3", "sha256": "0hg6faz9j1vvxx8dyjhwx8nc2c0zbwxi9gdg2nhx839kyl3bk9kn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZm9yayBvZiB0aGUgV2F0dG1ldGVyIGV4dGVuc2lvbiBieSBibGFja0JyaWFyLCBjb21wYXRpYmxlIHdpdGggZ25vbWUgNDAuIE9yaWdpbmFsIHZlcnNpb246IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE4Njcvd2F0dG1ldGVyLyIsCiAgIm5hbWUiOiAid2F0dG1ldGVyLWZvcmtlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jbGVtZW50aGVydmUvd2F0dG1ldGVyLWZvcmtlZCIsCiAgInV1aWQiOiAid2F0dG1ldGVyLWZvcmtlZEBjbGVtZW50aGVydmUuZnIiLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "snap-manager-lite@fthx", "name": "Snap Manager Lite", "pname": "snap-manager-lite", "description": "Popup menu in the top bar to easily manage usual snap tasks (list, changes, refresh, remove, install...).\n\n No update notification at session start-up: use Snap Manager extension for that.\n\n All the results of actions are displayed in GNOME Terminal, so you can exactly know what you are doing and what is processing. Very light extension, no background process, no periodic background task.\n\n You can disable snaps auto updates for a limited time (up to one month, renewable), consequently be notified of snap updates and manually install them.\n\n This is not an official Ubuntu/Canonical extension.", "link": "https://extensions.gnome.org/extension/4889/snap-manager-lite/", "shell_version_map": {"38": {"version": "2", "sha256": "19x72pjbyqnk871680v88c40brq33ap99xv32wk9dknmiaa5bfd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "19x72pjbyqnk871680v88c40brq33ap99xv32wk9dknmiaa5bfd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "19x72pjbyqnk871680v88c40brq33ap99xv32wk9dknmiaa5bfd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}}} ] diff --git a/pkgs/desktops/gnome/games/gnome-2048/default.nix b/pkgs/desktops/gnome/games/gnome-2048/default.nix index bba3000b7f2..90bd99e4a7b 100644 --- a/pkgs/desktops/gnome/games/gnome-2048/default.nix +++ b/pkgs/desktops/gnome/games/gnome-2048/default.nix @@ -9,6 +9,7 @@ , itstool , clutter-gtk , libgee +, libgnome-games-support , gnome , gtk3 }: @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ clutter-gtk libgee - gnome.libgnome-games-support + libgnome-games-support gtk3 ]; diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index 6a9f4f19385..0725af81c0a 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "40.0"; + version = "40.10"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+V8/4DGwsBwC95oWWfiJFS03cq4+RN+EA9FGC6Xuw2o="; + sha256 = "z/07M6OZV3+7RJHOj70C9UxZJPEFbzARTo1CApDvI/w="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index e0fc06135e1..7874586ce8e 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -14,13 +14,13 @@ python3Packages.buildPythonApplication rec { pname = "mate-tweak"; - version = "22.04.1"; + version = "22.04.4"; src = fetchFromGitHub { owner = "ubuntu-mate"; repo = pname; rev = version; - sha256 = "FcXJc8tlpP9RCrO6EVGvHPFF6qXorImzi9UccgZU+co="; + sha256 = "ncBN1wjCcMtuasnXk7WMge+9MK7BMmTu89/R+hiY/Ks="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index d62141ece2b..93c10d07292 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -7,6 +7,7 @@ , desktop-file-utils , elementary-icon-theme , fetchFromGitHub +, fetchpatch , flatpak , gettext , glib @@ -38,6 +39,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0="; }; + patches = [ + # Fix AppStream.PoolFlags being renamed + # Though the API break has been fixed in latest appstream, + # let's use the non-deprecated version anyway. + # https://github.com/elementary/appcenter/pull/1794 + (fetchpatch { + url = "https://github.com/elementary/appcenter/commit/84bc6400713484aa9365f0ba73f59c495da3f08b.patch"; + sha256 = "sha256-HNRCJ/5mRbEVjCq9nrXtdQOOk1Jj5jalApkghD8ecpk="; + }) + ]; + nativeBuildInputs = [ appstream-glib dbus # for pkg-config diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 2963f98db40..4a003d6c5ab 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-ooqVNMgeAqGlFcfachPPfhSiKTEEcNGv5oWdM7VLWOc="; }; + patches = [ + # Fix build with vala 0.56 + # https://github.com/elementary/mail/pull/765 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/c3aa61d226f49147d7685cc00013469ff4df369a.patch"; + sha256 = "sha256-OxNBGIC1hrEaFSufQ59Wb0AMfdzqPt6diL4g3hbL/Ig="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 1ff9157b301..e5a8523014d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -41,6 +42,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI="; }; + patches = [ + # Fix build with vala 0.56 + # https://github.com/elementary/photos/pull/711 + (fetchpatch { + url = "https://github.com/elementary/photos/commit/6594f1323726fb0d38519a7bdafe16f9170353cb.patch"; + sha256 = "sha256-Ie9ULC8Xw4KLQJANPXh4LDywMjWfniPX/P76eHW8LHc="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index 7953105951c..e42df9bee06 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -19,7 +19,8 @@ let testingName = lib.optionalString (testName != null) "${testName}-"; in stdenv.mkDerivation rec { - name = "${testingName}${switchboard.name}-with-plugs"; + pname = "${testingName}${switchboard.pname}-with-plugs"; + inherit (switchboard) version; src = null; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index fe7a8e946d1..45a8f119ee0 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , linkFarm , substituteAll @@ -31,13 +30,13 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = "greeter"; rev = version; - sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq"; + sha256 = "sha256-0chBM8JuCYgZXHneiSxSICZwBVm2Vgx+bas9wUjbnyg="; }; patches = [ @@ -47,15 +46,6 @@ stdenv.mkDerivation rec { src = ./hardcode-fallback-background.patch; default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; }) - # https://github.com/NixOS/nixpkgs/issues/151609 - # https://github.com/elementary/greeter/issues/578#issuecomment-1030746697 - ./fix-crash.patch - # Fix build with meson 0.61 - # https://github.com/elementary/greeter/pull/590 - (fetchpatch { - url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch"; - sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY="; - }) ]; nativeBuildInputs = [ @@ -80,7 +70,6 @@ stdenv.mkDerivation rec { libhandy lightdm mutter - wingpanel-with-indicators ]; mesonFlags = [ diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch deleted file mode 100644 index ca6f6aab6d6..00000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala -index 83df22c..8cd917e 100644 ---- a/src/Cards/UserCard.vala -+++ b/src/Cards/UserCard.vala -@@ -42,6 +42,7 @@ public class Greeter.UserCard : Greeter.BaseCard { - private Gtk.Stack login_stack; - private Greeter.PasswordEntry password_entry; - -+ private SelectionCheck logged_in; - private unowned Gtk.StyleContext logged_in_context; - private weak Gtk.StyleContext main_grid_style_context; - private weak Gtk.StyleContext password_entry_context; -@@ -214,7 +215,7 @@ public class Greeter.UserCard : Greeter.BaseCard { - }; - avatar_overlay.add (avatar); - -- var logged_in = new SelectionCheck () { -+ logged_in = new SelectionCheck () { - halign = Gtk.Align.END, - valign = Gtk.Align.END - }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index ca887d45dc3..89a359a4c9d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -17,7 +17,8 @@ let else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators); in stdenv.mkDerivation rec { - name = "${wingpanel.name}-with-indicators"; + pname = "${wingpanel.pname}-with-indicators"; + inherit (wingpanel) version; src = null; diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix new file mode 100644 index 00000000000..caf3819a361 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitLab, python3 }: +let + pythonEnv = python3.withPackages (p: with p; [ dbus-python pygobject3 ]); +in +stdenv.mkDerivation rec { + pname = "krunner-ssh"; + version = "1.0"; + + src = fetchFromGitLab { + owner = "Programie"; + repo = "krunner-ssh"; + rev = version; + sha256 = "sha256-rFTTvmetDeN6t0axVc+8t1TRiuyPBpwqhvsq2IFxa/A="; + }; + + postPatch = '' + sed -e "s|Exec=.*|Exec=$out/libexec/runner.py|" -i ssh-runner.service + ''; + + nativeBuildInputs = [ + pythonEnv + ]; + + installPhase = '' + runHook preInstall + + patchShebangs runner.py + + install -m 0755 -D runner.py $out/libexec/runner.py + install -m 0755 -D ssh-runner.desktop $out/share/kservices5/ssh-runner.desktop + install -m 0755 -D ssh-runner.service $out/share/dbus-1/services/com.selfcoders.ssh-runner.service + + runHook postInstall + ''; + + meta = with lib; { + description = "A simple backend for KRunner providing SSH hosts from your .ssh/known_hosts file as search results"; + homepage = "https://selfcoders.com/projects/krunner-ssh"; + license = licenses.mit; + maintainers = with maintainers; [ aanderse ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index db1e46f6d4e..0474d875997 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "bluedevil"; + pname = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtbase qtdeclarative bluez-qt diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix index eed396b5437..24d0c96cad9 100644 --- a/pkgs/desktops/plasma-5/breeze-grub.nix +++ b/pkgs/desktops/plasma-5/breeze-grub.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "breeze-grub"; + pname = "breeze-grub"; installPhase = '' runHook preInstall diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index bff3546aa33..b499ab034e5 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -3,7 +3,7 @@ let inherit (lib) getLib; in mkDerivation { - name = "breeze-gtk"; + pname = "breeze-gtk"; nativeBuildInputs = [ extra-cmake-modules sassc python3 python3.pkgs.pycairo breeze-qt5 ]; buildInputs = [ qtbase ]; patches = [ diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index 9127b7fecb6..bc60662b434 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -24,7 +24,7 @@ in mkDerivation { - name = "breeze-plymouth"; + pname = "breeze-plymouth"; nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ]; buildInputs = [ plymouth ]; patches = [ diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index 3f3222e05cd..13a426bb258 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "breeze-qt5"; + pname = "breeze-qt5"; sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 0eafc182e46..0b713902358 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -76,8 +76,8 @@ let mkDerivation = args: let - inherit (args) name; - sname = args.sname or name; + inherit (args) pname; + sname = args.sname or pname; inherit (srcs.${sname}) src version; outputs = args.outputs or [ "out" ]; @@ -98,8 +98,7 @@ let }; in mkDerivation (args // { - name = "${name}-${version}"; - inherit meta outputs setupHook src; + inherit pname version meta outputs setupHook src; }); }; @@ -161,6 +160,7 @@ let kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; + krunner-ssh = callPackage ./3rdparty/addons/krunner-ssh.nix { }; krunner-symbols = callPackage ./3rdparty/addons/krunner-symbols.nix { }; lightly = callPackage ./3rdparty/lightly { }; parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index e065837cd2f..dd6c7a3008c 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -32,7 +32,7 @@ }: mkDerivation { - name = "discover"; + pname = "discover"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ]; buildInputs = [ # discount is needed for libmarkdown diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index b0e706602b6..44b96e8beb9 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 47543da1114..57800c316aa 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kactivitymanagerd"; + pname = "kactivitymanagerd"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index d84b7bc9801..02694b085f8 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kde-cli-tools"; + pname = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 798f8d807af..6949f73a9ce 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kde-gtk-config"; + pname = "kde-gtk-config"; nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; dontWrapGApps = true; # There is nothing to wrap buildInputs = [ diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 9b67d7bc529..86d146c8b41 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -1,8 +1,8 @@ -{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n, kcoreaddons }: mkDerivation { - name = "kdecoration"; + pname = "kdecoration"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ki18n ]; + buildInputs = [ qtbase ki18n kcoreaddons ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 77e3cad8d48..5be47327d72 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kdeplasma-addons"; + pname = "kdeplasma-addons"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index d371ce81510..be5b191c3de 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kgamma5"; + pname = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ]; } diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index fd366443861..dfd5d4668a2 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "khotkeys"; + pname = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index e9b9f514816..662662cdb2f 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kinfocenter"; + pname = "kinfocenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix index c0cfebcdc0c..6a9d055abe4 100644 --- a/pkgs/desktops/plasma-5/kmenuedit.nix +++ b/pkgs/desktops/plasma-5/kmenuedit.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kmenuedit"; + pname = "kmenuedit"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdbusaddons khotkeys ki18n kiconthemes kio kxmlgui sonnet diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 11b0f38fed0..36eea905739 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kscreen"; + pname = "kscreen"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index e6c70f8e8cc..b37bbc6c845 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kscreenlocker"; + pname = "kscreenlocker"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index bc6702ed6d3..4cbf0804493 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ksshaskpass"; + pname = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ]; } diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix index f117872ce5c..d5f96e42981 100644 --- a/pkgs/desktops/plasma-5/ksystemstats.nix +++ b/pkgs/desktops/plasma-5/ksystemstats.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "ksystemstats"; + pname = "ksystemstats"; NIX_CFLAGS_COMPILE = [ "-I${lib.getBin libksysguard}/share" ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ]; diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index 590c523e9d7..dcc139bcafd 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }: mkDerivation { - name = "kwallet-pam"; + pname = "kwallet-pam"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ pam socat libgcrypt qtbase kwallet ]; postPatch = '' diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 02e963ba904..5462814e8de 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kwayland-integration"; + pname = "kwayland-integration"; nativeBuildInputs = [ extra-cmake-modules wayland-scanner ]; buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-protocols wayland ]; } diff --git a/pkgs/desktops/plasma-5/kwayland-server/default.nix b/pkgs/desktops/plasma-5/kwayland-server/default.nix index f24e0e6d6a0..e71b98b1b94 100644 --- a/pkgs/desktops/plasma-5/kwayland-server/default.nix +++ b/pkgs/desktops/plasma-5/kwayland-server/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kwayland-server"; + pname = "kwayland-server"; nativeBuildInputs = [ cmake extra-cmake-modules #kdoctools diff --git a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch index e6ab62caf71..9bade4eab6a 100644 --- a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch +++ b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch @@ -63,11 +63,11 @@ index 0000000..726065d + +}// namespace + -+#endif // SERVICE_UTILS_H -diff --git a/src/service_utils.h b/src/service_utils.h ++#endif // NIXOS_UTILS_H +diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h index 8a70c1f..475b15d 100644 ---- a/src/service_utils.h -+++ b/src/service_utils.h +--- a/src/utils/serviceutils.h ++++ b/src/utils/serviceutils.h @@ -19,6 +19,7 @@ #include <QLoggingCategory> //KF diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 36f0da9e961..db0485db887 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -18,7 +18,7 @@ # TODO (ttuegel): investigate qmlplugindump failure mkDerivation { - name = "kwin"; + pname = "kwin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index bb8798d2d0e..9ba1afaf9f8 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kwrited"; + pname = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ]; } diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix index 9e18bbb4bff..81263779553 100644 --- a/pkgs/desktops/plasma-5/layer-shell-qt.nix +++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "layer-shell-qt"; + pname = "layer-shell-qt"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-scanner wayland wayland-protocols ]; } diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index ae623a80d7d..6798a2cdcb0 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "libkscreen"; + pname = "libkscreen"; nativeBuildInputs = [ extra-cmake-modules wayland-scanner ]; buildInputs = [ kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch index cda82e08442..ec4a34037dc 100644 --- a/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch @@ -11,11 +11,10 @@ diff --git a/processui/scripting.cpp b/processui/scripting.cpp index efed8ff..841761a 100644 --- a/processui/scripting.cpp +++ b/processui/scripting.cpp -@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() { - QStringList scripts; +@@ -293,7 +293,7 @@ void Scripting::loadContextMenu() const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("ksysguard/scripts/"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { + for (const QString &dir : dirs) { - QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); + QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 19bbc6390c9..ef4e4438444 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "libksysguard"; + pname = "libksysguard"; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 0e7169abf6f..8ae5061436d 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "milou"; + pname = "milou"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 6eea3c92319..78603c3c306 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "oxygen"; + pname = "oxygen"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix index e9ad3c28c10..1ddd844444d 100644 --- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "plasma-browser-integration"; + pname = "plasma-browser-integration"; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 457902ad185..6c8d8a3bc4b 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -17,7 +17,7 @@ }: mkDerivation { - name = "plasma-desktop"; + pname = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix index f97b061292a..8ddd53548e7 100644 --- a/pkgs/desktops/plasma-5/plasma-disks.nix +++ b/pkgs/desktops/plasma-5/plasma-disks.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "plasma-disks"; + pname = "plasma-disks"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix index f6964428762..9febc5172d4 100644 --- a/pkgs/desktops/plasma-5/plasma-integration/default.nix +++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix @@ -8,7 +8,7 @@ # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration mkDerivation { - name = "plasma-integration"; + pname = "plasma-integration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland diff --git a/pkgs/desktops/plasma-5/plasma-nano/default.nix b/pkgs/desktops/plasma-5/plasma-nano/default.nix index 0960eec33f2..6e2608c7f97 100644 --- a/pkgs/desktops/plasma-5/plasma-nano/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nano/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "plasma-nano"; + pname = "plasma-nano"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plasma-framework diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 5c82112f3b1..54c8079cf5f 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -11,7 +11,7 @@ }: mkDerivation { - name = "plasma-nm"; + pname = "plasma-nm"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index bc39e520f8a..9e47356579e 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "plasma-pa"; + pname = "plasma-pa"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop diff --git a/pkgs/desktops/plasma-5/plasma-phone-components/default.nix b/pkgs/desktops/plasma-5/plasma-phone-components/default.nix index d925d7e408b..ed0f434025d 100644 --- a/pkgs/desktops/plasma-5/plasma-phone-components/default.nix +++ b/pkgs/desktops/plasma-5/plasma-phone-components/default.nix @@ -16,7 +16,7 @@ let inherit (lib) getBin getLib; in mkDerivation { - name = "plasma-phone-components"; + pname = "plasma-phone-components"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/desktops/plasma-5/plasma-sdk.nix b/pkgs/desktops/plasma-5/plasma-sdk.nix index e82fc4d0602..8ab2d635b28 100644 --- a/pkgs/desktops/plasma-5/plasma-sdk.nix +++ b/pkgs/desktops/plasma-5/plasma-sdk.nix @@ -20,7 +20,7 @@ }: mkDerivation { - name = "plasma-sdk"; + pname = "plasma-sdk"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive diff --git a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix index f69808bf452..da5ad45df9c 100644 --- a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix +++ b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix @@ -15,7 +15,7 @@ }: mkDerivation { - name = "plasma-systemmonitor"; + pname = "plasma-systemmonitor"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtquickcontrols2 diff --git a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix b/pkgs/desktops/plasma-5/plasma-thunderbolt.nix index 1bb79c327eb..c35f1bf0970 100644 --- a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix +++ b/pkgs/desktops/plasma-5/plasma-thunderbolt.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "plasma-thunderbolt"; + pname = "plasma-thunderbolt"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcmutils diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix index 453ba2b107a..b6ceb37a71f 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/default.nix +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -14,7 +14,7 @@ }: mkDerivation { - name = "plasma-vault"; + pname = "plasma-vault"; nativeBuildInputs = [ extra-cmake-modules ]; patches = [ diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix index cb068166c1d..8ae136ac78b 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix @@ -1,6 +1,6 @@ { mkDerivation , extra-cmake-modules }: mkDerivation { - name = "plasma-workspace-wallpapers"; + pname = "plasma-workspace-wallpapers"; nativeBuildInputs = [ extra-cmake-modules ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index 508d3949884..e00d8b4a5c9 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -14,33 +14,33 @@ diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/start index 270744053..356160e96 100644 --- a/startkde/plasma-session/startup.cpp +++ b/startkde/plasma-session/startup.cpp -@@ -143,7 +143,7 @@ Startup::Startup(QObject *parent) - const AutoStart autostart; +@@ -179,7 +179,7 @@ Startup::Startup(QObject *parent) + } // Keep for KF5; remove in KF6 (KInit will be gone then) - QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList()); + QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList()); - KJob *windowManagerJob = nullptr; - if (qEnvironmentVariable("XDG_SESSION_TYPE") != QLatin1String("wayland")) { -diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp + KJob *phase1 = nullptr; + m_lock.reset(new QEventLoopLocker); +diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp index 3a054a04f..b2e7ab3fb 100644 ---- a/startkde/startplasma-waylandsession.cpp -+++ b/startkde/startplasma-waylandsession.cpp -@@ -33,7 +33,7 @@ int main(int argc, char **argv) - out << "startplasma-waylandsession: Shutting down...\n"; +--- a/startkde/startplasma-wayland.cpp ++++ b/startkde/startplasma-wayland.cpp +@@ -91,7 +91,7 @@ int main(int argc, char **argv) + out << "startplasma-wayland: Shutting down...\n"; // Keep for KF5; remove in KF6 (KInit will be gone then) - runSync(QStringLiteral("kdeinit5_shutdown"), {}); + runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {}); - out << "startplasma-waylandsession: Done.\n"; - + out << "startplasmacompositor: Shutting down...\n"; + cleanupPlasmaEnvironment(oldSystemdEnvironment); diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp index d6b2c5439..534eeb0e5 100644 --- a/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp -@@ -90,7 +90,7 @@ int main(int argc, char **argv) +@@ -89,7 +89,7 @@ int main(int argc, char **argv) out << "startkde: Shutting down...\n"; // Keep for KF5; remove in KF6 (KInit will be gone then) @@ -53,7 +53,7 @@ diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp index 008fdfcaf..72468f21c 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp -@@ -39,7 +39,7 @@ QTextStream out(stderr); +@@ -50,7 +50,7 @@ QTextStream out(stderr); void messageBox(const QString &text) { out << text; @@ -62,7 +62,7 @@ index 008fdfcaf..72468f21c 100644 } QStringList allServices(const QLatin1String &prefix) -@@ -340,7 +340,7 @@ void setupX11() +@@ -412,7 +412,7 @@ void setupX11() // If the user has overwritten fonts, the cursor font may be different now // so don't move this up. @@ -70,17 +70,8 @@ index 008fdfcaf..72468f21c 100644 + runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); } - void cleanupPlasmaEnvironment(const std::optional<QStringList> &oldSystemdEnvironment) -@@ -403,7 +403,7 @@ void setupFontDpi() - // TODO port to c++? - const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); - QProcess p; -- p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")}); -+ p.start(QStringLiteral(NIXPKGS_XRDB), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")}); - p.setProcessChannelMode(QProcess::ForwardedChannels); - p.write(input); - p.closeWriteChannel(); -@@ -425,7 +425,7 @@ QProcess *setupKSplash() + void cleanupPlasmaEnvironment(const std::optional<QProcessEnvironment> &oldSystemdEnvironment) +@@ -500,7 +500,7 @@ QProcess *setupKSplash() KConfigGroup ksplashCfg = cfg.group("KSplash"); if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch index 633551f6e3c..211316e2473 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch @@ -15,8 +15,8 @@ index a560da3..f723c1e 100644 type=image color=#1d99f3 fontSize=10 --background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png -+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png +-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg ++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg needsFullUserModel=false -- 2.30.0 diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index fac10cf31d4..68b6d1d675f 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -23,7 +23,7 @@ let inherit (lib) getBin getLib; in mkDerivation { - name = "plasma-workspace"; + pname = "plasma-workspace"; passthru.providedSessions = [ "plasma" "plasmawayland" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 72217204b35..82ebf3e3136 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "polkit-kde-agent"; + pname = "polkit-kde-agent"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index 9d2dc183cf1..229810edde1 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "powerdevil"; + pname = "powerdevil"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth diff --git a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix index 420529eb174..a45488c287d 100644 --- a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix +++ b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix @@ -12,7 +12,7 @@ }: mkDerivation { - name = "qqc2-breeze-style"; + pname = "qqc2-breeze-style"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 7c44e0f140d..50801d31774 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -17,7 +17,7 @@ }: mkDerivation { - name = "sddm-kcm"; + pname = "sddm-kcm"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 9de087f10e8..c5da337d10d 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,435 @@ { bluedevil = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/bluedevil-5.23.5.tar.xz"; - sha256 = "1nbnmfdaisqngygyz1478fswsm1xp28v9l78xlw70yvvyjk2kc6v"; - name = "bluedevil-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/bluedevil-5.24.0.tar.xz"; + sha256 = "128br83hkxxrb6wca3d1racygdnfgk3r5md1gcjvgwb0gpy6bnzp"; + name = "bluedevil-5.24.0.tar.xz"; }; }; breeze = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/breeze-5.23.5.tar.xz"; - sha256 = "1pyw7rhzkbd9kwsm8l7iz867jhwlbmkarc5iihg0bkbcg1ds18ic"; - name = "breeze-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/breeze-5.24.0.tar.xz"; + sha256 = "08b3hihz98z7kdybb0y1b74q1dn511ga81qqqxzlfirgpp8c9f9q"; + name = "breeze-5.24.0.tar.xz"; }; }; breeze-grub = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/breeze-grub-5.23.5.tar.xz"; - sha256 = "12rm9a3vrmb3sm04l2c4vcj8psfyjxplp9wgh87q3k1rcyqz7fqk"; - name = "breeze-grub-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/breeze-grub-5.24.0.tar.xz"; + sha256 = "0p0pzmsd6scssyxcm9n58mp7fc9vz1lg4n7c1ch4bqragih1gnlr"; + name = "breeze-grub-5.24.0.tar.xz"; }; }; breeze-gtk = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/breeze-gtk-5.23.5.tar.xz"; - sha256 = "1ynbvfgy2nlxg5svjqazj70m7py58ixxa7xyj13dcj6i2ikbcjld"; - name = "breeze-gtk-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/breeze-gtk-5.24.0.tar.xz"; + sha256 = "090cczxc1ciic6wghz3p21gpfdwnc8pjcvq6wn7bfkp1i3r5mihp"; + name = "breeze-gtk-5.24.0.tar.xz"; }; }; breeze-plymouth = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/breeze-plymouth-5.23.5.tar.xz"; - sha256 = "1sllcrhz8hniqkgybk5bbb36fzjcdp5drjbf7v7jn4ih4wvybwmk"; - name = "breeze-plymouth-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/breeze-plymouth-5.24.0.tar.xz"; + sha256 = "1qqpwgp1yy3p1s0z21xwds6wx4z8daibkgk1bynj73cx7a2wch9g"; + name = "breeze-plymouth-5.24.0.tar.xz"; }; }; discover = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/discover-5.23.5.tar.xz"; - sha256 = "1kzp7jpw2kgml2yc3cx9n5syln3kyd9fxa5klh3sa1xn6bz9f8zr"; - name = "discover-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/discover-5.24.0.tar.xz"; + sha256 = "0dbfvqana31wqharsbyb8rcrw1w6l9x1g6p02aqwiph0inkrz20q"; + name = "discover-5.24.0.tar.xz"; }; }; drkonqi = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/drkonqi-5.23.5.tar.xz"; - sha256 = "08jjh52r6dmgp7dyxjxvavb4cxhmvzirwdn7hnmfhdbwkm09fqm5"; - name = "drkonqi-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/drkonqi-5.24.0.tar.xz"; + sha256 = "1ismgg7rcxijkprn4sci15wn4w2gmdn0fdbgvzxdcrqaf4g6qc3s"; + name = "drkonqi-5.24.0.tar.xz"; }; }; kactivitymanagerd = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kactivitymanagerd-5.23.5.tar.xz"; - sha256 = "09v6pia34a694g0amj0miqi0j42yqvhfcv6yr9zfix4gf1qcdidn"; - name = "kactivitymanagerd-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kactivitymanagerd-5.24.0.tar.xz"; + sha256 = "12dvgm3ilyqlxzm8209b7g42nfk0ahfzizs3pbmi18zapjszcsps"; + name = "kactivitymanagerd-5.24.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kde-cli-tools-5.23.5.tar.xz"; - sha256 = "1203z87i4dmhq1vlrfj4kiw157i5zkccd2bwc7p7qwhgbddaw5jd"; - name = "kde-cli-tools-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kde-cli-tools-5.24.0.tar.xz"; + sha256 = "0l8a4ysz1cqwdh3c20q51qamwh58vvs8yzb5jdvbp8bahsyyc4mr"; + name = "kde-cli-tools-5.24.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kde-gtk-config-5.23.5.tar.xz"; - sha256 = "14qqxy2vz9004kfam9biv6q0601sn9yhrkx0i8y0958a58s5z3hp"; - name = "kde-gtk-config-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kde-gtk-config-5.24.0.tar.xz"; + sha256 = "024pglycz2kbp9npnvbx5qpkz9381wyyp6xkalqynzr9gy58syrx"; + name = "kde-gtk-config-5.24.0.tar.xz"; }; }; kdecoration = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kdecoration-5.23.5.tar.xz"; - sha256 = "1kqj8l95wy46kfsw3f1crxwba9zwdlbgi7345mamhyks74wj1628"; - name = "kdecoration-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kdecoration-5.24.0.tar.xz"; + sha256 = "0xl8892w49z11k9mxgh7lp8a4l1x8wldmaij82kd1vnh9sxvb3f3"; + name = "kdecoration-5.24.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kdeplasma-addons-5.23.5.tar.xz"; - sha256 = "0cq0g8nqrkwv12010rsrmzqvxsa5arjpa87gvws8pah3v9k1xnkq"; - name = "kdeplasma-addons-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kdeplasma-addons-5.24.0.tar.xz"; + sha256 = "0q8yf0gz4gjn1kyf545i8fpsn2dpy48qhjpm8ssp3ywv6s2abjxn"; + name = "kdeplasma-addons-5.24.0.tar.xz"; }; }; kgamma5 = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kgamma5-5.23.5.tar.xz"; - sha256 = "17j0kv00ibs2g9jxfvflk965221iznm0ydgj3i05i6j2bd8301zn"; - name = "kgamma5-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kgamma5-5.24.0.tar.xz"; + sha256 = "07w7l25snpi98j5bxg3zri5lsymabnli6h9d5w0qx0c19wzjwayl"; + name = "kgamma5-5.24.0.tar.xz"; }; }; khotkeys = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/khotkeys-5.23.5.tar.xz"; - sha256 = "13562p0bv0jkamx9q07wi5vs78bdrhd0h3qg5rxajc5s36gyh63a"; - name = "khotkeys-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/khotkeys-5.24.0.tar.xz"; + sha256 = "0gjdwdzg5vybalima8jnwrprqj0rnxmzds0x8w707nb9ypz4k7k6"; + name = "khotkeys-5.24.0.tar.xz"; }; }; kinfocenter = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kinfocenter-5.23.5.tar.xz"; - sha256 = "0f7ik3gg1pimjlc94dp6psk0sha8k7pinx50nvmgsglap4k1xbk7"; - name = "kinfocenter-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kinfocenter-5.24.0.tar.xz"; + sha256 = "09fq69q4300ppi1y9pp8s4h1bbai1p5qsz384bb445pjvwsyn6nf"; + name = "kinfocenter-5.24.0.tar.xz"; }; }; kmenuedit = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kmenuedit-5.23.5.tar.xz"; - sha256 = "0k3dbip98zwia6m8nlgiw4mz09pkw7bik4cn3j73v2x3n7y3c542"; - name = "kmenuedit-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kmenuedit-5.24.0.tar.xz"; + sha256 = "0bjiqdw4wqi5vpkn98wjjz23x6k47lvxac8nyxs8ddd9i8mlklij"; + name = "kmenuedit-5.24.0.tar.xz"; }; }; kscreen = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kscreen-5.23.5.tar.xz"; - sha256 = "0j5rgzj132j7qy1pgi12mhihf1a89a3xh8j5f7dp5s1f8kyjq0yi"; - name = "kscreen-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kscreen-5.24.0.tar.xz"; + sha256 = "19kqvvgj209ri035ldzn1k5l36l54rvagsnfzhw61v8rd9r6r02x"; + name = "kscreen-5.24.0.tar.xz"; }; }; kscreenlocker = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kscreenlocker-5.23.5.tar.xz"; - sha256 = "07vhwvcyz9ynjzh44zny1f6di2knzy3fkiji3bhrki8p3zc9vjpm"; - name = "kscreenlocker-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kscreenlocker-5.24.0.tar.xz"; + sha256 = "0d827h5br27sdd925brljb1mwnkzj739g5q0k8xkw9f9q9bxk8l8"; + name = "kscreenlocker-5.24.0.tar.xz"; }; }; ksshaskpass = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/ksshaskpass-5.23.5.tar.xz"; - sha256 = "0p8aka60mc8p96v3bx954jy99n9lf0a4b09sig307clwinfr23if"; - name = "ksshaskpass-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/ksshaskpass-5.24.0.tar.xz"; + sha256 = "1xiw25imhmkcikp746q9s393djmkdpkh9jb7h1diwwhambnimy6d"; + name = "ksshaskpass-5.24.0.tar.xz"; }; }; ksystemstats = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/ksystemstats-5.23.5.tar.xz"; - sha256 = "1xmr0yk5xynja6z7xc6l1zd529q5si5qs71f72dba2zna22hb7hb"; - name = "ksystemstats-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/ksystemstats-5.24.0.tar.xz"; + sha256 = "1182dfcg1av9329g9p9ll64yiwyxm46kczakxb3vj4d2ajaclzm1"; + name = "ksystemstats-5.24.0.tar.xz"; }; }; kwallet-pam = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kwallet-pam-5.23.5.tar.xz"; - sha256 = "1cha41wiqsfgyrqb8di5qnnz0mnvmchprxay48czrn3r5mz49pw9"; - name = "kwallet-pam-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kwallet-pam-5.24.0.tar.xz"; + sha256 = "0jzi2rcwxxjp3lg8cywp96ysnwm51a0m9pdwk8z7n3v1ncr2p38q"; + name = "kwallet-pam-5.24.0.tar.xz"; }; }; kwayland-integration = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kwayland-integration-5.23.5.tar.xz"; - sha256 = "0gs68v4rriknn59fv0yjcgrmcryv7wxgskswdgi1xx18v0rlc4ag"; - name = "kwayland-integration-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kwayland-integration-5.24.0.tar.xz"; + sha256 = "1yq9cjb8xcvqr747p5hm8xxg4rn6mahchd5c2camv3qrjbqm8ll6"; + name = "kwayland-integration-5.24.0.tar.xz"; }; }; kwayland-server = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kwayland-server-5.23.5.tar.xz"; - sha256 = "0b8c1mkh36cgxhx18v9j23n9gnvzy22x50gpiw3dbkjzsmr1n7by"; - name = "kwayland-server-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kwayland-server-5.24.0.tar.xz"; + sha256 = "1zbi4c14zvjwkxxqlg80mv749ybnkmcdvn72irmrzbbf4g1z7k32"; + name = "kwayland-server-5.24.0.tar.xz"; }; }; kwin = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kwin-5.23.5.tar.xz"; - sha256 = "00azqmdgkh72bg4d8868cin984vxxk6s6pk5x4dfvlaknzlyfjgp"; - name = "kwin-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kwin-5.24.0.tar.xz"; + sha256 = "19q5pphqnr1xc1c4z0sd3yr60jsiq190llwllfmlj4acjlbcbbn6"; + name = "kwin-5.24.0.tar.xz"; }; }; kwrited = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kwrited-5.23.5.tar.xz"; - sha256 = "0aj911kfzd100jq1k1sg7i1nhiixnl7qiphc2bczn47f1jj64iqv"; - name = "kwrited-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/kwrited-5.24.0.tar.xz"; + sha256 = "018wvkkqzg4qyjd0w1h2d3ms72ghlq8mg79rrsj518l7hhlv6rsg"; + name = "kwrited-5.24.0.tar.xz"; }; }; layer-shell-qt = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/layer-shell-qt-5.23.5.tar.xz"; - sha256 = "1ah66z9hiricw6h3j7x2k7d49y7g4l2s9w2658wjrava2qng9bsr"; - name = "layer-shell-qt-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/layer-shell-qt-5.24.0.tar.xz"; + sha256 = "0y3z2xr9vpxnm84gs1zpa1apma341wza7pjcpwibaqd6aiz9vpqv"; + name = "layer-shell-qt-5.24.0.tar.xz"; }; }; libkscreen = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/libkscreen-5.23.5.tar.xz"; - sha256 = "08wgg96clp685fl5lflrfd4kmf5c2p5ms7n1q2izvg0n6qr37m1i"; - name = "libkscreen-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/libkscreen-5.24.0.tar.xz"; + sha256 = "0h6sycib940gbw2rf6ax3v7mg77pzga36xzwzbyz9h49fba3dpjk"; + name = "libkscreen-5.24.0.tar.xz"; }; }; libksysguard = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/libksysguard-5.23.5.tar.xz"; - sha256 = "1gy1grkkz7vwglby52vv4gr8zbzsv8rbvwbp6rqvvhmqg7ascc1h"; - name = "libksysguard-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/libksysguard-5.24.0.tar.xz"; + sha256 = "1f0hwk2kzmgpjxmsjfd4g25sr91qyazp4hysyfjdhrrs2ajdkm0b"; + name = "libksysguard-5.24.0.tar.xz"; }; }; milou = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/milou-5.23.5.tar.xz"; - sha256 = "05bc6hc5pn5rz4zp6b2akjdbssv7xppvzsw3pidkqb8pincl01gh"; - name = "milou-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/milou-5.24.0.tar.xz"; + sha256 = "0sxsisrzfancxwk8lsxhj2b85sgjdb9gzy4l0nax4fp942ygiirs"; + name = "milou-5.24.0.tar.xz"; }; }; oxygen = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/oxygen-5.23.5.tar.xz"; - sha256 = "1vvy9yqllqq9dx2riwv4bmxfq13wph5wagy84f1hhl7zxnbcyv0c"; - name = "oxygen-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/oxygen-5.24.0.tar.xz"; + sha256 = "0ym74q29c2f32l1xm3kd0s2p7zzbg6a96g7d39fkp5paxicx5fb7"; + name = "oxygen-5.24.0.tar.xz"; }; }; plasma-browser-integration = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-browser-integration-5.23.5.tar.xz"; - sha256 = "0jw9jircgbilig4pryyjxhby8qc7nag9a1s5nk1zdsnlaqr08jyp"; - name = "plasma-browser-integration-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-browser-integration-5.24.0.tar.xz"; + sha256 = "1gp9m7drwxflb0ms0vbvk7qydm1bghhzalc00lpcjh4nrf0bgh33"; + name = "plasma-browser-integration-5.24.0.tar.xz"; }; }; plasma-desktop = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-desktop-5.23.5.tar.xz"; - sha256 = "0ym8cssw351ygw2vy27cyxql05y0gaflnqnq4fwkdgidldvmi45k"; - name = "plasma-desktop-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-desktop-5.24.0.tar.xz"; + sha256 = "1brnm6yivjy2piy88ncmclv4g2rxkaiyi923c557dmiipah2bx7z"; + name = "plasma-desktop-5.24.0.tar.xz"; }; }; plasma-disks = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-disks-5.23.5.tar.xz"; - sha256 = "0197zyj5p7j8y80g0vvf5d9bq86qxkhwpa9dzb5l3is50y8lkj6p"; - name = "plasma-disks-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-disks-5.24.0.tar.xz"; + sha256 = "1c3pwnyhdmj7grk3gjh4kw5437m5cxhp70qsbhnfsaacps3mdv5d"; + name = "plasma-disks-5.24.0.tar.xz"; }; }; plasma-firewall = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-firewall-5.23.5.tar.xz"; - sha256 = "0fhycjrb89blh6wf24rvq7bafqqrxj37ir0daj5jlph9f1w4laq0"; - name = "plasma-firewall-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-firewall-5.24.0.tar.xz"; + sha256 = "1jjw414547qksjxg2x5n666iq6qildbn9k9c8hqipmwnlkprpbb1"; + name = "plasma-firewall-5.24.0.tar.xz"; }; }; plasma-integration = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-integration-5.23.5.tar.xz"; - sha256 = "03c0cqvr5cdpvxgm145sqpbbr8wv0qv4pqjl69v3bs010pd755lg"; - name = "plasma-integration-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-integration-5.24.0.tar.xz"; + sha256 = "17dqf6j1za3q8hzk7jfc5wc7s4kr28slrkq5iqvzqgyqjqy3z7rv"; + name = "plasma-integration-5.24.0.tar.xz"; + }; + }; + plasma-mobile = { + version = "5.24.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.24.0/plasma-mobile-5.24.0.tar.xz"; + sha256 = "0g9mbb8dzqcngc1sq43knwyc3kr81w3vl359wyrgvnr8r1qikv2z"; + name = "plasma-mobile-5.24.0.tar.xz"; }; }; plasma-nano = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-nano-5.23.5.tar.xz"; - sha256 = "1yh67bh1smk7zx35hd72pafjbjdv7wwwhm76ga5sj251m61ncxim"; - name = "plasma-nano-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-nano-5.24.0.tar.xz"; + sha256 = "0i8lsp83g2i3c88djkmxawwbwa6lr0w89lzxj73fr6az6vdcrypj"; + name = "plasma-nano-5.24.0.tar.xz"; }; }; plasma-nm = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-nm-5.23.5.tar.xz"; - sha256 = "14sknzy4v4xx1ihjn1s6x0lv5difnp4gi24zsdqvnkxkmxzhcij3"; - name = "plasma-nm-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-nm-5.24.0.tar.xz"; + sha256 = "17pmyklmr46qg21w4ql9q5nhfdjw1xmmv1qz7lyhlww7qa6mz1ny"; + name = "plasma-nm-5.24.0.tar.xz"; }; }; plasma-pa = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-pa-5.23.5.tar.xz"; - sha256 = "1pcnf59qj7rgmcbc5xhad5zl487r48i2kyp6nc3yrlgj1xcfpfxg"; - name = "plasma-pa-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-pa-5.24.0.tar.xz"; + sha256 = "19n2plbk455qwgq0lcpb7rj2ck78ck64fpvlldmh53j9vxyzcasl"; + name = "plasma-pa-5.24.0.tar.xz"; }; }; plasma-phone-components = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-phone-components-5.23.5.tar.xz"; - sha256 = "08c03pycvv7ald21d8ckxpv6d25qlxs28gjm99hdn6x8m74j7frn"; - name = "plasma-phone-components-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-phone-components-5.24.0.tar.xz"; + sha256 = "0g9mbb8dzqcngc1sq43knwyc3kr81w3vl359wyrgvnr8r1qikv2z"; + name = "plasma-phone-components-5.24.0.tar.xz"; }; }; plasma-sdk = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-sdk-5.23.5.tar.xz"; - sha256 = "1s0l09lgqipks0w0jplaaipcs4a1ny4iclkz9hkfx4xjgcvk5m2j"; - name = "plasma-sdk-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-sdk-5.24.0.tar.xz"; + sha256 = "16fn98rv4qaci3b5whzjs6csbbxyrnmnr9gngn5dirdpla8cffld"; + name = "plasma-sdk-5.24.0.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-systemmonitor-5.23.5.tar.xz"; - sha256 = "1snzabxgja9rsk000h97qjadb9fs8zdbqpr4zqa9sk0jjgm011lf"; - name = "plasma-systemmonitor-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-systemmonitor-5.24.0.tar.xz"; + sha256 = "0zkvbgwm2rpyisbx72a75ywy45d2primjjpnmw76x6924j8sp7pd"; + name = "plasma-systemmonitor-5.24.0.tar.xz"; }; }; plasma-tests = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-tests-5.23.5.tar.xz"; - sha256 = "125b0sf7h0ibjl7msw1sc3cccms8nrrkx6cgwd46a9xi5svrsfg2"; - name = "plasma-tests-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-tests-5.24.0.tar.xz"; + sha256 = "1q95mrrb0p9ah4dg3bhkc9yh2ydasdmyd87jclraybcsfl6fi9kf"; + name = "plasma-tests-5.24.0.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-thunderbolt-5.23.5.tar.xz"; - sha256 = "1ich92w479llvq1vjlfyvxh3dvqc4pgycfi97hz4sfhn7dnaw3vr"; - name = "plasma-thunderbolt-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-thunderbolt-5.24.0.tar.xz"; + sha256 = "1vsb3wf2sgbfbm2wk8kj18qhv4z9l4yzxaf8g30zpz4d1sva7jdc"; + name = "plasma-thunderbolt-5.24.0.tar.xz"; }; }; plasma-vault = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-vault-5.23.5.tar.xz"; - sha256 = "1gf531q29qnvvsdxqgb1zyxwh5ck25kb0h1kk0d95pjkkylgyv0d"; - name = "plasma-vault-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-vault-5.24.0.tar.xz"; + sha256 = "1vk38iarhsr6rdrmhbcyjziw3dn8yjmgyn4dy2xdr0l4yqpq7qzz"; + name = "plasma-vault-5.24.0.tar.xz"; }; }; plasma-workspace = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-workspace-5.23.5.tar.xz"; - sha256 = "0x950nb56xmmdf7hfpbrd9hvgq1a8vca0x8g1qsvrjhh5ymydgif"; - name = "plasma-workspace-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-workspace-5.24.0.tar.xz"; + sha256 = "0jnksl2i2viw5aaqv38b371z4lxrxah6p1bjp40a1zfa68vr8dz3"; + name = "plasma-workspace-5.24.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-workspace-wallpapers-5.23.5.tar.xz"; - sha256 = "0nr631yz8v671a87vh9f2a5kfjhn4f9147b339p09fwgfpx06vfx"; - name = "plasma-workspace-wallpapers-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plasma-workspace-wallpapers-5.24.0.tar.xz"; + sha256 = "0329ks3q32nb9k3dxddlmxccjilgyxx5jplwbpln5b0p4plkn77k"; + name = "plasma-workspace-wallpapers-5.24.0.tar.xz"; }; }; plymouth-kcm = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plymouth-kcm-5.23.5.tar.xz"; - sha256 = "0ynyqfm6az8yj3d30yxza5mjcsgfw6mmdkcgr3v95r6db112hqbx"; - name = "plymouth-kcm-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/plymouth-kcm-5.24.0.tar.xz"; + sha256 = "1pcvfrv8vmk43s14209iv8gngi3al9g4za74yz2l79nxscyppzh5"; + name = "plymouth-kcm-5.24.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.23.5"; + version = "1-5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/polkit-kde-agent-1-5.23.5.tar.xz"; - sha256 = "1wgpgbq987qa6fdayw4155fwym6rcn2z7w66s8faqv94x78njzln"; - name = "polkit-kde-agent-1-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/polkit-kde-agent-1-5.24.0.tar.xz"; + sha256 = "1qayxff5hl8qr9p5bsfrq0cz3x1jlwc8f0nx66rkbngphdm7085n"; + name = "polkit-kde-agent-1-5.24.0.tar.xz"; }; }; powerdevil = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/powerdevil-5.23.5.tar.xz"; - sha256 = "1lxjqd4w3jvnffcn9751j9k1fzsyasd1z8b1gm2iaf38iys21116"; - name = "powerdevil-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/powerdevil-5.24.0.tar.xz"; + sha256 = "06mrahlrqibvgfhcxywh72h6jblqq6sjsxqjzbq7zbq61vgc3jg3"; + name = "powerdevil-5.24.0.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/qqc2-breeze-style-5.23.5.tar.xz"; - sha256 = "15i9h2md54a1h7isvma4x9pni3iy0bk84z8ibn3a36ydimyq5hra"; - name = "qqc2-breeze-style-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/qqc2-breeze-style-5.24.0.tar.xz"; + sha256 = "11kwrqsq5i1y1kvhg75hvax7bz122cjdsvb66f6hvni09yfcgyci"; + name = "qqc2-breeze-style-5.24.0.tar.xz"; }; }; sddm-kcm = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/sddm-kcm-5.23.5.tar.xz"; - sha256 = "0csj1gml8w29dzv62zpbia9g10qz5k1nzv1yywsvay1q8rbqccxv"; - name = "sddm-kcm-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/sddm-kcm-5.24.0.tar.xz"; + sha256 = "011b68vca8nnmj9rxlyl5gl3xrrbysmcrx8szyfhha0wl9rgy2hx"; + name = "sddm-kcm-5.24.0.tar.xz"; }; }; systemsettings = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/systemsettings-5.23.5.tar.xz"; - sha256 = "0shsqancxbxy6f4fd9m2a30x7gnjmd6gb8kq4nhlj6rramcwn3jh"; - name = "systemsettings-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/systemsettings-5.24.0.tar.xz"; + sha256 = "1jx1kllfd5561fq11d90r7m68736rsdlyzb109yq8awdwrl1vkp3"; + name = "systemsettings-5.24.0.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.23.5"; + version = "5.24.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/xdg-desktop-portal-kde-5.23.5.tar.xz"; - sha256 = "09s3fpjdrnxqvnyxmxva0rx612d6pxv28qqvm00hzrb23nxz6qgb"; - name = "xdg-desktop-portal-kde-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.0/xdg-desktop-portal-kde-5.24.0.tar.xz"; + sha256 = "0f5wv4557avzcn7gf2hjqpn2p9r0d16k1iqcijzcfdmnvh2cp69d"; + name = "xdg-desktop-portal-kde-5.24.0.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 9ff906f7974..c83bbcecf56 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "systemsettings"; + pname = "systemsettings"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 60d4867cb47..00533367d4c 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "xdg-desktop-portal-kde"; + pname = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ cups libepoxy mesa pcre pipewire wayland wayland-protocols diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix index 4743099506c..fb070ed3652 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; - version = "1.2.6"; - sha256 = "sha256-HS+9pBCHy0NmDVUwL8QFDPeVpKyKib8YCwV8fZDL5Uc="; + version = "1.2.7"; + sha256 = "sha256-M+BehEYcHZlnuYwBlI7F0aPxPGwExTL5I9Jf6W5ugOY="; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/development/compilers/4th/001-install-manual-fixup.diff b/pkgs/development/compilers/4th/001-install-manual-fixup.diff new file mode 100644 index 00000000000..6002e7a0d99 --- /dev/null +++ b/pkgs/development/compilers/4th/001-install-manual-fixup.diff @@ -0,0 +1,12 @@ +diff -Naur 4th-3.64.0-old/sources/Makefile 4th-3.64.0-new/sources/Makefile +--- 4th-3.64.0-old/sources/Makefile 2022-03-15 12:37:45.925122854 -0300 ++++ 4th-3.64.0-new/sources/Makefile 2022-03-15 12:38:50.987870211 -0300 +@@ -125,7 +125,7 @@ + + install: mostlyinstall + install -Dm644 ../documentation/4th.1 $(MANDIR)/man1/4th.1 +- install -Dm644 ../documentation/4tHmanual.txt $(DOCDIR)/4th/ ++ install -Dm644 ../documentation/4tHmanual.pdf $(DOCDIR)/4th/ + + uninstall: + -rm -f $(LIBRARIES)/lib4th.{a,so*} diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix index a8923879c06..d76a5cc733c 100644 --- a/pkgs/development/compilers/4th/default.nix +++ b/pkgs/development/compilers/4th/default.nix @@ -2,13 +2,18 @@ stdenv.mkDerivation rec { pname = "4th"; - version = "3.62.5"; + version = "3.64.0"; src = fetchurl { url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz"; - sha256 = "sha256-+CL33Yz7CxdEpi1lPG7+kzV4rheJ7GCgiFCaOLyktPw="; + hash = "sha256-wJBekjFsFRIkhY/P/yHBQ8he+k+fGyrePGTP2Yjgpqg="; }; + patches = [ + # Fix install manual; report this patch to upstream + ./001-install-manual-fixup.diff + ]; + dontConfigure = true; makeFlags = [ @@ -31,9 +36,11 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A portable Forth compiler"; homepage = "https://thebeez.home.xs4all.nl/4tH/index.html"; - license = licenses.lgpl3; - platforms = platforms.all; + description = "A portable Forth compiler"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; }; } +# TODO: set Makefile according to platform diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/development/compilers/bs-platform/ocaml.nix index d650d767a8d..05fb8b6b17e 100644 --- a/pkgs/development/compilers/bs-platform/ocaml.nix +++ b/pkgs/development/compilers/bs-platform/ocaml.nix @@ -1,7 +1,7 @@ { lib, stdenv, src, version }: stdenv.mkDerivation rec { inherit src version; - name = "ocaml-${version}+bs"; + pname = "ocaml-bs"; configurePhase = '' ./configure -prefix $out ''; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 4ac820b7e01..280e0fdd230 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -33,6 +33,7 @@ let i686-linux = "linux-i686"; x86_64-darwin = "darwin-x86_64"; aarch64-darwin = "darwin-universal"; + aarch64-linux = "linux-aarch64"; }; arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); @@ -40,13 +41,19 @@ let checkInputs = [ git gmp openssl readline libxml2 libyaml ]; + binaryUrl = version: rel: + if arch == archs.aarch64-linux then + "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz" + else + "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; + genericBinary = { version, sha256s, rel ? 1 }: stdenv.mkDerivation rec { pname = "crystal-binary"; inherit version; src = fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; + url = binaryUrl version rel; sha256 = sha256s.${stdenv.system}; }; @@ -225,6 +232,7 @@ rec { x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; + aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53"; }; }; diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index f408d7b3312..46832e1cc2d 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -61,8 +61,6 @@ stdenv.mkDerivation rec { gtk2 glib fontconfig freetype unixODBC alsa-lib ]; - rpath = "${lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64"; - unpackPhase = '' sh $src --keep --noexec @@ -119,6 +117,12 @@ stdenv.mkDerivation rec { fi done mv pkg/builds/cuda_nvcc/nvvm $out/nvvm + + mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api + ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer + + mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64 + mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64 ''} rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? @@ -184,22 +188,35 @@ stdenv.mkDerivation rec { done ''; - preFixup = '' - while IFS= read -r -d ''$'\0' i; do - if ! isELF "$i"; then continue; fi - echo "patching $i..." - if [[ ! $i =~ \.so ]]; then - patchelf \ - --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i - fi - if [[ $i =~ libcudart ]]; then - patchelf --remove-rpath $i - else - rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 - patchelf --set-rpath "$rpath2" --force-rpath $i - fi - done < <(find $out $lib $doc -type f -print0) - ''; + preFixup = + let rpath = lib.concatStringsSep ":" [ + (lib.makeLibraryPath (runtimeDependencies ++ [ "$lib" "$out" "$out/nvvm" ])) + "${stdenv.cc.cc.lib}/lib64" + "$out/jre/lib/amd64/jli" + "$out/lib64" + "$out/nvvm/lib64" + ]; + in + '' + while IFS= read -r -d $'\0' i; do + if ! isELF "$i"; then continue; fi + echo "patching $i..." + if [[ ! $i =~ \.so ]]; then + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $i + fi + if [[ $i =~ libcudart ]]; then + patchelf --remove-rpath $i + else + patchelf --set-rpath "${rpath}" --force-rpath $i + fi + done < <(find $out $lib $doc -type f -print0) + '' + lib.optionalString (lib.versionAtLeast version "11") '' + for file in $out/target-linux-x64/*.so; do + echo "patching $file..." + patchelf --set-rpath "${rpath}:\$ORIGIN" $file + done + ''; # Set RPATH so that libcuda and other libraries in # /run/opengl-driver(-32)/lib can be found. See the explanation in @@ -208,6 +225,10 @@ stdenv.mkDerivation rec { # --force-rpath prevents changing RPATH (set above) to RUNPATH. postFixup = '' addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so + '' + lib.optionalString (lib.versionAtLeast version "11") '' + addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/* + addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/x86/* + addOpenGLRunpath $out/target-linux-x64/* ''; # cuda-gdb doesn't run correctly when not using sandboxing, so diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index a284caffa5d..6e6b27c2cf7 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -80,9 +80,9 @@ rec { }; cudatoolkit_11_6 = common { - version = "11.6.0"; - url = "https://developer.download.nvidia.com/compute/cuda/11.6.0/local_installers/cuda_11.6.0_510.39.01_linux.run"; - sha256 = "10wcv42ljp7hz1k0wzgwb4hi8834rfipzdc01428c1wpcdnxm0qp"; + version = "11.6.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run"; + sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4="; gcc = gcc10; # can bump to 11 along with stdenv.cc }; diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/development/compilers/dictu/default.nix index 8ff6a5120f7..94871fd7d7c 100644 --- a/pkgs/development/compilers/dictu/default.nix +++ b/pkgs/development/compilers/dictu/default.nix @@ -13,13 +13,13 @@ assert enableLTO -> stdenv.cc.isGNU; stdenv.mkDerivation rec { pname = "dictu"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "dictu-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K/RbkRK8nCkmaNwWplWe2nWtULhn/GCNPXYStfMeUPg="; + sha256 = "sha256-EYoLEyK8jh4z3/9aMuUBt0pCwks7NIevsK2mOh8x6bQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 21cc6c8227c..55deb594706 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -4,9 +4,11 @@ }: assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; + { lib , stdenv , fetchurl +, writeText , libunwind , openssl , icu @@ -87,6 +89,13 @@ in stdenv.mkDerivation rec { $out/bin/dotnet --info ''; + setupHook = writeText "dotnet-setup-hook" '' + export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dont try to expand NuGetFallbackFolder to disk + export DOTNET_NOLOGO=1 # Disables the welcome message + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + ''; + meta = with lib; { homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index e60d647f6d3..47ea90482b6 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -33,7 +33,7 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "202108"; + version = "202202"; # submodules src = fetchFromGitHub { @@ -41,21 +41,9 @@ edk2 = buildStdenv.mkDerivation { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2"; + sha256 = "0srmhi6c27n5vyl01nhh0fq8k4vngbwn79siyjvcacjbj2ivhh8d"; }; - patches = [ - # Pull upstream fix for gcc-11 build. - (fetchpatch { - name = "gcc-11-vla.patch"; - url = "https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b.patch"; - sha256 = "10c6ibnxh4f8lrh9i498nywgva32jxy2c1zzvr9mcqgblf9d19pj"; - # Apply submodule patch to subdirectory: "a/" -> "BaseTools/Source/C/BrotliCompress/brotli/" - stripLen = 1; - extraPrefix = "BaseTools/Source/C/BrotliCompress/brotli/"; - }) - ]; - buildInputs = [ libuuid pythonEnv ]; makeFlags = [ "-C BaseTools" ] @@ -75,7 +63,7 @@ edk2 = buildStdenv.mkDerivation { meta = with lib; { description = "Intel EFI development kit"; - homepage = "https://sourceforge.net/projects/edk2/"; + homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/"; license = licenses.bsd2; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; }; diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 9f4263b08ed..d9f809c0a0a 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.29"; + version = "1.73.30"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "sha256-Yyj02DRo9wTkJ01ukOwElHr1ZyZFPOMTibwyAkqYISs="; + sha256 = "sha256-dRlQUaWIHbu+DwQBFh6Tf4o2u0LTRw/Ehp2hT9LC8QE="; }; installPhase = '' diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 891751a6ad6..3f704b52572 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.19.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pJ4RSijuwdKAL24WzcDIQen1RGofN1tUlbAA18zUvBE="; + sha256 = "sha256-AK+eb0eJyI7ALn7sg0wz4GzHthxrJWd1PVT5bL9LKWA="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-f/6LdvKRykpBX2GlRuyUcSD719f6XzhbMHzhrGNU0Cg="; + cargoSha256 = "sha256-kFTAPbP42sbhsvP069ua0ys1Dw7W+Gdsv2YaGrzorIk="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 2b7c6a2f071..25bedd397b2 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testVersion }: -buildGoModule rec { +let self = buildGoModule rec { pname = "go-jsonnet"; version = "0.18.0"; @@ -15,12 +15,19 @@ buildGoModule rec { doCheck = false; - subPackages = [ "cmd/jsonnet" "cmd/jsonnetfmt" ]; + subPackages = [ "cmd/jsonnet*" ]; + + passthru.tests.version = testVersion { + package = self; + version = "v${version}"; + }; meta = with lib; { description = "An implementation of Jsonnet in pure Go"; homepage = "https://github.com/google/go-jsonnet"; license = licenses.asl20; - maintainers = with maintainers; [ nshalman ]; + maintainers = with maintainers; [ nshalman aaronjheng ]; + mainProgram = "jsonnet"; }; -} +}; +in self diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 46591d2369d..872ade45946 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.14"; + version = "1.16.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-RniYzTohbeVNy5AU9UHv536beacVTbwf0t13iwxj+1Y="; + sha256 = "sha256-kKCMaJJ54184ZbpRCZjDOmMlXDYImz7CBskS/AVow9M="; }; # perl is used for testing go vet @@ -168,6 +168,7 @@ stdenv.mkDerivation rec { ./creds-test.patch ./go-1.9-skip-flaky-19608.patch ./go-1.9-skip-flaky-20072.patch + ./skip-chown-tests-1.16.patch ./skip-external-network-tests-1.16.patch ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 4b2a3d39a98..a7259358749 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -168,6 +168,7 @@ stdenv.mkDerivation rec { ./creds-test.patch ./go-1.9-skip-flaky-19608.patch ./go-1.9-skip-flaky-20072.patch + ./skip-chown-tests-1.16.patch ./skip-external-network-tests-1.16.patch ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 17c31051999..23e9f70d4da 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.18rc1"; + version = "1.18"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-XOx6ZlMAj6hfiCGzNmXeN74om3oC8X829wWojEOYC7g="; + sha256 = "sha256-OPQj20zINIg/K1I0QoL6ejn7uTZQ3GKhH98L5kCb2tY="; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index d5277899892..4ac022be6a9 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -3,7 +3,7 @@ let ocamlDependencies = version: if lib.versionAtLeast version "4.2" - then with ocaml-ng.ocamlPackages; [ + then with ocaml-ng.ocamlPackages_4_12; [ ocaml findlib sedlex_2 diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix index 688ca15177a..ea1af60993f 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -4,7 +4,7 @@ automake, autoconf, libtool, clangStdenv } : clangStdenv.mkDerivation rec { - name = "ios-cross-compile-${version}"; + pname = "ios-cross-compile"; version = "9.2"; sdk = "iPhoneOS9.2.sdk"; cctools_port = fetchFromGitHub { diff --git a/pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch b/pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch new file mode 100644 index 00000000000..8007ba05f6e --- /dev/null +++ b/pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch @@ -0,0 +1,18 @@ +diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp +index 94a7553e273b..8a1d455950b2 100644 +--- a/lib/Driver/Driver.cpp ++++ b/lib/Driver/Driver.cpp +@@ -412,6 +412,13 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const { + } + #endif + ++ { ++ Arg *A = DAL->MakeFlagArg(/*BaseArg=*/nullptr, ++ Opts.getOption(options::OPT_nostdlibinc)); ++ A->claim(); ++ DAL->append(A); ++ } ++ + return DAL; + } + diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index 6c227f1ae72..62b9e0470a6 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -42,6 +42,7 @@ let # mis-compilation in firefox. # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 ./revert-malloc-alignment-assumption.patch + ./add-nostdlibinc-flag.patch (substituteAll { src = ../../clang-11-12-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; @@ -51,10 +52,6 @@ let 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 - # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index be5e9404cdd..874be111ade 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -18,7 +18,7 @@ }: let - release_version = "13.0.0"; + release_version = "13.0.1"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "0cjl0vssi4y2g4nfr710fb6cdhxmn5r0vis15sf088zsc5zydfhw"; + sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; }; llvm_meta = { diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 6f4a0d8ee75..ce126f7b502 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -19,7 +19,7 @@ let release_version = "14.0.0"; - candidate = "rc1"; # empty or "rcN" + candidate = "rc4"; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit rev-version = ""; # When using a Git commit @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "sha256-bO13J5bhE4YVGvoaTuzFgf62HYh+Shv6T0u07CFjI9E="; + sha256 = "0xm3hscg6xv48rjdi7sg9ky960af1qyg5k3jyavnaqimlaj9wxgp"; }; llvm_meta = { diff --git a/pkgs/development/compilers/llvm/14/libcxxabi/default.nix b/pkgs/development/compilers/llvm/14/libcxxabi/default.nix index d64708ab040..07aaa2737ce 100644 --- a/pkgs/development/compilers/llvm/14/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/14/libcxxabi/default.nix @@ -82,5 +82,6 @@ stdenv.mkDerivation rec { # the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; + broken = true; # TODO: gnu-install-dirs.patch fails to apply }; } diff --git a/pkgs/development/compilers/llvm/14/libunwind/default.nix b/pkgs/development/compilers/llvm/14/libunwind/default.nix index c6d9eda5e47..109b92f1e02 100644 --- a/pkgs/development/compilers/llvm/14/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/14/libunwind/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { I). It is a dependency of the C++ ABI library, and sometimes is a dependency of other runtimes. ''; + broken = true; # TODO: gnu-install-dirs.patch fails to apply }; } diff --git a/pkgs/development/compilers/llvm/14/lldb/default.nix b/pkgs/development/compilers/llvm/14/lldb/default.nix index a2c68b22477..fdfb550c280 100644 --- a/pkgs/development/compilers/llvm/14/lldb/default.nix +++ b/pkgs/development/compilers/llvm/14/lldb/default.nix @@ -115,6 +115,7 @@ stdenv.mkDerivation (rec { larger LLVM Project, such as the Clang expression parser and LLVM disassembler. ''; + broken = stdenv.isDarwin; # error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E' }; } // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index d2059cc66ba..05aac728b45 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -209,6 +209,9 @@ in stdenv.mkDerivation (rec { checkTarget = "check-all"; + # For the update script: + passthru.monorepoSrc = monorepoSrc; + requiredSystemFeatures = [ "big-parallel" ]; meta = llvm_meta // { homepage = "https://llvm.org/"; diff --git a/pkgs/development/compilers/llvm/14/openmp/default.nix b/pkgs/development/compilers/llvm/14/openmp/default.nix index 7add0c7ed46..2b580a9c169 100644 --- a/pkgs/development/compilers/llvm/14/openmp/default.nix +++ b/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { # "All of the code is dual licensed under the MIT license and the UIUC # License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; + broken = true; # TODO: gnu-install-dirs.patch fails to apply }; } diff --git a/pkgs/development/compilers/llvm/update.sh b/pkgs/development/compilers/llvm/update.sh index 603c603f275..95ad356dbd9 100755 --- a/pkgs/development/compilers/llvm/update.sh +++ b/pkgs/development/compilers/llvm/update.sh @@ -20,7 +20,11 @@ sed -Ei \ readonly ATTRSET="llvmPackages_$VERSION_MAJOR" -if [ "$VERSION_MAJOR" -ge "13" ]; then +if [ "$VERSION_MAJOR" -ge "14" ]; then + readonly SOURCES=( + "llvm.monorepoSrc" + ) +elif [ "$VERSION_MAJOR" -eq "13" ]; then readonly SOURCES=( "llvm.src" ) @@ -43,7 +47,7 @@ fi for SOURCE in "${SOURCES[@]}"; do echo "Updating the hash of $SOURCE:" declare ATTR="$ATTRSET.$SOURCE" - declare OLD_HASH="$(nix eval -f . $ATTR.outputHash)" + declare OLD_HASH="$(nix --extra-experimental-features nix-command eval -f . $ATTR.outputHash)" declare NEW_HASH="\"$(nix-prefetch-url -A $ATTR)\"" find "$DIR" -type f -exec sed -i "s/$OLD_HASH/$NEW_HASH/" {} + done diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index c67f8d2f72f..75b3d1128e4 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -12,7 +12,8 @@ let "-x86-64"; in stdenv.mkDerivation { - name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}"; + pname = "mit-scheme" + lib.optionalString enableX11 "-x11"; + inherit version; # MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from # the platform-specific tarballs, which contain pre-built binaries. It diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix index 0662e66e0b6..4be2bcf5f9d 100644 --- a/pkgs/development/compilers/ocaml/4.12.nix +++ b/pkgs/development/compilers/ocaml/4.12.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "12"; - patch_version = "0"; - sha256 = "1hxy349jfa2vkfgmxf6pvd9w4z5bmcgsg0fxfdabcghyvjw9vvir"; + patch_version = "1"; + sha256 = "1jbjjnmqq6ymsy81x188i256bz4z5jrz1pws8g1qf59c32ganjkf"; } diff --git a/pkgs/development/compilers/ocaml/4.14.nix b/pkgs/development/compilers/ocaml/4.14.nix new file mode 100644 index 00000000000..96e1c13d285 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.14.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "14"; + patch_version = "0-beta1"; + src = fetchTarball { + url = "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~beta1.tar.xz"; + sha256 = "0jiz20hb58jbbk8j38agx11ra4hg0v3prmzc5a9j70lm09mnzfcd"; + }; +} diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index de2dae156ee..dc2af6e7835 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -2,24 +2,24 @@ , lib , fetchFromGitHub , unstableGitUpdater +, dosbox # Docs cause an immense increase in build time, up to 2 additional hours , withDocs ? false -, dosbox , ghostscript , withGUI ? false }: stdenv.mkDerivation rec { pname = "open-watcom-v2"; - version = "unstable-2022-01-18"; + version = "unstable-2022-03-14"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "f09e0c969c45679c048180f2dc6b3dbbe69e42a0"; - sha256 = "dEjG4L/VVufSAerKcXPUqZ7esz4m8/210ZshVz4SNAA="; + rev = "22627ccc1bd3de70aff9ac056e0dc9ecf7f7b6ec"; + sha256 = "khy/fhmQjTGKfx6iOUBt+ySwpEx0df/7meyNvBnJAPY="; }; postPatch = '' @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { --replace '-static' "" ''; - nativeBuildInputs = [ ] - ++ lib.optional (withDocs || withGUI) dosbox + nativeBuildInputs = [ dosbox ] ++ lib.optional withDocs ghostscript; configurePhase = '' @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { export OWGUINOBUILD=${if withGUI then "0" else "1"} export OWNOBUILD= export OWDISTRBUILD=0 - export OWDOSBOX=${lib.optionalString (withDocs || withGUI) "${dosbox}/bin/dosbox"} + export OWDOSBOX=${dosbox}/bin/dosbox export OWVERBOSE=0 export OWRELROOT=$out diff --git a/pkgs/development/compilers/openjdk/jre.nix b/pkgs/development/compilers/openjdk/jre.nix index 78dec7885d9..02f6da928cd 100644 --- a/pkgs/development/compilers/openjdk/jre.nix +++ b/pkgs/development/compilers/openjdk/jre.nix @@ -7,7 +7,7 @@ let jre = stdenv.mkDerivation { - name = "${jdk.name}-minimal-jre"; + pname = "${jdk.pname}-minimal-jre"; version = jdk.version; buildInputs = [ jdk ]; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 713b32a349b..40681faae8a 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -66,7 +66,7 @@ let in let result = stdenv.mkDerivation rec { - pname = if installjdk then "oraclejdk" else "oraclejre"; + pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin"; version = "${productVersion}u${patchVersion}"; src = diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 736a9d3c34c..53b05c16d9a 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -7,7 +7,7 @@ let boost_static = boost165.override { enableStatic = true; }; in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this - name = "openshadinglanguage-${version}"; + pname = "openshadinglanguage"; version = "1.10.9"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index 52397f78b8a..ee057f26c42 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "unstable-2021-12-05"; + version = "unstable-2022-03-11"; src = fetchgit { url = "git://c9x.me/qbe.git"; - rev = "367c8215d99054892740ad74c690b106c45ebf60"; - sha256 = "sha256-xhTEiFR1RXMHtxmXlRof3O8monXEjstyWP3GClZmMuU="; + rev = "c7842d84da65bcaf2d3c82aa69fb3ec930c7369f"; + sha256 = "sha256-fbxeoMJcVltrIGRLdJtxWykGIop8DVzpfrBatXniDPk="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 0937ff8bd84..cc99aa078f9 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,16 +1,14 @@ -{ lib, callPackage, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 +{ lib, callPackage, stdenv, makeWrapper, fetchurl, ocaml, findlib, dune_2 , fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.7.0"; + version = "3.8.0"; - src = fetchFromGitHub { - owner = "facebook"; - repo = "reason"; - rev = "daa11255cb4716ce1c370925251021bd6e3bd974"; - sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs"; + src = fetchurl { + url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; + sha256 = "sha256:0yc94m3ddk599crg33yxvkphxpy54kmdsl599c320wvn055p4y4l"; }; nativeBuildInputs = [ @@ -39,11 +37,13 @@ stdenv.mkDerivation rec { buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed installPhase = '' + runHook preInstall dune install --prefix=$out --libdir=$OCAMLFIND_DESTDIR wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \ --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" + runHook postInstall ''; passthru.tests = { diff --git a/pkgs/development/compilers/roslyn/create-deps.sh b/pkgs/development/compilers/roslyn/create-deps.sh index 5bdc37956b5..f5da4acd8bf 100755 --- a/pkgs/development/compilers/roslyn/create-deps.sh +++ b/pkgs/development/compilers/roslyn/create-deps.sh @@ -48,7 +48,7 @@ do sha256=$(nix-prefetch-url "$url" 2>/dev/null) cat << EOL { - name = "$package"; + pname = "$package"; version = "$version"; src = fetchurl { url = "$url"; diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/development/compilers/roslyn/default.nix index df07eea54e2..69cca6b13d9 100644 --- a/pkgs/development/compilers/roslyn/default.nix +++ b/pkgs/development/compilers/roslyn/default.nix @@ -13,8 +13,7 @@ let deps = map (package: stdenv.mkDerivation (with package; { - pname = name; - inherit version src; + inherit pname version src; buildInputs = [ unzip ]; unpackPhase = '' @@ -40,7 +39,7 @@ let installPhase = '' runHook preInstall - package=$out/lib/dotnet/${name}/${version} + package=$out/lib/dotnet/${pname}/${version} mkdir -p $package cp -r . $package echo "{}" > $package/.nupkg.metadata diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix index b08bd0740a4..61835f74e76 100644 --- a/pkgs/development/compilers/roslyn/deps.nix +++ b/pkgs/development/compilers/roslyn/deps.nix @@ -1,6 +1,6 @@ { fetchurl }: [ { - name = "microsoft.aspnetcore.app.ref"; + pname = "microsoft.aspnetcore.app.ref"; version = "3.1.10"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"; @@ -8,7 +8,7 @@ }; } { - name = "microsoft.build.framework"; + pname = "microsoft.build.framework"; version = "15.3.409"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/15.3.409/microsoft.build.framework.15.3.409.nupkg"; @@ -16,7 +16,7 @@ }; } { - name = "microsoft.build.tasks.core"; + pname = "microsoft.build.tasks.core"; version = "15.3.409"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/15.3.409/microsoft.build.tasks.core.15.3.409.nupkg"; @@ -24,7 +24,7 @@ }; } { - name = "microsoft.build.tasks.git"; + pname = "microsoft.build.tasks.git"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.build.tasks.git/1.1.0-beta-20206-02/microsoft.build.tasks.git.1.1.0-beta-20206-02.nupkg"; @@ -32,7 +32,7 @@ }; } { - name = "microsoft.build.utilities.core"; + pname = "microsoft.build.utilities.core"; version = "15.3.409"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/15.3.409/microsoft.build.utilities.core.15.3.409.nupkg"; @@ -40,7 +40,7 @@ }; } { - name = "microsoft.codeanalysis.analyzers"; + pname = "microsoft.codeanalysis.analyzers"; version = "3.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.0.0/microsoft.codeanalysis.analyzers.3.0.0.nupkg"; @@ -48,7 +48,7 @@ }; } { - name = "microsoft.codeanalysis.bannedapianalyzers"; + pname = "microsoft.codeanalysis.bannedapianalyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.bannedapianalyzers.3.3.2-beta1.20562.1.nupkg"; @@ -56,7 +56,7 @@ }; } { - name = "microsoft.codeanalysis.common"; + pname = "microsoft.codeanalysis.common"; version = "3.8.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/3.8.0/microsoft.codeanalysis.common.3.8.0.nupkg"; @@ -64,7 +64,7 @@ }; } { - name = "microsoft.codeanalysis.csharp.codestyle"; + pname = "microsoft.codeanalysis.csharp.codestyle"; version = "3.8.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.csharp.codestyle/3.8.0/microsoft.codeanalysis.csharp.codestyle.3.8.0.nupkg"; @@ -72,7 +72,7 @@ }; } { - name = "microsoft.codeanalysis.netanalyzers"; + pname = "microsoft.codeanalysis.netanalyzers"; version = "6.0.0-preview1.21054.10"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/6.0.0-preview1.21054.10/microsoft.codeanalysis.netanalyzers.6.0.0-preview1.21054.10.nupkg"; @@ -80,7 +80,7 @@ }; } { - name = "microsoft.codeanalysis.performancesensitiveanalyzers"; + pname = "microsoft.codeanalysis.performancesensitiveanalyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.2-beta1.20562.1.nupkg"; @@ -88,7 +88,7 @@ }; } { - name = "microsoft.codeanalysis.publicapianalyzers"; + pname = "microsoft.codeanalysis.publicapianalyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.publicapianalyzers.3.3.2-beta1.20562.1.nupkg"; @@ -96,7 +96,7 @@ }; } { - name = "microsoft.codeanalysis.visualbasic.codestyle"; + pname = "microsoft.codeanalysis.visualbasic.codestyle"; version = "3.8.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.visualbasic.codestyle/3.8.0/microsoft.codeanalysis.visualbasic.codestyle.3.8.0.nupkg"; @@ -104,7 +104,7 @@ }; } { - name = "microsoft.csharp"; + pname = "microsoft.csharp"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.3.0/microsoft.csharp.4.3.0.nupkg"; @@ -112,7 +112,7 @@ }; } { - name = "microsoft.diasymreader.native"; + pname = "microsoft.diasymreader.native"; version = "16.9.0-beta1.21055.5"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader.native/16.9.0-beta1.21055.5/microsoft.diasymreader.native.16.9.0-beta1.21055.5.nupkg"; @@ -120,7 +120,7 @@ }; } { - name = "microsoft.dotnet.arcade.sdk"; + pname = "microsoft.dotnet.arcade.sdk"; version = "1.0.0-beta.21072.7"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/1.0.0-beta.21072.7/microsoft.dotnet.arcade.sdk.1.0.0-beta.21072.7.nupkg"; @@ -128,7 +128,7 @@ }; } { - name = "microsoft.net.compilers.toolset"; + pname = "microsoft.net.compilers.toolset"; version = "3.10.0-1.21101.2"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/3.10.0-1.21101.2/microsoft.net.compilers.toolset.3.10.0-1.21101.2.nupkg"; @@ -136,7 +136,7 @@ }; } { - name = "microsoft.netcore.app.host.linux-x64"; + pname = "microsoft.netcore.app.host.linux-x64"; version = "3.1.21"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.21/microsoft.netcore.app.host.linux-x64.3.1.21.nupkg"; @@ -144,7 +144,7 @@ }; } { - name = "microsoft.netcore.app.host.linux-arm64"; + pname = "microsoft.netcore.app.host.linux-arm64"; version = "3.1.21"; src = fetchurl { url = "https://globalcdn.nuget.org/packages/microsoft.netcore.app.host.linux-arm64.3.1.21.nupkg"; @@ -152,7 +152,7 @@ }; } { - name = "microsoft.netcore.app.ref"; + pname = "microsoft.netcore.app.ref"; version = "3.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"; @@ -160,7 +160,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "1.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; @@ -168,7 +168,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "1.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; @@ -176,7 +176,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "2.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/2.1.0/microsoft.netcore.platforms.2.1.0.nupkg"; @@ -184,7 +184,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "2.1.2"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg"; @@ -192,7 +192,7 @@ }; } { - name = "microsoft.netcore.targets"; + pname = "microsoft.netcore.targets"; version = "1.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; @@ -200,7 +200,7 @@ }; } { - name = "microsoft.netcore.targets"; + pname = "microsoft.netcore.targets"; version = "1.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; @@ -208,7 +208,7 @@ }; } { - name = "microsoft.netframework.referenceassemblies"; + pname = "microsoft.netframework.referenceassemblies"; version = "1.0.0-preview.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.0-preview.1/microsoft.netframework.referenceassemblies.1.0.0-preview.1.nupkg"; @@ -216,7 +216,7 @@ }; } { - name = "microsoft.netframework.referenceassemblies.net472"; + pname = "microsoft.netframework.referenceassemblies.net472"; version = "1.0.0-preview.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.0-preview.1/microsoft.netframework.referenceassemblies.net472.1.0.0-preview.1.nupkg"; @@ -224,7 +224,7 @@ }; } { - name = "microsoft.sourcelink.azurerepos.git"; + pname = "microsoft.sourcelink.azurerepos.git"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.1.0-beta-20206-02/microsoft.sourcelink.azurerepos.git.1.1.0-beta-20206-02.nupkg"; @@ -232,7 +232,7 @@ }; } { - name = "microsoft.sourcelink.common"; + pname = "microsoft.sourcelink.common"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.common/1.1.0-beta-20206-02/microsoft.sourcelink.common.1.1.0-beta-20206-02.nupkg"; @@ -240,7 +240,7 @@ }; } { - name = "microsoft.sourcelink.github"; + pname = "microsoft.sourcelink.github"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.github/1.1.0-beta-20206-02/microsoft.sourcelink.github.1.1.0-beta-20206-02.nupkg"; @@ -248,7 +248,7 @@ }; } { - name = "microsoft.visualstudio.threading.analyzers"; + pname = "microsoft.visualstudio.threading.analyzers"; version = "16.8.55"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/16.8.55/microsoft.visualstudio.threading.analyzers.16.8.55.nupkg"; @@ -256,7 +256,7 @@ }; } { - name = "microsoft.win32.primitives"; + pname = "microsoft.win32.primitives"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg"; @@ -264,7 +264,7 @@ }; } { - name = "microsoft.win32.registry"; + pname = "microsoft.win32.registry"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.0.0/microsoft.win32.registry.4.0.0.nupkg"; @@ -272,7 +272,7 @@ }; } { - name = "netstandard.library"; + pname = "netstandard.library"; version = "2.0.3"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; @@ -280,7 +280,7 @@ }; } { - name = "richcodenav.envvardump"; + pname = "richcodenav.envvardump"; version = "0.1.1643-alpha"; src = fetchurl { url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"; @@ -288,7 +288,7 @@ }; } { - name = "roslyn.diagnostics.analyzers"; + pname = "roslyn.diagnostics.analyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.3.2-beta1.20562.1/roslyn.diagnostics.analyzers.3.3.2-beta1.20562.1.nupkg"; @@ -296,7 +296,7 @@ }; } { - name = "runtime.native.system"; + pname = "runtime.native.system"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg"; @@ -304,7 +304,7 @@ }; } { - name = "runtime.native.system.net.http"; + pname = "runtime.native.system.net.http"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.net.http/4.0.1/runtime.native.system.net.http.4.0.1.nupkg"; @@ -312,7 +312,7 @@ }; } { - name = "runtime.native.system.security.cryptography"; + pname = "runtime.native.system.security.cryptography"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography/4.0.0/runtime.native.system.security.cryptography.4.0.0.nupkg"; @@ -320,7 +320,7 @@ }; } { - name = "system.appcontext"; + pname = "system.appcontext"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg"; @@ -328,7 +328,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.5.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; @@ -336,7 +336,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg"; @@ -344,7 +344,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; @@ -352,7 +352,7 @@ }; } { - name = "system.collections.concurrent"; + pname = "system.collections.concurrent"; version = "4.0.12"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"; @@ -360,7 +360,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.2.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg"; @@ -368,7 +368,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.3.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.3.1/system.collections.immutable.1.3.1.nupkg"; @@ -376,7 +376,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "5.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; @@ -384,7 +384,7 @@ }; } { - name = "system.collections.nongeneric"; + pname = "system.collections.nongeneric"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.nongeneric/4.0.1/system.collections.nongeneric.4.0.1.nupkg"; @@ -392,7 +392,7 @@ }; } { - name = "system.console"; + pname = "system.console"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.0.0/system.console.4.0.0.nupkg"; @@ -400,7 +400,7 @@ }; } { - name = "system.diagnostics.debug"; + pname = "system.diagnostics.debug"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; @@ -408,7 +408,7 @@ }; } { - name = "system.diagnostics.debug"; + pname = "system.diagnostics.debug"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; @@ -416,7 +416,7 @@ }; } { - name = "system.diagnostics.process"; + pname = "system.diagnostics.process"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg"; @@ -424,7 +424,7 @@ }; } { - name = "system.diagnostics.tools"; + pname = "system.diagnostics.tools"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg"; @@ -432,7 +432,7 @@ }; } { - name = "system.diagnostics.tracesource"; + pname = "system.diagnostics.tracesource"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.0.0/system.diagnostics.tracesource.4.0.0.nupkg"; @@ -440,7 +440,7 @@ }; } { - name = "system.diagnostics.tracing"; + pname = "system.diagnostics.tracing"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"; @@ -448,7 +448,7 @@ }; } { - name = "system.dynamic.runtime"; + pname = "system.dynamic.runtime"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; @@ -456,7 +456,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; @@ -464,7 +464,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; @@ -472,7 +472,7 @@ }; } { - name = "system.globalization.calendars"; + pname = "system.globalization.calendars"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.0.1/system.globalization.calendars.4.0.1.nupkg"; @@ -480,7 +480,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg"; @@ -488,7 +488,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; @@ -496,7 +496,7 @@ }; } { - name = "system.io.filesystem"; + pname = "system.io.filesystem"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; @@ -504,7 +504,7 @@ }; } { - name = "system.io.filesystem.primitives"; + pname = "system.io.filesystem.primitives"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; @@ -512,7 +512,7 @@ }; } { - name = "system.io.pipes.accesscontrol"; + pname = "system.io.pipes.accesscontrol"; version = "4.5.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes.accesscontrol/4.5.1/system.io.pipes.accesscontrol.4.5.1.nupkg"; @@ -520,7 +520,7 @@ }; } { - name = "system.linq"; + pname = "system.linq"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg"; @@ -528,7 +528,7 @@ }; } { - name = "system.linq"; + pname = "system.linq"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg"; @@ -536,7 +536,7 @@ }; } { - name = "system.linq.expressions"; + pname = "system.linq.expressions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; @@ -544,7 +544,7 @@ }; } { - name = "system.linq.parallel"; + pname = "system.linq.parallel"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.parallel/4.0.1/system.linq.parallel.4.0.1.nupkg"; @@ -552,7 +552,7 @@ }; } { - name = "system.memory"; + pname = "system.memory"; version = "4.5.4"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg"; @@ -560,7 +560,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.4.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; @@ -568,7 +568,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.5.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; @@ -576,7 +576,7 @@ }; } { - name = "system.objectmodel"; + pname = "system.objectmodel"; version = "4.0.12"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; @@ -584,7 +584,7 @@ }; } { - name = "system.objectmodel"; + pname = "system.objectmodel"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; @@ -592,7 +592,7 @@ }; } { - name = "system.private.datacontractserialization"; + pname = "system.private.datacontractserialization"; version = "4.1.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.datacontractserialization/4.1.1/system.private.datacontractserialization.4.1.1.nupkg"; @@ -600,7 +600,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; @@ -608,7 +608,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; @@ -616,7 +616,7 @@ }; } { - name = "system.reflection.emit"; + pname = "system.reflection.emit"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; @@ -624,7 +624,7 @@ }; } { - name = "system.reflection.emit"; + pname = "system.reflection.emit"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; @@ -632,7 +632,7 @@ }; } { - name = "system.reflection.emit.ilgeneration"; + pname = "system.reflection.emit.ilgeneration"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; @@ -640,7 +640,7 @@ }; } { - name = "system.reflection.emit.ilgeneration"; + pname = "system.reflection.emit.ilgeneration"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg"; @@ -648,7 +648,7 @@ }; } { - name = "system.reflection.emit.lightweight"; + pname = "system.reflection.emit.lightweight"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; @@ -656,7 +656,7 @@ }; } { - name = "system.reflection.emit.lightweight"; + pname = "system.reflection.emit.lightweight"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; @@ -664,7 +664,7 @@ }; } { - name = "system.reflection.extensions"; + pname = "system.reflection.extensions"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; @@ -672,7 +672,7 @@ }; } { - name = "system.reflection.extensions"; + pname = "system.reflection.extensions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; @@ -680,7 +680,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "1.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.3.0/system.reflection.metadata.1.3.0.nupkg"; @@ -688,7 +688,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "5.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; @@ -696,7 +696,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; @@ -704,7 +704,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; @@ -712,7 +712,7 @@ }; } { - name = "system.reflection.typeextensions"; + pname = "system.reflection.typeextensions"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; @@ -720,7 +720,7 @@ }; } { - name = "system.reflection.typeextensions"; + pname = "system.reflection.typeextensions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg"; @@ -728,7 +728,7 @@ }; } { - name = "system.resources.reader"; + pname = "system.resources.reader"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.reader/4.0.0/system.resources.reader.4.0.0.nupkg"; @@ -736,7 +736,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; @@ -744,7 +744,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; @@ -752,7 +752,7 @@ }; } { - name = "system.resources.writer"; + pname = "system.resources.writer"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.writer/4.0.0/system.resources.writer.4.0.0.nupkg"; @@ -760,7 +760,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; @@ -768,7 +768,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; @@ -776,7 +776,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.7.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"; @@ -784,7 +784,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "5.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; @@ -792,7 +792,7 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.extensions"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; @@ -800,7 +800,7 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.extensions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; @@ -808,7 +808,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; @@ -816,7 +816,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; @@ -824,7 +824,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; @@ -832,7 +832,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; @@ -840,7 +840,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; @@ -848,7 +848,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; @@ -856,7 +856,7 @@ }; } { - name = "system.runtime.loader"; + pname = "system.runtime.loader"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; @@ -864,7 +864,7 @@ }; } { - name = "system.runtime.numerics"; + pname = "system.runtime.numerics"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.0.1/system.runtime.numerics.4.0.1.nupkg"; @@ -872,7 +872,7 @@ }; } { - name = "system.runtime.serialization.primitives"; + pname = "system.runtime.serialization.primitives"; version = "4.1.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; @@ -880,7 +880,7 @@ }; } { - name = "system.runtime.serialization.xml"; + pname = "system.runtime.serialization.xml"; version = "4.1.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.xml/4.1.1/system.runtime.serialization.xml.4.1.1.nupkg"; @@ -888,7 +888,7 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.security.accesscontrol"; version = "4.5.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; @@ -896,7 +896,7 @@ }; } { - name = "system.security.cryptography.algorithms"; + pname = "system.security.cryptography.algorithms"; version = "4.2.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.2.0/system.security.cryptography.algorithms.4.2.0.nupkg"; @@ -904,7 +904,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "4.2.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.cng/4.2.0/system.security.cryptography.cng.4.2.0.nupkg"; @@ -912,7 +912,7 @@ }; } { - name = "system.security.cryptography.csp"; + pname = "system.security.cryptography.csp"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.csp/4.0.0/system.security.cryptography.csp.4.0.0.nupkg"; @@ -920,7 +920,7 @@ }; } { - name = "system.security.cryptography.encoding"; + pname = "system.security.cryptography.encoding"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.0.0/system.security.cryptography.encoding.4.0.0.nupkg"; @@ -928,7 +928,7 @@ }; } { - name = "system.security.cryptography.openssl"; + pname = "system.security.cryptography.openssl"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.openssl/4.0.0/system.security.cryptography.openssl.4.0.0.nupkg"; @@ -936,7 +936,7 @@ }; } { - name = "system.security.cryptography.primitives"; + pname = "system.security.cryptography.primitives"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.0.0/system.security.cryptography.primitives.4.0.0.nupkg"; @@ -944,7 +944,7 @@ }; } { - name = "system.security.cryptography.x509certificates"; + pname = "system.security.cryptography.x509certificates"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.1.0/system.security.cryptography.x509certificates.4.1.0.nupkg"; @@ -952,7 +952,7 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal.windows"; version = "4.5.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; @@ -960,7 +960,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; @@ -968,7 +968,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; @@ -976,7 +976,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; @@ -984,7 +984,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.5.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"; @@ -992,7 +992,7 @@ }; } { - name = "system.text.encoding.extensions"; + pname = "system.text.encoding.extensions"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; @@ -1000,7 +1000,7 @@ }; } { - name = "system.text.regularexpressions"; + pname = "system.text.regularexpressions"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; @@ -1008,7 +1008,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg"; @@ -1016,7 +1016,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; @@ -1024,7 +1024,7 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.tasks"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; @@ -1032,7 +1032,7 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.tasks"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; @@ -1040,7 +1040,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; @@ -1048,7 +1048,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.5.4"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; @@ -1056,7 +1056,7 @@ }; } { - name = "system.threading.thread"; + pname = "system.threading.thread"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"; @@ -1064,7 +1064,7 @@ }; } { - name = "system.threading.threadpool"; + pname = "system.threading.threadpool"; version = "4.0.10"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.threadpool/4.0.10/system.threading.threadpool.4.0.10.nupkg"; @@ -1072,7 +1072,7 @@ }; } { - name = "system.threading.timer"; + pname = "system.threading.timer"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg"; @@ -1080,7 +1080,7 @@ }; } { - name = "system.xml.readerwriter"; + pname = "system.xml.readerwriter"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; @@ -1088,7 +1088,7 @@ }; } { - name = "system.xml.xdocument"; + pname = "system.xml.xdocument"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg"; @@ -1096,7 +1096,7 @@ }; } { - name = "system.xml.xmldocument"; + pname = "system.xml.xmldocument"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg"; @@ -1104,7 +1104,7 @@ }; } { - name = "system.xml.xmlserializer"; + pname = "system.xml.xmlserializer"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmlserializer/4.0.11/system.xml.xmlserializer.4.0.11.nupkg"; @@ -1112,7 +1112,7 @@ }; } { - name = "system.xml.xpath"; + pname = "system.xml.xpath"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath/4.0.1/system.xml.xpath.4.0.1.nupkg"; @@ -1120,7 +1120,7 @@ }; } { - name = "system.xml.xpath.xmldocument"; + pname = "system.xml.xpath.xmldocument"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath.xmldocument/4.0.1/system.xml.xpath.xmldocument.4.0.1.nupkg"; @@ -1128,7 +1128,7 @@ }; } { - name = "xlifftasks"; + pname = "xlifftasks"; version = "1.0.0-beta.20206.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xlifftasks/1.0.0-beta.20206.1/xlifftasks.1.0.0-beta.20206.1.nupkg"; diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index a3597e9febf..23b8e7effe1 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -1,6 +1,6 @@ { stdenv, lib, rustPlatform, rustc, Security, patchelf }: rustPlatform.buildRustPackage { - name = "clippy-${rustc.version}"; + pname = "clippy"; inherit (rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index 2071c48cc6d..b859d01dc08 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,4 +1,4 @@ -{ buildPackages, callPackage, stdenv }@prev: +{ buildPackages, callPackage, stdenv, runCommand }@prev: { rustc, cargo, stdenv ? prev.stdenv, ... }: @@ -21,11 +21,11 @@ rec { importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; rustcSrc = callPackage ./rust-src.nix { - inherit stdenv rustc; + inherit runCommand rustc; }; rustLibSrc = callPackage ./rust-lib-src.nix { - inherit stdenv rustc; + inherit runCommand rustc; }; # Hooks diff --git a/pkgs/development/compilers/rust/rust-lib-src.nix b/pkgs/development/compilers/rust/rust-lib-src.nix index 67a7fa3641a..aa914338639 100644 --- a/pkgs/development/compilers/rust/rust-lib-src.nix +++ b/pkgs/development/compilers/rust/rust-lib-src.nix @@ -1,11 +1,6 @@ -{ stdenv, rustc }: +{ runCommand, rustc }: -stdenv.mkDerivation { - name = "rust-lib-src"; - src = rustc.src; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mv library $out - ''; -} +runCommand "rust-lib-src" { } '' + tar --strip-components=1 -xzf ${rustc.src} + mv library $out +'' diff --git a/pkgs/development/compilers/rust/rust-src.nix b/pkgs/development/compilers/rust/rust-src.nix index 4239e92b036..69bdb37ac2f 100644 --- a/pkgs/development/compilers/rust/rust-src.nix +++ b/pkgs/development/compilers/rust/rust-src.nix @@ -1,25 +1,21 @@ -{ lib, stdenv, rustc, minimalContent ? true }: +{ lib, runCommand, rustc, minimalContent ? true }: -stdenv.mkDerivation { - name = "rust-src"; - src = rustc.src; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' - mv src $out - rm -rf $out/{${lib.concatStringsSep "," ([ - "ci" - "doc" - "etc" - "grammar" - "llvm-project" - "llvm-emscripten" - "rtstartup" - "rustllvm" - "test" - "vendor" - ] ++ lib.optionals minimalContent [ - "tools" - "stdarch" - ])}} - ''; -} +runCommand "rust-src" { } '' + tar -xzf ${rustc.src} + mv rustc-${rustc.version}-src $out + rm -rf $out/{${lib.concatStringsSep "," ([ + "ci" + "doc" + "etc" + "grammar" + "llvm-project" + "llvm-emscripten" + "rtstartup" + "rustllvm" + "test" + "vendor" + ] ++ lib.optionals minimalContent [ + "tools" + "stdarch" + ])}} +'' diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix index c99ed24c214..1cd187f2e54 100644 --- a/pkgs/development/compilers/scala/dotty.nix +++ b/pkgs/development/compilers/scala/dotty.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "dotty-${dotty-bare.version}"; + pname = "dotty"; + inherit (dotty-bare) version; dontUnpack = true; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 28a461b0988..8f6bc5e6dac 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "sdcc"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "0gskzli17ghnn5qllvn4d56qf9bvvclqjh63nnj63p52smvggvc1"; + sha256 = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM="; }; buildInputs = [ boost gputils texinfo zlib ]; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index e3a9aa2b486..f47d4cd818f 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -182,7 +182,8 @@ let in stdenv.mkDerivation { - name = "swift-${versions.swift}"; + pname = "swift"; + version = versions.swift; nativeBuildInputs = [ autoconf diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index 7381e7c89fe..66f1bda6d5f 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation { - name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}"; + pname = "urn${optionalString (extraLibraries != []) "-with-libraries"}"; + inherit version; src = fetchFromGitLab { owner = "urn"; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 1dc910c6222..72512a1202f 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -90,8 +90,8 @@ in rec { }; vala_0_54 = generic { - version = "0.54.6"; - sha256 = "SdYNlqP99sQoc5dEK8bW2Vv0CqffZ47kkSjEsRum5Gk="; + version = "0.54.7"; + sha256 = "Ygecof8C5dF65yqppa3GGuav3P67DZ8GBjo2776soMc="; }; vala = vala_0_54; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 30b9b839398..ecdebdda849 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.12+54"; + version = "0.15"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "59a71503448401d2476cf0872808e0a99c3a4d81"; - hash = "sha256-cz4PQymaA9UW91lN+6iniFhbcPRpFNIAeC8ZkwYeg0U="; + rev = "${pname}-${version}"; + hash = "sha256-1NCcsq0otVKTTSSmnX2kCvvngF1yzqYWlRVzu+XY65w="; }; enableParallelBuilding = true; @@ -143,7 +143,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Open RTL synthesis framework and tools"; - homepage = "http://www.clifford.at/yosys/"; + homepage = "https://yosyshq.net/yosys/"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ shell thoughtpolice emily ]; diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix index 420475806a0..a433840b7bc 100644 --- a/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -10,13 +10,13 @@ buildDotnetModule rec { pname = "python-language-server"; - version = "2021-09-08"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "microsoft"; repo = "python-language-server"; - rev = "26ea18997f45f7d7bc5a3c5a9efc723a8dbb02fa"; - sha256 = "1m8pf9k20wy4fzv27v3bswvc8s01ag6ka2qm9nn6bgq0s0lq78mh"; + rev = "52c1afd34b5acb0b44597bb8681232876fe94084"; + sha256 = "05s8mwi3dqzjghgpr1mfs1b7cgrq818bbj1v7aly6axc8c2n4gny"; }; projectFile = "src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj"; diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 31255aaca53..f19458fa84f 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -9,54 +9,32 @@ let python = python3.override { packageOverrides = self: super: { - aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { - version = "0.8.0"; - src = fetchFromGitHub { - owner = "Tinche"; - repo = "aiofiles"; - rev = "v${version}"; - sha256 = "0mr9pzji4vqyf2yzh8yxz5q7fm8mgmkimx1xh49wh625m72pxcap"; - }; - }); - - asgiref = super.asgiref.overridePythonAttrs (oldAttrs: rec { - version = "3.4.1"; - src = fetchFromGitHub { - owner = "django"; - repo = "asgiref"; - rev = version; - sha256 = "0440321alpqb1cdsmfzmiiy8rpq0ic0wvraalzk39cgrl7mghw39"; - }; - }); - - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "8.0.3"; - src = fetchFromGitHub { - owner = "pallets"; - repo = "click"; - rev = version; - sha256 = "0pxvxgfhqjgsjbgfnilqjki1l24r0rdfd98cl77i71yqdd2f497g"; + semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec { + version = "2.9.0"; + src = fetchPypi { + pname = "semantic_version"; + version = version; + sha256 = "1chjd8019wnwb5mnd4x4jw9f8nhzg0xnapsdznk0fpiyamrlixdb"; }; }); starlette = super.starlette.overridePythonAttrs (oldAttrs: rec { - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "encode"; repo = "starlette"; rev = version; - sha256 = "1g76qpvqzivmwll5ir4bf45jx5kilnkadvy6b7qjisvr402i3qmw"; + sha256 = "1dpj33cggjjvpd3qdf6hv04z5ckcn9f5dfn98p5a8hx262kgsr9p"; }; - disabledTestPaths = []; }); uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "encode"; repo = "uvicorn"; rev = version; - sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; + sha256 = "142x8skb1yfys6gndfaay2r240j56dkr006p49pw4y9i0v85kynp"; }; }); }; @@ -80,6 +58,7 @@ with python.pkgs; buildPythonApplication rec { pyserial requests semantic-version + spdx-license-list-data.json starlette tabulate uvicorn @@ -171,7 +150,7 @@ with python.pkgs; buildPythonApplication rec { postPatch = '' substitute platformio/package/manifest/schema.py platformio/package/manifest/schema.py \ - --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data}' + --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ --replace "zeroconf==0.37.*" "zeroconf" @@ -180,7 +159,7 @@ with python.pkgs; buildPythonApplication rec { meta = with lib; { broken = stdenv.isAarch64; description = "An open source ecosystem for IoT development"; - homepage = "http://platformio.org"; + homepage = "https://platformio.org"; license = licenses.asl20; maintainers = with maintainers; [ mog makefu ]; }; diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index 5bbc5491636..31b7b8d4951 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -4,14 +4,14 @@ let callPackage = newScope self; - version = "5.2.4"; + version = "5.2.5"; # 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 = "1dhyxrdxrca669qm6alxxn2jmvcwlpqrx9kfwh4iqy9za5717ag9"; + sha256 = "1x1jqprwzpb09ca953rqbh2jvizh7bz8yj30krphb6007bnjilwy"; }; self = { diff --git a/pkgs/development/embedded/platformio/fix-searchpath.patch b/pkgs/development/embedded/platformio/fix-searchpath.patch index 46e84d15a82..fe7f9f127a7 100644 --- a/pkgs/development/embedded/platformio/fix-searchpath.patch +++ b/pkgs/development/embedded/platformio/fix-searchpath.patch @@ -2,7 +2,7 @@ diff --git a/platformio/proc.py b/platformio/proc.py index 80e50201..15cee5a5 100644 --- a/platformio/proc.py +++ b/platformio/proc.py -@@ -167,7 +167,7 @@ def copy_pythonpath_to_osenv(): +@@ -181,7 +181,7 @@ def copy_pythonpath_to_osenv(): conditions.append(isdir(join(p, "click")) or isdir(join(p, "platformio"))) if all(conditions): _PYTHONPATH.append(p) diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index b5601890285..342fb120a0f 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -6,7 +6,7 @@ index 416dccfd..896c3649 100644 @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.15" +- version = "3.16" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" - "v%s/json/licenses.json" % version diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index 7c0b1802bac..e6ead8dd372 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.4.0"; + version = "6.5.0"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-5qotjAyaNFtYUjHlNKwywmBJGAzS/IM9bF+dmONE4bk="; + sha256 = "sha256-19RG+bJCmkaytMtDpDLbDvfKo27Z+Mo/sOrs8lOVV44="; stripRoot = false; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6d217a6d138..b3cac2e3973 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5199,7 +5199,6 @@ broken-packages: - unfix-binders - unfoldable - unicode-prelude - - unicode-show - unicode-symbols - unicode-tricks - uniform-fileio diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 032b2577c51..c8893a751fd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -700,11 +700,6 @@ self: super: builtins.intersectAttrs super { testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or []; }) super.retrie_1_2_0_0; - nix-output-monitor = overrideCabal { - # Can't ran the golden-tests with nix, because they call nix - testTarget = "unit-tests"; - } super.nix-output-monitor; - haskell-language-server = overrideCabal (drv: { # starting with 1.6.1.1 haskell-language-server wants to be linked dynamically # by default. Unless we reflect this in the generic builder, GHC is going to diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f6db635805b..2e08662a9de 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -286292,8 +286292,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "print and show in unicode"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unicode-symbols" = callPackage diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index c0ee8988c09..4a8b639071a 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,18 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: -let - version = "0.10"; - name = "chibi-scheme-${version}"; -in -stdenv.mkDerivation { - inherit name; - meta = { - homepage = "https://github.com/ashinn/chibi-scheme"; - description = "Small Footprint Scheme for use as a C Extension Language"; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.DerGuteMoritz ]; - }; +stdenv.mkDerivation rec { + version = "0.10"; + pname = "chibi-scheme"; src = fetchFromGitHub { owner = "ashinn"; @@ -36,4 +26,12 @@ stdenv.mkDerivation { --replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme" done ''; + + meta = { + homepage = "https://github.com/ashinn/chibi-scheme"; + description = "Small Footprint Scheme for use as a C Extension Language"; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.DerGuteMoritz ]; + }; } diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 2a387d34f47..926308f0d30 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -24,11 +24,11 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { - v = "2.49"; - name = "clisp-${v}"; + version = "2.49"; + pname = "clisp"; src = fetchurl { - url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; + url = "mirror://gnu/clisp/release/${version}/clisp-${version}.tar.bz2"; sha256 = "8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890"; }; diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 7ab4134facb..7b10d2cad0e 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -23,8 +23,8 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { - v = "2.50pre20171114"; - name = "clisp-${v}"; + version = "2.50pre20171114"; + pname = "clisp"; src = fetchhg { url = "http://hg.code.sf.net/p/clisp/clisp"; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 4b7f8ee38e9..c3dcd0a0f71 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.6"; + version = "0.7.8"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-bRuf9qUBgb+1Sr2US67NZZrrb2MycSvNbekLLSpvZss="; + sha256 = "sha256-VbDivl92YYWzIbkbOgDijzf9bZ5ZyodcapPPG4EiGXc="; }; executable = "bb"; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index a66f0422b6d..09774f7fb6d 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.1082"; + version = "1.10.3.1087"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-8hW8zgP+D72MtXYFPXx9FfkThQuCBo1Y6CU5w7xPE7c="; + sha256 = "sha256-prOzVHrcbabKXP4Q4Dfx/eiKePlINyu1mO9NCFnaPpQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix index 7fe1b46e3a5..f7c730c9277 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix @@ -24,7 +24,6 @@ lib.makePackageOverridable code = "${src}/${file}"; } - // lib.optionalAttrs document { documentationRoot = src; } + // lib.optionalAttrs document { documentationRoot = "${src}"; } ) ) - diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 646fd70ff8f..5f08386c9f5 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -25,7 +25,7 @@ in assert versionAtLeast (getVersion erlang) minimumOTPVersion; stdenv.mkDerivation ({ - name = "${baseName}-${version}"; + pname = "${baseName}"; inherit src version debugInfo; diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 19ef0e60848..04c60e80e8f 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -83,9 +83,9 @@ builder rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - # don't have "libgcc_s.so.1" on darwin + # don't have "libgcc_s.so.1" on clang LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 76aa0c4404f..99f3f84829c 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -14,6 +14,7 @@ , pkg-config , pkgsBuildBuild , readline +, writeScript }: let @@ -24,11 +25,11 @@ let in builder rec { pname = "guile"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9X2GxwYgJxv863qb4MgXRKAz8IrcfOuoMsmRerPmkbc="; + sha256 = "sha256-2qcGClbygE6bdMjX5/6L7tErQ6qyeJo4WFGD/MF7ihM="; }; outputs = [ "out" "dev" "info" ]; @@ -81,9 +82,9 @@ builder rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - # don't have "libgcc_s.so.1" on darwin + # don't have "libgcc_s.so.1" on clang LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" @@ -102,7 +103,10 @@ builder rec { ] # Disable JIT on Apple Silicon, as it is not yet supported # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44505"; - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "--enable-jit=no"; + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "--enable-jit=no" + # At least on x86_64-darwin '-flto' autodetection is not correct: + # https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028 + ++ lib.optional (stdenv.isDarwin) "--disable-lto"; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" @@ -126,6 +130,20 @@ builder rec { setupHook = ./setup-hook-3.0.sh; + passthru = { + updateScript = writeScript "update-guile-3" '' + #!/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 '"https://ftp.gnu.org/gnu/guile/guile-3.0.8.tar.gz"' + new_version="$(curl -s https://www.gnu.org/software/guile/download/ | + pcregrep -o1 '"https://ftp.gnu.org/gnu/guile/guile-(3[.0-9]+).tar.gz"')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { homepage = "https://www.gnu.org/software/guile/"; description = "Embeddable Scheme implementation"; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 1bcbd2bb4b5..02ecf8d25b1 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -191,7 +191,6 @@ in with passthru; stdenv.mkDerivation { prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' - substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' '' + optionalString (pythonOlder "3.9" && stdenv.isDarwin && x11Support) '' # Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch substituteInPlace setup.py --replace /Library/Frameworks /no-such-path @@ -342,8 +341,6 @@ in with passthru; stdenv.mkDerivation { substituteInPlace ./setup.py --replace $i /no-such-path done '' + optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" - export MACOSX_DEPLOYMENT_TARGET=10.6 # Override the auto-detection in setup.py, which assumes a universal build export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"} '' + optionalString (isPy3k && pythonOlder "3.7") '' diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 6bee51f6423..a7d5e0854fb 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -201,9 +201,9 @@ in { major = "3"; minor = "11"; patch = "0"; - suffix = "a4"; + suffix = "a6"; }; - sha256 = "sha256-Q3/nN2w2Pa+vNM6A8ERrQfyaQsDiqMflGdPwoLfPs+0="; + sha256 = "sha256-HFOi/3WHljPjDKwp0qpregEONVuV8L+axpG+zPX50So="; inherit (darwin) configd; inherit passthruFun; }; @@ -282,9 +282,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "6"; + patch = "8"; }; - sha256 = "sha256-ghJ/Q/rmznXUfWxFOfjB6jcunC2/pA+ui1g1HVInk6Q="; # linux64 + sha256 = "0h493q0lhpz035afi4g09f4mz5a72vqx4sa7qcry5z4zagxq8bhz"; # linux64 pythonVersion = "2.7"; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 460af1cc67b..877a00efa48 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -7,7 +7,6 @@ # Dependencies , bzip2 , zlib -, openssl_1_0_2 , expat , ncurses6 , tcl-8_5 @@ -50,7 +49,6 @@ let deps = [ bzip2 zlib - openssl_1_0_2 expat ncurses6 tcl-8_5 diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index e56945ed651..b73cdaff5d3 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -2,9 +2,10 @@ }: racket.overrideAttrs (oldAttrs: rec { - name = "racket-minimal-${oldAttrs.version}"; + pname = "racket-minimal"; + version = oldAttrs.version; src = oldAttrs.src.override { - inherit name; + name = "${pname}-${version}"; sha256 = "sha256-FZlUWvjtioe4S8gPetj7vdneVX6jEFguJo4j2wJsKAw="; }; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index c676a7b05e5..ea31f354d0d 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -268,10 +268,10 @@ in { }; ruby_3_1 = generic { - version = rubyVersion "3" "1" "0" ""; + version = rubyVersion "3" "1" "1" ""; sha256 = { - src = "sha256-UKBQTG7ctNYc5rjP292qlXBxlfqw7Ne16SZUsqlBKFQ="; - git = "sha256-TcsoWY+zVZeue1/ypV1L0WERp1UVK35WtVtYPYiJh4c="; + src = "sha256-/m5Hgt6XRDl43bqLpL440iKqJNw+PwKmqOdwHA7rYZ0="; + git = "sha256-76t/tGyK5nz7nvcRdHJTjjckU+Kv+/kbTMiNWJ93jU8="; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 2e51670a9f8..b76dc1a23b1 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -10,6 +10,6 @@ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; - "3.1.0" = ops useRailsExpress [ # no patches yet (2021-12-25) + "3.1.1" = ops useRailsExpress [ # no patches yet (2021-12-25) ]; } diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index 6be61a1210b..811a0247a57 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "91.6.0"; + version = "91.7.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; + sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index d0a13f62520..f223e205220 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -2,15 +2,15 @@ { version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }: let - name = "${artifactId}-${version}"; m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; - m2File = "${name}${suffix}.${type}"; + m2File = "${artifactId}-${version}${suffix}.${type}"; src = fetchurl { inherit sha512; url = "mirror://maven/${m2Path}/${m2File}"; }; in stdenv.mkDerivation { - inherit name m2Path m2File src; + inherit version m2Path m2File src; + pname = artifactId; dontUnpack = true; diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index a1d3c183b8e..7380a85248f 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.14.2"; - name = "cgal-" + version; + pname = "cgal"; src = fetchFromGitHub { owner = "CGAL"; diff --git a/pkgs/development/libraries/SDL2/Fix-build-against-wayland-1.20.patch b/pkgs/development/libraries/SDL2/Fix-build-against-wayland-1.20.patch deleted file mode 100644 index 1be600bedb3..00000000000 --- a/pkgs/development/libraries/SDL2/Fix-build-against-wayland-1.20.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a31d1f1683ef2e9c063c3fa1db79d111cca99414 Mon Sep 17 00:00:00 2001 -From: David Redondo <kde@david-redondo.de> -Date: Fri, 10 Dec 2021 16:22:34 +0100 -Subject: [PATCH] Fix build against wayland 1.20 - -Fixes #5088 - -(cherry picked from commit e2ade2bfc46d915cd306c63c830b81d800b2575f) ---- - src/video/wayland/SDL_waylanddyn.h | 2 ++ - src/video/wayland/SDL_waylandsym.h | 4 ++++ - 2 files changed, 6 insertions(+) - -diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h -index 485a9c19f..37070e946 100644 ---- a/src/video/wayland/SDL_waylanddyn.h -+++ b/src/video/wayland/SDL_waylanddyn.h -@@ -81,6 +81,8 @@ void SDL_WAYLAND_UnloadSymbols(void); - #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener) - #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor) - #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) -+#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags) -+#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags) - - #define wl_seat_interface (*WAYLAND_wl_seat_interface) - #define wl_surface_interface (*WAYLAND_wl_surface_interface) -diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h -index c4c189d3c..789f49e27 100644 ---- a/src/video/wayland/SDL_waylandsym.h -+++ b/src/video/wayland/SDL_waylandsym.h -@@ -71,6 +71,10 @@ SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_prox - SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10) - SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...)) - -+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20) -+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...)) -+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args)) -+ - SDL_WAYLAND_INTERFACE(wl_seat_interface) - SDL_WAYLAND_INTERFACE(wl_surface_interface) - SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) --- -2.33.1 diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 95022211d2f..d1086de3718 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,20 +1,50 @@ -{ lib, stdenv, config, fetchurl, pkg-config +{ lib +, stdenv +, config +, fetchurl +, pkg-config , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, openglSupport ? libGLSupported, libGL -, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib +, openglSupport ? libGLSupported +, libGL +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, alsa-lib , x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid -, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor -, libXinerama, libXext, libXxf86vm, libXrandr +, libX11 +, xorgproto +, libICE +, libXi +, libXScrnSaver +, libXcursor +, libXinerama +, libXext +, libXxf86vm +, libXrandr , waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid -, wayland, wayland-protocols, libxkbcommon -, dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, dbus -, udevSupport ? false, udev -, ibusSupport ? false, ibus -, fcitxSupport ? false, fcitx +, wayland +, wayland-protocols +, libxkbcommon +, dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, dbus +, udevSupport ? false +, udev +, ibusSupport ? false +, ibus +, fcitxSupport ? false +, fcitx +, libdecorSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, libdecor +, pipewireSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, pipewire # NOTE: must be built with SDL2 without pipewire support , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid , libpulseaudio -, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL -, audiofile, libiconv +, AudioUnit +, Cocoa +, CoreAudio +, CoreServices +, ForceFeedback +, OpenGL +, audiofile +, libiconv , withStatic ? false }: @@ -25,32 +55,16 @@ with lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.14"; + version = "2.0.20"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq"; + sha256 = "sha256-xWq6HXtbDn6Znkp2mMcLY6M5T/lwS19uHFfgwW8E3QY="; }; dontDisableStatic = withStatic; outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config - patches = [ - ./find-headers.patch - # To fix the build with wayland 1.20.0: - ./Fix-build-against-wayland-1.20.patch - ]; - - # Fix with mesa 19.2: https://bugzilla.libsdl.org/show_bug.cgi?id=4797 - postPatch = '' - substituteInPlace include/SDL_opengl_glext.h \ - --replace "typedef ptrdiff_t GLsizeiptr;" "typedef signed long int khronos_ssize_t; typedef khronos_ssize_t GLsizeiptr;" \ - --replace "typedef ptrdiff_t GLintptr;" "typedef signed long int khronos_intptr_t; typedef khronos_intptr_t GLintptr;" - - substituteInPlace configure \ - --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`' - ''; - depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ]; @@ -63,18 +77,19 @@ stdenv.mkDerivation rec { # Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h. ++ optionals x11Support [ libX11 xorgproto ]; - dlopenBuildInputs = [ ] - ++ optionals alsaSupport [ alsa-lib audiofile ] - ++ optional dbusSupport dbus - ++ optional pulseaudioSupport libpulseaudio - ++ optional udevSupport udev + 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 ]; buildInputs = [ libiconv ] ++ dlopenBuildInputs - ++ optional ibusSupport ibus - ++ optional fcitxSupport fcitx + ++ optional ibusSupport ibus + ++ optional fcitxSupport fcitx ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; enableParallelBuilding = true; @@ -82,9 +97,9 @@ stdenv.mkDerivation rec { 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"; + ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" + ++ optional stdenv.targetPlatform.isWindows "--disable-video-opengles" + ++ 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` @@ -117,15 +132,17 @@ stdenv.mkDerivation rec { # # You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to # list the symbols used in this way. - postFixup = let - rpath = makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); - in 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" - fi - done - ''; + postFixup = + let + rpath = makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); + in + 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" + fi + done + ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch deleted file mode 100644 index a2e0c483703..00000000000 --- a/pkgs/development/libraries/SDL2/find-headers.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ru3 SDL2-2.0.14/sdl2-config.cmake.in SDL2-2.0.14-new/sdl2-config.cmake.in ---- SDL2-2.0.14/sdl2-config.cmake.in 2020-12-21 18:44:36.000000000 +0100 -+++ SDL2-2.0.14-new/sdl2-config.cmake.in 2021-01-16 23:53:40.721121792 +0100 -@@ -6,7 +6,8 @@ - set(SDL2_PREFIX "@prefix@") - set(SDL2_EXEC_PREFIX "@prefix@") - set(SDL2_LIBDIR "@libdir@") --set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") -+set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) -+separate_arguments(SDL2_INCLUDE_DIRS) - set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") - string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) - -@@ -20,14 +21,14 @@ - - add_library(SDL2::SDL2 SHARED IMPORTED) - set_target_properties(SDL2::SDL2 PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" -+ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}" - INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") - - add_library(SDL2::SDL2-static STATIC IMPORTED) - set_target_properties(SDL2::SDL2-static PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" -+ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" - INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") -diff -ru3 SDL2-2.0.14/sdl2-config.in SDL2-2.0.14-new/sdl2-config.in ---- SDL2-2.0.14/sdl2-config.in 2020-12-21 18:44:36.000000000 +0100 -+++ SDL2-2.0.14-new/sdl2-config.in 2021-01-16 23:57:11.940353171 +0100 -@@ -42,7 +42,11 @@ - echo @SDL_VERSION@ - ;; - --cflags) -- echo -I@includedir@/SDL2 @SDL_CFLAGS@ -+ SDL_CFLAGS="" -+ for i in @includedir@/SDL2 $SDL2_PATH; do -+ SDL_CFLAGS="$SDL_CFLAGS -I$i" -+ done -+ echo $SDL_CFLAGS @SDL_CFLAGS@ - ;; - @ENABLE_SHARED_TRUE@ --libs) - @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 1887060aadb..efe9640af6f 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , substituteAll , pkg-config , glib @@ -20,13 +19,13 @@ stdenv.mkDerivation rec { pname = "accountsservice"; - version = "22.07.5"; + version = "22.08.8"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "IdRJwN6tilQ86o8R5x6wSWwDXXMOpIOTOXowKzpMfBo="; + sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E="; }; patches = [ @@ -45,15 +44,6 @@ stdenv.mkDerivation rec { # Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme. # Fixes https://github.com/NixOS/nixpkgs/issues/72396 ./drop-prefix-check-extensions.patch - - # Work around not being able to set profile picture in GNOME Settings. - # https://github.com/NixOS/nixpkgs/issues/85357 - # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/98 - # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1629 - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/1ef3add46983af875adfed5d29954cbfb184f688.patch"; - sha256 = "N4siK4SWkwYBnFa0JJUFgahi9XBkB/nS5yc+PyH3/iM="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/alglib/default.nix b/pkgs/development/libraries/alglib/default.nix new file mode 100644 index 00000000000..1ff34a8d1f1 --- /dev/null +++ b/pkgs/development/libraries/alglib/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, cmake, clang }: + +stdenv.mkDerivation rec { + pname = "alglib3"; + version = "3.18.0"; + + src = fetchurl { + url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; + sha256 = "0ag8dvcxzzp9riqvk4lhcbwhvh0lq54lbdnsbyr107rjfi2p1vlq"; + }; + + nativeBuildInputs = [ + cmake + clang + ]; + + patches = [ + ./patch-alglib-CMakeLists.patch + ]; + + meta = with lib; { + description = "Numerical analysis and data processing library"; + homepage = "https://www.alglib.net/"; + license = lib.licenses.gpl2Plus; + maintainers = [ maintainers.paperdigits ]; + longDescription = '' + ALGLIB is a cross-platform numerical analysis and data processing library. It supports several programming languages (C++, C#, Delphi) and several operating systems (Windows and POSIX, including Linux). ALGLIB features include: + + * Data analysis (classification/regression, statistics) + * Optimization and nonlinear solvers + * Interpolation and linear/nonlinear least-squares fitting + * Linear algebra (direct algorithms, EVD/SVD), direct and iterative linear solvers + * Fast Fourier Transform and many other algorithms + ''; + }; +} diff --git a/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch b/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch new file mode 100644 index 00000000000..b91a0c0aefd --- /dev/null +++ b/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch @@ -0,0 +1,23 @@ +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,20 @@ ++cmake_minimum_required(VERSION 2.8) ++ ++project(alglib3 CXX) ++ ++file(GLOB_RECURSE sources src/*.cpp) ++file(GLOB_RECURSE headers src/*.h) ++ ++add_library(${PROJECT_NAME} STATIC ${sources} ${headers}) ++ ++install( ++ TARGETS ${PROJECT_NAME} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++ ++install( ++ FILES ${headers} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alglib ++) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index c39ea78a775..9b07697a6a9 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -14,27 +14,31 @@ , glib , xapian , libxml2 +, libxmlb , libyaml , gobject-introspection , pcre , itstool , gperf , vala -, lmdb , curl +, nixosTests }: stdenv.mkDerivation rec { pname = "appstream"; - version = "0.14.4"; + version = "0.15.2"; + # When bumping this package, please also check whether + # fix-build-for-qt-olderthan-514.patch still applies by + # building libsForQt512.appstream-qt. - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "installedTests" ]; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "sha256-DJXCw50f+8c58bJw6xx0ECfkc9/KcWaeA+ne2zmTyhg="; + sha256 = "sha256-/JZ49wjtcInbGUOVVjevVSrLCHcA60FMT165rhfb78Q="; }; patches = [ @@ -43,6 +47,9 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; libstemmer_includedir = "${lib.getDev libstemmer}/include"; }) + + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch ]; nativeBuildInputs = [ @@ -65,9 +72,9 @@ stdenv.mkDerivation rec { glib xapian libxml2 + libxmlb libyaml gperf - lmdb curl ]; @@ -75,8 +82,15 @@ stdenv.mkDerivation rec { "-Dapidocs=false" "-Ddocs=false" "-Dvapi=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; + passthru = { + tests = { + installed-tests = nixosTests.installed-tests.appstream; + }; + }; + meta = with lib; { description = "Software metadata handling library"; homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; @@ -88,5 +102,5 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.unix; - }; + }; } diff --git a/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch b/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch new file mode 100644 index 00000000000..35db2bec914 --- /dev/null +++ b/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch @@ -0,0 +1,43 @@ +diff --git a/qt/component.h b/qt/component.h +index 47abd1f3..74de943c 100644 +--- a/qt/component.h ++++ b/qt/component.h +@@ -90,7 +90,7 @@ class APPSTREAMQT_EXPORT Component { + UrlKindContact, + + // deprecated +- UrlTranslate [[deprecated]] = UrlKindTranslate, ++ UrlTranslate = UrlKindTranslate, + }; + Q_ENUM(UrlKind) + +diff --git a/qt/pool.h b/qt/pool.h +index b59829b7..5237f613 100644 +--- a/qt/pool.h ++++ b/qt/pool.h +@@ -70,9 +70,9 @@ public: + FlagMonitor = 1 << 7, + + // deprecated +- FlagReadCollection [[deprecated]] = FlagLoadOsCollection, +- FlagReadMetainfo [[deprecated]] = FlagLoadOsMetainfo, +- FlagReadDesktopFiles [[deprecated]] = FlagLoadOsDesktopFiles, ++ FlagReadCollection = FlagLoadOsCollection, ++ FlagReadMetainfo = FlagLoadOsMetainfo, ++ FlagReadDesktopFiles = FlagLoadOsDesktopFiles, + }; + + /** +@@ -84,9 +84,9 @@ public: + * Flags on how caching should be used. + **/ + enum CacheFlags { +- CacheFlagNone [[deprecated]] = 0, +- CacheFlagUseUser [[deprecated]] = 1 << 0, +- CacheFlagUseSystem [[deprecated]] = 1 << 1, ++ CacheFlagNone = 0, ++ CacheFlagUseUser = 1 << 0, ++ CacheFlagUseSystem = 1 << 1, + }; + + /** diff --git a/pkgs/development/libraries/appstream/fix-paths.patch b/pkgs/development/libraries/appstream/fix-paths.patch index 0da72a78cbc..2f1249daef4 100644 --- a/pkgs/development/libraries/appstream/fix-paths.patch +++ b/pkgs/development/libraries/appstream/fix-paths.patch @@ -1,18 +1,21 @@ diff --git a/data/meson.build b/data/meson.build -index 1eb3dfb0..623b66ec 100644 +index 53f31cb4..90f40e77 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -26,4 +26,4 @@ i18n.merge_file ( +@@ -68,7 +68,7 @@ test('as-validate_metainfo.cli', ) - install_data ('appstream.conf', -- install_dir: get_option('sysconfdir')) -+ install_dir: get_option('prefix') / 'etc') + install_data('appstream.conf', +- install_dir: get_option('sysconfdir')) ++ install_dir: get_option('prefix') / 'etc') + + if get_option('compose') + ascompose_metainfo = 'org.freedesktop.appstream.compose.metainfo.xml' diff --git a/meson.build b/meson.build -index dc1fb1a5..5ee03b73 100644 +index 2efe86b7..9dc79e28 100644 --- a/meson.build +++ b/meson.build -@@ -108,12 +108,12 @@ if get_option ('gir') +@@ -107,12 +107,12 @@ if get_option ('gir') dependency('gobject-introspection-1.0', version: '>=1.56') endif diff --git a/pkgs/development/libraries/appstream/installed-tests-path.patch b/pkgs/development/libraries/appstream/installed-tests-path.patch new file mode 100644 index 00000000000..188c1e52589 --- /dev/null +++ b/pkgs/development/libraries/appstream/installed-tests-path.patch @@ -0,0 +1,27 @@ +diff --git a/meson_options.txt b/meson_options.txt +index 8dd8e0c7..e2a30b06 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -44,6 +44,11 @@ option('install-docs', + value : true, + description : 'Install documentation for API and specification' + ) ++option('installed_test_prefix', ++ type : 'string', ++ value : '', ++ description : 'Prefix for installed tests' ++) + + # + # For development +diff --git a/tests/installed-tests/meson.build b/tests/installed-tests/meson.build +index 405820ce..f592a753 100644 +--- a/tests/installed-tests/meson.build ++++ b/tests/installed-tests/meson.build +@@ -10,5 +10,5 @@ configure_file( + output : 'metainfo-validate.test', + configuration : itconf, + install: true, +- install_dir: join_paths('share', 'installed-tests', 'appstream'), ++ install_dir: join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'appstream'), + ) diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 0bcb4741ff1..3704332119e 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -1,12 +1,12 @@ -{ mkDerivation, appstream, qtbase, qttools }: +{ lib, mkDerivation, appstream, qtbase, qttools, nixosTests }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here mkDerivation { pname = "appstream-qt"; - inherit (appstream) version src patches; + inherit (appstream) version src; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "installedTests" ]; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; @@ -14,11 +14,26 @@ mkDerivation { mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; + patches = (appstream.patches or []) ++ lib.optionals (lib.versionOlder qtbase.version "5.14") [ + # Fix darwin build for libsForQt5.appstream-qt + # Old Qt moc doesn't know about fancy C++14 features + # ../qt/component.h:93: Parse error at "UrlTranslate" + # Remove both this patch and related comment in default.nix + # once Qt 5.14 or later becomes default on darwin + ./fix-build-for-qt-olderthan-514.patch + ]; + postFixup = '' sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \ -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@" ''; + passthru = appstream.passthru // { + tests = { + installed-tests = nixosTests.installed-tests.appstream-qt; + }; + }; + meta = appstream.meta // { description = "Software metadata handling library - Qt"; }; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 274a35c6ccf..806df81a708 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -19,7 +19,6 @@ , grpc , gtest , jemalloc -, libnsl , lz4 , minio , ninja @@ -39,7 +38,7 @@ , zlib , zstd , enableShared ? !stdenv.hostPlatform.isStatic -, enableFlight ? !stdenv.isDarwin # libnsl is not supported on darwin +, enableFlight ? true , enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin) # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and # non-existent in older versions @@ -129,7 +128,6 @@ stdenv.mkDerivation rec { python3.pkgs.numpy ] ++ lib.optionals enableFlight [ grpc - libnsl openssl protobuf ] ++ lib.optionals enableS3 [ aws-sdk-cpp openssl ] diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 22cac39dbe1..2e8bdc50ca6 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; + dontAddWafCrossFlags = true; + wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests"; meta = with lib; { description = "Library for audio labelling"; diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index ad1f3483cff..b6fcb11c315 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.8"; + version = "0.6.11"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-cZyWe3kX5JiB6th1VkkBFKa2MEilRtU+tHvu7c9e+Yw="; + sha256 = "sha256-3pFOnXDvB4CUUG992i5ErKMe3lAiyYoMTSvm6eKyLjs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 87d66e15355..e7f0c0854db 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.12"; + version = "0.5.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KzuaT9c1l9Uhyj6IEy8JfDYzEYI2OcUkq+KRDoJx+Cc="; + sha256 = "sha256-+hWiDlL0GVVmMajoC+hfyvT4rm16RoAWhUr04B8JZts="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 4af6d9b0ac4..ab52fa5aa74 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.18"; + version = "0.6.19"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5Y+cfiVtZGmExPuE3s5m8hnd0HrPwSiKptj0DM1mtUY="; + sha256 = "sha256-oB5kAzIRyr8kfl4sILuIw343ghDZDXSEH97qkUeTqXI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 2cfba1bd204..f19a69fc457 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.13"; + version = "0.10.19"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wdsSxEY9FwJoqdi0S8TNoyq8oxoZORKWeorsSpn+1IY="; + sha256 = "sha256-dPstIWB+wuMJi+EfecPKw0WD1c3IvHS+L1XU72xrAoc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index f75b744c3a9..11ba67fe6f5 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-YMAqK4DOFA5TkMNwLHRk1m14V8lN6X5SDAwrTYWdGMc="; + sha256 = "sha256-efkRr36FbLyS9tgE/ZF3tcmhQ4f5C5ySTlgzThbqv2I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index bd8ac2365a4..2868e6b80b8 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.30"; + version = "0.1.33"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-vsKQJPYdaBveb9kpZitmXFTqEeWWA4h0BkqxRzdOu28="; + sha256 = "sha256-lP5Luh/jFmlbb11rE5qYev+DMXjyMNwni0LcNvQGY4o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 9042dc56154..058e4ea6a5f 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fXu7GI2UR9QiBGP2n2pEFRjz9ZwA+BAK9zxhNnoYWt4="; + sha256 = "sha256-k3hIGk92HncRAktpuvNcZnaBZiLj63/wQBz2WScUjhQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 9f70be5eb8d..391ecc26fb8 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.17.8"; + version = "0.17.16"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-eHABIg3v5ycpQzacW/8C74PT6yDOXGmJqDa9P1hN7Mo="; + sha256 = "sha256-RNcx/Enm1bd/NZOcNosNnYsT9Ot7AMQU7wsg+moT16c="; }; patches = [ diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 49069303570..bad87fba8c6 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -127,7 +127,14 @@ stdenv.mkDerivation { extraPrefix = "libs/context/"; }) ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch - ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch; + ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch + ++ optional (version == "1.77.0") (fetchpatch { + url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; + sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; + stripLen = 2; + extraPrefix = ""; + includes = [ "boost/math/special_functions/detail/bernoulli_details.hpp" ]; + }); meta = { homepage = "http://boost.org/"; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 47e9ffa925a..4a482c9da45 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg="; + hash = "sha256-OWpztnyVXCg+uoAb6e/2eUK2ebBalDlz6Qcjf17IeMk="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch b/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch deleted file mode 100644 index 8a14fb3a5fa..00000000000 --- a/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -u a/Makefile b/Makefile ---- a/Makefile 2020-12-27 18:48:53.934098765 +0100 -+++ b/Makefile 2020-12-27 18:50:44.022674117 +0100 -@@ -19,13 +19,13 @@ - # http://www.gnu.org/prep/standards/html_node/Directory-Variables.html - PREFIX ?= /usr/local - EXEC_PREFIX = $(PREFIX) --BINDIR = $(EXEC_PREFIX)/bin -+BINDIR ?= $(EXEC_PREFIX)/bin - DATAROOTDIR = $(PREFIX)/share - DOCDIR = $(DATAROOTDIR)/doc/$(CPROG) - SYSCONFDIR ?= $(PREFIX)/etc - HTMLDIR = $(DOCDIR) --INCLUDEDIR = $(DESTDIR)$(PREFIX)/include --LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib -+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include -+LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib - PID_FILE ?= /var/run/$(CPROG).pid - - # build tools -@@ -337,10 +337,10 @@ - install -m 755 $(CPROG) "$(BINDIR)/" - - install-headers: -- install -m 644 $(HEADERS) "$(INCLUDEDIR)" -+ install -m 644 $(HEADERS) "$(INCLUDEDIR)/" - - install-lib: lib$(CPROG).a -- install -m 644 $< "$(LIBDIR)" -+ install -m 644 $< "$(LIBDIR)/" - - install-slib: lib$(CPROG).so - $(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g')) diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix index 93ac618bcac..bf737972612 100644 --- a/pkgs/development/libraries/civetweb/default.nix +++ b/pkgs/development/libraries/civetweb/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, cmake }: stdenv.mkDerivation rec { @@ -13,33 +15,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4="; }; - makeFlags = [ - "WITH_CPP=1" - "PREFIX=${placeholder "out"}" - "LIBDIR=${placeholder "out"}/lib" - "INCLUDEDIR=${placeholder "dev"}/include" - ]; - - patches = [ - ./0001-allow-setting-paths-in-makefile.patch - ]; + outputs = [ "out" "dev" ]; strictDeps = true; - outputs = [ "out" "dev" ]; - - installTargets = [ - "install-headers" - "install-lib" - "install-slib" - "install" + nativeBuildInputs = [ + cmake ]; - preInstall = '' - mkdir -p $dev/include - mkdir -p $out/lib + # The existence of the "build" script causes `mkdir -p build` to fail: + # mkdir: cannot create directory 'build': File exists + preConfigure = '' + rm build ''; + cmakeFlags = [ + "-DCIVETWEB_ENABLE_CXX=ON" + "-DBUILD_SHARED_LIBS=ON" + + # The civetweb unit tests rely on downloading their fork of libcheck. + "-DCIVETWEB_BUILD_TESTING=OFF" + ]; + meta = { description = "Embedded C/C++ web server"; homepage = "https://github.com/civetweb/civetweb"; diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix deleted file mode 100644 index 1a3e261c60e..00000000000 --- a/pkgs/development/libraries/clearsilver/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, python2 }: - -stdenv.mkDerivation rec { - pname = "clearsilver"; - version = "0.10.5"; - - src = fetchurl { - url = "http://www.clearsilver.net/downloads/clearsilver-${version}.tar.gz"; - sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y"; - }; - - PYTHON_SITE = "${placeholder "out"}/${python2.sitePackages}"; - - configureFlags = [ - "--with-python=${python2.interpreter}" - "--disable-apache" - "--disable-perl" - "--disable-ruby" - "--disable-java" - "--disable-csharp" - ]; - - preInstall = '' - mkdir -p $out - mkdir -p $out/${python2.sitePackages} - ''; - - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/clang-gcc5.patch"; - sha256 = "0d44v9jx0b6k8nvrhknd958i9rs59kdh73z0lb4f1mzi8if16c38"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/CVE-2011-4357.diff"; - sha256 = "1lfncavxdqckrz03gv97lcliygbpi9lnih944vmdbn9zw6fwcipi"; - }) - ]; - - meta = with lib; { - description = "Fast, powerful, and language-neutral HTML template system"; - homepage = "http://www.clearsilver.net/"; - license = licenses.free; - }; -} diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/development/libraries/cmark-gfm/default.nix index 7641b6043ef..599ac2b2e7b 100644 --- a/pkgs/development/libraries/cmark-gfm/default.nix +++ b/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.2"; + version = "0.29.0.gfm.3"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-8PjG87hR66ozKx+PSuKi0vHIoKICHSLdl2cKUYf+5m8="; + sha256 = "sha256-V3XegSjqKLCMpfnoYHr9/r5fSC2CC7A2jXkAcHUt7eA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix index 44e534757ce..bfa8aef2dd1 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/development/libraries/coeurl/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "coeurl"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitLab { domain = "nheko.im"; owner = "nheko-reborn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F4kHE9r2pR8hI+CrZQ9ElPjtp0McgwfSxoD5p56KDGs="; + sha256 = "sha256-IIIl+/5Omv0lYTNAjeA63ofJlBmNe3+yTOxDsvL+ak0="; }; nativeBuildInputs = [ ninja pkg-config meson ]; diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 76152996a1d..2a71b82af3c 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -18,13 +18,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2021.11.001"; + version = "2021.11.002"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "0bw0nwzwvjfmijfwznmrghypd3q237a3h5g5fcdncilrqnk1sdpv"; + sha256 = "sha256-V28cru14g7gTlmQP2g9QQYOGbPbL1Lxx0Tg7oiCPH5c="; }; patches = [ diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 322c6ecebbf..ac54ced75b1 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,4 +1,13 @@ -{ stdenv, fetchurl, lib }: +{ lib +, stdenv +, fetchurl +# for passthru.tests +, python3 +, perlPackages +, haskellPackages +, luaPackages +, ocamlPackages +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -7,11 +16,11 @@ stdenv.mkDerivation rec { pname = "expat"; - version = "2.4.4"; + version = "2.4.6"; src = fetchurl { url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tdJdbjczUcLtGbVitHMtAdJYmsjI6eeWLY3xIHzDEbg="; + sha256 = "sha256-3lV5S3qbwhSFL9wHW+quzYVO/hNhWX5iaO6HlGlRKJs="; }; outputs = [ "out" "dev" ]; # TODO: fix referrers @@ -34,6 +43,14 @@ stdenv.mkDerivation rec { --replace "$"'{_IMPORT_PREFIX}' $out ''; + passthru.tests = { + inherit python3; + inherit (haskellPackages) hexpat; + inherit (perlPackages) XMLSAXExpat XMLParser; + inherit (luaPackages) luaexpat; + inherit (ocamlPackages) ocaml_expat; + }; + meta = with lib; { homepage = "https://libexpat.github.io/"; description = "A stream-oriented XML parser library written in C"; diff --git a/pkgs/development/libraries/febio/default.nix b/pkgs/development/libraries/febio/default.nix new file mode 100644 index 00000000000..4d01bf52bf7 --- /dev/null +++ b/pkgs/development/libraries/febio/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchFromGitHub, cmake, boost, eigen, libxml2, mpi, python3 +, mklSupport ? true, mkl +}: + +stdenv.mkDerivation rec { + pname = "FEBio"; + version = "3.6"; + + src = fetchFromGitHub { + owner = "febiosoftware"; + repo = pname; + rev = "v${version}"; + sha256 = "187s4lyzr806xla3smq3lsvj3f6wxlhfkban89w0fnyfmfb8w9am"; + }; + + patches = [ + ./fix-cmake.patch # cannot find mkl libraries without this + ]; + + cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On" + ++ lib.optional mklSupport "-DMKLROOT=${mkl}" + ; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp -R lib bin $out/ + cp -R ../FECore \ + ../FEBioFluid \ + ../FEBioLib \ + ../FEBioMech \ + ../FEBioMix \ + ../FEBioOpt \ + ../FEBioPlot \ + ../FEBioXML \ + ../NumCore \ + $out/include + + runHook postInstall + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ] + ++ lib.optional mklSupport mkl + ; + + meta = { + description = "FEBio Suite Solver"; + license = with lib.licenses; [ mit ]; + homepage = "https://febio.org/"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ Scriptkiddi ]; + }; +} diff --git a/pkgs/development/libraries/febio/fix-cmake.patch b/pkgs/development/libraries/febio/fix-cmake.patch new file mode 100644 index 00000000000..5af10a0b396 --- /dev/null +++ b/pkgs/development/libraries/febio/fix-cmake.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,7 +47,7 @@ function(findLib libName libDir libOut) + find_library(TEMP NAMES ${libName}.lib ${ARGV3}.lib ${ARGV4}.lib ${ARGV5}.lib ${ARGV6}.lib + PATHS ${${libDir}} NO_DEFAULT_PATH) + else() +- find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a ++ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}.so lib${ARGV3}.so lib${ARGV4}.so lib${ARGV5}.so lib${ARGV6}.so + PATHS ${${libDir}} NO_DEFAULT_PATH) + endif() + +diff --git a/FindDependencies.cmake b/FindDependencies.cmake +index 2d644005f..7261ba923 100644 +--- a/FindDependencies.cmake ++++ b/FindDependencies.cmake +@@ -46,8 +46,8 @@ if(MKLROOT) + NO_DEFAULT_PATH) + + find_library(MKL_OMP_LIB +- NAMES iomp5 iomp5md libiomp5md.lib +- PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib ++ NAMES libiomp5.so libiomp5 iomp5 iomp5md libiomp5md.lib ++ PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib + PATH_SUFFIXES "intel64" "intel32" + NO_DEFAULT_PATH + DOC "MKL OMP Library") diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 9f0585e0eff..dfc194f1d4c 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.02.21.00"; + version = "2022.02.28.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-QCL+GLc6b4Ae3jUj7VCxnE7Yc1JJ8+P0/r41Zf0KYos="; + sha256 = "sha256-9h2NsfQMQ7ps9Rt0HhTD+YKwk/soGchCC9GyEJGcm4g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ftxui/default.nix b/pkgs/development/libraries/ftxui/default.nix index df664a309a7..27a21ceca66 100644 --- a/pkgs/development/libraries/ftxui/default.nix +++ b/pkgs/development/libraries/ftxui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ftxui"; - version = "unstable-2021-08-13"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ArthurSonzogni"; repo = pname; - rev = "69b0c9e53e523ac43a303964fc9c5bc0da7d5d61"; - sha256 = "0cbljksgy1ckw34h0mq70s8sma0p16sznn4z9r4hwv76y530m0ww"; + rev = "v${version}"; + sha256 = "sha256-BfNUk2DbBpKMBEu1tQWl85tgjB/4NAh86VVSS9zAjKo="; }; nativeBuildInputs = [ @@ -23,9 +23,13 @@ stdenv.mkDerivation rec { graphviz ]; + # gtest and gbenchmark don't seem to generate any binaries + doCheck = false; + meta = with lib; { homepage = "https://github.com/ArthurSonzogni/FTXUI"; - description = "Functional Terminal User Interface for C++"; + changelog = "https://github.com/ArthurSonzogni/FTXUI/blob/v${version}/CHANGELOG.md"; + description = "Functional Terminal User Interface library for C++"; license = licenses.mit; maintainers = [ maintainers.ivar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index cd971b291b9..7ea8ce6d29b 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -5,10 +5,11 @@ , pkg-config , zlib , libpng -, libjpeg ? null -, libwebp ? null -, libtiff ? null -, libXpm ? null +, libjpeg +, libwebp +, libtiff +, libXpm +, libavif , fontconfig , freetype }: @@ -41,8 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = [ zlib fontconfig freetype ]; - propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ]; + buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libXpm libavif ]; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 83df37f236b..e1a3def0ba4 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gdbm"; - version = "1.20"; + version = "1.23"; src = fetchurl { url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz"; - sha256 = "sha256-OurAVkizSCoQotqYa586OAoprWUL6AuYF6Q1+4EUopI="; + sha256 = "sha256-dLEIHSH/8TrkvXwW5dblBKTCb3zeHcoNljpIQXS7ys0="; }; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 30f43c00a05..c98058768b2 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.70.2"; + version = "2.70.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BVFFnIXNPaPVjdyQFv0ovlr1A/XhYVpxultRKslFgG8="; + sha256 = "Iz+khBweGeOW23YH1Y9rdbozE8UL8Pzgey41MtXrfUY="; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz index 49ffd4a7441..777e94e2b2e 100644 --- a/pkgs/development/libraries/glibc/2.33-master.patch.gz +++ b/pkgs/development/libraries/glibc/2.33-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 9a84a5f8167..ffec9972d28 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.33"; - patchSuffix = "-108"; + patchSuffix = "-117"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-108-g3e2a15c666 + glibc-2.33-117-g55446dd8a2 $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index a08997ea2cd..0b765019992 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -20,6 +20,8 @@ in stdenv.mkDerivation { mkdir -p $out cp ${configGuess} $out/config.guess cp ${configSub} $out/config.sub + + chmod +x $out/config.* ''; meta = with lib; { diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 870e919357e..8758daf9c3a 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -11,6 +11,7 @@ , gtest , ninja , nlohmann_json +, openssl , pkg-config , protobuf # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 @@ -18,29 +19,29 @@ , staticOnly ? stdenv.hostPlatform.isStatic }: let - googleapisRev = "ed739492993c4a99629b6430affdd6c0fb59d435"; + googleapisRev = "d4f3468ef85278428005ed555b3a85db91551ee6"; googleapis = fetchFromGitHub { owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256:1xrnh77vb8hxmf1ywqsifzd39kylhbdyah0b0b9bm7nw0mnahssl"; + hash = "sha256-sIQVFQhE3Ae6ia45apzdgtwzglMM4hFZ8efNAhMO5ZY="; }; excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml); in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "1.32.1"; + version = "1.38.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "0g720sni70nlncv4spm4rlfykdkpjnv81axfz2jd1arpdajm0mg9"; + sha256 = "sha256-kobOkohWIDTQaaihhoh/25tZUNv+CjKFwj2xQqO52bA="; }; postPatch = '' substituteInPlace external/googleapis/CMakeLists.txt \ - --replace "https://github.com/googleapis/googleapis/archive/${googleapisRev}.tar.gz" "file://${googleapis}" + --replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" ''; nativeBuildInputs = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ninja pkg-config ] ++ lib.optionals (!doInstallCheck) [ - # enable these dependencies when doInstallCheck failse because we're + # 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 @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { curl grpc nlohmann_json + openssl protobuf ]; diff --git a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml index c2fb2a24483..8cbe766862b 100644 --- a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml +++ b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml @@ -1,6 +1,6 @@ whole = [ "bigquery_bigquery_read_integration_test", - "bigtable_admin_backup_integration_test", + "bigtable_admin_admin_iam_policy_integration_test", "bigtable_admin_iam_policy_integration_test", "bigtable_admin_integration_test", "bigtable_apply_read_latency_benchmark", @@ -15,12 +15,15 @@ whole = [ "bigtable_table_sample_rows_integration_test", "iam_iam_credentials_integration_test", "iam_iam_integration_test", + "logging_quickstart", "pubsub_endurance", "pubsub_schema_admin_integration_test", "pubsub_subscriber_integration_test", "pubsub_subscription_admin_integration_test", "pubsub_throughput", "pubsub_topic_admin_integration_test", + "rest_internal_internal_curl_rest_client_integration_test", + "rest_internal_internal_unified_rest_credentials_integration_test", "spanner_admin_backup_extra_integration_test", "spanner_admin_database_admin_integration_test", "spanner_admin_instance_admin_integration_test", diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 263807c2fc1..75b13b6b7ef 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,28 +1,37 @@ -{ lib, stdenv, fetchurl, fetchpatch -, autoreconfHook, libgpg-error, gnupg, pkg-config, glib, pth, libassuan -, file, which, ncurses +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, libgpg-error +, gnupg +, pkg-config +, glib +, pth +, libassuan +, file +, which +, ncurses , texinfo , buildPackages , qtbase ? null -, pythonSupport ? false, swig2 ? null, python ? null +, pythonSupport ? false +, swig2 ? null +, python ? null }: - let inherit (stdenv.hostPlatform) system; in - stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - sha256 = "1l4yw9fqc1blvx1sq1jnfvp1jijla3ca2jw90p4x9m8hvfpc933c"; + sha256 = "1xb9k88rrafdi0n95nzx0d6bz7hcn9b44hciqbigrqkvxc6gblsf"; }; patches = [ - # probably included in > 1.16.0 - ./test_t-edit-sign.diff # https://dev.gnupg.org/rMc4cf527ea227edb468a84bf9b8ce996807bd6992 ./fix_gpg_list_keys.diff # https://lists.gnupg.org/pipermail/gnupg-devel/2020-April/034591.html @@ -31,22 +40,48 @@ stdenv.mkDerivation rec { url = "https://lists.gnupg.org/pipermail/gnupg-devel/attachments/20200415/f7be62d1/attachment.obj"; sha256 = "00d4sxq63601lzdp2ha1i8fvybh7dzih4531jh8bx07fab3sw65g"; }) + # Support Python 3.10 version detection without distutils, https://dev.gnupg.org/D545 + ./python-310-detection-without-distutils.patch + # Find correct version string for Python >= 3.10, https://dev.gnupg.org/D546 + ./python-find-version-string-above-310.patch # Disable python tests on Darwin as they use gpg (see configureFlags below) ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch - # Fix _AC_UNDECLARED_WARNING for autoconf≥2.70. See https://lists.gnupg.org/pipermail/gnupg-devel/2020-November/034643.html + # Fix _AC_UNDECLARED_WARNING for autoconf>=2.70 + # See https://lists.gnupg.org/pipermail/gnupg-devel/2020-November/034643.html ++ lib.optional stdenv.cc.isClang ./fix-clang-autoconf-undeclared-warning.patch; outputs = [ "out" "dev" "info" ]; + outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool - propagatedBuildInputs = - [ libgpg-error glib libassuan pth ] - ++ lib.optional (qtbase != null) qtbase; + nativeBuildInputs = [ + autoreconfHook + gnupg + pkg-config + texinfo + ] ++ lib.optionals pythonSupport [ + ncurses + python + swig2 + which + ]; - nativeBuildInputs = [ pkg-config gnupg texinfo autoreconfHook ] - ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; + propagatedBuildInputs = [ + glib + libassuan + libgpg-error + pth + ] ++ lib.optionals (qtbase != null) [ + qtbase + ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; + checkInputs = [ + which + ]; + + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; dontWrapQtApps = true; @@ -59,16 +94,15 @@ stdenv.mkDerivation rec { # which has a path length limit. Nix on darwin is using a build directory # that already has quite a long path and the resulting socket path doesn't # fit in the limit. https://github.com/NixOS/nix/pull/1085 - ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; + ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; NIX_CFLAGS_COMPILE = toString ( # qgpgme uses Q_ASSERT which retains build inputs at runtime unless # debugging is disabled lib.optional (qtbase != null) "-DQT_NO_DEBUG" # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html - ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"); - - checkInputs = [ which ]; + ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64" + ); doCheck = true; diff --git a/pkgs/development/libraries/gpgme/python-310-detection-without-distutils.patch b/pkgs/development/libraries/gpgme/python-310-detection-without-distutils.patch new file mode 100644 index 00000000000..e0eea9ff042 --- /dev/null +++ b/pkgs/development/libraries/gpgme/python-310-detection-without-distutils.patch @@ -0,0 +1,273 @@ +diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 +--- a/m4/ax_python_devel.m4 ++++ b/m4/ax_python_devel.m4 +@@ -1,5 +1,5 @@ + # =========================================================================== +-# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html ++# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html + # =========================================================================== + # + # SYNOPSIS +@@ -12,8 +12,8 @@ + # in your configure.ac. + # + # This macro checks for Python and tries to get the include path to +-# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) +-# output variables. It also exports $(PYTHON_EXTRA_LIBS) and ++# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output ++# variables. It also exports $(PYTHON_EXTRA_LIBS) and + # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. + # + # You can search for some particular version of Python by passing a +@@ -67,7 +67,7 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 17 ++#serial 23 + + AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) + AC_DEFUN([AX_PYTHON_DEVEL],[ +@@ -99,7 +99,7 @@ + This version of the AC@&t@_PYTHON_DEVEL macro + doesn't work properly with versions of Python before + 2.1.0. You may need to re-run configure, setting the +-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, ++variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, + PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. + Moreover, to disable this check, set PYTHON_NOVERSIONCHECK + to something else than an empty string. +@@ -135,16 +135,25 @@ + # + # Check if you have distutils, else fail + # +- AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ AC_MSG_CHECKING([for the sysconfig Python package]) ++ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1` ++ if test $? -eq 0; then + AC_MSG_RESULT([yes]) ++ IMPORT_SYSCONFIG="import sysconfig" + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import Python module "distutils". ++ ++ AC_MSG_CHECKING([for the distutils Python package]) ++ ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1` ++ if test $? -eq 0; then ++ AC_MSG_RESULT([yes]) ++ IMPORT_SYSCONFIG="from distutils import sysconfig" ++ else ++ AC_MSG_ERROR([cannot import Python module "distutils". + Please check your Python installation. The error was: +-$ac_distutils_result]) +- PYTHON_VERSION="" ++$ac_sysconfig_result]) ++ PYTHON_VERSION="" ++ fi + fi + + # +@@ -152,10 +161,19 @@ + # + AC_MSG_CHECKING([for Python include path]) + if test -z "$PYTHON_CPPFLAGS"; then +- python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc ());"` +- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` ++ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then ++ # sysconfig module has different functions ++ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_path ('include'));"` ++ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_path ('platinclude'));"` ++ else ++ # old distutils way ++ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_python_inc ());"` ++ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_python_inc (plat_specific=1));"` ++ fi + if test -n "${python_path}"; then + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" +@@ -172,14 +190,14 @@ + # Check for Python library path + # + AC_MSG_CHECKING([for Python library path]) +- if test -z "$PYTHON_LDFLAGS"; then ++ if test -z "$PYTHON_LIBS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat<<EOD | $PYTHON - + + # join all versioning strings, on some systems + # major/minor numbers could be in different list elements +-from distutils.sysconfig import * ++from sysconfig import * + e = get_config_var('VERSION') + if e is not None: + print(e) +@@ -197,7 +215,7 @@ + # Make the versioning information available to the compiler + + # JW: We don't need it and it interferes with the hack +- # to detect multiple Pyhton versions ++ # to detect multiple Python versions + #AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"], + # [If available, contains the Python version number currently in use.]) + +@@ -205,8 +223,8 @@ + ac_python_libdir=`cat<<EOD | $PYTHON - + + # There should be only one +-import distutils.sysconfig +-e = distutils.sysconfig.get_config_var('LIBDIR') ++$IMPORT_SYSCONFIG ++e = sysconfig.get_config_var('LIBDIR') + if e is not None: + print (e) + EOD` +@@ -214,8 +232,8 @@ + # Now, for the library: + ac_python_library=`cat<<EOD | $PYTHON - + +-import distutils.sysconfig +-c = distutils.sysconfig.get_config_vars() ++$IMPORT_SYSCONFIG ++c = sysconfig.get_config_vars() + if 'LDVERSION' in c: + print ('python'+c[['LDVERSION']]) + else: +@@ -230,44 +248,67 @@ + then + # use the official shared library + ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"` +- PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library" ++ PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library" + else + # old way: use libpython from python_configdir + ac_python_libdir=`$PYTHON -c \ +- "from distutils.sysconfig import get_python_lib as f; \ ++ "from sysconfig import get_python_lib as f; \ + import os; \ + print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"` +- PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version" ++ PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version" + fi + +- if test -z "PYTHON_LDFLAGS"; then ++ if test -z "PYTHON_LIBS"; then + AC_MSG_ERROR([ + Cannot determine location of your Python DSO. Please check it was installed with +- dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand. ++ dynamic libraries enabled, or try setting PYTHON_LIBS by hand. + ]) + fi + fi +- AC_MSG_RESULT([$PYTHON_LDFLAGS]) +- AC_SUBST([PYTHON_LDFLAGS]) ++ AC_MSG_RESULT([$PYTHON_LIBS]) ++ AC_SUBST([PYTHON_LIBS]) + + # + # Check for site packages + # + AC_MSG_CHECKING([for Python site-packages path]) + if test -z "$PYTHON_SITE_PKG"; then +- PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_lib(0,0));"` ++ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then ++ PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_path('purelib'));"` ++ else ++ # distutils.sysconfig way ++ PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_python_lib(0,0));"` ++ fi + fi + AC_MSG_RESULT([$PYTHON_SITE_PKG]) + AC_SUBST([PYTHON_SITE_PKG]) + ++ # ++ # Check for platform-specific site packages ++ # ++ AC_MSG_CHECKING([for Python platform specific site-packages path]) ++ if test -z "$PYTHON_SITE_PKG"; then ++ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then ++ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_path('platlib'));"` ++ else ++ # distutils.sysconfig way ++ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_python_lib(1,0));"` ++ fi ++ fi ++ AC_MSG_RESULT([$PYTHON_PLATFORM_SITE_PKG]) ++ AC_SUBST([PYTHON_PLATFORM_SITE_PKG]) ++ + # + # libraries which must be linked in when embedding + # + AC_MSG_CHECKING(python extra libraries) + if test -z "$PYTHON_EXTRA_LIBS"; then +- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ +- conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LIBS=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ conf = sysconfig.get_config_var; \ + print (conf('LIBS') + ' ' + conf('SYSLIBS'))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) +@@ -278,8 +319,8 @@ + # + AC_MSG_CHECKING(python extra linking flags) + if test -z "$PYTHON_EXTRA_LDFLAGS"; then +- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ +- conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ conf = sysconfig.get_config_var; \ + print (conf('LINKFORSHARED'))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) +@@ -291,8 +332,10 @@ + AC_MSG_CHECKING([consistency of all components of python development environment]) + # save current global flags + ac_save_LIBS="$LIBS" ++ ac_save_LDFLAGS="$LDFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" +- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS" ++ LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LIBS" ++ LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS" + CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" + AC_LANG_PUSH([C]) + AC_LINK_IFELSE([ +@@ -303,15 +346,17 @@ + # turn back to default flags + CPPFLAGS="$ac_save_CPPFLAGS" + LIBS="$ac_save_LIBS" ++ LDFLAGS="$ac_save_LDFLAGS" + + AC_MSG_RESULT([$pythonexists]) + + if test ! "x$pythonexists" = "xyes"; then ++ # gpgme: only warn here, no error, as we are looking for multiple versions + AC_MSG_WARN([ + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, +- via the LDFLAGS environment variable. +- Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" ++ via the LIBS environment variable. ++ Example: ./configure LIBS="-L/usr/non-standard-path/python/lib" + ============================================================================ + You probably have to install the development version of the Python package + for your distribution. The exact name of this package varies among them. +@@ -323,4 +368,4 @@ + # + # all done! + # +-]) ++]) +\ No newline at end of file + diff --git a/pkgs/development/libraries/gpgme/python-find-version-string-above-310.patch b/pkgs/development/libraries/gpgme/python-find-version-string-above-310.patch new file mode 100644 index 00000000000..3d8191c9929 --- /dev/null +++ b/pkgs/development/libraries/gpgme/python-find-version-string-above-310.patch @@ -0,0 +1,373 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -425,11 +425,12 @@ + if test "$found_py" = "1" -o "$found_py3" = "1"; then + # Reset everything, so that we can look for another Python. + m4_foreach([mym4pythonver], +- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[all]], ++ [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10],[all]], + [unset PYTHON + unset PYTHON_VERSION + unset PYTHON_CPPFLAGS + unset PYTHON_LDFLAGS ++ unset PYTHON_LIBS + unset PYTHON_SITE_PKG + unset PYTHON_EXTRA_LIBS + unset PYTHON_EXTRA_LDFLAGS +diff --git a/m4/python.m4 b/m4/python.m4 +--- a/m4/python.m4 ++++ b/m4/python.m4 +@@ -1,10 +1,10 @@ + ## ------------------------ -*- Autoconf -*- + ## Python file handling + ## From Andrew Dalke +-## Updated by James Henstridge ++## Updated by James Henstridge and other contributors. + ## Updated by Werner Koch 2018-10-17 +-## --------------------------------- +-# Copyright (C) 1999-2017 Free Software Foundation, Inc. ++## ------------------------ ++# Copyright (C) 1999-2021 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -36,13 +36,12 @@ + # numbers and dots only. + AC_DEFUN([AM_PATH_PYTHON], + [ +- dnl Find a Python interpreter. Python versions prior to 2.0 are not +- dnl supported. (2.0 was released on October 16, 2000). Python 3.0 +- dnl through to Python 3.9 are also not supported. ++ dnl Find a Python interpreter. Python versions prior to 2.7 are not ++ dnl supported. Python 3.0 through to Python 3.3 are also not supported. + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], + [python2 python2.7 dnl + python dnl +- python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 ++ python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 + ]) + + AC_ARG_VAR([PYTHON], [the Python interpreter]) +@@ -85,34 +84,141 @@ + ]) + + if test "$PYTHON" = :; then +- dnl Run any user-specified action, or abort. ++ dnl Run any user-specified action, or abort. + m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) + else + +- dnl Query Python for its version number. Getting [:3] seems to be +- dnl the best way to do this; it's what "site.py" does in the standard +- dnl library. +- ++ dnl Query Python for its version number. Although site.py simply uses ++ dnl sys.version[:3], printing that failed with Python 3.10, since the ++ dnl trailing zero was eliminated. So now we output just the major ++ dnl and minor version numbers, as numbers. Apparently the tertiary ++ dnl version is not of interest. ++ dnl + AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], +- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) ++ [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`]) + AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) + +- dnl Use the values of $prefix and $exec_prefix for the corresponding +- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made +- dnl distinct variables so they can be overridden if need be. However, +- dnl general consensus is that you shouldn't need this ability. +- +- AC_SUBST([PYTHON_PREFIX], ['${prefix}']) +- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) +- +- dnl At times (like when building shared libraries) you may want ++ dnl At times, e.g., when building shared libraries, you may want + dnl to know which OS platform Python thinks this is. +- ++ dnl + AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], + [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) + AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + +- # Just factor out some code duplication. ++ dnl emacs-page ++ dnl If --with-python-sys-prefix is given, use the values of sys.prefix ++ dnl and sys.exec_prefix for the corresponding values of PYTHON_PREFIX ++ dnl and PYTHON_EXEC_PREFIX. Otherwise, use the GNU ${prefix} and ++ dnl ${exec_prefix} variables. ++ dnl ++ dnl The two are made distinct variables so they can be overridden if ++ dnl need be, although general consensus is that you shouldn't need ++ dnl this separation. ++ dnl ++ dnl Also allow directly setting the prefixes via configure options, ++ dnl overriding any default. ++ dnl ++ if test "x$prefix" = xNONE; then ++ am__usable_prefix=$ac_default_prefix ++ else ++ am__usable_prefix=$prefix ++ fi ++ ++ # Allow user to request using sys.* values from Python, ++ # instead of the GNU $prefix values. ++ AC_ARG_WITH([python-sys-prefix], ++ [AS_HELP_STRING([--with-python-sys-prefix], ++ [use Python's sys.prefix and sys.exec_prefix values])], ++ [am_use_python_sys=:], ++ [am_use_python_sys=false]) ++ ++ # Allow user to override whatever the default Python prefix is. ++ AC_ARG_WITH([python_prefix], ++ [AS_HELP_STRING([--with-python_prefix], ++ [override the default PYTHON_PREFIX])], ++ [am_python_prefix_subst=$withval ++ am_cv_python_prefix=$withval ++ AC_MSG_CHECKING([for explicit $am_display_PYTHON prefix]) ++ AC_MSG_RESULT([$am_cv_python_prefix])], ++ [ ++ if $am_use_python_sys; then ++ # using python sys.prefix value, not GNU ++ AC_CACHE_CHECK([for python default $am_display_PYTHON prefix], ++ [am_cv_python_prefix], ++ [am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`]) ++ ++ dnl If sys.prefix is a subdir of $prefix, replace the literal value of ++ dnl $prefix with a variable reference so it can be overridden. ++ case $am_cv_python_prefix in ++ $am__usable_prefix*) ++ am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'` ++ am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"` ++ ;; ++ *) ++ am_python_prefix_subst=$am_cv_python_prefix ++ ;; ++ esac ++ else # using GNU prefix value, not python sys.prefix ++ am_python_prefix_subst='${prefix}' ++ am_python_prefix=$am_python_prefix_subst ++ AC_MSG_CHECKING([for GNU default $am_display_PYTHON prefix]) ++ AC_MSG_RESULT([$am_python_prefix]) ++ fi]) ++ # Substituting python_prefix_subst value. ++ AC_SUBST([PYTHON_PREFIX], [$am_python_prefix_subst]) ++ ++ # emacs-page Now do it all over again for Python exec_prefix, but with yet ++ # another conditional: fall back to regular prefix if that was specified. ++ AC_ARG_WITH([python_exec_prefix], ++ [AS_HELP_STRING([--with-python_exec_prefix], ++ [override the default PYTHON_EXEC_PREFIX])], ++ [am_python_exec_prefix_subst=$withval ++ am_cv_python_exec_prefix=$withval ++ AC_MSG_CHECKING([for explicit $am_display_PYTHON exec_prefix]) ++ AC_MSG_RESULT([$am_cv_python_exec_prefix])], ++ [ ++ # no explicit --with-python_exec_prefix, but if ++ # --with-python_prefix was given, use its value for python_exec_prefix too. ++ AS_IF([test -n "$with_python_prefix"], ++ [am_python_exec_prefix_subst=$with_python_prefix ++ am_cv_python_exec_prefix=$with_python_prefix ++ AC_MSG_CHECKING([for python_prefix-given $am_display_PYTHON exec_prefix]) ++ AC_MSG_RESULT([$am_cv_python_exec_prefix])], ++ [ ++ # Set am__usable_exec_prefix whether using GNU or Python values, ++ # since we use that variable for pyexecdir. ++ if test "x$exec_prefix" = xNONE; then ++ am__usable_exec_prefix=$am__usable_prefix ++ else ++ am__usable_exec_prefix=$exec_prefix ++ fi ++ # ++ if $am_use_python_sys; then # using python sys.exec_prefix, not GNU ++ AC_CACHE_CHECK([for python default $am_display_PYTHON exec_prefix], ++ [am_cv_python_exec_prefix], ++ [am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`]) ++ dnl If sys.exec_prefix is a subdir of $exec_prefix, replace the ++ dnl literal value of $exec_prefix with a variable reference so it can ++ dnl be overridden. ++ case $am_cv_python_exec_prefix in ++ $am__usable_exec_prefix*) ++ am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'` ++ am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"` ++ ;; ++ *) ++ am_python_exec_prefix_subst=$am_cv_python_exec_prefix ++ ;; ++ esac ++ else # using GNU $exec_prefix, not python sys.exec_prefix ++ am_python_exec_prefix_subst='${exec_prefix}' ++ am_python_exec_prefix=$am_python_exec_prefix_subst ++ AC_MSG_CHECKING([for GNU default $am_display_PYTHON exec_prefix]) ++ AC_MSG_RESULT([$am_python_exec_prefix]) ++ fi])]) ++ # Substituting python_exec_prefix_subst. ++ AC_SUBST([PYTHON_EXEC_PREFIX], [$am_python_exec_prefix_subst]) ++ ++ # Factor out some code duplication into this shell variable. + am_python_setup_sysconfig="\ + import sys + # Prefer sysconfig over distutils.sysconfig, for better compatibility +@@ -132,96 +238,95 @@ + except ImportError: + pass" + +- dnl Set up 4 directories: ++ dnl emacs-page Set up 4 directories: + +- dnl pythondir -- where to install python scripts. This is the +- dnl site-packages directory, not the python standard library +- dnl directory like in previous automake betas. This behavior +- dnl is more consistent with lispdir.m4 for example. ++ dnl 1. pythondir: where to install python scripts. This is the ++ dnl site-packages directory, not the python standard library ++ dnl directory like in previous automake betas. This behavior ++ dnl is more consistent with lispdir.m4 for example. + dnl Query distutils for this directory. +- AC_CACHE_CHECK([for $am_display_PYTHON script directory], +- [am_cv_python_pythondir], +- [if test "x$prefix" = xNONE +- then +- am_py_prefix=$ac_default_prefix +- else +- am_py_prefix=$prefix +- fi +- am_cv_python_pythondir=`$PYTHON -c " ++ dnl ++ AC_CACHE_CHECK([for $am_display_PYTHON script directory (pythondir)], ++ [am_cv_python_pythondir], ++ [if test "x$am_cv_python_prefix" = x; then ++ am_py_prefix=$am__usable_prefix ++ else ++ am_py_prefix=$am_cv_python_prefix ++ fi ++ am_cv_python_pythondir=`$PYTHON -c " + $am_python_setup_sysconfig + if can_use_sysconfig: +- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) ++ sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) + else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') ++ from distutils import sysconfig ++ sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') + sys.stdout.write(sitedir)"` +- case $am_cv_python_pythondir in +- $am_py_prefix*) +- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` +- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` +- ;; +- *) +- case $am_py_prefix in +- /usr|/System*) ;; +- *) +- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages +- ;; +- esac +- ;; ++ # ++ case $am_cv_python_pythondir in ++ $am_py_prefix*) ++ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` ++ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"` ++ ;; ++ *) ++ case $am_py_prefix in ++ /usr|/System*) ;; ++ *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages" ++ ;; + esac +- ]) ++ ;; ++ esac ++ ]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) + +- dnl pkgpythondir -- $PACKAGE directory under pythondir. Was +- dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is +- dnl more consistent with the rest of automake. +- ++ dnl 2. pkgpythondir: $PACKAGE directory under pythondir. Was ++ dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is ++ dnl more consistent with the rest of automake. ++ dnl + AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) + +- dnl pyexecdir -- directory for installing python extension modules +- dnl (shared libraries) ++ dnl 3. pyexecdir: directory for installing python extension modules ++ dnl (shared libraries). + dnl Query distutils for this directory. +- AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], +- [am_cv_python_pyexecdir], +- [if test "x$exec_prefix" = xNONE +- then +- am_py_exec_prefix=$am_py_prefix +- else +- am_py_exec_prefix=$exec_prefix +- fi +- am_cv_python_pyexecdir=`$PYTHON -c " ++ dnl ++ AC_CACHE_CHECK([for $am_display_PYTHON extension module directory (pyexecdir)], ++ [am_cv_python_pyexecdir], ++ [if test "x$am_cv_python_exec_prefix" = x; then ++ am_py_exec_prefix=$am__usable_exec_prefix ++ else ++ am_py_exec_prefix=$am_cv_python_exec_prefix ++ fi ++ am_cv_python_pyexecdir=`$PYTHON -c " + $am_python_setup_sysconfig + if can_use_sysconfig: +- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) ++ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) + else: +- from distutils import sysconfig +- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') ++ from distutils import sysconfig ++ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix') + sys.stdout.write(sitedir)"` +- case $am_cv_python_pyexecdir in +- $am_py_exec_prefix*) +- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` +- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` +- ;; +- *) +- case $am_py_exec_prefix in +- /usr|/System*) ;; +- *) +- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages +- ;; +- esac +- ;; ++ # ++ case $am_cv_python_pyexecdir in ++ $am_py_exec_prefix*) ++ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` ++ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"` ++ ;; ++ *) ++ case $am_py_exec_prefix in ++ /usr|/System*) ;; ++ *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages" ++ ;; + esac +- ]) ++ ;; ++ esac ++ ]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) + +- dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) +- ++ dnl 4. pkgpyexecdir: $(pyexecdir)/$(PACKAGE) ++ dnl + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + + dnl Run any user-specified action. + $2 + fi +- + ]) + + + diff --git a/pkgs/development/libraries/gpgme/test_t-edit-sign.diff b/pkgs/development/libraries/gpgme/test_t-edit-sign.diff deleted file mode 100644 index 55075b9eb12..00000000000 --- a/pkgs/development/libraries/gpgme/test_t-edit-sign.diff +++ /dev/null @@ -1,125 +0,0 @@ -From 81a33ea5e1b86d586b956e893a5b25c4cd41c969 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de> -Date: Sat, 26 Jun 2021 18:02:47 +0200 -Subject: [PATCH] core: Fix use-after-free issue in test - -* tests/gpg/t-edit-sign.c (sign_key, verify_key_signature): New. -(main): Factored out signing and verifying the result. --- - -Factoring the two steps of the test into different functions fixes the -use-after-free issue that was caused by accidentaly using a variable -of the first step in the second step. - -GnuPG-bug-id: 5509 ---- - tests/gpg/t-edit-sign.c | 54 ++++++++++++++++++++++++++++------------- - 1 file changed, 37 insertions(+), 17 deletions(-) - -diff --git a/tests/gpg/t-edit-sign.c b/tests/gpg/t-edit-sign.c -index 2f983622..e0494c54 100644 ---- a/tests/gpg/t-edit-sign.c -+++ b/tests/gpg/t-edit-sign.c -@@ -107,31 +107,19 @@ interact_fnc (void *opaque, const char *status, const char *args, int fd) - } - - --int --main (int argc, char **argv) -+void -+sign_key (const char *key_fpr, const char *signer_fpr) - { - gpgme_ctx_t ctx; - gpgme_error_t err; - gpgme_data_t out = NULL; -- const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */ - gpgme_key_t signing_key = NULL; -- const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */ - gpgme_key_t key = NULL; -- gpgme_key_t signed_key = NULL; -- gpgme_user_id_t signed_uid = NULL; -- gpgme_key_sig_t key_sig = NULL; - char *agent_info; -- int mode; -- -- (void)argc; -- (void)argv; -- -- init_gpgme (GPGME_PROTOCOL_OpenPGP); - - err = gpgme_new (&ctx); - fail_if_err (err); - -- /* Sign the key */ - agent_info = getenv("GPG_AGENT_INFO"); - if (!(agent_info && strchr (agent_info, ':'))) - gpgme_set_passphrase_cb (ctx, passphrase_cb, 0); -@@ -159,8 +147,23 @@ main (int argc, char **argv) - gpgme_data_release (out); - gpgme_key_unref (key); - gpgme_key_unref (signing_key); -+ gpgme_release (ctx); -+} -+ -+ -+void -+verify_key_signature (const char *key_fpr, const char *signer_keyid) -+{ -+ gpgme_ctx_t ctx; -+ gpgme_error_t err; -+ gpgme_key_t signed_key = NULL; -+ gpgme_user_id_t signed_uid = NULL; -+ gpgme_key_sig_t key_sig = NULL; -+ int mode; -+ -+ err = gpgme_new (&ctx); -+ fail_if_err (err); - -- /* Verify the key signature */ - mode = gpgme_get_keylist_mode (ctx); - mode |= GPGME_KEYLIST_MODE_SIGS; - err = gpgme_set_keylist_mode (ctx, mode); -@@ -168,7 +171,7 @@ main (int argc, char **argv) - err = gpgme_get_key (ctx, key_fpr, &signed_key, 0); - fail_if_err (err); - -- signed_uid = key->uids; -+ signed_uid = signed_key->uids; - if (!signed_uid) - { - fprintf (stderr, "Signed key has no user IDs\n"); -@@ -180,7 +183,7 @@ main (int argc, char **argv) - exit (1); - } - key_sig = signed_uid->signatures->next; -- if (strcmp ("2D727CC768697734", key_sig->keyid)) -+ if (strcmp (signer_keyid, key_sig->keyid)) - { - fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n", - key_sig->keyid); -@@ -196,6 +199,23 @@ main (int argc, char **argv) - - gpgme_key_unref (signed_key); - gpgme_release (ctx); -+} -+ -+ -+int -+main (int argc, char **argv) -+{ -+ const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */ -+ const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16; -+ const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */ -+ -+ (void)argc; -+ (void)argv; -+ -+ init_gpgme (GPGME_PROTOCOL_OpenPGP); -+ -+ sign_key (key_fpr, signer_fpr); -+ verify_key_signature (key_fpr, signer_keyid); - - return 0; - } --- -2.32.0 diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index b7c2d5d3aa9..ffb4e5bbbf9 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2021-10-01"; + version = "unstable-2021-10-28"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0"; - sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko="; + rev = "a44d84ec687f41ad37e43697b28a018f65780780"; + sha256 = "7J4jf3gDiorsc4zs6zwC+j/Zg0oZWKAFAz9vvJJ2CYM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 1e36f1e7f0f..e47b18252e9 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -24,7 +24,7 @@ }: let - version = "3.2.0"; + version = "3.3.2"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "sha256-iNYp/hyJTaaF6e09YpUL7ktBhq2wRN9zKiEH59WLbYU="; + sha256 = "sha256-UbYqV7Ch9ugTIwSsCpjnS8H7tcv4P3OVpFDFDZtQCk0="; }; postPatch = '' diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 8581ab729a6..79ff2c4ee5f 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.0.2"; + version = "22.1.0"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "001kkm1l4s9i7ikaqpf78l5h0a5dy1m9w5r5g0yrlqpi54h6ph28"; + sha256 = "sha256-4LFBokMEhhobKIMzZYlt3Nn88lX60l+IZZ0gi+o7Tds="; }; nativeBuildInputs = [ cmake ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { OpenCL(TM) and the Intel(R) Media Driver for VAAPI. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 08ce4235498..380f0c1f7e2 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.1.1"; + version = "22.2.2"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1gv89k48s03hwvlcg484li0dznqg93z82xv9lpv3gkncvwfvh9c8"; + sha256 = "sha256-ksh8xx46x9OgXBrhJr3FnBI9g4PHXUDhLPbgpvccffM="; }; patches = [ @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; license = with licenses; [ bsd3 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ primeos jfrankenau SuperSandro2000 ]; + maintainers = with maintainers; [ jfrankenau SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 50204bc0ec0..cb4e4cc2629 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.90/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.91/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch index 07da70092dc..1379707f02f 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch +++ b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch @@ -13,18 +13,18 @@ diff --git a/src/client.cpp b/src/client.cpp index 44fbacd..6b5abf5 100644 --- a/src/client.cpp +++ b/src/client.cpp -@@ -378,11 +378,14 @@ int KDEsuClient::stopServer() +@@ -384,11 +384,14 @@ int KDEsuClient::stopServer() static QString findDaemon() { -- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); +- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud"); - if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH - daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); - if (daemon.isEmpty()) { - qCWarning(KSU_LOG) << "kdesud daemon not found."; + QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); + if (!QFile::exists(daemon)) { // if not in wrappers -+ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); ++ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud"); + if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH + daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); + if (daemon.isEmpty()) { diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 1ffc5df68c3..2b3983a892c 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/attica-5.90.0.tar.xz"; - sha256 = "0zs37qyh9biafk76ps2xfc41hbd1n4dq42qqqcvbqcrwfgqz2wlk"; - name = "attica-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/attica-5.91.0.tar.xz"; + sha256 = "0svvy7qflidwxns12y2lra54gg6lhglcddzmrw7ccvbdyqcy2pn0"; + name = "attica-5.91.0.tar.xz"; }; }; baloo = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/baloo-5.90.0.tar.xz"; - sha256 = "1nnfys8dyiivd2if81qrgrmpprfni77an9l3wff0l5k85ac86i56"; - name = "baloo-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/baloo-5.91.0.tar.xz"; + sha256 = "1cqjbaiwqba707xaz9zsrdz9cms2mdrhv6jpwsq8q7f4g4rxcx3m"; + name = "baloo-5.91.0.tar.xz"; }; }; bluez-qt = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/bluez-qt-5.90.0.tar.xz"; - sha256 = "056i5ndrg5fqm1bx49a0plfhlladphha128wi766zdhcm6np11z3"; - name = "bluez-qt-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/bluez-qt-5.91.0.tar.xz"; + sha256 = "0p37jrmppwahh4vaq3wkw6xn0ms8dxcxpfd4glzjlnw426zrwnjr"; + name = "bluez-qt-5.91.0.tar.xz"; }; }; breeze-icons = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/breeze-icons-5.90.0.tar.xz"; - sha256 = "06dfh571rf8gp4gnnqn13xqgc1bpc4ycn6bmxf38x53fxxfl3fnn"; - name = "breeze-icons-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/breeze-icons-5.91.0.tar.xz"; + sha256 = "0aj24gn48c17n9jzrj0az04ph4hpx7zf2rj4vgwl19iip69vfzf1"; + name = "breeze-icons-5.91.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/extra-cmake-modules-5.90.0.tar.xz"; - sha256 = "1c5wza7srib3mdkf29ygmyj5b6jq322s6h7k5hlljqm5xhy7q07k"; - name = "extra-cmake-modules-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/extra-cmake-modules-5.91.0.tar.xz"; + sha256 = "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp"; + name = "extra-cmake-modules-5.91.0.tar.xz"; }; }; frameworkintegration = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/frameworkintegration-5.90.0.tar.xz"; - sha256 = "1v7vlq2gk7j5b6gzbawgnpii7csh2zclp5v24qhx4qrmpfssylan"; - name = "frameworkintegration-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/frameworkintegration-5.91.0.tar.xz"; + sha256 = "1176ql8f96ap4gzjaj8vm4cr6f2rsx9z93gpc4hx4jcqjhxqrg3z"; + name = "frameworkintegration-5.91.0.tar.xz"; }; }; kactivities = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kactivities-5.90.0.tar.xz"; - sha256 = "0wf7nnf3bjz2iq2wqxnyay1100ks0zscsh7sa8xfcijrl7pp305w"; - name = "kactivities-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kactivities-5.91.0.tar.xz"; + sha256 = "03y4hx7jgrhac12ys8pm22h0f49kms8b71gck4xv577p3ywi3j60"; + name = "kactivities-5.91.0.tar.xz"; }; }; kactivities-stats = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kactivities-stats-5.90.0.tar.xz"; - sha256 = "0qamy8xggjlnm8pkv6vxbaagcp1hg9vgi2ws2yb9xpqk8mdlfbvp"; - name = "kactivities-stats-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kactivities-stats-5.91.0.tar.xz"; + sha256 = "0864qfljh20723djfzdv8h6nipw01825lhiknyqz17aj2x2ymzcq"; + name = "kactivities-stats-5.91.0.tar.xz"; }; }; kapidox = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kapidox-5.90.0.tar.xz"; - sha256 = "16jl519sx7pirjp5x57x5gbgv477457063rrbwpvyf2ldb6lc29p"; - name = "kapidox-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kapidox-5.91.0.tar.xz"; + sha256 = "1xxpl8rn49d2cr7ld94j3wsg21019l2kq14p5bvilisnj3salka3"; + name = "kapidox-5.91.0.tar.xz"; }; }; karchive = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/karchive-5.90.0.tar.xz"; - sha256 = "0411rpgr9dy0zf9mmhj7n7ax0afrn7zvkpzpnjvpvvqsrfkz7qm6"; - name = "karchive-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/karchive-5.91.0.tar.xz"; + sha256 = "1kjc47zzdd9jhcmynq6zw6y6zaj2c1i8pxvszx3d9x5asaz2qq53"; + name = "karchive-5.91.0.tar.xz"; }; }; kauth = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kauth-5.90.0.tar.xz"; - sha256 = "1g4i1prspcczpx25wvd8lgdk8c3my7kp3wv489gvcci40rl5z913"; - name = "kauth-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kauth-5.91.0.tar.xz"; + sha256 = "001svdyvs8qc6h8zkb9x072npkz6xabz6j0djjb380gl9h9wnrgq"; + name = "kauth-5.91.0.tar.xz"; }; }; kbookmarks = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kbookmarks-5.90.0.tar.xz"; - sha256 = "1svc1i9zxbxf65crfhnv6sz5gknb7x87lzjd8cn11y5lwnsw36kx"; - name = "kbookmarks-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kbookmarks-5.91.0.tar.xz"; + sha256 = "0iqfngsvpbgxk6h8l68idcp97df28sa2zwj707zs0mf2bl9k68m4"; + name = "kbookmarks-5.91.0.tar.xz"; }; }; kcalendarcore = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kcalendarcore-5.90.0.tar.xz"; - sha256 = "0qbds2ysjv9rqwpvrhisvdd6wyhq5qwhbw5xcbj7ndxwpf8lpa8w"; - name = "kcalendarcore-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcalendarcore-5.91.0.tar.xz"; + sha256 = "0gkn0mzk3za86pjrpi8gd9d71bfv0ihzkgn8yy1ik3dw1rf9gxip"; + name = "kcalendarcore-5.91.0.tar.xz"; }; }; kcmutils = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kcmutils-5.90.0.tar.xz"; - sha256 = "04crq3j48xwlvp047p3waqrv1gg5sv1950jh02w85q00yjjh0qxk"; - name = "kcmutils-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcmutils-5.91.0.tar.xz"; + sha256 = "009r9r7fz1588g2cnqw585d2fz170x8j8bip1zqr7i4jl21ms68s"; + name = "kcmutils-5.91.0.tar.xz"; }; }; kcodecs = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kcodecs-5.90.0.tar.xz"; - sha256 = "0kwqyhjs63pqslqcmv3sngyqvl6ah8iaa6nn045sb8a58xb09inh"; - name = "kcodecs-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcodecs-5.91.0.tar.xz"; + sha256 = "0qkwvbp4vp3w57f3fyjknxd66qac77hl77mf042c7jxjl5vq7h1y"; + name = "kcodecs-5.91.0.tar.xz"; }; }; kcompletion = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kcompletion-5.90.0.tar.xz"; - sha256 = "0hd3nsixibw5z846mpib2lap3ar65rqvasifdnlmqsrvxfmw0ggk"; - name = "kcompletion-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcompletion-5.91.0.tar.xz"; + sha256 = "1l6z85a4rh3vrf4x5g3pqvp0q36gwmw0fbp9ny1iaqyy21dlh8i4"; + name = "kcompletion-5.91.0.tar.xz"; }; }; kconfig = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kconfig-5.90.0.tar.xz"; - sha256 = "0yqs3ydxzhhb7rrl01swjc9xw8j1bs3n204bf9slb2bs7lfz56rn"; - name = "kconfig-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kconfig-5.91.0.tar.xz"; + sha256 = "0axdnqipa8xgx864zylxllnzchlp50q59bbfw3c98svvvkm3yg56"; + name = "kconfig-5.91.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kconfigwidgets-5.90.0.tar.xz"; - sha256 = "1sm1x64x2v3xfcz9ia6qk8d8y1q02fggrc2q0yy5ag5xh1yr9zwq"; - name = "kconfigwidgets-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kconfigwidgets-5.91.0.tar.xz"; + sha256 = "01mvv01hv64wadjh8xk3hhp1vbs04cvbrjpfl1g9cv2sa6hr7102"; + name = "kconfigwidgets-5.91.0.tar.xz"; }; }; kcontacts = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kcontacts-5.90.0.tar.xz"; - sha256 = "0vv2136da5a6lwdj2x38jx2qwrk96hgn8iwaad4yynvc2csx6dim"; - name = "kcontacts-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcontacts-5.91.0.tar.xz"; + sha256 = "1c839c9rvys3jwmi3fzw06r1nhgvrb4z8sdh8gda0w03vqh7h1hv"; + name = "kcontacts-5.91.0.tar.xz"; }; }; kcoreaddons = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kcoreaddons-5.90.0.tar.xz"; - sha256 = "02m4h4r0kdy94zq8c6d2fhnd8qwrp4a0v5i4wf6khk4yf4fqy5kf"; - name = "kcoreaddons-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcoreaddons-5.91.0.tar.xz"; + sha256 = "16vimllvcs6rnb1ccbv9zg8hxbzacisgrlffyvwm608f4q1xmqyz"; + name = "kcoreaddons-5.91.0.tar.xz"; }; }; kcrash = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kcrash-5.90.0.tar.xz"; - sha256 = "0634jqzbvr8xkv53n2q3fcqlkcmq843w7g455v3swnlaqi92l04f"; - name = "kcrash-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcrash-5.91.0.tar.xz"; + sha256 = "0gdknmp5a36ipvzms4jhxywyxpjh0vy26861c54jfsk13yircjal"; + name = "kcrash-5.91.0.tar.xz"; }; }; kdav = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kdav-5.90.0.tar.xz"; - sha256 = "0181ray8vigmwlamx4j5dinw10al0g4l965kyx4wjq9k59nxxgbi"; - name = "kdav-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdav-5.91.0.tar.xz"; + sha256 = "026w3bk2lmc7lqzra8w9jq8i2l1hvqsxz36r1jzj9p01skhdm32v"; + name = "kdav-5.91.0.tar.xz"; }; }; kdbusaddons = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kdbusaddons-5.90.0.tar.xz"; - sha256 = "0g609bymfixwaic30y7i0q96anf7pi3galipmjbbfg85ghj9rsa4"; - name = "kdbusaddons-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdbusaddons-5.91.0.tar.xz"; + sha256 = "18qhpj0s4abypkb8ix2d84wv1kqv6qxyblninn2f9hjkl2dnlwis"; + name = "kdbusaddons-5.91.0.tar.xz"; }; }; kdeclarative = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kdeclarative-5.90.0.tar.xz"; - sha256 = "1z7zyj6pw2ym3izi19kpgy12mqpar6mbdbsn6jpxy36l6m3jld1y"; - name = "kdeclarative-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdeclarative-5.91.0.tar.xz"; + sha256 = "183df5c0xyjqsip0izqvvk4wy2bjb973900s1wqsldhhvc7gpf7z"; + name = "kdeclarative-5.91.0.tar.xz"; }; }; kded = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kded-5.90.0.tar.xz"; - sha256 = "094g6p87nd5cxcars71315w6zrxjgiw2080p6cf6g72ww54k7sps"; - name = "kded-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kded-5.91.0.tar.xz"; + sha256 = "1zi0sixlzaxvw4lfil2r36i3xrav3vfwxp2r1lp4n65dpl7nv7p5"; + name = "kded-5.91.0.tar.xz"; }; }; kdelibs4support = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/portingAids/kdelibs4support-5.90.0.tar.xz"; - sha256 = "0zxc11jbg06qz79ljrd6wl36jp73hafcmbk29d0hcvxnkscg3k29"; - name = "kdelibs4support-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kdelibs4support-5.91.0.tar.xz"; + sha256 = "1373fi9vi7ki8frr0lsw6yp335i95v8yq2j41s7ip003dpy4hr2g"; + name = "kdelibs4support-5.91.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/portingAids/kdesignerplugin-5.90.0.tar.xz"; - sha256 = "18gsy8f32hjadzjnavi3dsknc6hflcnfpr0107lwfc735fd2x2iq"; - name = "kdesignerplugin-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kdesignerplugin-5.91.0.tar.xz"; + sha256 = "07lvvryc3k418hd0j7ddlqhid26c51isa8mvk7g6gd0v2x3gp76q"; + name = "kdesignerplugin-5.91.0.tar.xz"; }; }; kdesu = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kdesu-5.90.0.tar.xz"; - sha256 = "1q8k2q7c41fzw9gwx9nq4zjpjdwvh29zyh3zd0w3r2kxf6vhf1wp"; - name = "kdesu-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdesu-5.91.0.tar.xz"; + sha256 = "1wj099w810dabqn43pqis4sism3zwq3d1qa9mvcdyjafqbl7xnjm"; + name = "kdesu-5.91.0.tar.xz"; }; }; kdewebkit = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/portingAids/kdewebkit-5.90.0.tar.xz"; - sha256 = "19dqlxy2sl822aldqy1jj7fvxabmg97a0av7d5ayzhnbhhy5izx1"; - name = "kdewebkit-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kdewebkit-5.91.0.tar.xz"; + sha256 = "1mln0w1dzrbpm373vfpcyss4xxnrfgwh9nhzr8wmzs8965bn3wqq"; + name = "kdewebkit-5.91.0.tar.xz"; }; }; kdnssd = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kdnssd-5.90.0.tar.xz"; - sha256 = "17szlqsafz6p4h7s9wascaggn5909c1ig452wy6y4z4402s2lsrr"; - name = "kdnssd-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdnssd-5.91.0.tar.xz"; + sha256 = "1smzwh7lvz8g7vydxnd2kkh0ymg7yp6akc7k2vg8q65pa6pxqn3g"; + name = "kdnssd-5.91.0.tar.xz"; }; }; kdoctools = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kdoctools-5.90.0.tar.xz"; - sha256 = "1l2a9mlcm8np3s8myq0hj08l82284r90yhx3z2gn7h68b8fzyx0s"; - name = "kdoctools-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdoctools-5.91.0.tar.xz"; + sha256 = "02lr4l4n5gnv7ffzml8lbrdwgfpq6m7ayhz3bdqqijdfvw6h283n"; + name = "kdoctools-5.91.0.tar.xz"; }; }; kemoticons = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kemoticons-5.90.0.tar.xz"; - sha256 = "08mgk56dafj3q9gs69qcx17qfc45s8ifkjrpzg44p8zs0q51q6cb"; - name = "kemoticons-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kemoticons-5.91.0.tar.xz"; + sha256 = "1jznkiq87rkndv10xs6974b5k0v82ly32agy5acxc2xy9wq7la0h"; + name = "kemoticons-5.91.0.tar.xz"; }; }; kfilemetadata = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kfilemetadata-5.90.0.tar.xz"; - sha256 = "18y4bn6hz8xa68m0nxv88a1f3xkkks7c7pbiqb1vkrp9bbh52yax"; - name = "kfilemetadata-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kfilemetadata-5.91.0.tar.xz"; + sha256 = "1z030irzcvmjq329nwfk3h8cd51dwy9mppnwbgcd0lw6y3bka0rq"; + name = "kfilemetadata-5.91.0.tar.xz"; }; }; kglobalaccel = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kglobalaccel-5.90.0.tar.xz"; - sha256 = "04qd1fcc22x70jacqzrv44q1jg5ldzynlfpw5cg2679409r0wnxw"; - name = "kglobalaccel-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kglobalaccel-5.91.0.tar.xz"; + sha256 = "09wscg6f19sh314ywpxp47pdr1xf1wzpjchg9rcjg207zrfhqqf0"; + name = "kglobalaccel-5.91.0.tar.xz"; }; }; kguiaddons = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kguiaddons-5.90.0.tar.xz"; - sha256 = "0m9l8xyc7xyj29fzxwp8ahr2l1rzs5rw1c26x446kb7smxvy8awx"; - name = "kguiaddons-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kguiaddons-5.91.0.tar.xz"; + sha256 = "0gn8lvpm4i11s5vavlpm162bizjkmh5cb4dhj3p34dlp4vcc4mky"; + name = "kguiaddons-5.91.0.tar.xz"; }; }; kholidays = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kholidays-5.90.0.tar.xz"; - sha256 = "1p1kgy110ijk5a3ix4g9y1i7w0gsnzf82jdkwbdza95vibm82iz8"; - name = "kholidays-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kholidays-5.91.0.tar.xz"; + sha256 = "165vfmi5y8l00ng494469w5s1gjnf9zkggqrzmq65dfkdis3amdm"; + name = "kholidays-5.91.0.tar.xz"; }; }; khtml = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/portingAids/khtml-5.90.0.tar.xz"; - sha256 = "1bi839x4dhlkqxmv98pq01725b8i8szdxf9b1hf1jv37fk468mja"; - name = "khtml-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/khtml-5.91.0.tar.xz"; + sha256 = "1ldkk1f954mmgz30vqa895z1nw2jaknnb53lsd5vqxzxi3cmc054"; + name = "khtml-5.91.0.tar.xz"; }; }; ki18n = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/ki18n-5.90.0.tar.xz"; - sha256 = "13k8kbkmgdywclcdbfj5ri3gmdblv8yzalmvqd0hn7sym6pkdqfw"; - name = "ki18n-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/ki18n-5.91.0.tar.xz"; + sha256 = "11gdd2gvzsz3r8zvqbxxwbpwjvjwnzzhzyrd4spbpdy0w7j8n6ly"; + name = "ki18n-5.91.0.tar.xz"; }; }; kiconthemes = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kiconthemes-5.90.0.tar.xz"; - sha256 = "0w3wi4xy1yy2s1a927cj4my63q0fqhw06ghy9zjw830m31xwpx1k"; - name = "kiconthemes-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kiconthemes-5.91.0.tar.xz"; + sha256 = "1khh4ngivwdj9rxxcpx08ka8anskc9i1z9n2zijp4m5ix8mmj3c2"; + name = "kiconthemes-5.91.0.tar.xz"; }; }; kidletime = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kidletime-5.90.0.tar.xz"; - sha256 = "1xzwmk0aqv1lcdi51nl1k0lyiinnqxwla6w0xxmsh6193qa3fpvq"; - name = "kidletime-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kidletime-5.91.0.tar.xz"; + sha256 = "12qmiwc8p3izj1y5h0rndj2s496ckm1p85dv4g51zbpg7m8a48qv"; + name = "kidletime-5.91.0.tar.xz"; }; }; kimageformats = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kimageformats-5.90.0.tar.xz"; - sha256 = "0r3ihkly0hf20aqbn7b9171mzqjna078rksdp96z6f7f1qy99v1v"; - name = "kimageformats-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kimageformats-5.91.0.tar.xz"; + sha256 = "0df8in33xwajqay487w0hjfsplz8y51w9sjb75na7yqsn75p38xb"; + name = "kimageformats-5.91.0.tar.xz"; }; }; kinit = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kinit-5.90.0.tar.xz"; - sha256 = "0z65hfhj68ahjm558p2pj7dlrczcww8f2xyw9f44w10bp3p5hf1a"; - name = "kinit-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kinit-5.91.0.tar.xz"; + sha256 = "1y62k24mwzbg4gchvjb8wn6ygq57wc72clb3jgyipw034czdihvi"; + name = "kinit-5.91.0.tar.xz"; }; }; kio = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kio-5.90.0.tar.xz"; - sha256 = "0ds6465fyzjj2azwdghrkxr9wvih0m96lv4kp6syqwii8nv2w7rs"; - name = "kio-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kio-5.91.0.tar.xz"; + sha256 = "14v28qilb5ayv9shw86hb88k60nr4bbd2pa4vwsqij9xkwlympgj"; + name = "kio-5.91.0.tar.xz"; }; }; kirigami2 = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kirigami2-5.90.0.tar.xz"; - sha256 = "0r48n11pv3yqsf11phl19cs52ph5ldabrfmq3xmsvxsknm6c4f9b"; - name = "kirigami2-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kirigami2-5.91.0.tar.xz"; + sha256 = "0ifljwa6hli2rndfadpzs30dpwc99nnvcm3yi9j5dim2bdf6glwc"; + name = "kirigami2-5.91.0.tar.xz"; }; }; kitemmodels = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kitemmodels-5.90.0.tar.xz"; - sha256 = "0f7zlif7kskbwpw8yrzlfyl954b623icdd9qn0algjcc2i9gqbzi"; - name = "kitemmodels-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kitemmodels-5.91.0.tar.xz"; + sha256 = "189kgrw2vjr9067mqr4f2sv06xmnjaapry0bf8s41v6r9v7py708"; + name = "kitemmodels-5.91.0.tar.xz"; }; }; kitemviews = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kitemviews-5.90.0.tar.xz"; - sha256 = "10s285vxaaxjcy3am4bvch5wd7wv64wwcjvj7lqk2866aql9hmzp"; - name = "kitemviews-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kitemviews-5.91.0.tar.xz"; + sha256 = "16cm4zmv1ngrsmy6k0ybv5wxd0g8cc8zwq6ab7jvs7a04sykv238"; + name = "kitemviews-5.91.0.tar.xz"; }; }; kjobwidgets = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kjobwidgets-5.90.0.tar.xz"; - sha256 = "1jv3c68mlsxhnd6jgqw5d4qqd66jf8bh6zbcs6bq0bad52ad2r8d"; - name = "kjobwidgets-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kjobwidgets-5.91.0.tar.xz"; + sha256 = "14pkyd6j78kignr62xfkvpyi2fwvzcvcsdnn23h8jxkhwm2ri42v"; + name = "kjobwidgets-5.91.0.tar.xz"; }; }; kjs = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/portingAids/kjs-5.90.0.tar.xz"; - sha256 = "1z5d1ixzvaq6x9x0jhmh5bdrdqpsl1x7mh3s8wnycfxwmln6bawv"; - name = "kjs-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kjs-5.91.0.tar.xz"; + sha256 = "0jbwlnmf8whzgjkrbnsvdsnn3kv0h44ghf63m2qcgg2l9wb0j8rj"; + name = "kjs-5.91.0.tar.xz"; }; }; kjsembed = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/portingAids/kjsembed-5.90.0.tar.xz"; - sha256 = "0ydrsg7z1b5hkskjvkb0b9lhx60aqcby2alhfbmkac197sf2frn4"; - name = "kjsembed-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kjsembed-5.91.0.tar.xz"; + sha256 = "124y7518jhjg3y2x7bcyl6b3c0bfxfbgd2sz6dwk45y4byx7rl60"; + name = "kjsembed-5.91.0.tar.xz"; }; }; kmediaplayer = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/portingAids/kmediaplayer-5.90.0.tar.xz"; - sha256 = "010m5qrn41hcxsmxsq72m83qxikfvn3mgibkgy4bn2x8kxibzmlq"; - name = "kmediaplayer-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kmediaplayer-5.91.0.tar.xz"; + sha256 = "0rn9azrj8k1m67y9ni0f3nwl9ldf1ksiqv6dgnzrx6xh0rxfm2h1"; + name = "kmediaplayer-5.91.0.tar.xz"; }; }; knewstuff = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/knewstuff-5.90.0.tar.xz"; - sha256 = "0q30p7z5zg3p24gp8q83i7my5bg4yfcdwsblmhl230kih8aap2cg"; - name = "knewstuff-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/knewstuff-5.91.0.tar.xz"; + sha256 = "0akaxi9klmpwn4pyr6ys5sxcapdspldq1f64im7vd6byzqrgpnax"; + name = "knewstuff-5.91.0.tar.xz"; }; }; knotifications = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/knotifications-5.90.0.tar.xz"; - sha256 = "15qb3jh5y1z84dp6wddwid4bk3ks05knkxlwv79hb9cdj8m4m7gi"; - name = "knotifications-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/knotifications-5.91.0.tar.xz"; + sha256 = "1207rimq8si1zxnn827631a1hskrd3m3ilgaj3wj859qrbkqmxzm"; + name = "knotifications-5.91.0.tar.xz"; }; }; knotifyconfig = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/knotifyconfig-5.90.0.tar.xz"; - sha256 = "1qss40sr7az9x4yvl59mblzzgjm3hd8nvxgqmqlylargvggw496c"; - name = "knotifyconfig-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/knotifyconfig-5.91.0.tar.xz"; + sha256 = "07m5mphd8mrak5sdqlldbcd51946v49xpcwi9fhn7w0kx29hknyf"; + name = "knotifyconfig-5.91.0.tar.xz"; }; }; kpackage = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kpackage-5.90.0.tar.xz"; - sha256 = "1rig9aws8530sav0pmginqmdcrnz10qjbxfc5lw6mmb3sfig53z0"; - name = "kpackage-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kpackage-5.91.0.tar.xz"; + sha256 = "12w8lfwifa107wlrld3zz774hczn9mkib6wqxw24yxxmzfw9lc2i"; + name = "kpackage-5.91.0.tar.xz"; }; }; kparts = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kparts-5.90.0.tar.xz"; - sha256 = "1x8kxd8kgzabd9dyqx2yx1qrrzl1mms4hm3lyg3f1nxki7xl6ra2"; - name = "kparts-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kparts-5.91.0.tar.xz"; + sha256 = "10ni6b114acjnmrahvvqw75iqkc10ii97y3z7lirj2727a3qmzzj"; + name = "kparts-5.91.0.tar.xz"; }; }; kpeople = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kpeople-5.90.0.tar.xz"; - sha256 = "1632k365bn9n3n8babq620v0px2hmapk8fprx28xpfp27zakhfgw"; - name = "kpeople-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kpeople-5.91.0.tar.xz"; + sha256 = "09l2q8cg9p8g7zkd1mjx6x08bqkr4ykxjibskc184asff7v47gvp"; + name = "kpeople-5.91.0.tar.xz"; }; }; kplotting = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kplotting-5.90.0.tar.xz"; - sha256 = "0i5ganvpzkpkd2p1avw0fpbp3mgbbifg8mmpvdf28ayh75dvrh9y"; - name = "kplotting-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kplotting-5.91.0.tar.xz"; + sha256 = "0rgmmliw9cfi0j2miszqz2kphqm04r5nfs8dqq6pnvclk1k9kss6"; + name = "kplotting-5.91.0.tar.xz"; }; }; kpty = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kpty-5.90.0.tar.xz"; - sha256 = "1p5ny9ry0wwwprhpj9s9xg96h9476rldly7mawvfp5q3ihys8c4a"; - name = "kpty-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kpty-5.91.0.tar.xz"; + sha256 = "1yy1k96kikvvnlyd00krc08ifiqbrz0x5vwv3pgdbpnwgl8p580d"; + name = "kpty-5.91.0.tar.xz"; }; }; kquickcharts = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kquickcharts-5.90.0.tar.xz"; - sha256 = "1vf9vwrb03z6f19xyc1dc50s3kz21s4mkrv85mmyia0by4qvq5fi"; - name = "kquickcharts-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kquickcharts-5.91.0.tar.xz"; + sha256 = "1ghiymm257b8xgmkibb7s7bwb28x3zhnrgrrsya47q5njb87h0ck"; + name = "kquickcharts-5.91.0.tar.xz"; }; }; kross = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/portingAids/kross-5.90.0.tar.xz"; - sha256 = "1gs7h03j753pq78q0fmajgd5pw8j3mc105rsph1c22l23vccya3z"; - name = "kross-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kross-5.91.0.tar.xz"; + sha256 = "06f8220jmvjsfbzjkr2ybwicwjffbi3yw9sr3bcyrilchrrpgqal"; + name = "kross-5.91.0.tar.xz"; }; }; krunner = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/krunner-5.90.0.tar.xz"; - sha256 = "1q3hsml5274v8dy8rnqpnwxliad2q7a8mbs8k6kpqzih9z94crgi"; - name = "krunner-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/krunner-5.91.0.tar.xz"; + sha256 = "17iaw55rkzyfpgkbw2an6pa4wid79b0dnb3310vfaq0xkm0gjxq6"; + name = "krunner-5.91.0.tar.xz"; }; }; kservice = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kservice-5.90.0.tar.xz"; - sha256 = "121y8bbq3m4pv5m9pj753v2nk914216a86ksmdqbgffw217qckdd"; - name = "kservice-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kservice-5.91.0.tar.xz"; + sha256 = "0m4j7djiyapi1hm23lz9nd238rrlldxlggzkqq056z486v2137bp"; + name = "kservice-5.91.0.tar.xz"; }; }; ktexteditor = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/ktexteditor-5.90.0.tar.xz"; - sha256 = "1g1dky9bgr2zjr0rw9c730shz588ykyw7qw3sgf0dr3sh8aq222n"; - name = "ktexteditor-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/ktexteditor-5.91.0.tar.xz"; + sha256 = "1bkz6v1y5vyxav398a6224ldqa9pqhbad3vmhxrjb2hxcbha2cpm"; + name = "ktexteditor-5.91.0.tar.xz"; }; }; ktextwidgets = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/ktextwidgets-5.90.0.tar.xz"; - sha256 = "02g85zahh6hfsw3fcac7hp8kv4d1ha2asmmhnknqd054yl0adxjg"; - name = "ktextwidgets-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/ktextwidgets-5.91.0.tar.xz"; + sha256 = "0xmzrak5mwg1l4v38g14i7j1yr3j6sj13q2iqa433hs5agl6l6n4"; + name = "ktextwidgets-5.91.0.tar.xz"; }; }; kunitconversion = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kunitconversion-5.90.0.tar.xz"; - sha256 = "1vrvbsd8limfsmgjcv5kvzyf7g62rv1a0rvbdyq15z23zf4rsmf3"; - name = "kunitconversion-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kunitconversion-5.91.0.tar.xz"; + sha256 = "0n2v0f08s71z2imhn41jkm2knjvk7bkwmcz70gs8h97ykrj6niap"; + name = "kunitconversion-5.91.0.tar.xz"; }; }; kwallet = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kwallet-5.90.0.tar.xz"; - sha256 = "06ffg84jvrc8xhymg1g5j311vq3ajfqg3arx2cxa98aqld213akl"; - name = "kwallet-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kwallet-5.91.0.tar.xz"; + sha256 = "1z1qb6a2b5rqj7js88ms8n67fbs885pw6djbf1l86na2zhf0adip"; + name = "kwallet-5.91.0.tar.xz"; }; }; kwayland = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kwayland-5.90.0.tar.xz"; - sha256 = "0n7f4rx695q889j8g4sdpdi3jhk29z8zc4wrk5srs2diqi4y0qqi"; - name = "kwayland-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kwayland-5.91.0.tar.xz"; + sha256 = "1a03ckacp39lpsqyykkm6lxajxm71s6ifpzgj8q0a37v75jzmz9y"; + name = "kwayland-5.91.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kwidgetsaddons-5.90.0.tar.xz"; - sha256 = "1c17iq0q2w80p7v7k32db0pc5sbzqhvh0w5d145a1nkgr3nbnk6a"; - name = "kwidgetsaddons-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kwidgetsaddons-5.91.0.tar.xz"; + sha256 = "03pj98sgybkcz487vr774x05w46imnipq2794nkv426nnhyxrd73"; + name = "kwidgetsaddons-5.91.0.tar.xz"; }; }; kwindowsystem = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kwindowsystem-5.90.0.tar.xz"; - sha256 = "0fj7a86dk833ld76c3b1s4ri47bhpvjsi6ryfgdv5q7h2fwh6ia5"; - name = "kwindowsystem-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kwindowsystem-5.91.0.tar.xz"; + sha256 = "1yy02fvfabrsvdpmrkdnjdsdd3d2crxavsl47si6ry8fdxb90y95"; + name = "kwindowsystem-5.91.0.tar.xz"; }; }; kxmlgui = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/kxmlgui-5.90.0.tar.xz"; - sha256 = "1q8v1wrx67c37jnd874ilkk8kfk3zvf3f86qg51k16ml0nrwjysg"; - name = "kxmlgui-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kxmlgui-5.91.0.tar.xz"; + sha256 = "1qww2isx99lx0mn1dv0vzrvmr2xdp8zgikyvgw1wf8hfay3v2s1g"; + name = "kxmlgui-5.91.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/portingAids/kxmlrpcclient-5.90.0.tar.xz"; - sha256 = "0mq2wgi4qnvscjdkis7jhs004k3s1b3wg0vijjai7xzy772kvclc"; - name = "kxmlrpcclient-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kxmlrpcclient-5.91.0.tar.xz"; + sha256 = "1bnymf5wq4apjsgshvbhcggdw7jc0yxv4jag3k19ff9820lskhph"; + name = "kxmlrpcclient-5.91.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/modemmanager-qt-5.90.0.tar.xz"; - sha256 = "08nlvg5lwvl3rspi848gp2b2b5pki6sy8c3ww9nn4afy4lk7p609"; - name = "modemmanager-qt-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/modemmanager-qt-5.91.0.tar.xz"; + sha256 = "15l46lkh8nkal1nai494dabaysy581jzi8nwrv4kjvc6qwc3yrx2"; + name = "modemmanager-qt-5.91.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/networkmanager-qt-5.90.0.tar.xz"; - sha256 = "0i9wvrxbkbil21zndiq4cmnldbqsrdp9gnhmp2ns78xdih8wysa7"; - name = "networkmanager-qt-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/networkmanager-qt-5.91.0.tar.xz"; + sha256 = "0f27qin2ks3q7rin53sk9vjjnadjnax99d9k245sjr6fjpczy81f"; + name = "networkmanager-qt-5.91.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/oxygen-icons5-5.90.0.tar.xz"; - sha256 = "1izfh6cxivmwiymy7lwbmf9j1hxy2skv6z1lbjr0c4snmx6pqx1g"; - name = "oxygen-icons5-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/oxygen-icons5-5.91.0.tar.xz"; + sha256 = "0j3j2lyxr2iz68vasvpjqkix4bnnj6wc4sr97i6x6z06zq0kawai"; + name = "oxygen-icons5-5.91.0.tar.xz"; }; }; plasma-framework = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/plasma-framework-5.90.0.tar.xz"; - sha256 = "1msqjnwvb815kii0rjhn1lvsnvq5wr8iprdjzsviw67va6gaz4p1"; - name = "plasma-framework-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/plasma-framework-5.91.0.tar.xz"; + sha256 = "0ydhhpnwf7lfl3kdjsw92mgsza5gy292f7v6kyby4ygjnir1hizl"; + name = "plasma-framework-5.91.0.tar.xz"; }; }; prison = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/prison-5.90.0.tar.xz"; - sha256 = "0z2k2hyjj86va5rqgd8qrvhflfppcl2d3f9smxb5w9pp19ashvyk"; - name = "prison-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/prison-5.91.0.tar.xz"; + sha256 = "0k1zp3jzh8gjsji6wh5g8k41zdl8s1vd58ipm0lxy670a71wcqcg"; + name = "prison-5.91.0.tar.xz"; }; }; purpose = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/purpose-5.90.0.tar.xz"; - sha256 = "182196hj3mdy1k7wfgadfxy7m1kbqzk6kksn7yd681h2gpky82l1"; - name = "purpose-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/purpose-5.91.0.tar.xz"; + sha256 = "1z6wpz7d9byx4n5zx6chmyy9k1jkmghdgahsvkqsc33z6hnh2b4m"; + name = "purpose-5.91.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/qqc2-desktop-style-5.90.0.tar.xz"; - sha256 = "05g1rydx0innmiz28mslix4bjsrhsnci227gadngzijncp2v288r"; - name = "qqc2-desktop-style-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/qqc2-desktop-style-5.91.0.tar.xz"; + sha256 = "0rd9rvffhif8yckwr7axjcv5iqn5b0jdviij7f9y8vjpkzyjvm8i"; + name = "qqc2-desktop-style-5.91.0.tar.xz"; }; }; solid = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/solid-5.90.0.tar.xz"; - sha256 = "10hk4mh426dhi7is5hxa1varn15ijzra5a420zk297pzkphvx0ip"; - name = "solid-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/solid-5.91.0.tar.xz"; + sha256 = "1a4k0amyg8mvfr2ld7v8zyphhxv33yybh55vqcshwv4a0jm1wmjg"; + name = "solid-5.91.0.tar.xz"; }; }; sonnet = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/sonnet-5.90.0.tar.xz"; - sha256 = "0d4xxm9vw1rc2mypv4z0yihcn679sab0afxr2kbzq01wr6p759y7"; - name = "sonnet-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/sonnet-5.91.0.tar.xz"; + sha256 = "067xj5mllpzl0gnxxljhfi9y4xdgrpqbckm7pykczzqrklrrx8dx"; + name = "sonnet-5.91.0.tar.xz"; }; }; syndication = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/syndication-5.90.0.tar.xz"; - sha256 = "0a9j443w42jwvlzjh5mfxn25kwjrz1ya6sgy0c4y3n5xbg031zmx"; - name = "syndication-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/syndication-5.91.0.tar.xz"; + sha256 = "1f2kb6mh1xc1k1bn536lq9gq0j2lb65qw4vpp4ixynlfij4zq1gy"; + name = "syndication-5.91.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/syntax-highlighting-5.90.0.tar.xz"; - sha256 = "19mckdfdxb5i26y75cgmda91s864jbh1wmf98bv8xa1iqxwkwj5z"; - name = "syntax-highlighting-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/syntax-highlighting-5.91.0.tar.xz"; + sha256 = "0fprqi2z8issh3jkql6labszkwd3cpvd6qadsg9fi46vfjr4a2ip"; + name = "syntax-highlighting-5.91.0.tar.xz"; }; }; threadweaver = { - version = "5.90.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.90/threadweaver-5.90.0.tar.xz"; - sha256 = "1frhzlzmnrp5y3lrl0ahzxh8syj4vlkjvaypsmbm2bkkn4akizg3"; - name = "threadweaver-5.90.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/threadweaver-5.91.0.tar.xz"; + sha256 = "1900kqglkwzkjc24mvl0j7jf7xcx6cr6b1g78s5b5m18rw050j12"; + name = "threadweaver-5.91.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index b600a2ca4c3..14579bc5915 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lcms2"; - version = "2.12"; + version = "2.13.1"; src = fetchurl { url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; - sha256 = "sha256-GGY5hehkEARVrD5QdiXEOMNxA1TYXly7fNQEPhH+EPU="; + sha256 = "sha256-1HPnlueyfFrwG9bRVS1CtFtDRX5xgs6ZA/OLt0ggO4g="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 3d28d6ef5a9..a270051f48a 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libaacs"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"; + sha256 = "sha256-qIqg6+TJinf3rv/ZKrPvZKxUjGuCLoJIqLkmclvqCjk="; }; buildInputs = [ libgcrypt libgpg-error ]; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 82e44033313..3a3866911b8 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libaom"; - version = "3.2.0"; + version = "3.3.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "0fmnbzpl481i7kchx4hbvb507r5pfgyrzfrlrs7jk3bicycm75qv"; + sha256 = "sha256-g6QkKLrk+SH1s5fRmseAQMmM6y4QwmKmVDPxdbqGmwg="; stripRoot = false; }; diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix index 62b425bba05..ae74fd3028a 100644 --- a/pkgs/development/libraries/libarchive-qt/default.nix +++ b/pkgs/development/libraries/libarchive-qt/default.nix @@ -1,19 +1,20 @@ -{ mkDerivation, lib, fetchFromGitLab, libarchive, xz, zlib, bzip2, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, libarchive, xz, zlib, bzip2, meson, pkg-config, ninja }: mkDerivation rec { pname = "libarchive-qt"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitLab { owner = "marcusbritanicus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z+2zjQolV1Ncr6v9r7fGrc/fEMt0iMtGwv9eZ2Tu2cA="; + sha256 = "sha256-KRywB+Op44N00q9tgO2WNCliRgUDRvrCms1O8JYt62o="; }; nativeBuildInputs = [ - cmake + meson ninja + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 2a1d53e6ee0..1cc6fe6f521 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -12,13 +12,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.5.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "sha256-H00UJ+ON1kBc19BgWBBKmO8f23oAg2mk7o9hhDhn50Q="; + sha256 = "sha256-u6Zeu9yTjhx5U7KZVUkuuUsQPjWN71mE5egG4T+FGfY="; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index e8b550e06c2..08cba497fc9 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -10,24 +10,15 @@ let }; in stdenv.mkDerivation rec { pname = "libbladeRF"; - version = "2.2.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l"; + sha256 = "05axh51lrzxpz2qfswnjwxpfk3mlsv2wc88dd12gfr1karn5jwz9"; }; - # This patch is required for version 2.2.1. As the patch is already part of - # upstream master, it will be incorporated into the next release. The patch - # fixes a (well-justified) compiler warning which breaks the build because - # we compile with -Werror. - patches = [ (fetchpatch { - url = "https://github.com/Nuand/bladeRF/commit/163425d48a3b7d8c100d7295220d3648c050d0dd.patch"; - sha256 = "1swsymlyxm3yk2k8l71z1fv0a5k2rmab02f0c7xkrvk683mq6yxw"; - }) ]; - nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 buildInputs = [ tecla libusb1 ] diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 745b34226e2..8c8e47b98a4 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libbsd"; - version = "0.11.3"; + version = "0.11.5"; src = fetchurl { url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "18a2bcl9z0zyxhrm1lfv4yhhz0589s6jz0s78apaq78mhj0wz5gz"; + sha256 = "sha256-GpyVJSVjXBu2dwyyLpabk42Oap15EjYrmO6DcFmbDv0="; }; outputs = [ "out" "dev" "man" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Common functions found on BSD systems"; homepage = "https://libbsd.freedesktop.org/"; - license = licenses.bsd3; + license = with licenses; [ beerware bsd2 bsd3 bsdOriginal isc mit ]; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; }; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index fdcc2ae0081..c634892944c 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja python3 ]; buildInputs = [ llvm clang-unwrapped ]; strictDeps = true; + cmakeFlags = [ + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; meta = with lib; { homepage = "http://libclc.llvm.org/"; diff --git a/pkgs/development/libraries/libctl/default.nix b/pkgs/development/libraries/libctl/default.nix new file mode 100644 index 00000000000..d7fed2415df --- /dev/null +++ b/pkgs/development/libraries/libctl/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, gfortran +, guile +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "libctl"; + version = "4.5.1"; + + src = fetchFromGitHub { + owner = "NanoComp"; + repo = pname; + rev = "v${version}"; + sha256 = "uOydBWYPXSBUi+4MM6FNx6B5l2to7Ny9Uc1MMTV9bGA="; + }; + + nativeBuildInputs = [ autoreconfHook gfortran guile pkg-config ]; + + configureFlags = [ "--enable-shared" ]; + + meta = with lib; { + description = "Guile-based library for supporting flexible control files in scientific simulations"; + homepage = "https://github.com/NanoComp/libctl"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ carpinchomug ]; + }; +} diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 8d506efef89..5b969284995 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.75.0"; + version = "1.76.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-3oYQwV1Srnq8VfS+M+BwIznXRxQFXr78SwXO3Xu08ws="; + hash = "sha256-aeYOszOFyLaC1xKswYZLzqoWSFFWOOeOkc+WrtqU0jo="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-jti1aY8a9YB8x6fz7UqTY4uDj6gkMnG1hTN/Mgc+mHs="; + hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 731039e26a0..e08a4673248 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.109"; + version = "2.4.110"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "09kzrdsd14zr0i3izvi5mck4vqccl3c9hr84r9i4is0zikh554v2"; + sha256 = "0dwpry9m5l27dlhq48j4bsiqwm0247cxdqwv3b7ddmkynk2f9kpf"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index f2ecf94053b..e5a3b79ba77 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.16"; + version = "1.1.19"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-g+3yRRiTv2l7ZpJc5a6tOPsErKjdALomAWmYHErdfIQ="; + sha256 = "sha256-HTmNoTGyFtOXRy7Y/ZnEgTa2GW6/+TeZxZo7c7ksNtc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index 28235d65d98..c02c6116e64 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , intltool , meson @@ -37,6 +38,20 @@ stdenv.mkDerivation rec { sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr"; }; + patches = [ + # Fix undefined behavior + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/657b2f8497da907559a6769c5b1d2d7b5bd40688.patch"; + sha256 = "Qx4S9KQsTAr4M0QJi0Xr5kKuHSp4NwZJHoRPYyxIyTk="; + }) + + # Fix building vapi + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch"; + sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8="; + }) + ]; + nativeBuildInputs = [ pkg-config intltool diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index f85dbea54d9..e0d3a7318a8 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -45,15 +45,15 @@ stdenv.mkDerivation rec { buildInputs = [ gcr - glib - libsoup - libxml2 openssl p11-kit uhttpmock ]; propagatedBuildInputs = [ + glib + libsoup + libxml2 gnome-online-accounts json-glib ]; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 1a40d1f17b4..b34790d59c7 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.4"; + version = "0.20.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03nyf8n7i7f67fsh220g52slmihdk1lv4iwspm7xmkgrj3rink2j"; + sha256 = "MYY6iVfVpyf5BnSVyr8KCIn6XT1EYm5UCUMxGI1cFRg="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix b/pkgs/development/libraries/libgnome-games-support/default.nix index 46de584d5b1..80c76ea980f 100644 --- a/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix +++ b/pkgs/development/libraries/libgnome-games-support/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 187382e1f3e..0c84cb7e0b1 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20210624"; + version = "20220303"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "sha256-3q9GO7zD7vpy+XGZ77YhP3sOLI6R8bPSy/UgVqhxXRU="; + sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc="; }; patchPhase = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index f61fb775fbd..893704ddb18 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.20.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-DuMVs9cC0VnZg3E9GtZB8LYkp3Ybfzlv8vd4d1Muwyc="; + sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8="; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 3988a79c325..ba21e2206a8 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -6,16 +6,17 @@ , perl , libxml2 , fuse +, fuse3 , gnutls }: stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.9.5"; + version = "1.12.2"; src = fetchurl { - url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; - hash = "sha256-BnMoxIiuwhqcwVr3AwAIFgZPcFsIg55N66ZwWMTUnCw="; + url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; + hash = "sha256-57veJapt72LkP02wO4c1nDdHmnodqfT+rKPNDeTGQPM="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse + fuse3 gnutls libxml2 ]; @@ -55,7 +57,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux; }; } -# TODO: NBD URI support apparently is not enabled # TODO: package the 1.6-stable version too # TODO: git version needs ocaml # TODO: bindings for go, ocaml and python diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index 4e12553b00b..dd442b2cd4b 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnfs"; - version = "4.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libnfs"; rev = "libnfs-${version}"; - sha256 = "0i27wd4zvhjz7620q043p4d4mkx8zv2yz9adm1byin47dynahyda"; + sha256 = "sha256-5jyY7hqEhBPiQ8pNd+mRTEc4brht4ID7PoV7O2RFNQA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index aeb3fcba06f..2293dfc00a0 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -11,7 +11,7 @@ let whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation rec { - name = "libpng" + whenPatched "-apng" + "-${version}"; + pname = "libpng" + whenPatched "-apng"; version = "1.6.37"; src = fetchurl { diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix new file mode 100644 index 00000000000..9abe3224120 --- /dev/null +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -0,0 +1,102 @@ +{ lib +, clang-tools +, llvmPackages +, boost17x +, protobuf +, python3Support ? false +, python3 +, log4cxxSupport ? false +, log4cxx +, snappySupport ? false +, snappy +, zlibSupport ? true +, zlib +, zstdSupport ? true +, zstd +, gtest +, gtestSupport ? false +, cmake +, curl +, fetchurl +, jsoncpp +, openssl +, pkg-config +, stdenv +}: + +let + /* + Check if null or false + Example: + let result = enableFeature null + => "OFF" + let result = enableFeature false + => "OFF" + let result = enableFeature «derivation» + => "ON" + */ + enableCmakeFeature = p: if (p == null || p == false) then "OFF" else "ON"; + + # Not really sure why I need to do this.. If I call clang-tools without the override it defaults to a different version and fails + clangTools = clang-tools.override { inherit stdenv llvmPackages; }; + # If boost has python enabled, then boost-python package will be installed which is used by libpulsars python wrapper + boost = if python3Support then boost17x.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost17x; + defaultOptionals = [ boost protobuf ] + ++ lib.optional python3Support python3 + ++ lib.optional snappySupport snappy.dev + ++ lib.optional zlibSupport zlib + ++ lib.optional zstdSupport zstd + ++ lib.optional log4cxxSupport log4cxx; + +in +stdenv.mkDerivation rec { + pname = "libpulsar"; + version = "2.9.1"; + + src = fetchurl { + hash = "sha512-NKHiL7D/Lmnn6ICpQyUmmQYQETz4nZPJU9/4LMRDUQ3Pck6qDh+t6CRk+b9UQ2Vb0jvPIGTjEsSp2nC7TJk3ug=="; + url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; + }; + + sourceRoot = "apache-pulsar-${version}-src/pulsar-client-cpp"; + + # clang-tools needed for clang-format + nativeBuildInputs = [ cmake pkg-config clangTools ] + ++ defaultOptionals + ++ lib.optional gtestSupport gtest.dev; + + buildInputs = [ jsoncpp openssl curl ] + ++ defaultOptionals; + + # Needed for GCC on Linux + NIX_CFLAGS_COMPILE = [ "-Wno-error=return-type" ]; + + cmakeFlags = [ + "-DBUILD_TESTS=${enableCmakeFeature gtestSupport}" + "-DBUILD_PYTHON_WRAPPER=${enableCmakeFeature python3Support}" + "-DUSE_LOG4CXX=${enableCmakeFeature log4cxxSupport}" + "-DClangTools_PATH=${clangTools}/bin" + ]; + + enableParallelBuilding = true; + doInstallCheck = true; + installCheckPhase = '' + echo ${lib.escapeShellArg '' + #include <pulsar/Client.h> + int main (int argc, char **argv) { + pulsar::Client client("pulsar://localhost:6650"); + return 0; + } + ''} > test.cc + $CXX test.cc -L $out/lib -I $out/include -lpulsar -o test + ''; + + meta = with lib; { + homepage = "https://pulsar.apache.org/docs/en/client-libraries-cpp"; + description = "Apache Pulsar C++ library"; + + platforms = platforms.all; + license = licenses.asl20; + maintainers = [ maintainers.corbanr ]; + }; +} diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index c3c9bf6947e..0906d7b967c 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.30.2"; + version = "1.30.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-vgHs4OosIZTL6ldEv1qvBsBLpft+x4h6ExFsdtEU/t0="; + sha256 = "sha256-ANfaMKT40RhfN8uiic+vHfzQSljy921qz99bhTEtbtY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 1de6090b146..81cad37351a 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.52.5"; + version = "2.52.6"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QHy7q1GBN+oYo/MiC+oYD77nXz5b1roQp6hiwab3TYI="; + sha256 = "o/k5oeajpgQIJEYy0DI/jDsg60t7AAU24uW9k7jv+q0="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix index 96b8c7ac2e5..d8093a58dee 100644 --- a/pkgs/development/libraries/libschrift/default.nix +++ b/pkgs/development/libraries/libschrift/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "libschrift"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "tomolt"; repo = pname; - rev = "c207585486b3e78ec5506f55f5d56178f421a53c"; - sha256 = "13qrplsi2a53s84giwnzqmn0zbslyaagvjn89wsn9fd90m2v2bs1"; + rev = "v" + version; + sha256 = "0fvji0z6z2al68p07w58l4hc29ds68v71h7z84vxiqhxnsgc0hlv"; }; - # fix a compilation failure related to darwin integers, remove at next release - patches = [ - (fetchpatch { - url = "https://github.com/tomolt/libschrift/commit/1b1292f2cf4b582d66b2f6c87105997391f9fa08.patch"; - sha256 = "076l3n28famgi74nr5bz47yn192bm76p8c8558fm5zj5c21pcfsv"; - }) - ]; - postPatch = '' substituteInPlace config.mk \ --replace "PREFIX = /usr/local" "PREFIX = $out" diff --git a/pkgs/development/libraries/libsciter/default.nix b/pkgs/development/libraries/libsciter/default.nix new file mode 100644 index 00000000000..6f3016ce47a --- /dev/null +++ b/pkgs/development/libraries/libsciter/default.nix @@ -0,0 +1,45 @@ +{ lib +, glib +, cairo +, libuuid +, pango +, gdk-pixbuf +, gtk3 +, stdenv +, fetchurl +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "libsciter"; + version = "4.4.8.23-bis"; # Version specified in GitHub commit title + + src = fetchurl { + url = "https://github.com/c-smile/sciter-sdk/raw/9f1724a45f5a53c4d513b02ed01cdbdab08fa0e5/bin.lnx/x64/libsciter-gtk.so"; + sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ glib cairo libuuid pango gtk3 ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -m755 -D $src $out/lib/libsciter-gtk.so + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://sciter.com"; + description = "Embeddable HTML/CSS/JavaScript engine for modern UI development"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ leixb ]; + license = licenses.unfree; + }; +} diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix index 92229811207..f6a796f2561 100644 --- a/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/pkgs/development/libraries/libsigcxx/3.0.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "3.0.7"; + version = "3.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "v76RwNCU6mu8bL05CbfZjGVh7qi22cDCWt2Qam6D1zM="; + sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index d4583c74df0..c9f6e11d411 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.7"; + version = "2.10.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI="; + sha256 = "sha256-I1pAvsc0bHuCtqjKrgRWNT3AbnHxS8QUvMhYrxg4cZo="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index bc36a12eea8..84c2f19e5e2 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsigsegv"; - version = "2.13"; + version = "2.14"; src = fetchurl { url = "mirror://gnu/libsigsegv/libsigsegv-${version}.tar.gz"; - sha256 = "sha256-vnjuQXawX3x1/wMpjYSHTbkPS2ydVQPw2hIms6PEgRk="; + sha256 = "sha256-zaw5QYAzZM+BqQhJm+t5wgDq1gtrW0DK0ST9HgbKopU="; }; patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 5f34a80d253..1371345ddd7 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , autoreconfHook , pkg-config @@ -27,6 +28,21 @@ stdenv.mkDerivation rec { # libc++abi 11 has an `#include <version>`, this picks up files name # `version` in the project's include paths ./rename-version.patch + (fetchpatch { + name = "CVE-2022-22844.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64.patch"; + sha256 = "0cfih55f5qpc84mvlwsffik80bgz6drkflkhrdyqq8m84jw3mbwb"; + }) + (fetchpatch { + name = "CVE-2022-0561.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch"; + sha256 = "0m57fdxyvhhr9cc260lvkkn2g4zr4n4v9nricc6lf9h6diagd7mk"; + }) + (fetchpatch { + name = "CVE-2022-0562.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/561599c99f987dc32ae110370cfdd7df7975586b.patch"; + sha256 = "0ycirjjc1vigj03kwjb92n6jszsl9p17ccw5hry7lli9gxyyr0an"; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index 86dd461ea07..0945f21211d 100644 --- a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -1,4 +1,4 @@ -From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001 +From ad42041cfedcf25716429d2aad16641e0e2a012f Mon Sep 17 00:00:00 2001 From: Euan Kemp <euank@euank.com> Date: Thu, 14 Jan 2021 00:32:00 -0800 Subject: [PATCH] meson: patch in an install prefix for building on nix @@ -6,22 +6,28 @@ Subject: [PATCH] meson: patch in an install prefix for building on nix Used in the nixpkgs version of libvirt so that we can install things in the nix store, but read them from the root filesystem. --- - meson.build | 9 +++++++++ + meson.build | 9 ++++++++ meson_options.txt | 2 ++ - src/libxl/meson.build | 6 +++--- - src/locking/meson.build | 8 ++++---- - src/lxc/meson.build | 6 +++--- - src/meson.build | 18 +++++++++--------- - src/network/meson.build | 12 ++++++------ + src/ch/meson.build | 6 ++--- + src/interface/meson.build | 2 +- + src/libxl/meson.build | 18 +++++++-------- + src/locking/meson.build | 8 +++---- + src/lxc/meson.build | 10 ++++---- + src/meson.build | 18 +++++++-------- + src/network/meson.build | 14 ++++++------ + src/node_device/meson.build | 2 +- + src/nwfilter/meson.build | 6 ++--- src/nwfilter/xml/meson.build | 2 +- - src/qemu/meson.build | 14 +++++++------- - src/remote/meson.build | 6 +++--- - src/security/apparmor/meson.build | 8 ++++---- - tools/meson.build | 4 ++-- - 12 files changed, 53 insertions(+), 42 deletions(-) + src/qemu/meson.build | 38 +++++++++++++++---------------- + src/remote/meson.build | 10 ++++---- + src/secret/meson.build | 4 ++-- + src/security/apparmor/meson.build | 8 +++---- + src/storage/meson.build | 6 ++--- + tools/meson.build | 2 +- + 18 files changed, 88 insertions(+), 77 deletions(-) diff --git a/meson.build b/meson.build -index b5164f6..33719f1 100644 +index 9016c0458a..b26e690194 100644 --- a/meson.build +++ b/meson.build @@ -39,6 +39,8 @@ if host_machine.system() == 'windows' @@ -48,7 +54,7 @@ index b5164f6..33719f1 100644 # sysconfdir as this makes a lot of things break in testing situations if prefix == '/usr' diff --git a/meson_options.txt b/meson_options.txt -index e5d79c2..081cd32 100644 +index 5b43cdbd6b..e9dff18441 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ @@ -57,27 +63,67 @@ index e5d79c2..081cd32 100644 option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version') +diff --git a/src/ch/meson.build b/src/ch/meson.build +index 66b77907b0..6aa9bbc548 100644 +--- a/src/ch/meson.build ++++ b/src/ch/meson.build +@@ -64,8 +64,8 @@ if conf.has('WITH_CH') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'ch', +- localstatedir / 'log' / 'libvirt' / 'ch', +- runstatedir / 'libvirt' / 'ch', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'ch', ++ install_prefix + runstatedir / 'libvirt' / 'ch', + ] + endif +diff --git a/src/interface/meson.build b/src/interface/meson.build +index 828f274422..2a6b1f8c5e 100644 +--- a/src/interface/meson.build ++++ b/src/interface/meson.build +@@ -56,6 +56,6 @@ if conf.has('WITH_INTERFACE') + } + + virt_install_dirs += [ +- runstatedir / 'libvirt' / 'interface', ++ install_prefix + runstatedir / 'libvirt' / 'interface', + ] + endif diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 3bb6cc5..78d7be0 100644 +index 0cc277db82..48d8c5b962 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build -@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') +@@ -79,14 +79,14 @@ if conf.has('WITH_LIBXL') } virt_install_dirs += [ +- confdir / 'libxl', +- confdir / 'libxl' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'libxl', -- runstatedir / 'libvirt' / 'libxl', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save', - localstatedir / 'log' / 'libvirt' / 'libxl', +- runstatedir / 'libvirt' / 'libxl', ++ install_prefix + confdir / 'libxl', ++ install_prefix + confdir / 'libxl' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl', -+ install_prefix + runstatedir / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save', + install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl', ++ install_prefix + runstatedir / 'libvirt' / 'libxl', ] endif diff --git a/src/locking/meson.build b/src/locking/meson.build -index 8a28310..9da81cc 100644 +index 72f7780438..abe70d20d5 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build -@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -238,14 +238,14 @@ if conf.has('WITH_LIBVIRTD') } virt_install_dirs += [ @@ -97,26 +143,39 @@ index 8a28310..9da81cc 100644 endif endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index f8e2a88..96d6687 100644 +index 99d4a34213..aae477c1ee 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build -@@ -182,8 +182,8 @@ if conf.has('WITH_LXC') +@@ -176,10 +176,10 @@ if conf.has('WITH_LXC') } virt_install_dirs += [ +- confdir / 'lxc', +- confdir / 'lxc' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'lxc', -- runstatedir / 'libvirt' / 'lxc', - localstatedir / 'log' / 'libvirt' / 'lxc', +- runstatedir / 'libvirt' / 'lxc', ++ install_prefix + confdir / 'lxc', ++ install_prefix + confdir / 'lxc' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc', -+ install_prefix + runstatedir / 'libvirt' / 'lxc', + install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc', ++ install_prefix + runstatedir / 'libvirt' / 'lxc', ] endif diff --git a/src/meson.build b/src/meson.build -index 7c47821..d33d16a 100644 +index b2d951d36c..305716010f 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -669,7 +669,7 @@ endforeach +@@ -210,7 +210,7 @@ openrc_init_files = [] + + # virt_install_dirs: + # list of directories to create during installation +-virt_install_dirs = [ confdir ] ++virt_install_dirs = [ install_prefix + confdir ] + + # driver_source_files: + # driver source files to check +@@ -663,7 +663,7 @@ endforeach virt_conf_files += 'libvirt.conf' @@ -125,7 +184,7 @@ index 7c47821..d33d16a 100644 install_data(virt_aug_files, install_dir: virt_aug_dir) # augeas_test_data: -@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs +@@ -723,7 +723,7 @@ foreach data : virt_daemon_confs output: '@0@.conf'.format(data['name']), configuration: daemon_conf, install: true, @@ -134,15 +193,16 @@ index 7c47821..d33d16a 100644 ) if data.get('with_ip', false) -@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -847,7 +847,7 @@ if conf.has('WITH_LIBVIRTD') install_data( init_file, - install_dir: sysconfdir / 'init.d', + install_dir: install_prefix + sysconfdir / 'init.d', + install_mode: 'rwxr-xr-x', rename: [ init['name'] ], ) - +@@ -855,7 +855,7 @@ if conf.has('WITH_LIBVIRTD') if init.has_key('confd') install_data( init['confd'], @@ -151,16 +211,7 @@ index 7c47821..d33d16a 100644 rename: [ init['name'] ], ) endif -@@ -872,7 +872,7 @@ if init_script != 'none' - foreach sysconf : sysconf_files - install_data( - sysconf['file'], -- install_dir: sysconfdir / 'sysconfig', -+ install_dir: install_prefix + sysconfdir / 'sysconfig', - rename: [ sysconf['name'] ], - ) - endforeach -@@ -897,10 +897,10 @@ endif +@@ -882,10 +882,10 @@ endif # Install empty directories virt_install_dirs += [ @@ -176,23 +227,27 @@ index 7c47821..d33d16a 100644 meson.add_install_script( diff --git a/src/network/meson.build b/src/network/meson.build -index 3ec598c..b02040b 100644 +index b5eff0c3ab..a0f26d624e 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') +@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK') } virt_install_dirs += [ +- confdir / 'qemu' / 'networks', +- confdir / 'qemu' / 'networks' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'network', - localstatedir / 'lib' / 'libvirt' / 'dnsmasq', - runstatedir / 'libvirt' / 'network', ++ install_prefix + confdir / 'qemu' / 'networks', ++ install_prefix + confdir / 'qemu' / 'networks' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'network', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', + install_prefix + runstatedir / 'libvirt' / 'network', ] configure_file( -@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK') +@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK') output: '@BASENAME@', copy: true, install: true, @@ -207,8 +262,37 @@ index 3ec598c..b02040b 100644 '../default.xml', 'default.xml', ) +diff --git a/src/node_device/meson.build b/src/node_device/meson.build +index 1c95975c37..a7831242db 100644 +--- a/src/node_device/meson.build ++++ b/src/node_device/meson.build +@@ -64,6 +64,6 @@ if conf.has('WITH_NODE_DEVICES') + } + + virt_install_dirs += [ +- runstatedir / 'libvirt' / 'nodedev', ++ install_prefix + runstatedir / 'libvirt' / 'nodedev', + ] + endif +diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build +index 55cf8fcce4..d331086f2e 100644 +--- a/src/nwfilter/meson.build ++++ b/src/nwfilter/meson.build +@@ -62,9 +62,9 @@ if conf.has('WITH_NWFILTER') + } + + virt_install_dirs += [ +- confdir / 'nwfilter', +- runstatedir / 'libvirt' / 'nwfilter-binding', +- runstatedir / 'libvirt' / 'nwfilter', ++ install_prefix + confdir / 'nwfilter', ++ install_prefix + runstatedir / 'libvirt' / 'nwfilter-binding', ++ install_prefix + runstatedir / 'libvirt' / 'nwfilter', + ] + + subdir('xml') diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build -index 0d96c54..66c92a1 100644 +index 0d96c54ebe..66c92a1016 100644 --- a/src/nwfilter/xml/meson.build +++ b/src/nwfilter/xml/meson.build @@ -25,4 +25,4 @@ nwfilter_xml_files = [ @@ -218,43 +302,71 @@ index 0d96c54..66c92a1 100644 -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 90640b0..8802cec 100644 +index 39f0f615cc..5f6f30f82b 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') - } +@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU') + endif virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'qemu', -- runstatedir / 'libvirt' / 'qemu', +- confdir / 'qemu', +- confdir / 'qemu' / 'autostart', - localstatedir / 'cache' / 'libvirt' / 'qemu', -- localstatedir / 'log' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot', - localstatedir / 'lib' / 'libvirt' / 'swtpm', -- runstatedir / 'libvirt' / 'qemu' / 'swtpm', +- localstatedir / 'log' / 'libvirt' / 'qemu', - localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', -+ install_prefix + runstatedir / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu' / 'dbus', +- runstatedir / 'libvirt' / 'qemu' / 'slirp', +- runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + confdir / 'qemu', ++ install_prefix + confdir / 'qemu' / 'autostart', + install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm', -+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', + install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build -index 9ad2f6a..429a15b 100644 +index b2aafe6320..6972d254ca 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build -@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') +@@ -235,9 +235,9 @@ if conf.has('WITH_REMOTE') } virt_install_dirs += [ - localstatedir / 'log' / 'libvirt', +- runstatedir / 'libvirt', +- runstatedir / 'libvirt' / 'common', + install_prefix + localstatedir / 'log' / 'libvirt', ++ install_prefix + runstatedir / 'libvirt', ++ install_prefix + runstatedir / 'libvirt' / 'common', ] logrotate_conf = configuration_data() -@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE') +@@ -251,7 +251,7 @@ if conf.has('WITH_REMOTE') ) install_data( log_file, @@ -263,7 +375,7 @@ index 9ad2f6a..429a15b 100644 rename: [ name ], ) endforeach -@@ -309,7 +309,7 @@ endif +@@ -301,7 +301,7 @@ endif if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -272,11 +384,25 @@ index 9ad2f6a..429a15b 100644 rename: [ 'libvirt.conf' ], ) endif +diff --git a/src/secret/meson.build b/src/secret/meson.build +index 1bda59849b..392bc2cb2e 100644 +--- a/src/secret/meson.build ++++ b/src/secret/meson.build +@@ -45,7 +45,7 @@ if conf.has('WITH_SECRETS') + } + + virt_install_dirs += [ +- confdir / 'secrets', +- runstatedir / 'libvirt' / 'secrets', ++ install_prefix + confdir / 'secrets', ++ install_prefix + runstatedir / 'libvirt' / 'secrets', + ] + endif diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build -index af43780..e2d6c81 100644 +index 990f00b4f3..e5a7a14e1d 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build -@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles +@@ -19,22 +19,22 @@ foreach name : apparmor_gen_profiles output: name, configuration: apparmor_gen_profiles_conf, install: true, @@ -303,11 +429,28 @@ index af43780..e2d6c81 100644 + install_dir: install_prefix + apparmor_dir / 'local', rename: 'usr.lib.libvirt.virt-aa-helper', ) +diff --git a/src/storage/meson.build b/src/storage/meson.build +index 26e7ff1a1a..ad5c6eddc3 100644 +--- a/src/storage/meson.build ++++ b/src/storage/meson.build +@@ -127,9 +127,9 @@ if conf.has('WITH_STORAGE') + } + + virt_install_dirs += [ +- confdir / 'storage', +- confdir / 'storage' / 'autostart', +- runstatedir / 'libvirt' / 'storage', ++ install_prefix + confdir / 'storage', ++ install_prefix + confdir / 'storage' / 'autostart', ++ install_prefix + runstatedir / 'libvirt' / 'storage', + ] + endif + diff --git a/tools/meson.build b/tools/meson.build -index b8c6802..dacd0ff 100644 +index f4b4a16c29..059c73a955 100644 --- a/tools/meson.build +++ b/tools/meson.build -@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') +@@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL') install_rpath: libvirt_rpath, ) @@ -316,11 +459,6 @@ index b8c6802..dacd0ff 100644 endif if host_machine.system() == 'windows' -@@ -274,7 +274,7 @@ configure_file( - if init_script == 'systemd' - install_data( - 'libvirt-guests.sysconf', -- install_dir: sysconfdir / 'sysconfig', -+ install_dir: install_prefix + sysconfdir / 'sysconfig', - rename: 'libvirt-guests', - ) +-- +2.35.1 + diff --git a/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch b/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch deleted file mode 100644 index ae97c6455c6..00000000000 --- a/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ch/meson.build b/src/ch/meson.build -index e34974d56c..4767763c2c 100644 ---- a/src/ch/meson.build -+++ b/src/ch/meson.build -@@ -68,7 +68,7 @@ if conf.has('WITH_CH') - } - - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'ch', -- runstatedir / 'libvirt' / 'ch', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', -+ install_prefix + runstatedir / 'libvirt' / 'ch', - ] - endif diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 03d0e17cb4c..14e0e478790 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,85 +1,122 @@ { lib -, stdenv -, fetchurl -, fetchFromGitLab -, makeWrapper , autoreconfHook -, fetchpatch +, bash-completion +, bridge-utils +, cmake , coreutils -, libxml2 -, gnutls -, perl -, python3 -, attr -, glib +, curl +, darwin +, dbus +, dnsmasq , docutils -, iproute2 -, readline -, lvm2 -, util-linux -, systemd -, libpciaccess +, fetchFromGitLab +, fetchurl , gettext -, libtasn1 +, glib +, gnutls +, iproute2 , iptables , libgcrypt -, yajl -, pmutils -, libcap_ng -, libapparmor -, dnsmasq -, libnl , libpcap +, libtasn1 +, libxml2 , libxslt -, xhtml1 -, numad -, numactl -, perlPackages -, curl -, libiconv -, gmp -, zfs -, parted -, bridge-utils -, dmidecode -, dbus -, libtirpc -, rpcsvc-proto -, darwin +, makeWrapper , meson , ninja -, audit -, cmake -, bash-completion +, perl +, perlPackages , pkg-config -, enableXen ? false -, xen ? null -, enableIscsi ? false -, openiscsi +, pmutils +, python3 +, readline +, rpcsvc-proto +, stdenv +, xhtml1 +, yajl + + # Linux +, acl ? null +, attr ? null +, audit ? null +, dmidecode ? null +, fuse ? null +, kmod ? null +, libapparmor ? null +, libcap_ng ? null +, libnl ? null +, libpciaccess ? null +, libtirpc ? null +, lvm2 ? null +, numactl ? null +, numad ? null +, parted ? null +, systemd ? null +, util-linux ? null + + # Darwin +, gmp ? null +, libiconv ? null +, Carbon ? null +, AppKit ? null + + # Options , enableCeph ? false -, ceph +, ceph ? null , enableGlusterfs ? false -, glusterfs -, Carbon -, AppKit +, glusterfs ? null +, enableIscsi ? false +, openiscsi ? null +, libiscsi ? null +, enableXen ? false +, xen ? null +, enableZfs ? stdenv.isLinux +, zfs ? null }: with lib; -# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> let - buildFromTarball = stdenv.isDarwin; + inherit (stdenv) isDarwin isLinux isx86_64; + binPath = makeBinPath ([ + dnsmasq + ] ++ optionals isLinux [ + bridge-utils + dmidecode + dnsmasq + iproute2 + iptables + kmod + lvm2 + numactl + numad + pmutils + systemd + ] ++ optionals enableIscsi [ + libiscsi + openiscsi + ]); in + +assert enableXen -> isLinux && isx86_64; +assert enableCeph -> isLinux; +assert enableGlusterfs -> isLinux; +assert enableZfs -> isLinux; + +# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> stdenv.mkDerivation rec { pname = "libvirt"; - version = "7.10.0"; + # NOTE: You must also bump: + # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> + # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> + version = "8.1.0"; src = - if buildFromTarball then + if isDarwin then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "sha256-yzGAFK8JcyeSjG49cpIuO+AqPmQBJHsqpS2auOC0gPk="; + sha256 = "sha256-PGxDvs/+s0o/OXxhYgaqaaiT/4v16CCDk8hOjnU1KTQ="; } else fetchFromGitLab @@ -87,76 +124,84 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-bB8LsjZFeJbMmmC0YRPyMag2MBhwagUFC7aB1KhZEkA="; + sha256 = "sha256-nk8pBlss+g4EMy+RnAOyz6YlGGvlBvl5aBpcytsK1wY="; fetchSubmodules = true; }; patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch - ./0002-meson-patch-ch-install-prefix.patch ]; + # remove some broken tests + postPatch = '' + sed -i '/commandtest/d' tests/meson.build + sed -i '/virnetsockettest/d' tests/meson.build + # delete only the first occurrence of this + sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build + '' + optionalString isDarwin '' + sed -i '/qemucapabilitiestest/d' tests/meson.build + ''; + + nativeBuildInputs = [ - ninja meson + cmake + docutils makeWrapper + ninja pkg-config - docutils - ] ++ optional (!stdenv.isDarwin) [ - rpcsvc-proto - ] ++ optionals stdenv.isDarwin [ - darwin.developer_cmds # needed for rpcgen - ]; + ] + ++ optional (!isDarwin) rpcsvc-proto + # NOTE: needed for rpcgen + ++ optional isDarwin darwin.developer_cmds; buildInputs = [ bash-completion - pkg-config - libxml2 + curl + dbus + gettext + glib gnutls + libgcrypt + libpcap + libtasn1 + libxml2 + libxslt perl + perlPackages.XMLXPath + pkg-config python3 readline - gettext - libtasn1 - libgcrypt - yajl - libxslt xhtml1 - perlPackages.XMLXPath - curl - libpcap - glib - dbus - ] ++ optionals stdenv.isLinux [ + yajl + ] ++ optionals isLinux [ + acl + attr audit - libpciaccess - lvm2 - util-linux - systemd - libnl - numad - zfs + fuse libapparmor libcap_ng + libnl + libpciaccess + libtirpc + lvm2 numactl - attr + numad parted - libtirpc - ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ - xen - ] ++ optionals enableIscsi [ - openiscsi - ] ++ optionals enableCeph [ - ceph - ] ++ optionals enableGlusterfs [ - glusterfs - ] ++ optionals stdenv.isDarwin [ - libiconv - gmp - Carbon + systemd + util-linux + ] ++ optionals isDarwin [ AppKit - ]; + Carbon + gmp + libiconv + ] + ++ optionals enableCeph [ ceph ] + ++ optionals enableGlusterfs [ glusterfs ] + ++ optionals enableIscsi [ libiscsi openiscsi ] + ++ optionals enableXen [ xen ] + ++ optionals enableZfs [ zfs ]; preConfigure = let @@ -164,80 +209,124 @@ stdenv.mkDerivation rec { QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; }; + patchBuilder = var: value: '' sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" ''; in '' - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH="${binPath}:$PATH" # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + substituteInPlace build-aux/meson.build \ --replace "gsed" "sed" \ --replace "gmake" "make" \ --replace "ggrep" "grep" + patchShebangs . '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); - mesonAutoFeatures = "auto"; + mesonAutoFeatures = "disabled"; mesonFlags = let - opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; + cfg = option: val: "-D${option}=${val}"; + feat = option: enable: cfg option (if enable then "enabled" else "disabled"); + driver = name: feat "driver_${name}"; + storage = name: feat "storage_${name}"; in [ "--sysconfdir=/var/lib" - "-Dinstall_prefix=${placeholder "out"}" - "-Dlocalstatedir=/var" - "-Drunstatedir=/run" - "-Dlibpcap=enabled" - "-Ddriver_qemu=enabled" - "-Ddriver_vmware=enabled" - "-Ddriver_vbox=enabled" - "-Ddriver_test=enabled" - "-Ddriver_esx=enabled" - "-Ddriver_remote=enabled" - "-Dpolkit=enabled" - (opt "storage_iscsi" enableIscsi) - ] ++ optionals stdenv.isLinux [ - (opt "storage_zfs" (zfs != null)) - "-Dattr=enabled" - "-Dapparmor=enabled" - "-Dsecdriver_apparmor=enabled" - "-Dnumad=enabled" - "-Dstorage_disk=enabled" - (opt "glusterfs" enableGlusterfs) - (opt "storage_rbd" enableCeph) - ] ++ optionals stdenv.isDarwin [ - "-Dinit_script=none" + (cfg "install_prefix" (placeholder "out")) + (cfg "localstatedir" "/var") + (cfg "runstatedir" "/run") + + (cfg "init_script" (if isDarwin then "none" else "systemd")) + + (feat "apparmor" isLinux) + (feat "attr" isLinux) + (feat "audit" isLinux) + (feat "bash_completion" true) + (feat "blkid" isLinux) + (feat "capng" isLinux) + (feat "curl" true) + (feat "docs" true) + (feat "expensive_tests" true) + (feat "firewalld" isLinux) + (feat "firewalld_zone" isLinux) + (feat "fuse" isLinux) + (feat "glusterfs" enableGlusterfs) + (feat "host_validate" true) + (feat "libiscsi" enableIscsi) + (feat "libnl" isLinux) + (feat "libpcap" true) + (feat "libssh2" true) + (feat "login_shell" isLinux) + (feat "nss" isLinux) + (feat "numactl" isLinux) + (feat "numad" isLinux) + (feat "pciaccess" isLinux) + (feat "polkit" true) + (feat "readline" true) + (feat "secdriver_apparmor" isLinux) + (feat "tests" true) + (feat "udev" isLinux) + (feat "yajl" true) + + (driver "ch" isLinux) + (driver "esx" true) + (driver "interface" isLinux) + (driver "libvirtd" true) + (driver "libxl" enableXen) + (driver "lxc" isLinux) + (driver "network" true) + (driver "openvz" isLinux) + (driver "qemu" true) + (driver "remote" true) + (driver "secrets" true) + (driver "test" true) + (driver "vbox" true) + (driver "vmware" true) + + (storage "dir" true) + (storage "disk" isLinux) + (storage "fs" isLinux) + (storage "gluster" enableGlusterfs) + (storage "iscsi" enableIscsi) + (storage "iscsi_direct" enableIscsi) + (storage "lvm" isLinux) + (storage "mpath" isLinux) + (storage "rbd" enableCeph) + (storage "scsi" true) + (storage "vstorage" isLinux) + (storage "zfs" enableZfs) ]; - postInstall = - let - binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; - in - '' - substituteInPlace $out/bin/virt-xml-validate \ - --replace xmllint ${libxml2}/bin/xmllint - - substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ - --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ - --replace "$out/bin" '${gettext}/bin' \ - --replace 'lock/subsys' 'lock' \ - --replace 'gettext.sh' 'gettext.sh - # Added in nixpkgs: - gettext() { "${gettext}/bin/gettext" "$@"; } - ' - '' + optionalString stdenv.isLinux '' - substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill - rm $out/lib/systemd/system/{virtlockd,virtlogd}.* - wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} - ''; + doCheck = true; + + postInstall = '' + substituteInPlace $out/bin/virt-xml-validate \ + --replace xmllint ${libxml2}/bin/xmllint + + substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ + --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' + '' + optionalString isLinux '' + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : /run/libvirt/nix-emulators:${binPath} + ''; meta = { homepage = "https://libvirt.org/"; @@ -248,6 +337,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin lovesegfault ]; }; } diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 2f9afff56d8..1517cf97078 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.99.1"; + version = "2.0.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-WGW/4m+BTe6dEigUcuUIZjoTeamInW6zrtrlaqKM6Js="; + sha256 = "sha256-k8pEgEu+oWNa0rI47osVPKaZGxgwX/ENaz9jPrQXy0E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libwbxml/default.nix b/pkgs/development/libraries/libwbxml/default.nix new file mode 100644 index 00000000000..b5dc8c18208 --- /dev/null +++ b/pkgs/development/libraries/libwbxml/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, lib, cmake, expat }: + +stdenv.mkDerivation rec { + pname = "libwbxml"; + version = "0.11.8"; + + src = fetchFromGitHub { + owner = "libwbxml"; + repo = "libwbxml"; + rev = "${pname}-${version}"; + sha256 = "sha256-WCVKfIk6R2rVaz1SbJL9eLqNC0f4VzL74Sw2IKdDE9I="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ expat ]; + + postPatch = '' + sed -i 's/^SET.*$//' cmake/CMakeLists.txt + ''; + + meta = with lib; { + homepage = "https://github.com/libwbxml/libwbxml"; + description = "The WBXML Library (aka libwbxml) contains a library and its associated tools to Parse, Encode and Handle WBXML documents"; + maintainers = with maintainers; [ mh ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index c78cc192a7c..9f92ed5fd45 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "40.0"; + version = "40.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM="; + sha256 = "AxNPoRTvP740B1qoNnj1iqLevp/O9OojwHeeKGAdZhE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 25d2d89add0..7bcc62af6ec 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0d4jzq0zv1xmng0z0q5lb4rz03ikgxdwi68k3r70ac16gb911ixk"; + sha256 = "0ca00awfzvxiznvd4mgwgxyqxiwvi07j5xxmg5z0l47rcd9fqv0h"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index bc11c9cfea1..3b7cae36a0e 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,20 +1,37 @@ -{ stdenv, lib, fetchurl, fetchpatch -, zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs +{ stdenv +, lib +, fetchurl +, zlib +, pkg-config +, autoreconfHook +, xz +, libintl +, python +, gettext +, ncurses +, findXMLCatalogs , libiconv , pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform -, icuSupport ? false, icu ? null +, icuSupport ? false +, icu , enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic , enableStatic ? !enableShared +, gnome }: stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.9.12"; + version = "2.9.13"; + + outputs = [ "bin" "dev" "out" "man" "doc" ] + ++ lib.optional pythonSupport "py" + ++ lib.optional (enableStatic && enableShared) "static"; src = fetchurl { - url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; - sha256 = "14hxwzmf5xqppx77z7i0ni9lpzg1a84dqpf8j8l1fvy570g6imn8"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "J2EwYC0S/khOzANEfuXnWdBGVVj7yda9FE43RTBuvw4="; }; + patches = [ # Upstream bugs: # https://bugzilla.gnome.org/show_bug.cgi?id=789714 @@ -28,62 +45,65 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/63174 # https://github.com/NixOS/nixpkgs/pull/72342 ./utf8-xmlErrorFuncHandler.patch - - # Work around lxml API misuse. - # https://gitlab.gnome.org/GNOME/libxml2/issues/255 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libxml2/commit/85b1792e37b131e7a51af98a37f92472e8de5f3f.patch"; - sha256 = "epqlNs2S0Zczox3KyCB6R2aJKh87lXydlZ0x6tLHweE="; - }) ]; - outputs = [ "bin" "dev" "out" "man" "doc" ] - ++ lib.optional pythonSupport "py" - ++ lib.optional (enableStatic && enableShared) "static"; - strictDeps = true; - buildInputs = lib.optional pythonSupport python - ++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext - ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses - ++ lib.optional (stdenv.isDarwin && - pythonSupport && python?isPy2 && python.isPy2) libintl + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = lib.optionals pythonSupport [ + python + ] ++ lib.optionals (pythonSupport && python?isPy2 && python.isPy2) [ + gettext + ] ++ lib.optionals (pythonSupport && python?isPy3 && python.isPy3) [ + ncurses + ] ++ lib.optionals (stdenv.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [ + libintl + ] ++ lib.optionals stdenv.isFreeBSD [ # Libxml2 has an optional dependency on liblzma. However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a # RUNPATH for that, leading to undefined references for its users. - ++ lib.optional stdenv.isFreeBSD xz; + xz + ]; - propagatedBuildInputs = [ zlib findXMLCatalogs ] - ++ lib.optional stdenv.isDarwin libiconv - ++ lib.optional icuSupport icu; + propagatedBuildInputs = [ + zlib + findXMLCatalogs + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + ] ++ lib.optionals icuSupport [ + icu + ]; configureFlags = [ - "--exec_prefix=$dev" + "--exec-prefix=${placeholder "dev"}" (lib.enableFeature enableStatic "static") (lib.enableFeature enableShared "shared") (lib.withFeature icuSupport "icu") (lib.withFeatureAs pythonSupport "python" python) ]; - preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' - MACOSX_DEPLOYMENT_TARGET=10.16 - ''; + installFlags = lib.optionals pythonSupport [ + "pythondir=\"${placeholder "py"}/${python.sitePackages}\"" + ]; enableParallelBuilding = true; - # disable test that's problematic with newer pythons: see - # https://mail.gnome.org/archives/xml/2017-August/msg00014.html - preCheck = lib.optionalString (pythonSupport && !(python?pythonOlder && python.pythonOlder "3.5")) '' - echo "" > python/tests/tstLastError.py - ''; - - doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin && + doCheck = + (stdenv.hostPlatform == stdenv.buildPlatform) && + !stdenv.isDarwin && stdenv.hostPlatform.libc != "musl"; - preInstall = lib.optionalString pythonSupport - ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; - installFlags = lib.optional pythonSupport - "pythondir=\"${placeholder "py"}/lib/${python.libPrefix}/site-packages\""; + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + MACOSX_DEPLOYMENT_TARGET=10.16 + ''; + + preInstall = lib.optionalString pythonSupport '' + substituteInPlace python/libxml2mod.la --replace "$dev/${python.sitePackages}" "$py/${python.sitePackages}" + ''; postFixup = '' moveToOutput bin/xml2-config "$dev" @@ -93,13 +113,21 @@ stdenv.mkDerivation rec { moveToOutput lib/libxml2.a "$static" ''; - passthru = { inherit version; pythonSupport = pythonSupport; }; + passthru = { + inherit version; + pythonSupport = pythonSupport; + + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; - meta = { + meta = with lib; { homepage = "http://xmlsoft.org/"; - description = "An XML parsing library for C"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.eelco ]; + description = "XML parsing library for C"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ eelco jtojnar ]; }; } diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 85fda8ddc8e..80d6129f18a 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , docbook_xml_dtd_43 , docbook_xsl , glib @@ -30,6 +31,13 @@ stdenv.mkDerivation rec { patches = [ ./installed-tests-path.patch + # Fix darwin build, can be removed on next release + # `--version-script` isn't supported by the macOS linker + # https://github.com/hughsie/libxmlb/pull/119 + (fetchpatch { + url = "https://github.com/hughsie/libxmlb/commit/d83aac5bd78cfbbfa2ecd428ff54b811071dfe4d.patch"; + sha256 = "sha256-UNRMbyNzdxfTZ8xV6J8a622hPnr3mowooP1q8Dg19yw="; + }) ]; nativeBuildInputs = [ @@ -72,6 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 3993b3f73e1..ac4dd749233 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,38 +1,60 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , pkg-config -, libxml2, findXMLCatalogs, gettext, python, libgcrypt +, autoreconfHook +, libxml2 +, findXMLCatalogs +, gettext +, python +, ncurses +, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform +, gnome }: stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.34"; + version = "1.1.35"; + + outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; src = fetchurl { - url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; - sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "gkfzPpqHLGrIWapFAYvExNALl+L+rJ7rwQyTzh803Xk="; }; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; - nativeBuildInputs = [ pkg-config + autoreconfHook ]; - buildInputs = [ libxml2.dev ] - ++ lib.optional stdenv.isDarwin gettext - ++ lib.optionals pythonSupport [ libxml2.py python ] - ++ lib.optionals cryptoSupport [ libgcrypt ]; + buildInputs = [ + libxml2.dev + ] ++ lib.optional stdenv.isDarwin [ + gettext + ] ++ lib.optionals pythonSupport [ + libxml2.py + python + ncurses + ] ++ lib.optionals cryptoSupport [ + libgcrypt + ]; - propagatedBuildInputs = [ findXMLCatalogs ]; + propagatedBuildInputs = [ + findXMLCatalogs + ]; configureFlags = [ "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ lib.optional pythonSupport "--with-python=${python}" - ++ lib.optional (!cryptoSupport) "--without-crypto"; + ] ++ lib.optionals pythonSupport [ + "--with-python=${python}" + ] ++ lib.optionals (!cryptoSupport) [ + "--without-crypto" + ]; postFixup = '' moveToOutput bin/xslt-config "$dev" @@ -46,6 +68,11 @@ stdenv.mkDerivation rec { passthru = { inherit pythonSupport; + + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; }; meta = with lib; { @@ -53,7 +80,7 @@ stdenv.mkDerivation rec { description = "A C library and tools to do XSL transformations"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.eelco ]; - broken = !(pythonSupport -> libxml2.pythonSupport); # see #73102 for why this is not an assert + maintainers = with maintainers; [ eelco jtojnar ]; + broken = pythonSupport && !libxml2.pythonSupport; # see #73102 for why this is not an assert }; } diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/development/libraries/libyuv/default.nix new file mode 100644 index 00000000000..ac69ab8dacc --- /dev/null +++ b/pkgs/development/libraries/libyuv/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchgit +, cmake +, libjpeg +}: + +stdenv.mkDerivation rec { + pname = "libyuv"; + version = "1787"; # Defined in: include/libyuv/version.h + + src = fetchgit { + url = "https://chromium.googlesource.com/libyuv/libyuv.git"; + rev = "eb6e7bb63738e29efd82ea3cf2a115238a89fa51"; # refs/heads/stable + sha256 = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU="; + }; + + nativeBuildInputs = [ + cmake + ]; + + # NEON does not work on aarch64, we disable it + cmakeFlags = lib.optionals stdenv.isAarch64 ["-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"]; + + buildInputs = [ libjpeg ]; + + meta = with lib; { + homepage = "https://chromium.googlesource.com/libyuv/libyuv"; + description = "Open source project that includes YUV scaling and conversion functionality"; + platforms = platforms.linux; + maintainers = with maintainers; [ leixb ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1fb573931b6..23163763ed9 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -33,7 +33,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.3.5"; + version = "21.3.7"; branch = versions.major version; self = stdenv.mkDerivation { @@ -47,18 +47,13 @@ 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 = "0k2ary16ixsrp65m2n5djpr51nbwdgzpv81pfrnqbvk44jfjlfyr"; + sha256 = "0ggw3s514z6szasbiy4dv5mdi689121yy2xly2g21gv1mavrvyml"; }; # TODO: # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ - # To fix flickering on Intel GPUs (iris), see https://github.com/NixOS/nixpkgs/issues/153377: - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/07dc3d4238e57901ccf98e0b506d9aad2c86b9d9.diff"; - sha256 = "sha256-3fa1qHJes3x1/iXsxfjgy9HnEGlOyFtJatSkU1a3XDI="; - }) # fixes pkgsMusl.mesa build ./musl.patch (fetchpatch { diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index 1e9e44e0997..22d4567c562 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja +, fetchpatch , secureBuild ? false }: @@ -7,14 +8,28 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n4FGld3bq6ZOSLTzXcVlucCGbQ5/eSFbijU0dfBD/T0="; + sha256 = "sha256-q3W/w1Ofqt6EbKF/Jf9wcC+7jAxh59B3cOGxudWQXlA="; }; + patches = [ + (fetchpatch { + name = "older-macos-fixes.patch"; + url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch"; + sha256 = "15qx2a3axhhwbfzxdis98b8j14y9cfgca0i484aj2pjpqnm0pb8c"; + }) + ]; + + doCheck = true; + preCheck = let + ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + export ${ldLibraryPathEnv}="$(pwd)/build:''${${ldLibraryPathEnv}}" + ''; nativeBuildInputs = [ cmake ninja ]; cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optional secureBuild [ "-DMI_SECURE=ON" ]; @@ -25,10 +40,9 @@ stdenv.mkDerivation rec { in '' # first, move headers and cmake files, that's easy mkdir -p $dev/lib - mv $out/include $dev/include - mv $out/cmake $dev/lib/ + mv $out/lib/cmake $dev/lib/ - find $out/lib + find $dev $out -type f '' + (lib.optionalString secureBuild '' # pretend we're normal mimalloc ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${suffix} @@ -44,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/microsoft/mimalloc"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ kamadorueda thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 9bf5235db82..075f096486b 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mxml"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "mxml"; rev = "v${version}"; - sha256 = "0zvib87rgsib0w9xp6bks5slq5ma1qbgyyyvr23cv7zkbgw3xgil"; + sha256 = "sha256-YN8g8KDk7xnDVK1io0zSLO7erxEp4VQ9heA7Lu/cUUg="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 570a123f860..bff44d8aaf5 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/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"; + version = "4.0.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "0r7zzcj8b9dbf5lp2d81wcvffi38c1zchkgzyxckk51adv4ijx6z"; + sha256 = "11rnljqwz6mr88ybj726mk710h7gvz20hy7labmz4jkkaa0gx8b6"; }; configureFlags = [ diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 92285501748..619ed721dff 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-TsGoSVewQJlr0zj8qYEd+UU8DlncZDCqfrqTv89LEYU="; + sha256 = "sha256-iGw+qdw7heL5q7G0dwtl4PX2UA0Kka0FUmH610dM/00="; }; postPatch = '' diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index efab246bb1f..2740b95986c 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Note the revision needs to be adjusted. version = "6.3"; - name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat"; + pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; # We cannot use fetchFromGitHub (which calls fetchzip) # because we need to be able to use fetchurlBoot. diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index a39ece28aae..1521c1a6389 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.31.2"; + version = "0.32.2"; pname = "neon"; src = fetchurl { url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0y46dbhiblcvg8k41bdydr3fivghwk73z040ki5825d24ynf67ng"; + sha256 = "sha256-mGVmRoxilfxdD7FBpZgeMcn4LuOOk4N0q+2Ece8vsoY="; }; patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 348faf56b56..44afdf45513 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -5,9 +5,9 @@ }: stdenv.mkDerivation { - name = "nettle-${version}"; + pname = "nettle"; - inherit src; + inherit version src; outputs = [ "out" "dev" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 86edacc6166..bd639ec3041 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -10,6 +10,10 @@ , enableJemalloc ? false, jemalloc ? null , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null + +# downstream dependencies, for testing +, curl +, libsoup }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -73,6 +77,10 @@ stdenv.mkDerivation rec { #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc + passthru.tests = { + inherit curl libsoup; + }; + meta = with lib; { homepage = "https://nghttp2.org/"; description = "A C implementation of HTTP/2"; diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index ea216335b7a..279c8a0fd05 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct" ]; + postFixup = '' + substituteInPlace $out/lib/cmake/nlopt/NLoptLibraryDepends.cmake --replace \ + 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/' 'INTERFACE_INCLUDE_DIRECTORIES "' + ''; + meta = { homepage = "https://nlopt.readthedocs.io/en/latest/"; description = "Free open-source library for nonlinear optimization"; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e92b3dec07b..d17f4c4a783 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -27,7 +27,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.74"; + version = "3.75"; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0mnhdkm4galhpvfz4rv0918jwmjlwkvcvb1f5va8f3zlz48qi4l8"; + sha256 = "10l5qn68gly2l4ifv0v6by1qc8nsmhra08nm9m7n913jh83iamzx"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index baae8ae81b7..6392383c983 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.9"; + version = "3.2.10"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08"; + sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index fa9fc1f87ee..2cd76a7ca78 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.3.2"; + version = "2.3.5"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "sha256-LevS9euBAFkI1ll79uqmVaRR/6FH6Z4cypHqvCIWxgU="; + sha256 = "sha256-GGaq8ziOCUDMxILq2QYUkSP4usBjbufbHwQF4Pr6hHw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index 93fc495d385..42ae370cd90 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openh264"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "cisco"; repo = pname; rev = "v${version}"; - sha256 = "0ffav46pz3sbj92nipd62z03fibyqgclfq9w8lgr80s6za6zdk5s"; + sha256 = "sha256-l64xP39Uaislqh4D7oSxJiQGhXkklol4LgS9BVPbaGk="; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 390227cfe95..33ddbf7018c 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -186,8 +186,8 @@ in { }; openssl_1_1 = common rec { - version = "1.1.1m"; - sha256 = "sha256-+JGZvosjykX8fLnx2NPuZzEjGChq0DD1MWrKZGLbbJY="; + version = "1.1.1n"; + sha256 = "sha256-QNzrUaT2pSdb3g5r8g70uRv8Mu1XwFUuLo4VRjNysXo="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -201,8 +201,8 @@ in { }; openssl_3_0 = common { - version = "3.0.1"; - sha256 = "sha256-wxGthTNTvOeW7a0BqGLFCopYf2Ln4hAO9GWrU+ybBtE="; + version = "3.0.2"; + sha256 = "sha256-mOkczq1NR1auPJzeXgkZGo5YbZ9NUIOOfsCdZBHf22M="; patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 1058eaa1f63..2c43cfb4cc9 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6Libn+S5c7sCmKGq8KojiUhI18zO37rgiiVwQxP3p4o="; + sha256 = "sha256-lrc4VEqmCp/P/h0+5/ix6tx4pjfkLy9BLBZtKYLlyGI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index abef3d6cd1d..dfb70ab624e 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -5,21 +5,22 @@ , nlopt , ipopt , boost +, tbb }: stdenv.mkDerivation rec { pname = "pagmo2"; - version = "2.9"; + version = "2.18.0"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; rev = "v${version}"; - sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400"; + sha256 = "0rd8scs4hj6qd8ylmn5hafncml2vr4fvcgm3agz3jrvmnc7hadrj"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen nlopt ipopt boost ]; + buildInputs = [ eigen nlopt ipopt boost tbb ]; cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no" diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 964a3640871..3033b7df4e3 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.3"; + version = "1.50.4"; outputs = [ "bin" "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "St0F7fUcH7N1oczedJiRQSDiPLKA3XOVsa60QfGDikw="; + sha256 = "9K1j6H3CsUUwBUKk+wBNB6n5GzQVL64N2+UOzdhRwWI="; }; strictDeps = !withIntrospection; diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index 80de299793a..18809654c46 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -32,7 +32,7 @@ let }; }; in - builtins.listToAttrs (map (a: { inherit (a) pname; value = mkDataset a; }) [ + builtins.listToAttrs (map (a: { name = a.pname; value = mkDataset a; }) [ { pname = "G4NDL"; version = "4.6"; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 03b298908bb..d33beb66599 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.306"; + version = "8.307"; src = fetchurl { url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "sha256-c0gDtyKxwbU8jPLw08MHR8gPwt3l4LoUG8k5fa03qPY="; + sha256 = "sha256-5bFNRKpZQzMuMt1d2poY/dGgCFxxmOKNhA4EFn+mAT0="; }; nativeBuildInputs = [ rsync ]; diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index d21ceafbcf9..16c8d5d2512 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -28,6 +28,11 @@ in stdenv.mkDerivation rec { alsa-lib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 ]; + # Workaround build on gcc-10+ and clang11+: + # spa/plugins/bluez5/libspa-bluez5.so.p/bluez5-monitor.c.o:(.bss+0x0): + # multiple definition of `spa_a2dp_sink_factory' + NIX_CFLAGS_COMPILE = [ "-fcommon" ]; + mesonFlags = [ "-Ddocs=true" "-Dgstreamer=enabled" diff --git a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch index 926de306254..b2bcb421bef 100644 --- a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch +++ b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch @@ -1,23 +1,23 @@ diff --git a/meson.build b/meson.build -index d4a4cda7..a27569bd 100644 +index 2107c19ec..20ccdfd9f 100644 --- a/meson.build +++ b/meson.build -@@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd' - - alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa')) +@@ -380,8 +380,8 @@ lilv_lib = dependency('lilv-0', required: get_option('lv2')) + summary({'lilv (for lv2 plugins)': lilv_lib.found()}, bool_yn: true) + cdata.set('HAVE_LILV', lilv_lib.found()) -installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name -installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name +installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / pipewire_name +installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / pipewire_name - installed_tests_enabled = not get_option('installed_tests').disabled() + installed_tests_enabled = get_option('installed_tests').allowed() installed_tests_template = files('template.test.in') diff --git a/meson_options.txt b/meson_options.txt -index 1b915ac3..85beb86a 100644 +index 961ae2a76..a36e9e45f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -29,6 +29,9 @@ option('installed_tests', +@@ -22,6 +22,9 @@ option('installed_tests', description: 'Install manual and automated test executables', type: 'feature', value: 'disabled') diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 79682d7ace8..d37e0a05086 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -20,7 +20,6 @@ , udev , libva , libsndfile -, SDL2 , vulkan-headers , vulkan-loader , webrtc-audio-processing @@ -69,7 +68,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.45"; + version = "0.3.48"; outputs = [ "out" @@ -87,7 +86,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-OnQd98qfOekAsVXLbciZLNPrM84KBX6fOx/f8y2BYI0="; + sha256 = "sha256-+gk/MJ9YimHBwN2I42DRP+I2OqBFFtZ81Fd/l89HcSk="; }; patches = [ @@ -129,7 +128,6 @@ let vulkan-headers vulkan-loader webrtc-audio-processing - SDL2 systemd ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optionals libcameraSupport [ libcamera libdrm ] @@ -139,7 +137,7 @@ let ++ lib.optional zeroconfSupport avahi ++ lib.optional raopSupport openssl ++ lib.optional rocSupport roc-toolkit - ++ lib.optionals x11Support [ libcanberra xorg.libxcb ]; + ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ]; # Valgrind binary is required for running one optional test. checkInputs = lib.optional withValgrind valgrind; @@ -169,6 +167,7 @@ let "-Dsession-managers=" "-Dvulkan=enabled" "-Dx11=${mesonEnableFeature x11Support}" + "-Dsdl2=disabled" # required only to build examples, causes dependency loop ]; # Fontconfig error: Cannot load default config file @@ -214,6 +213,7 @@ let "nix-support/client-rt.conf.json" "nix-support/client.conf.json" "nix-support/jack.conf.json" + "nix-support/minimal.conf.json" "nix-support/pipewire.conf.json" "nix-support/pipewire-pulse.conf.json" ]; diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index cde73edf790..8983f09f2d3 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -39,6 +39,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-xwfggrjKHh5mZdvH6dKqQo6o1ltxuYdjoGYaWl31C/Y="; }; + patches = [ + # backport a patch to fix hangs in some applications + # ref: https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/213 + # FIXME: drop this in 0.4.9 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/afbc0ce57aac7aee8dc1651de4620f15c73dbace.patch"; + sha256 = "sha256-8ycFnrzDq7QHgjwJ/772OTMsSsN3m7gjbdvTmlMJ+mU="; + }) + ]; + nativeBuildInputs = [ meson pkg-config @@ -69,6 +79,7 @@ stdenv.mkDerivation rec { "-Dintrospection=${mesonEnableFeature enableGI}" "-Dsystemd-system-service=true" "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system" + "-Dsysconfdir=/etc" ]; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index fe148368b49..082702ec46f 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zMn8INehMO2/sjPDOxMldArAGyZAqjelxUTtv7oYqDM="; + sha256 = "sha256-t0/6yWnvBn5HGA50imejoYFrcVf/TqYg7UQy9Ztw8B8="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 3a3199cbd7a..72907f7aedc 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -65,6 +65,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.patch"; sha256 = "162jkpg2myq0rb0s5k3nfr4pqwv9im13jf6vzj8p5l39nazg5i4s"; }) + # File descriptor leak allows an unprivileged user to cause a crash (CVE-2021-4115) + (fetchpatch { + name = "CVE-2021-4115.patch"; + url = "https://src.fedoraproject.org/rpms/polkit/raw/0a203bd46a1e2ec8cc4b3626840e2ea9d0d13a9a/f/CVE-2021-4115.patch"; + sha256 = "sha256-BivHVVpYB4Ies1YbBDyKwUmNlqq2D1MpMipH9/dZM54="; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Make netgroup support optional (musl does not have it) # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index 173ee6d2e09..a046f255a6a 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , gbenchmark @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { pname = "prometheus-cpp"; - version = "0.9.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "jupp0r"; repo = pname; rev = "v${version}"; - sha256 = "1pjz29ywzfg3blhg2v8fn7gjvq46k3bqn7y0xvmn468ixxhv21fi"; + sha256 = "L6CXRup3kU1lY5UnwPbaOwEtCeAySNmFCPmHwsk6cRE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix index e364b907794..ef6338207e3 100644 --- a/pkgs/development/libraries/protolock/default.nix +++ b/pkgs/development/libraries/protolock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protolock"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "nilslice"; repo = "protolock"; rev = "v${version}"; - sha256 = "sha256-cKrG8f8cabuGDN1gmBYleXcBqeJksdREiEy63UK/6J0="; + sha256 = "sha256-vWwRZVArmlTIGwD4zV3dEHN2kkoeCZuNIvjCBVAviPo="; }; - vendorSha256 = "sha256-2XbBiiiPvZCnlKUzGDLFnxA34N/LmHoPbvRKZckmhx4="; + vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk="; doCheck = false; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index e81f3c186d6..e581bdf5f88 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -20,7 +20,7 @@ # false build-time dependencies stdenv.mkDerivation rec { - pname = "qt"; + pname = "qt" + lib.optionalString ( docs && demos && examples && developerBuild ) "-full"; version = "4.8.7"; src = fetchurl { diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 76c4237dcaf..8bf6386c4c6 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,8 +1,8 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "7edec6e014de27b9dd03f63875c471aac606a918", - "sha256": "0qv4vhciigqd8bnqzrs7y71ls7jx1p9cal2rh78m42qgskk1ci59" + "rev": "dba14d48611b9e9d59576172658779ab4a39b416", + "sha256": "1w2m1rm6mhj9qbanak36rqvc30x495zvj7mh2syy1yd29by0g5i8" }, "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": "c9fde86b0a2440133bc08f4811b6ca793be47f0a", - "sha256": "1fqhdkv3sp3nbzqi2a5wvxn5d4v0xcrq2bl609bdyj4nx367a8wp" + "rev": "d16bf02a11953dcac01dca73e6f3778f293adefe", + "sha256": "0rpyd5r60707lzfmfi3y501c7is1gzhh30bframsy8bwglck2hjj" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", @@ -26,8 +26,8 @@ }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "69a87a9b831e36a578594a0a13130c384ad03121", - "sha256": "0ph07rdf9qfxnw3z2nqbmh6na65z0p2snmlzdw80amd7s0g255kw" + "rev": "5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26", + "sha256": "1lpiq3svlnj8f8apd12if11sng7k0l8y6vhr317srzz4dd77cfry" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", @@ -36,8 +36,8 @@ }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "55324650f9e759a43dce927f823c9858574106c3", - "sha256": "0cxz4pqvb8l0wqpc4hr0xmc72csqf7dpbbzdqgil9nyyg21ihkz0" + "rev": "1d49a5b678957adde7e2db23a485a3f48157bc8f", + "sha256": "1wdpgh23mdn0nny9c837iyg9kszc3m4cdmaanf8glymkzn0rkd8w" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", @@ -101,8 +101,8 @@ }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "be66bf9a5618c745d2a6ee2262967af6307b3b07", - "sha256": "11h3f3rb2kqgsw7njzhjwazw1k03v12i83irjndylafiaqw6c6ks" + "rev": "d8d6b14b9907adbc6ce307d52be34aaa761a58fa", + "sha256": "15c7nrvvn7qc3l7kdbl5wdpazqwv8zvg1aij2jvcrhbymn0zl3mc" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", @@ -146,8 +146,8 @@ }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "24128cdf8bef53eddf31a5709bbbc46293006b1c", - "sha256": "0vinjcbq4saxhlmvb5i93bzgg30qc3j8r2qfwrzaxc4vmfhfgi56" + "rev": "728012f7762ecd5762d493f8796907c6456f31e7", + "sha256": "1ldizgybl4fp95xlzf103hqmsqdmr3jbx048jyxcb5gjd3pbwh7p" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", @@ -161,18 +161,18 @@ }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "353b75b2e34bdae901625bbddf5c5e3f3e6c0de5", - "sha256": "12nv773zc05yrbai1z6i481yinih0kxcjzgm9pa0580qz69gd9a5" + "rev": "98d1fd864cbb6c7c012c4139118808af110fb8f0", + "sha256": "07xjmhca7z5bva03zk73d948qz0a3wnn4kvyy6j4cnp3w5giz5kc" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "992833ca741efe8f533c61abfaf129a1d8bfcfee", - "sha256": "1w8mq38k6s0fncqv113bw1pc7g10ysfmsbyg23hxh9fr5q4ia4q7" + "rev": "214f7ab9d3384a4123f14d9f6cd0205cf0aaa794", + "sha256": "1qd64w5c16gmpgi936dfjc0pn1a1rbs752k8lfqv2xwysx7qkqwi" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38", - "sha256": "167rp43c86xr4grzxs4bl46y6sf1q9xa0641mgp4r94g2ipxyc1d" + "rev": "fa8b07105b5e274daaa8adcc129fa4aa0447f9f7", + "sha256": "0mggqa8kixknbm1p5i5lkrmkj1na3b2xflj011dkjbj8wb78i42n" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", @@ -181,8 +181,8 @@ }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "e7883bc64440b1ff4666272ac6eb710ee4bc221b", - "sha256": "1rj99y1f0wn6g1m2k53xkni5v79zgq25yv8b9wx2bz0n2r9iasca" + "rev": "b13b56904b76e96ea52d0efe56395acc94b17d96", + "sha256": "047asrq7c44v7cn2d7c5zba47qzpsb6nidba77i2xn7gqlfv6z3b" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 22d803c17be..2cdad981fbd 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, nix-update-script }: +{ lib, stdenv, fetchFromGitHub, nix-update-script }: stdenv.mkDerivation rec { pname = "re2"; - version = "2021-11-01"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - sha256 = "sha256-q8u7xNp6n17F6twPoVkix8iCKPWUN+qg6rhSR4Dv+bI="; + sha256 = "sha256-3RspCfJD2jV7GYuzeBUcxkZsdHyL14kaz8lSoIrH7b8="; }; - patches = [ - # Pull upstreal fix for parallel testing. - (fetchpatch { - name = "parallel-tests.patch"; - url = "https://github.com/google/re2/commit/9262284a7edc1b83e7172f4ec2d7967d695e7420.patch"; - sha256 = "1knhfx9cs4841r09jw4ha6mdx9qwpvlcxvd04i8vr84kd0lilqms"; - }) - ]; - preConfigure = '' substituteInPlace Makefile --replace "/usr/local" "$out" # we're using gnu sed, even on darwin @@ -29,6 +20,11 @@ stdenv.mkDerivation rec { buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ]; enableParallelBuilding = true; + # Broken when shared/static are tested in parallel: + # cp: cannot create regular file 'obj/testinstall.cc': File exists + # make: *** [Makefile:334: static-testinstall] Error 1 + # Will be fixed by https://code-review.googlesource.com/c/re2/+/59830 + enableParallelChecking = false; preCheck = "patchShebangs runtests"; doCheck = true; diff --git a/pkgs/development/libraries/readline/readline-8.1-patches.nix b/pkgs/development/libraries/readline/readline-8.1-patches.nix index b8019fb3350..b2aaadf0e9b 100644 --- a/pkgs/development/libraries/readline/readline-8.1-patches.nix +++ b/pkgs/development/libraries/readline/readline-8.1-patches.nix @@ -1,4 +1,6 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ +(patch "001" "0i4ikdqgcjnb40y2ss3lm09rq56zih5rzma3bib50dk3d1d4cak8") +(patch "002" "1p15sfx5xg5k4lam12lyd0givk7dfjddqpnb1jdp3c4clray0nz5") ] diff --git a/pkgs/development/libraries/readline/update-patch-set.sh b/pkgs/development/libraries/readline/update-patch-set.sh new file mode 120000 index 00000000000..d4f5cd2f312 --- /dev/null +++ b/pkgs/development/libraries/readline/update-patch-set.sh @@ -0,0 +1 @@ +../../../shells/bash/update-patch-set.sh \ No newline at end of file diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix index 113143311ed..7711dde497f 100644 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -72,5 +72,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.DamienCassou ]; platforms = platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/retro-gtk.x86_64-darwin }; } diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 4d78209f141..b55c2ef8152 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-fsQANBND/oDeC/+wmCH/aLlDTxPIi7Z/oN1HnNHHnm0="; + hash = "sha256-x6XwYxgiCoy6Q7gIevSTEWgUQ0aEjPFhKSqMqQahHig="; }; prePatch = '' diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index e2ed679d212..773f98ee54a 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-UeunsDRLhmsDOzesiEgYIzYotwecehB6VswshzdRwjw="; + hash = "sha256-eZdy9+BfuUVzPO6huvqcwCog96qMVTYoY3l6J0YMUZQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index f69165c5811..9c19638d3f4 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-0OGYF4urlscr8tMkQwo2yATXwN0DjB092KQ+CBEhfIA="; + hash = "sha256-ovYwElZGRKySH1mWFIISxuNNxCjaqoe9oCvqYZGdfq0="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 54ecd4f59b8..aff0475c4a5 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "4.5.2"; + version = "5.0.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-DJDlEHnXhegcenO8BIY/8GnZdHldVs0GFLrQy4Z6heY="; + hash = "sha256-KOzVZNHtpwEOn7lZ36c4BGrImrq8dkUWRiHqGm+UTDk="; }; sourceRoot = "source/src"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index e76b7c1993a..9ceb1360cda 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-s/N1wkAgpxYCK6rIiWH8cGQU5YFGj0q4Dxj9j3yIys8="; + hash = "sha256-hhDLy92jS/akp1Ozun45OEjVbVcjufkRIfC8bqqFjp4="; }; preConfigure = '' diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 395e5d0c75d..c22ff6c3730 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.4"; + version = "1.3.6"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-/kZI/NOZO8T5jlG9Qtfr14aCJDKrP7wEQLgJ6qe9VzY="; + hash = "sha256-i1RbyHw+Fr1QABra6fskRpIbYxEfhOVToeesyax4NtU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index a214d28347d..933b972a4e7 100644 --- a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "1.9"; + version = "2.0"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "sha256-PiRXNiemJ+UjVhmd2KPcTKJoDW9K9QBf62nkP1LlOfw="; + sha256 = "sha256-pqTSsey1CgOHiEm/C+7sTl9uGe3RVpL7Rdm04KgY+Z8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix index cba9c28164a..f0408730282 100644 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { description = "BLAS-compatible library optimized for AMD CPUs"; homepage = "https://developer.amd.com/amd-aocl/blas-library/"; license = licenses.bsd3; - maintainers = [ ]; + maintainers = [ maintainers.markuskowa ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index b28fa43a226..a5b65737941 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -6,8 +6,12 @@ , amd-blis , withOpenMP ? true +, blas64 ? false }: +# right now only LP64 is supported +assert !blas64; + stdenv.mkDerivation rec { pname = "amd-libflame"; version = "3.0"; @@ -26,6 +30,8 @@ stdenv.mkDerivation rec { ./add-lapacke.diff ]; + passthru = { inherit blas64; }; + nativeBuildInputs = [ gfortran python3 ]; buildInputs = [ amd-blis ]; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index cfdc102e044..acb737836c0 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, gfortran }: +{ lib, stdenv, fetchurl, cmake, gfortran +# Wether to build with ILP64 interface +, blas64 ? false +}: stdenv.mkDerivation rec { pname = "blas"; @@ -9,50 +12,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; }; - nativeBuildInputs = [ gfortran ]; + passthru = { inherit blas64; }; - configurePhase = '' - echo >make.inc "SHELL = ${stdenv.shell}" - echo >>make.inc "PLAT = _LINUX" - echo >>make.inc "FORTRAN = gfortran" - echo >>make.inc "OPTS = -O2 -fPIC" - echo >>make.inc "DRVOPTS = $$(OPTS)" - echo >>make.inc "NOOPT = -O0 -fPIC" - echo >>make.inc "LOADER = gfortran" - echo >>make.inc "LOADOPTS =" - echo >>make.inc "AR = gfortran" - echo >>make.inc "ARFLAGS = -shared -o" - echo >>make.inc "RANLIB = echo" - echo >>make.inc "BLASLIB = libblas.so.${version}" - ''; + nativeBuildInputs = [ cmake gfortran ]; - buildPhase = '' - make - echo >>make.inc "ARFLAGS = " - echo >>make.inc "BLASLIB = libblas.a" - echo >>make.inc "AR = ar rcs" - echo >>make.inc "RANLIB = ranlib" - make - ''; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] + ++ lib.optional blas64 "-DBUILD_INDEX64=ON"; - installPhase = - # FreeBSD's stdenv doesn't use Coreutils. - let dashD = if stdenv.isFreeBSD then "" else "-D"; in - (lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;") - + '' - install ${dashD} -m755 libblas.a "$out/lib/libblas.a" - install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}" - ln -s libblas.so.${version} "$out/lib/libblas.so.3" - ln -s libblas.so.${version} "$out/lib/libblas.so" - # Write pkg-config alias. - # See also openblas/default.nix - mkdir $out/lib/pkgconfig - cat <<EOF > $out/lib/pkgconfig/blas.pc -Name: blas -Version: ${version} -Description: blas provided by the BLAS package. -Libs: -L$out/lib -lblas -EOF + postInstall = let + canonicalExtension = if stdenv.hostPlatform.isLinux + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}" + else stdenv.hostPlatform.extensions.sharedLibrary; + in lib.optionalString blas64 '' + ln -s $out/lib/libblas64${canonicalExtension} $out/lib/libblas${canonicalExtension} ''; preFixup = lib.optionalString stdenv.isDarwin '' @@ -62,10 +34,11 @@ EOF done ''; - meta = { + meta = with lib; { description = "Basic Linear Algebra Subprograms"; - license = lib.licenses.publicDomain; + license = licenses.publicDomain; + maintainers = [ maintainers.markuskowa ]; homepage = "http://www.netlib.org/blas/"; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/development/libraries/science/math/bonmin/default.nix new file mode 100644 index 00000000000..9526a625018 --- /dev/null +++ b/pkgs/development/libraries/science/math/bonmin/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, gfortran +, pkg-config +, blas +, bzip2 +, cbc +, clp +, ipopt +, lapack +, libamplsolver +, zlib +}: + +assert (!blas.isILP64) && (!lapack.isILP64); + +stdenv.mkDerivation rec { + pname = "bonmin"; + version = "1.8.8"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Bonmin"; + rev = "releases/${version}"; + sha256 = "sha256-HU25WjvG01oL3U1wG6ivTcYaN51MMxgLdKZ3AkDNe2Y="; + }; + + nativeBuildInputs = [ + gfortran + pkg-config + ]; + buildInputs = [ + blas + bzip2 + cbc + clp + ipopt + lapack + libamplsolver + zlib + ]; + + meta = with lib; { + description = "An open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems"; + homepage = "https://github.com/coin-or/Bonmin"; + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index e0dfef0b7ee..325a6b82a6f 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchurl, unzip, blas, lapack, gfortran }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, blas +, lapack +, gfortran +, enableAMPL ? stdenv.isLinux, libamplsolver +}: assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.12.13"; + version = "3.14.5"; - src = fetchurl { - url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0kzf05aypx8q5mr3sciclk926ans0yi2d2chjdxxgpi3sza609dx"; + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Ipopt"; + rev = "releases/${version}"; + sha256 = "sha256-eqOacZGuuGAjWMs2H6RntQ+WJmGTi+EqydHUQXEpY54="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; configureFlags = [ - "--with-blas-lib=-lblas" - "--with-lapack-lib=-llapack" + "--with-asl-cflags=-I${libamplsolver}/include" + "--with-asl-lflags=-lamplsolver" ]; - nativeBuildInputs = [ unzip gfortran ]; - - buildInputs = [ blas lapack ]; + nativeBuildInputs = [ pkg-config gfortran ]; + buildInputs = [ blas lapack ] ++ lib.optionals enableAMPL [ libamplsolver ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/development/libraries/science/math/libamplsolver/default.nix new file mode 100644 index 00000000000..bcbde5f6135 --- /dev/null +++ b/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "libamplsolver"; + version = "20211109"; + + src = fetchurl { + url = "https://ampl.com/netlib/ampl/solvers.tgz"; + sha256 = "sha256-LVmScuIvxmZzywPSBl9T9YcUBJP7UFAa3eWs9r4q3JM="; + }; + + patches = [ + # Debian provides a patch to build a shared library + (fetchpatch { + url = "https://sources.debian.org/data/main/liba/libamplsolver/0~20190702-2/debian/patches/fix-makefile-shared-lib.patch"; + sha256 = "sha256-96qwj3fLugzbsfxguKMce13cUo7XGC4VUE7xKcJs42Y="; + }) + ]; + + installPhase = '' + runHook preInstall + pushd sys.`uname -m`.`uname -s` + install -D -m 0644 *.h -t $out/include + install -D -m 0644 *.so* -t $out/lib + install -D -m 0644 *.a -t $out/lib + popd + runHook postInstall + ''; + + meta = with lib; { + description = "A library of routines that help solvers work with AMPL"; + homepage = "https://ampl.com/netlib/ampl/"; + license = [ licenses.mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index f2a50cb2d3d..9f481961e5b 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -5,6 +5,8 @@ , gfortran , cmake , shared ? true +# Compile with ILP64 interface +, blas64 ? false }: stdenv.mkDerivation rec { @@ -36,7 +38,19 @@ stdenv.mkDerivation rec { "-DLAPACKE=ON" "-DCBLAS=ON" "-DBUILD_TESTING=ON" - ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON"; + ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON" + ++ lib.optional blas64 "-DBUILD_INDEX64=ON"; + + passthru = { inherit blas64; }; + + postInstall = let + canonicalExtension = if stdenv.hostPlatform.isLinux + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}" + else stdenv.hostPlatform.extensions.sharedLibrary; + in lib.optionalString blas64 '' + ln -s $out/lib/liblapack64${canonicalExtension} $out/lib/liblapack${canonicalExtension} + ln -s $out/lib/liblapacke64${canonicalExtension} $out/lib/liblapacke${canonicalExtension} + ''; doCheck = true; @@ -63,7 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ markuskowa ]; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index d61b6ee3acb..8e5d7180115 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.19"; + version = "0.3.20"; outputs = [ "out" "dev" ]; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "sha256-EqA6oFM2theuvvuDOWeOx0Bv6AEFffmpWHJBzp23br0="; + sha256 = "sha256-FLPVcepf7tv/es+4kur9Op7o3iVAAayuYN4hY/P4mmQ="; }; inherit blas64; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 3eb0fa66dfa..a06df2b1950 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.16.4"; + version = "3.16.5"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-IpzOIr3P7bH+gn0wbtGvypc3eGzcPwVit0oZZsEkPK8="; + sha256 = "sha256-fehXDuuUBidS2CqDII/Cuvx3s/UVAjpMFNj/lEDmbKw="; }; mpiSupport = !withp4est || p4est.mpiSupport; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 9a7374f4f49..bafb52be7ff 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -6,13 +6,13 @@ assert blas.isILP64 == lapack.isILP64; stdenv.mkDerivation rec { pname = "scalapack"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "Reference-ScaLAPACK"; repo = pname; rev = "v${version}"; - sha256 = "0hiap5i9ik6xpvl721n2slanlqygagc1pg2bcjb27ans6balhsfh"; + sha256 = "sha256-GNVGWrIWdfyTfbz7c31Vjt9eDlVzCd/aLHoWq2DMyX4="; }; passthru = { inherit (blas) isILP64; }; diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 4af037ea694..bf5251d1aed 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "6.2.1"; + version = "6.2.2"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "sha256-YgQdhXxXcvhQ10hCGrGM49jjY4jyzqH9ea+gltdh+Uc="; + sha256 = "sha256-uSPE7uFiG4xbsAeo/UmOP5Ns+3yZ7kKL2bNxzd8mzP8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/trilinos/default.nix b/pkgs/development/libraries/science/math/trilinos/default.nix index 19d2119622e..1939b0a5307 100644 --- a/pkgs/development/libraries/science/math/trilinos/default.nix +++ b/pkgs/development/libraries/science/math/trilinos/default.nix @@ -59,7 +59,9 @@ let in stdenv.mkDerivation rec { pname = "trilinos"; - version = "12.12.1"; # Xyce 7.4 requires version 12.12.1 + # Xyce 7.4 requires version 12.12.1 + # nixpkgs-update: no auto update + version = "12.12.1"; src = fetchFromGitHub { owner = "trilinos"; diff --git a/pkgs/development/libraries/shine/default.nix b/pkgs/development/libraries/shine/default.nix new file mode 100644 index 00000000000..8e5d02e632d --- /dev/null +++ b/pkgs/development/libraries/shine/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "shine"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "toots"; + repo = "shine"; + rev = version; + sha256 = "06nwylqqji0i1isdprm2m5qsdj4qiywcgnp69c5b55pnw43f07qg"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Fast fixed-point mp3 encoding library"; + homepage = "https://github.com/toots/shine"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index a7d4aa97074..5509be7822d 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, fftw, speexdsp }: stdenv.mkDerivation rec { pname = "speex"; @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sed -i '/AC_CONFIG_MACRO_DIR/i PKG_PROG_PKG_CONFIG' configure.ac ''; + patches = [ + (fetchpatch { + name = "CVE-2020-23903.patch"; + url = "https://github.com/xiph/speex/commit/870ff845b32f314aec0036641ffe18aba4916887.patch"; + sha256 = "sha256-uEMDhDTw/LIWNPPCXW6kF+udBmNO88G/jJTojAA9fs8="; + }) + ]; + outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 16cf654914d..db5db61c6e9 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -124,6 +124,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dusb-acl-helper-dir=${placeholder "out"}/bin" "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids" + ] ++ lib.optionals (!withPolkit) [ + "-Dpolkit=disabled" ]; meta = with lib; { diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 35334721566..13714b4825c 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "sha256-MFuFyKvOOrDrq9cDPQlNK6/YHSkaRX4qbw/44m5CRh4="; + sha256 = "sha256-cvbR3tav6DjIdJB/x2q5Oq7ju9q63z75b6q1uHYY9bE="; }; nativeBuildInputs = [ installShellFiles tcl ]; diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 69940c18aaf..66c9863c38a 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -21,19 +21,22 @@ stdenv.mkDerivation rec { version = "5.1.2"; src = fetchurl { - url = "mirror://metalab/libs/graphics/t1lib-${version}.tar.gz"; - sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"; + url = "mirror://ibiblioPubLinux/libs/graphics/${pname}-${version}.tar.gz"; + hash = "sha256-ghMotQVPeJCg0M0vUoJScHBd82QdvUdtWNF+Vu2Ve1k="; }; inherit patches; buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + postInstall = lib.optionalString (!stdenv.isDarwin) '' + # ?? + chmod +x $out/lib/*.so.* + ''; meta = with lib; { - description = "A type 1 font rasterizer library for UNIX/X11"; homepage = "http://www.t1lib.org/"; + description = "A type 1 font rasterizer library for UNIX/X11"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index fa6ca014181..e2f611ed9d1 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -13,10 +13,10 @@ assert stdenv.isDarwin -> Carbon != null; stdenv.mkDerivation rec { pname = "tachyon"; - version = "0.99b6"; + version = "0.99.3"; src = fetchurl { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "15wv2748ngk2iid798a774sjxhhijq7kjm32yl897x54fsfazp7l"; + sha256 = "sha256-rsxxm1NK2IPRl/5O2Ng2sC1VH84Zj1uJ6mN+HZHyN+E="; }; buildInputs = lib.optionals stdenv.isDarwin [ Carbon diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 6aa67bf274d..fd4f3dea375 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -3,7 +3,8 @@ , ... }: tcl.mkTclDerivation { - name = "tk-${tcl.version}"; + pname = "tk"; + version = tcl.version; inherit src patches; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 10307c35f0c..4df448d08f4 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RDafU+Lt70FDdAbb7s1Hepf4qa/dkTSDLqRdG6KqLEc="; + sha256 = "/YTHHmIbwrgcrLX5CJMkNiRtG4pPw6Y1PiuNuuvAI2w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index b00177960d3..286f5ccc3fc 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.6"; + version = "0.17.7"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-X60zN3orHU8lOfRVCfbHTdrleKxB7ILCIGvXSZLdoSk="; + sha256 = "sha256-BdZCoW3QHM4Oue4bpuSFsuwIU1vsZ5pjqVv9TfGNC7U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f21a947a533..2a9f0cf7403 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { backends for each supported hardware vendor. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 0411086c78c..eae934a4ebb 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -21,6 +21,7 @@ , zlib , icu , systemd +, systemdSupport ? stdenv.hostPlatform.isLinux }: stdenv.mkDerivation rec { @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { pcre2 zlib icu + ] ++ lib.optionals systemdSupport [ systemd ]; @@ -73,6 +75,10 @@ stdenv.mkDerivation rec { pango ]; + mesonFlags = lib.optionals (!systemdSupport) [ + "-D_systemd=false" + ]; + postPatch = '' patchShebangs perf/* patchShebangs src/box_drawing_generate.sh diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index 56ed7367b2b..e8436f9e956 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -1,14 +1,27 @@ -{ stdenv, fetchFromGitHub, lib }: +{ stdenv, buildPackages, fetchFromGitHub, lib }: stdenv.mkDerivation { pname = "wasilibc"; - version = "20190712"; - src = fetchFromGitHub { - owner = "CraneStation"; + version = "unstable-2021-09-23"; + + src = buildPackages.fetchFromGitHub { + owner = "WebAssembly"; repo = "wasi-libc"; - rev = "8df0d4cd6a559b58d4a34b738a5a766b567448cf"; - sha256 = "1n4gvgzacpagar2mx8g9950q0brnhwz7jg2q44sa5mnjmlnkiqhh"; + rev = "ad5133410f66b93a2381db5b542aad5e0964db96"; + hash = "sha256-RiIClVXrb18jF9qCt+5iALHPCZKYcnad7JsILHBV0pA="; + fetchSubmodules = true; }; + + # clang-13: error: argument unused during compilation: '-rtlib=compiler-rt' [-Werror,-Wunused-command-line-argument] + postPatch = '' + substituteInPlace Makefile \ + --replace "-Werror" "" + ''; + + preBuild = '' + export NIX_CFLAGS_COMPILE="-I$(pwd)/sysroot/include $NIX_CFLAGS_COMPILE" + ''; + makeFlags = [ "WASM_CC=${stdenv.cc.targetPrefix}cc" "WASM_NM=${stdenv.cc.targetPrefix}nm" @@ -16,6 +29,8 @@ stdenv.mkDerivation { "INSTALL_DIR=${placeholder "out"}" ]; + enableParallelBuilding = true; + postInstall = '' mv $out/lib/*/* $out/lib ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports @@ -23,9 +38,9 @@ stdenv.mkDerivation { meta = with lib; { description = "WASI libc implementation for WebAssembly"; - homepage = "https://wasi.dev"; - platforms = platforms.wasi; - maintainers = [ maintainers.matthewbauer ]; + homepage = "https://wasi.dev"; + platforms = platforms.wasi; + maintainers = with maintainers; [ matthewbauer ]; license = with licenses; [ asl20 mit llvm-exception ]; }; } diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 92405b35de2..afa8c63490a 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -60,6 +60,7 @@ , addOpenGLRunpath , enableGeoLocation ? true , withLibsecret ? true +, systemdSupport ? stdenv.isLinux }: stdenv.mkDerivation rec { @@ -158,9 +159,10 @@ stdenv.mkDerivation rec { bubblewrap libseccomp libmanette - systemd wayland xdg-dbus-proxy + ] ++ lib.optionals systemdSupport [ + systemd ] ++ lib.optionals enableGeoLocation [ geoclue2 ] ++ lib.optionals withLibsecret [ @@ -193,7 +195,7 @@ stdenv.mkDerivation rec { "-DUSE_APPLE_ICU=OFF" "-DUSE_OPENGL_OR_ES=OFF" "-DUSE_SYSTEM_MALLOC=ON" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!systemdSupport) [ "-DUSE_SYSTEMD=OFF" ] ++ lib.optionals (stdenv.isLinux && enableGLES) [ "-DENABLE_GLES2=ON" diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix deleted file mode 100644 index cab0197c939..00000000000 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchurl -, pkg-config -, libXinerama -, libSM -, libXxf86vm -, libXtst -, gtk2 -, GConf ? null -, gtk3 -, xorgproto -, gst_all_1 -, setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, withMesa ? libGLSupported -, libGLU ? null -, libGL ? null -, compat28 ? false -, compat30 ? true -, unicode ? true -, withGtk2 ? true -, withWebKit ? false -, webkitgtk ? null -, AGL ? null -, Carbon ? null -, Cocoa ? null -, Kernel ? null -, QTKit ? null -}: - -with lib; - -assert withMesa -> libGLU != null && libGL != null; -assert withWebKit -> webkitgtk != null; - -assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK31: You cannot enable withWebKit when using withGtk2."; - -stdenv.mkDerivation rec { - version = "3.1.4"; - pname = "wxwidgets"; - - src = fetchFromGitHub { - owner = "wxWidgets"; - repo = "wxWidgets"; - rev = "v${version}"; - sha256 = "1fwzrk6w5k0vs8kqdq5lpzdbp5c09hx740wg6mi6vgmc1r67dv67"; - fetchSubmodules = true; - }; - - buildInputs = [ - libXinerama - libSM - libXxf86vm - libXtst - xorgproto - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 GConf ] - ++ optional (!withGtk2) gtk3 - ++ optional withMesa libGLU - ++ optional withWebKit webkitgtk - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - - nativeBuildInputs = [ pkg-config ]; - - propagatedBuildInputs = optional stdenv.isDarwin AGL; - - patches = [ - (fetchurl { - # https://trac.wxwidgets.org/ticket/17942 - url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" - + "fix_assertion_using_hide_in_destroy.diff"; - sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; - }) - ]; - - configureFlags = - [ - "--disable-precomp-headers" - "--enable-mediactrl" - (if compat28 then "--enable-compat28" else "--disable-compat28") - (if compat30 then "--enable-compat30" else "--disable-compat30") - ] - ++ optional unicode "--enable-unicode" - ++ optional withMesa "--with-opengl" - ++ optionals stdenv.isDarwin - # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ] - ++ optionals withWebKit - [ "--enable-webview" "--enable-webviewwebkit" ]; - - SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; - - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - " + optionalString stdenv.isDarwin '' - substituteInPlace configure --replace \ - 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ - 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' - substituteInPlace configure --replace \ - "-framework System" \ - -lSystem - ''; - - postInstall = " - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = { - inherit compat28 compat30 unicode; - gtk = if withGtk2 then gtk2 else gtk3; - }; - - enableParallelBuilding = true; - - meta = { - platforms = with platforms; darwin ++ linux; - license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "A C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = '' - WxWidgets gives you a single, easy-to-use API for - writing GUI applications on multiple platforms that still utilize the - native platform's controls and utilities. Link with the appropriate library - for your platform and compiler, and your application will adopt the look - and feel appropriate to that platform. On top of great GUI functionality, - wxWidgets gives you: online help, network programming, streams, clipboard - and drag and drop, multithreading, image loading and saving in a variety of - popular formats, database support, HTML viewing and printing, and much - more. - ''; - badPlatforms = [ "x86_64-darwin" ]; - maintainers = with maintainers; [ tfmoraes ]; - }; -} diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/wxGTK28.nix index 19a57d68e15..19a57d68e15 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK28.nix diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/wxGTK29.nix index 34d76e53ff6..d5bef77202f 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK29.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ../patches/0001-fix-assertion-using-hide-in-destroy.patch + ./patches/0001-fix-assertion-using-hide-in-destroy.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 628d8bd0237..11545330387 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -12,8 +12,8 @@ , pkg-config , xorgproto , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, compat24 ? false -, compat26 ? true +, compat26 ? false +, compat28 ? true , unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk @@ -69,14 +69,14 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ../patches/0001-fix-assertion-using-hide-in-destroy.patch + ./patches/0001-fix-assertion-using-hide-in-destroy.patch ]; configureFlags = [ "--disable-precomp-headers" "--enable-mediactrl" - (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") + (if compat28 then "--enable-compat28" else "--disable-compat28") ] ++ lib.optional unicode "--enable-unicode" ++ lib.optional withMesa "--with-opengl" @@ -136,6 +136,6 @@ stdenv.mkDerivation rec { passthru = { inherit gtk; - inherit compat24 compat26 unicode; + inherit compat26 compat28 unicode; }; } diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix new file mode 100644 index 00000000000..c262232f30d --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -0,0 +1,149 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, gnome2 +, gst_all_1 +, gtk2 +, gtk3 +, libGL +, libGLU +, libSM +, libXinerama +, libXtst +, libXxf86vm +, pkg-config +, xorgproto +, compat28 ? false +, compat30 ? true +, unicode ? true +, withGtk2 ? true +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, withWebKit ? false, webkitgtk +, darwin +}: + +assert withMesa -> libGLU != null && libGL != null; +assert withWebKit -> webkitgtk != null; + +assert withGtk2 -> (!withWebKit); + +let + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + inherit (gnome2) GConf; + inherit (gst_all_1) gst-plugins-base gstreamer; + gtk = if withGtk2 then gtk2 else gtk3; +in +stdenv.mkDerivation rec { + pname = "wxwidgets"; + version = "3.1.5"; + + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + hash = "sha256-2zMvcva0GUDmSYK0Wk3/2Y6R3F7MgdqGBrOhmWgVA6g="; + fetchSubmodules = true; + }; + + patches = [ + # https://github.com/wxWidgets/wxWidgets/issues/17942 + ./patches/0001-fix-assertion-using-hide-in-destroy.patch + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + gst-plugins-base + gstreamer + gtk + libSM + libXinerama + libXtst + libXxf86vm + xorgproto + ] + ++ lib.optionals withGtk2 [ + GConf + ] + ++ lib.optional withMesa libGLU + ++ lib.optional withWebKit webkitgtk + ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + Kernel + QTKit + setfile + ]; + + propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + + configureFlags = [ + "--disable-precomp-headers" + "--enable-mediactrl" + (if compat28 then "--enable-compat28" else "--disable-compat28") + (if compat30 then "--enable-compat30" else "--disable-compat30") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl" + ++ lib.optionals stdenv.isDarwin [ + # allow building on 64-bit + "--enable-universal-binaries" + "--with-cocoa" + "--with-macosx-version-min=10.7" + ] + ++ lib.optionals withWebKit [ + "--enable-webview" + "--enable-webviewwebkit" + ]; + + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; + + preConfigure = '' + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace \ + 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ + 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' + substituteInPlace configure --replace \ + "-framework System" "-lSystem" + ''; + + postInstall = " + pushd $out/include + ln -s wx-*/* . + popd + "; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.wxwidgets.org/"; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ AndersonTorres tfmoraes ]; + platforms = platforms.unix; + badPlatforms = platforms.darwin; # ofBorg is failing, don't know if internal + }; + + passthru = { + inherit gtk; + inherit compat28 compat30 unicode; + }; +} diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/wxmac30.nix index e1f732929ce..e1f732929ce 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/wxmac30.nix diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index 21d6b6fa73e..95373934a47 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xdg-dbus-proxy"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "03sj1h0c2l08xa8phw013fnxr4fgav7l2mkjhzf9xk3dykwxcj8p"; + sha256 = "sha256-A7XSjKh5JT3bvOMQmJCb7MoUleqBGmN3pJLijxbAm5s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index c2ddda7a6c5..c639eb7b30e 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.16"; + version = "1.2.0"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-+8FkivLTZXdu0+1wu+7T98y6rQzIHbG9l15Abrbln1o="; + hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4="; }; nativeBuildInputs = [ @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # does not find argp-standalone }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flow.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flow.nix new file mode 100644 index 00000000000..1adac0993d2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flow.nix @@ -0,0 +1,29 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "flow"; + version = "20200610-git"; + + description = "A flowchart and generalised graph library."; + + deps = [ args."closer-mop" args."documentation-utils" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz"; + sha256 = "1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194"; + }; + + packageName = "flow"; + + asdFilesToKeep = ["flow.asd"]; + overrides = x: x; +} +/* (SYSTEM flow DESCRIPTION A flowchart and generalised graph library. SHA256 + 1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194 URL + http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz MD5 + f0767467d5e9bfda6fe5777a26719811 NAME flow FILENAME flow DEPS + ((NAME closer-mop FILENAME closer-mop) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (closer-mop documentation-utils trivial-indent) VERSION + 20200610-git SIBLINGS (flow-visualizer) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lambda-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lambda-fiddle.nix new file mode 100644 index 00000000000..62adaf2bca4 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lambda-fiddle.nix @@ -0,0 +1,27 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "lambda-fiddle"; + version = "20190710-git"; + + description = "A collection of functions to process lambda-lists."; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz"; + sha256 = "0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j"; + }; + + packageName = "lambda-fiddle"; + + asdFilesToKeep = ["lambda-fiddle.asd"]; + overrides = x: x; +} +/* (SYSTEM lambda-fiddle DESCRIPTION + A collection of functions to process lambda-lists. SHA256 + 0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j URL + http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz + MD5 78f68f144ace9cb8f634ac14b3414e5e NAME lambda-fiddle FILENAME + lambda-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/legit.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/legit.nix new file mode 100644 index 00000000000..c9864093199 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/legit.nix @@ -0,0 +1,35 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "legit"; + version = "20190710-git"; + + description = "CL interface to the GIT binary."; + + deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."documentation-utils" args."lambda-fiddle" args."simple-inferiors" args."trivial-indent" args."uiop" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz"; + sha256 = "0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9"; + }; + + packageName = "legit"; + + asdFilesToKeep = ["legit.asd"]; + overrides = x: x; +} +/* (SYSTEM legit DESCRIPTION CL interface to the GIT binary. SHA256 + 0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9 URL + http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz + MD5 9b380fc23d4bab086df8a0e4a598457a NAME legit FILENAME legit DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cl-ppcre FILENAME cl-ppcre) + (NAME documentation-utils FILENAME documentation-utils) + (NAME lambda-fiddle FILENAME lambda-fiddle) + (NAME simple-inferiors FILENAME simple-inferiors) + (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop)) + DEPENDENCIES + (alexandria bordeaux-threads cl-ppcre documentation-utils lambda-fiddle + simple-inferiors trivial-indent uiop) + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nbd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nbd.nix new file mode 100644 index 00000000000..6387a8345dc --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nbd.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "nbd"; + version = "20200925-git"; + + parasites = [ "nbd/simple-in-memory" ]; + + description = "Network Block Device server library."; + + deps = [ args."bordeaux-threads" args."flexi-streams" args."lisp-binary" args."wild-package-inferred-system" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz"; + sha256 = "1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky"; + }; + + packageName = "nbd"; + + asdFilesToKeep = ["nbd.asd"]; + overrides = x: x; +} +/* (SYSTEM nbd DESCRIPTION Network Block Device server library. SHA256 + 1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky URL + http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz MD5 + f32b7a508ac87c1e179c259b171dc837 NAME nbd FILENAME nbd DEPS + ((NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME flexi-streams FILENAME flexi-streams) + (NAME lisp-binary FILENAME lisp-binary) + (NAME wild-package-inferred-system FILENAME wild-package-inferred-system)) + DEPENDENCIES + (bordeaux-threads flexi-streams lisp-binary wild-package-inferred-system) + VERSION 20200925-git SIBLINGS NIL PARASITES (nbd/simple-in-memory)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-inferiors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-inferiors.nix new file mode 100644 index 00000000000..a8dcd973eb9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-inferiors.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "simple-inferiors"; + version = "20200325-git"; + + description = "A very simple library to use inferior processes."; + + deps = [ args."alexandria" args."bordeaux-threads" args."documentation-utils" args."trivial-indent" args."uiop" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz"; + sha256 = "15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5"; + }; + + packageName = "simple-inferiors"; + + asdFilesToKeep = ["simple-inferiors.asd"]; + overrides = x: x; +} +/* (SYSTEM simple-inferiors DESCRIPTION + A very simple library to use inferior processes. SHA256 + 15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5 URL + http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz + MD5 f90ae807c10d5b3c4b9eef1134a537c8 NAME simple-inferiors FILENAME + simple-inferiors DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop)) + DEPENDENCIES + (alexandria bordeaux-threads documentation-utils trivial-indent uiop) + VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wild-package-inferred-system.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wild-package-inferred-system.nix new file mode 100644 index 00000000000..989c94b2654 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wild-package-inferred-system.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "wild-package-inferred-system"; + version = "20200325-git"; + + parasites = [ "wild-package-inferred-system/test" ]; + + description = "Introduces the wildcards `*' and `**' into package-inferred-system"; + + deps = [ args."fiveam" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz"; + sha256 = "1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas"; + }; + + packageName = "wild-package-inferred-system"; + + asdFilesToKeep = ["wild-package-inferred-system.asd"]; + overrides = x: x; +} +/* (SYSTEM wild-package-inferred-system DESCRIPTION + Introduces the wildcards `*' and `**' into package-inferred-system SHA256 + 1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas URL + http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz + MD5 4dfd9f90d780b1e67640543dd4acbf21 NAME wild-package-inferred-system + FILENAME wild-package-inferred-system DEPS ((NAME fiveam FILENAME fiveam)) + DEPENDENCIES (fiveam) VERSION 20200325-git SIBLINGS (foo-wild) PARASITES + (wild-package-inferred-system/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index d723903c0ee..93c38c989d6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -138,6 +138,7 @@ file-attributes fiveam flexi-streams float-features +flow form-fiddle fset generic-cl @@ -157,6 +158,7 @@ iterate jonathan jsown lack +legit let-plus lev lfarm-client @@ -183,6 +185,7 @@ moptilities more-conditions mt19937 named-readtables +nbd net-telent-date nibbles optima diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index a43351b1aff..08c152ddf72 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -297,6 +297,15 @@ let quicklisp-to-nix-packages = rec { })); + "wild-package-inferred-system" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."wild-package-inferred-system" or (x: {})) + (import ./quicklisp-to-nix-output/wild-package-inferred-system.nix { + inherit fetchurl; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + })); + + "parseq" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."parseq" or (x: {})) @@ -369,6 +378,43 @@ let quicklisp-to-nix-packages = rec { "usocket" = quicklisp-to-nix-packages."usocket"; })); + "simple-inferiors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."simple-inferiors" or (x: {})) + (import ./quicklisp-to-nix-output/simple-inferiors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + + "lambda-fiddle" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lambda-fiddle" or (x: {})) + (import ./quicklisp-to-nix-output/lambda-fiddle.nix { + inherit fetchurl; + })); + + + "iolib_dot_grovel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_dot_grovel" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_dot_grovel.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; + "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base"; + "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp"; + "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); "trivia_dot_quasiquote" = buildLispPackage ((f: x: (x // (f x))) @@ -2673,6 +2719,18 @@ let quicklisp-to-nix-packages = rec { })); + "nbd" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."nbd" or (x: {})) + (import ./quicklisp-to-nix-output/nbd.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "lisp-binary" = quicklisp-to-nix-packages."lisp-binary"; + "wild-package-inferred-system" = quicklisp-to-nix-packages."wild-package-inferred-system"; + })); + + "named-readtables" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."named-readtables" or (x: {})) @@ -2971,6 +3029,22 @@ let quicklisp-to-nix-packages = rec { })); + "legit" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."legit" or (x: {})) + (import ./quicklisp-to-nix-output/legit.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "lambda-fiddle" = quicklisp-to-nix-packages."lambda-fiddle"; + "simple-inferiors" = quicklisp-to-nix-packages."simple-inferiors"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + "lack" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lack" or (x: {})) @@ -3307,6 +3381,17 @@ let quicklisp-to-nix-packages = rec { })); + "flow" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."flow" or (x: {})) + (import ./quicklisp-to-nix-output/flow.nix { + inherit fetchurl; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + "float-features" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."float-features" or (x: {})) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c4442f1fd79..71d85a776bb 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2033,14 +2033,14 @@ luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luv"; - version = "1.42.0-0"; + version = "1.43.0-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luv-1.42.0-0.rockspec"; - sha256 = "0pr2gjjnm60w0csb0dacrjalan7ifsfw4lki4ykxx1f4m5snam09"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.43.0-0.rockspec"; + sha256 = "0z5a7yp20xbb3f9w73skm9fj89gxxqv72nrxjq3kycsc6c2v3m8f"; }).outPath; src = fetchurl { - url = "https://github.com/luvit/luv/releases/download/1.42.0-0/luv-1.42.0-0.tar.gz"; - sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm"; + url = "https://github.com/luvit/luv/releases/download/1.43.0-0/luv-1.43.0-0.tar.gz"; + sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn"; }; disabled = with lua; (luaOlder "5.1"); diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index abc5bd2c5b7..b308f6128c2 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -127,7 +127,15 @@ let # ../../applications/video/epgstation epgstation = super."epgstation-../../applications/video/epgstation".override (drv: { meta = drv.meta // { - broken = true; # not really broken, see the comment above + platforms = pkgs.lib.platforms.none; + }; + }); + + # NOTE: this is a stub package to fetch npm dependencies for + # ../../applications/video/epgstation/client + epgstation-client = super."epgstation-client-../../applications/video/epgstation/client".override (drv: { + meta = drv.meta // { + platforms = pkgs.lib.platforms.none; }; }); @@ -228,7 +236,7 @@ let near-cli = super.near-cli.override { nativeBuildInputs = with pkgs; [ - libusb + libusb1 nodePackages.prebuild-install nodePackages.node-gyp-build pkg-config @@ -270,6 +278,14 @@ let url = "https://github.com/svanderburg/node2nix/commit/e4c951971df6c9f9584c7252971c13b55c369916.patch"; sha256 = "0w8fcyr12g2340rn06isv40jkmz2khmak81c95zpkjgipzx7hp7w"; }) + # handle package alias in dependencies + # https://github.com/svanderburg/node2nix/pull/240 + # + # TODO: remove after node2nix 1.10.0 + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/644e90c0304038a446ed53efc97e9eb1e2831e71.patch"; + sha256 = "sha256-sQgVf80H1ouUjzHq+2d9RO4a+o++kh+l+FOTNXfPBH0="; + }) ]; }; postInstall = '' @@ -314,6 +330,13 @@ let ''; }; + parcel = super.parcel.override { + buildInputs = [ self.node-gyp-build ]; + preRebuild = '' + sed -i -e "s|#!/usr/bin/env node|#! ${pkgs.nodejs}/bin/node|" node_modules/node-gyp-build/bin.js + ''; + }; + postcss-cli = super.postcss-cli.override { nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' @@ -336,7 +359,7 @@ let src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-xLmVyO/L6C4ZdHzHqiJVq3ZfDWSym29x75JcwJx746ps61UcNEg4ozSwN9ud7UjXLntdXe1xDLNOUO1lc7LN5g=="; + sha512 = "sha512-8SdsLPhKR3mOfoo2o73h9mNn3v5kA/RqGA26Sv6qDS78Eh2uepPqt5e8/nwj5EOblYm5HEGuitaXQrOCLb6uTw=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 28034310893..3efdef6cbe6 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -114,6 +114,7 @@ , "emoj" , "emojione" , {"epgstation": "../../applications/video/epgstation"} +, {"epgstation-client": "../../applications/video/epgstation/client"} , "escape-string-regexp" , "eslint" , "eslint_d" @@ -224,6 +225,7 @@ , "nrm" , "ocaml-language-server" , "parcel-bundler" +, "parcel" , "parsoid" , "patch-package" , "peerflix" @@ -236,6 +238,7 @@ , "postcss-cli" , "prebuild-install" , "prettier" +, "prettier_d_slim" , "prettier-plugin-toml" , "prisma" , "@prisma/language-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 54fa82135c5..d1f1908ca7a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -94,76 +94,58 @@ let sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg=="; }; }; - "@angular-devkit/architect-0.1302.4" = { + "@angular-devkit/architect-0.1302.6" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1302.4"; + version = "0.1302.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.4.tgz"; - sha512 = "9dS0Gvs4ER1DPSnKorJ4uk27A/rWwyvNy5CheOZu4ZTUnggGA7SFtMG7CKPD11Ae01lIMfxKfDqJYE8j2VpQaw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.6.tgz"; + sha512 = "NztzorUMfwJeRaT7SY00Y8WSqc2lQYuF11yNoyEm7Dae3V7VZ28rW2Z9RwibP27rYQL0RjSMaz2wKITHX2vOAw=="; }; }; - "@angular-devkit/core-13.2.2" = { + "@angular-devkit/core-13.2.5" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "13.2.2"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.2.tgz"; - sha512 = "qH0Vu8qwGD5uhmE8PtePA1lm7xL3JtbBCcrQICmLqD6njLDVb2N5pbdDXeiXDlWGUoIRHUhu6Uw4AsY8zXP/FA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.5.tgz"; + sha512 = "WuWp/1R0FtCHPBcJLF13lTLHETtDGFUX0ULfGPRaYB5OVCSQcovVp5UbZTTy/Ss3ub3EOEmJlU8kMJfBrWuq+A=="; }; }; - "@angular-devkit/core-13.2.3" = { + "@angular-devkit/core-13.2.6" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "13.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.3.tgz"; - sha512 = "/47RA8qmWzeS60xSdaprIn1MiSv0Iw83t0M9/ENH7irFS5vMAq62NCcwiWXH59pZmvvLbF+7xy/RgYUZLr4nHQ=="; - }; - }; - "@angular-devkit/core-13.2.4" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "13.2.4"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.4.tgz"; - sha512 = "hSw1JWA/6dDAF/xleQRXGtzHphfU49TMUhvAoAmsmmz3NAn03xLy1dtqdIXIf+TkFXVvZDaAB2mW8KfRV67GFg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.6.tgz"; + sha512 = "8h2mWdBTN/dYwZuzKMg2IODlOWMdbJcpQG4XVrkk9ejCPP+3aX5Aa3glCe/voN6eBNiRfs8YDM0jxmpN2aWVtg=="; }; }; - "@angular-devkit/schematics-13.2.2" = { + "@angular-devkit/schematics-13.2.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "13.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.2.tgz"; - sha512 = "kXPLTkSzRCeBX+SYUkC6MIrWCkH90Y8hVegR9R5n2YqhCJyE+dZlcx4d/8d3VHtZlzAs0LL8BU+liC3wMIagjA=="; - }; - }; - "@angular-devkit/schematics-13.2.3" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "13.2.3"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.3.tgz"; - sha512 = "+dyC4iKV0huvpjiuz4uyjLNK3FsCIp/Ghv5lXvhG6yok/dCAubsJItJOxi6G16aVCzG/E9zbsDfm9fNMyVOkgQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.5.tgz"; + sha512 = "kAye6VYiF9JQAoeO+BYhy8eT2QOmhB+WLziRjXoFCBxh5+yXTygTVfs9fD5jmIpHmeu4hd2ErSh69yT5xWcD9g=="; }; }; - "@angular-devkit/schematics-13.2.4" = { + "@angular-devkit/schematics-13.2.6" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "13.2.4"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.4.tgz"; - sha512 = "VMhYa4cDu5yE31OvHncAd15Rmlchih/Sr6sxFsIwkg4xzRNIIZCtwqxVXgf0TiTN9zrvlvzK7nhPqTGNqqYb2A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.6.tgz"; + sha512 = "mPgSqdnZRuPSMeUA+T+mwVCrq2yhXpcYm1/Rjbhy09CyHs4wSrFv21WHCrE6shlvXpcmwr0n+I0DIeagAPmjUA=="; }; }; - "@angular-devkit/schematics-cli-13.2.3" = { + "@angular-devkit/schematics-cli-13.2.5" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "13.2.3"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.2.3.tgz"; - sha512 = "huCAno7u2K3Td3oiB41ax5AtoMyij6NmJsUxhpYQkZxnNsio9CKeSJnOuzml8SAILExc7sHFNW5A+9BeLluE4A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.2.5.tgz"; + sha512 = "/3Q1+wtE+l5XXoXX/7157yh4Wpi+FNEryx5gDcfPJchgtovxj28nzquD0vXnvpyr3Wd8OaMwg6vW4EfL82jRKg=="; }; }; "@antora/asciidoc-loader-3.0.1" = { @@ -373,6 +355,15 @@ let sha512 = "TmB2K5UfpDpSbCNBBntXzKHcAk2EA3/P68jmWvmJvglVUdkO9V6kTAuXVe12+h6C4GK0ndwuCrHHtEVcL5t6pQ=="; }; }; + "@astrojs/svelte-language-integration-0.1.1" = { + name = "_at_astrojs_slash_svelte-language-integration"; + packageName = "@astrojs/svelte-language-integration"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@astrojs/svelte-language-integration/-/svelte-language-integration-0.1.1.tgz"; + sha512 = "npUDO0bitzUC9oTDqVuup0yZObOF45GQ0IkaMf5wxe6XW30SIeyl1j8mdyjOv90vlJeothCKqnQ91qMudpq3Vg=="; + }; + }; "@aws-crypto/crc32-2.0.0" = { name = "_at_aws-crypto_slash_crc32"; packageName = "@aws-crypto/crc32"; @@ -382,6 +373,15 @@ let sha512 = "TvE1r2CUueyXOuHdEigYjIZVesInd9KN+K/TFFNfkkxRThiNxO6i4ZqqAVMoEjAamZZ1AA8WXJkjCz7YShHPQA=="; }; }; + "@aws-crypto/crc32c-2.0.0" = { + name = "_at_aws-crypto_slash_crc32c"; + packageName = "@aws-crypto/crc32c"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz"; + sha512 = "vF0eMdMHx3O3MoOXUfBZry8Y4ZDtcuskjjKgJz8YfIDjLStxTZrYXk+kZqtl6A0uCmmiN/Eb/JbC/CndTV1MHg=="; + }; + }; "@aws-crypto/ie11-detection-2.0.0" = { name = "_at_aws-crypto_slash_ie11-detection"; packageName = "@aws-crypto/ie11-detection"; @@ -391,6 +391,15 @@ let sha512 = "pkVXf/dq6PITJ0jzYZ69VhL8VFOFoPZLZqtU/12SGnzYuJOOGNfF41q9GxdI1yqC8R13Rq3jOLKDFpUJFT5eTA=="; }; }; + "@aws-crypto/sha1-browser-2.0.0" = { + name = "_at_aws-crypto_slash_sha1-browser"; + packageName = "@aws-crypto/sha1-browser"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz"; + sha512 = "3fIVRjPFY8EG5HWXR+ZJZMdWNRpwbxGzJ9IH9q93FpbgCH8u8GHRi46mZXp3cYD7gealmyqpm3ThZwLKJjWJhA=="; + }; + }; "@aws-crypto/sha256-browser-2.0.0" = { name = "_at_aws-crypto_slash_sha256-browser"; packageName = "@aws-crypto/sha256-browser"; @@ -427,13 +436,13 @@ let sha512 = "JJmFFwvbm08lULw4Nm5QOLg8+lAQeC8aCXK5xrtxntYzYXCGfHwUJ4Is3770Q7HmICsXthGQ+ZsDL7C2uH3yBQ=="; }; }; - "@aws-sdk/abort-controller-3.52.0" = { + "@aws-sdk/abort-controller-3.54.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.52.0.tgz"; - sha512 = "Z+4uVtgwbKSChruh6R/WIrGb5uvvXi/d6EQ7zC6hyghtn9EGQc+WJ3BVB4bIUshwMunlgjA3nDiPb5V3t5zv8Q=="; + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.54.0.tgz"; + sha512 = "6N7numECrGwal2NEbJwYXOGjwWsFafz8VuUvCBK5G9SgSL5XAbq1S3lL/4gbme5jhgh9CWh7s+bAY7EpOEH2Xg=="; }; }; "@aws-sdk/chunked-blob-reader-3.52.0" = { @@ -454,193 +463,193 @@ let sha512 = "/hVzC0Q12/mWRMBBQD3v82xsLSxZ4RwG6N44XP7MuJoHy4ui4T7D9RSuvBpzzr/4fqF0w9M7XYv6aM4BD2pFIQ=="; }; }; - "@aws-sdk/client-s3-3.52.0" = { + "@aws-sdk/client-s3-3.54.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.52.0.tgz"; - sha512 = "QTY12zuKqWbtLG1H2RV13JG+NFNDeDAR2Ffka/qNHU6NMUqyQnyf/1h2UCVIekTmSaR6L6bYGgHl//kxMSUwCw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.54.0.tgz"; + sha512 = "9JdhkTqRCYA3esnjFR7xaFysXMfX5TatKE9H8Sds78eoMQrfgB2Yl6ZcEl8Oy0vpMVpOzqRYmcSmFfaBOhuI/g=="; }; }; - "@aws-sdk/client-sso-3.52.0" = { + "@aws-sdk/client-sso-3.54.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.52.0.tgz"; - sha512 = "IvtZlZopWlWg6xnKSXAodWQaPcRySNBJLj68K6HJ8OVvBCgcXr53nNREArgPi0+KDzLsXqAZTRxvU5do/99PrA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.54.0.tgz"; + sha512 = "5ZYYhoMqeaYhOU4kOEM7daKb8D5QhJ+IpwhHHMPhoHqQEwbbhBTFDXRs3ObUP/QYdBUMWS71+pnDoUdyHqPQ0Q=="; }; }; - "@aws-sdk/client-sts-3.52.0" = { + "@aws-sdk/client-sts-3.54.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.52.0.tgz"; - sha512 = "tPLHYY9RdWehBQlyrwOaw4B31PqW1HmNNKJ3+Hc6KnEaiOwMAwQd8L7BFbSVG8ajQBDAEBUTDAkSaZ8jTYdfQQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.54.0.tgz"; + sha512 = "UY8fyi1zaWBJm+ZtDZRvSOv1rjHlvJjtJF3MfGQWDwUM10Amwzfh4Hc2JEzyeMJPkoSSvm6CVjSDyqXo8yLGZA=="; }; }; - "@aws-sdk/config-resolver-3.52.0" = { + "@aws-sdk/config-resolver-3.54.0" = { name = "_at_aws-sdk_slash_config-resolver"; packageName = "@aws-sdk/config-resolver"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.52.0.tgz"; - sha512 = "XKUCpPLMwdlqPtwutdMfAHWqGEPTDd14Dp01WyNhVtmTmsHkpFfLPpELLO1BczDS+jyoMUj+UDj9jHm4YLvXXg=="; + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.54.0.tgz"; + sha512 = "VaNuvJLMaz3znmBD9BNkoEqNUs5teILU66SnFqBwVqabmOVeOh7M6/f43CcDarkwGklzZB/bn/rx9NOWUtdunA=="; }; }; - "@aws-sdk/credential-provider-env-3.52.0" = { + "@aws-sdk/credential-provider-env-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.52.0.tgz"; - sha512 = "9R8kTMQ3udNz7fyY/0rkU6Yhu0ALYQJZQ0lFCrxtNo2Nlo9taQtZgxhtRcv+EeqbTcJs91voNNz70HLbedtBUw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.54.0.tgz"; + sha512 = "XWfzoUyFVsT4J7iTnXO38FKNdGFyE6ZNBtW9+Yx9EiiLtUlzH09PRv+54KIRQ4uqU+fEdtRh0gOdFajTrnRi3g=="; }; }; - "@aws-sdk/credential-provider-imds-3.52.0" = { + "@aws-sdk/credential-provider-imds-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-imds"; packageName = "@aws-sdk/credential-provider-imds"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.52.0.tgz"; - sha512 = "939kfHSkMLsOfQtO2nBqC/zAE1ecTOCAs72pKvVxrluGzDry4UtwlyQ4YGC04pYBRQeRIqvIOoVbADYJy4XjmQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.54.0.tgz"; + sha512 = "Chygp8jswdjtCPmNxEMXigX4clgqh5GDaFGopR/gFaaG960hjF88Fx1/CPYD7exvM1FRO67nyfBOS0QKjSqTXg=="; }; }; - "@aws-sdk/credential-provider-ini-3.52.0" = { + "@aws-sdk/credential-provider-ini-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.52.0.tgz"; - sha512 = "MCzWWPYoZjZ3C/X8UXXf9eRqgGJc3Y1QyFXIuQzNrVhffrFkYOkOUQsG4s5TuDr1MmGfxe83XtHQgATJ0fe3zw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.54.0.tgz"; + sha512 = "EobK9bJwsUdMKx7vB+tL5eaNaj/NoOPaFJlv0JRL3+5px7d2vF0i9yklj4uT7F3vDlOup6R3b1Gg9GtqxfYt9w=="; }; }; - "@aws-sdk/credential-provider-node-3.52.0" = { + "@aws-sdk/credential-provider-node-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.52.0.tgz"; - sha512 = "SUl+t2S7xKHxAkIfuyvucKQ/JemJ/bCsuCk2qtjTSiVjrLx65Rnfw14j+44JU8U5mP+xodpKNCpgIF5PHu1kKQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.54.0.tgz"; + sha512 = "KsXJG0K7yJg2MCzNW52fSDbCIR5mRobbNnXTMpDRkghlQyHP1gdHsyRedVciMkJhdDILop2lScLw70iQBayP/Q=="; }; }; - "@aws-sdk/credential-provider-process-3.52.0" = { + "@aws-sdk/credential-provider-process-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.52.0.tgz"; - sha512 = "DGaSprlcEGgFuCiXNH9moksa6/1vBmX/G/tt/ulpgFEJmKljoazIEgUse/6oPJT7t5jazydAqMRVp1HK3Jp/0A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.54.0.tgz"; + sha512 = "hjUQ6FRG3Ihsm77Rgrf1dSfRUVZAFEyAHCuwURePXpYjzMpFYjl12wL6Pwa7MLCqVMyLKQ8HYamznkgBlLQqxw=="; }; }; - "@aws-sdk/credential-provider-sso-3.52.0" = { + "@aws-sdk/credential-provider-sso-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.52.0.tgz"; - sha512 = "8Q0X4wro+sPMYkbZE/ZW+CBpjxGq/x/vv4yQh7zdHpNfANhqjTSR8tUCApemVcfPtwNhQNPpW8KrlWUIMguHdg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.54.0.tgz"; + sha512 = "8HfBTdOw+9gbWsXRTr5y+QYq8gK+YYDx7tKbNv7ZWjMfw49SDef0j0W4ZBZH+FYEPepOEAKjBgtjvlUeFxrOaA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.52.0" = { + "@aws-sdk/credential-provider-web-identity-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.52.0.tgz"; - sha512 = "+4qz0PZn9u6HRRNBO9YfIixdItukixPOtLP8tNlgriCh66BC6M1mAXXP/uq2x7kIaMRZtTo3Eey4T/tA0QMkOg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.54.0.tgz"; + sha512 = "Mi87IzpgIi6P3WntumgMJ6rNY8Ay/HtsLFYm4bZ1ZGJH/3QVT4YLm1n8A4xoC+ouhL0i24jmN3X1aNu6amBfEg=="; }; }; - "@aws-sdk/eventstream-marshaller-3.52.0" = { + "@aws-sdk/eventstream-marshaller-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-marshaller"; packageName = "@aws-sdk/eventstream-marshaller"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.52.0.tgz"; - sha512 = "RK5uWIOwae3Yzog8og3+e+k8kpRnjrg9hhOLmq2xG4m5seo7v7S5jfmb0uLX/Uqgd1vWMK5wKFJsdGhnAqykcQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.54.0.tgz"; + sha512 = "blOxssrHCnugxdcudYB3Vmlp7ziG0to9RfnPq+InI98mIDm3G+rt7vW6GtlkgyWu0EYduj6N+aOI7ssRUCOyDQ=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.52.0" = { + "@aws-sdk/eventstream-serde-browser-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.52.0.tgz"; - sha512 = "Lo1RzjOCvOGDoyq1hdxO7YWsdyc5ZMo0+jf/SDm64ZM8jE4eRUh1iGj0kCOKIIr/tCbzhbvP4SoNDfehJ2rqfA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.54.0.tgz"; + sha512 = "XU9+nA7WlO+Rj0hV+C/2ZlB0zfI4eoit/CIlfGaonfx6EFezH3l4ngMZq8lgd8fSuPy1dN25DWQsW/F3AFSRdg=="; }; }; - "@aws-sdk/eventstream-serde-config-resolver-3.52.0" = { + "@aws-sdk/eventstream-serde-config-resolver-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-config-resolver"; packageName = "@aws-sdk/eventstream-serde-config-resolver"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.52.0.tgz"; - sha512 = "yCfYf2MepHPpRTsbGNNLVDbN22woSmNDM2bEeK5gDbyV23MGlnLxjekLKdBbH5M6FUqfMbpsM60gDgJgas3ovA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.54.0.tgz"; + sha512 = "fnbwtjaSd05K2+rcEZ3TQfM6YBY6obWqqt/x0qTTt7277wdqvE3+i0dWcvrQLldGD7xY3+oitEmClAeCE0raiA=="; }; }; - "@aws-sdk/eventstream-serde-node-3.52.0" = { + "@aws-sdk/eventstream-serde-node-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.52.0.tgz"; - sha512 = "hL067bWZ875oL+l+Q1Wrhkq/V9727fHeJ1J4Kr/o84hGRnIkN7OiNDLIMyUTrGdc0I4diGUbc8FVJiRtZRmphw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.54.0.tgz"; + sha512 = "b/EXk+Yb6lspfdEvClDkutif1z7Ggbeg/s2z9ug8Zh32i4/8gc4kcoWHy4ez8GUqsrRuOfD1MScqxkSAmIlPlg=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.52.0" = { + "@aws-sdk/eventstream-serde-universal-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.52.0.tgz"; - sha512 = "CDMcBJDNDJfGWz2Vk2p1Ef6JbZDVZVZDG8F7Gdhn7RsiMsFf7QiF4vcNEJwQIX25ZSerRqEitBT8nEZEDxEYGw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.54.0.tgz"; + sha512 = "HdFYrLvKHWATev0BCp0I8xH40MhP9cNhxK0h+srdCC9o/Djs3QrI0Nn5rzWdg/hQDyRg8jPSvaGG8P/ekyTn2w=="; }; }; - "@aws-sdk/fetch-http-handler-3.52.0" = { + "@aws-sdk/fetch-http-handler-3.54.0" = { name = "_at_aws-sdk_slash_fetch-http-handler"; packageName = "@aws-sdk/fetch-http-handler"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.52.0.tgz"; - sha512 = "pFXkCeEIcrgH8esRyUab1nnIo1cjUjrheqwb/MK3gJ363/kenT6IqYXOq0UO4mF7bn6IOz/yxODlhQIU6i1Vww=="; + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.54.0.tgz"; + sha512 = "TIn2ocem/gpMQ12KoiOu3uTHO86OOrmFITulV9D8xTzvFqHe34JKjHQPqII6lDbTCnU9N5CMv3N1CXxolIhiOQ=="; }; }; - "@aws-sdk/hash-blob-browser-3.52.0" = { + "@aws-sdk/hash-blob-browser-3.54.0" = { name = "_at_aws-sdk_slash_hash-blob-browser"; packageName = "@aws-sdk/hash-blob-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.52.0.tgz"; - sha512 = "EhEXgO/cb67EHXl/F1D3vtdv695n1nIrAQLdiTOcNvdMRWLpjb2MkR3GI9tppkTabF4o3allgZVebKVeqINSMQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.54.0.tgz"; + sha512 = "KIflBj2efxy5/z1ffg1HL3CRxqM7hNqel+dtVCYaCfTJ/MQhcfcR5GsodhJYl99pitryorJeB4chhgNv4bbPUA=="; }; }; - "@aws-sdk/hash-node-3.52.0" = { + "@aws-sdk/hash-node-3.54.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.52.0.tgz"; - sha512 = "pN2dSSyyy0emFFtK6jgmzYXcJHITbfdPqR7UTQ1fj1wFvbURPN19C1f4uYbVDjuiUQX01hLclJDLnPy1BIzTGQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.54.0.tgz"; + sha512 = "o2XRftfj3Tj2jsZsdvnEY4OtmkT/9OADCWkINQCTcfy+nMuvs1IAS/qruunfaMJ58GntOoI4CVIbRa2lhhJr5w=="; }; }; - "@aws-sdk/hash-stream-node-3.52.0" = { + "@aws-sdk/hash-stream-node-3.54.0" = { name = "_at_aws-sdk_slash_hash-stream-node"; packageName = "@aws-sdk/hash-stream-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.52.0.tgz"; - sha512 = "Khgy6DM2Kpcqbom8dYQtH7GmxnprdQVHsKvhmkReqfksxvrwNwo+S2RCDlceGTVIkELuvyfnVd19JLQO7BnqTw=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.54.0.tgz"; + sha512 = "j936gz9O1ist0Bu2IXCf2DUrYfB9DkwKUMRAN14mTrKB+3PAMRhBazUVDJjIxPbcC9MQJnwIa2tiZWn8QC48UA=="; }; }; - "@aws-sdk/invalid-dependency-3.52.0" = { + "@aws-sdk/invalid-dependency-3.54.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.52.0.tgz"; - sha512 = "TjRzfFFiY4i/a9ry5llCQMiIwpyhIyriM2QuPgAdRaRPM076I01FohUzlAc7zgwwhCa5rpI4zRZ+auGPrU44Gw=="; + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.54.0.tgz"; + sha512 = "eeefTPtkb0FQFMBKmwhvmdPqCgGvTcWEiNH8pznAH0hqxLvOLNdNRoKnX5a1WlYoq3eTm0YN9Zh+N1Sj4mbkcg=="; }; }; "@aws-sdk/is-array-buffer-3.52.0" = { @@ -652,229 +661,229 @@ let sha512 = "5Pe9QKrOeSZb9Z8gtlx9CDMfxH8EiNdClBfXBbc6CiUM7y6l7UintYHkm133zM5XTqtMRYY1jaD8svVAoRPApA=="; }; }; - "@aws-sdk/md5-js-3.52.0" = { + "@aws-sdk/md5-js-3.54.0" = { name = "_at_aws-sdk_slash_md5-js"; packageName = "@aws-sdk/md5-js"; - version = "3.52.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.52.0.tgz"; - sha512 = "M0oHeBDvXCapQvvGzzlMrkW1vRfExngB/Gn93Vmdpt97+ieHkfHgo9fU/erQKb+HwnlZbhVJW3vEgfHPLvql6A=="; - }; - }; - "@aws-sdk/middleware-apply-body-checksum-3.52.0" = { - name = "_at_aws-sdk_slash_middleware-apply-body-checksum"; - packageName = "@aws-sdk/middleware-apply-body-checksum"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-apply-body-checksum/-/middleware-apply-body-checksum-3.52.0.tgz"; - sha512 = "f5ynflavshbkmV4ZpcwW2WoYAP69bOpv8bUPNsiKEzL07q6ZperkIaYre9BajNMxGN+UNSoE5CQIvRGcwC6UxA=="; + url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.54.0.tgz"; + sha512 = "pMprZD8JBw9WU4Risfd0Clm9SrUpsUS3QriSDeuFnGfRcKHkpw1sDj6HsNsIQ1OCeWuhYqW55Wtzc0pH8U80Mg=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.52.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.54.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.52.0.tgz"; - sha512 = "KOq8kTzhWYiwits89pnCduL7ojijthfFR5PRvLW6IwQbPxIg/AjdO5gYbMUTLaVAO1b7LoI3ztk+lmLQ2yvjOA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.54.0.tgz"; + sha512 = "4VC6zxDaveCnQD3eUJezSQ3Ikeq+MxRnvfcNhZytB20tYRy1PnR4jLoqjYkw5U1zstVRABbZdzlsWzZMe308ew=="; }; }; - "@aws-sdk/middleware-content-length-3.52.0" = { + "@aws-sdk/middleware-content-length-3.54.0" = { name = "_at_aws-sdk_slash_middleware-content-length"; packageName = "@aws-sdk/middleware-content-length"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.52.0.tgz"; - sha512 = "U+aa8UswtEvEdt4vvX+C4b+vetSpG6PZVeGN/hZ2J0j3jQxODQtjKHU3VIO+Fvp8m9rSCtcfAPly5CcejHLeKw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.54.0.tgz"; + sha512 = "DTlZo00stFwFHyR+GTXxhYePzNbXm+aX5yYQUsrsY2J2HuSbADVgDDekJXbtOH36QBa0OJf7JKbWP8PZDxk1zg=="; }; }; - "@aws-sdk/middleware-expect-continue-3.52.0" = { + "@aws-sdk/middleware-expect-continue-3.54.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.52.0.tgz"; - sha512 = "1rpD1I/HwDdVAW9wBtLv34gxrfkfLEyTEj2Y/1Qh/62rMX7KbBT0CmbbO33upOqyrsJDW961Mu/d5cVZW1N3XQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.54.0.tgz"; + sha512 = "6k4hoD7XqGDA8yq10AzF+iafgc+RyrPxr4kqzv50+hI5CZkPcl/vOAgS7iD+Y33dLITYuh+jzlpn7zlLwdOoqw=="; }; }; - "@aws-sdk/middleware-header-default-3.52.0" = { + "@aws-sdk/middleware-flexible-checksums-3.54.0" = { + name = "_at_aws-sdk_slash_middleware-flexible-checksums"; + packageName = "@aws-sdk/middleware-flexible-checksums"; + version = "3.54.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.54.0.tgz"; + sha512 = "4+bUwQyYHtTbaJDaj2F7j2K/JUcYdKg169pKmpefZiXZVdfR2/WWwj7Wx7EI40rpPYHaMpSal9tIxz054LPYnw=="; + }; + }; + "@aws-sdk/middleware-header-default-3.54.0" = { name = "_at_aws-sdk_slash_middleware-header-default"; packageName = "@aws-sdk/middleware-header-default"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.52.0.tgz"; - sha512 = "ts5kuAnLjC9HW9W/vkCrlMa4a5DG45BkOjhYhD4YZCDBt9+E/N5Pt/14jmTdTO5LQ26zVC6Z3ByBXXayDKEIow=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.54.0.tgz"; + sha512 = "DvkdMJRAYrVsu6S92Z/fhSnj7ZFCNE3ertmIiGsukfMuGmzkuVKxqlUfo89xS3sOF3VY2nNOdNTCnVY4VZLSQQ=="; }; }; - "@aws-sdk/middleware-host-header-3.52.0" = { + "@aws-sdk/middleware-host-header-3.54.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.52.0.tgz"; - sha512 = "t7y0gtJyFNrS6bwluR7N2LtppA7B0SDk+uNlvOJOYnJRms89fXltyMJWl8wrv8IHHvrhRLwNEP22vvOhn3hriA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.54.0.tgz"; + sha512 = "X+lvYc2ij1+9tfpvdGGb+/APvH7g/M9RYzIEkI/LvNjVCOA3f3rgzFftZZhD/zccRtrygsvXfeZhoDrHxFKl9g=="; }; }; - "@aws-sdk/middleware-location-constraint-3.52.0" = { + "@aws-sdk/middleware-location-constraint-3.54.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.52.0.tgz"; - sha512 = "P+RfKVXL6X+vu7e54vu73TNje15y+Jo1VEbBpFGz5wYsLlBO58e6utDYLOYLwj+WzLqShSzZX9ejZzxrOSYQdQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.54.0.tgz"; + sha512 = "qwZR+GWlRoIFvvCt5ywmX3kV15KxrFbUxyAADCEJ4Q86ebEI3ux9mAHB6niOArRwtA5/wyvjRrOiYo/fTq7eLQ=="; }; }; - "@aws-sdk/middleware-logger-3.52.0" = { + "@aws-sdk/middleware-logger-3.54.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.52.0.tgz"; - sha512 = "YbFuJAsOPvbYe64gpqmS6XmEQXwyAGwH3Y4iOp3CnrGAz/zXbwWwzb653Uby+h4PVkTZ1+RviCO/A6si9bUkhw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.54.0.tgz"; + sha512 = "bDCQj8IBq1vrXRRrpqD+suJ8hKc4oxUXpRkWdsAD+HnWWRqHjsy0hdq5F8Rj1Abq7CsFtZ+rUXddl+KlmgZ3+A=="; }; }; - "@aws-sdk/middleware-retry-3.52.0" = { + "@aws-sdk/middleware-retry-3.54.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.52.0.tgz"; - sha512 = "O+4mfn7OPv1POYagKwOgdlc16AQFWa4bY05g6Y94KZ2400ywNpK+Y2cwdskyNU3OTGOlluVGR21W5eO1b+XhNg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.54.0.tgz"; + sha512 = "8kVzwxe0HQajeZWXzAp2XCkbiK8E8AZESfXvLyM34Xy2e8L8gdi1j90QLzpFk6WX6rz7hXBQG7utrCJkwXQxLA=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.52.0" = { + "@aws-sdk/middleware-sdk-s3-3.54.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.52.0.tgz"; - sha512 = "M9ivvdTEPFoFUgfGLdFeRxFGRh/Edq6tevSnWjdOoLTgbzq8tnuKkj9v3gKsIN+a1QWP6Ef0ThH/jyuFDcBEnQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.54.0.tgz"; + sha512 = "xESksyOVCuDkMPC8mEqrInnuBeJHLSVOfwIl/pGwzevc+Q5spO9FDUlNfhaEVOEoLqK21TUdZo4z/ElNN94m4w=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.52.0" = { + "@aws-sdk/middleware-sdk-sts-3.54.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.52.0.tgz"; - sha512 = "NB1wHvOp+I6DXi5fPutyl9dAWvJYqzRqdi8lMeu02ub/d6nybrAjoB56za1LvGblcoEiYClf1A6dTKtmydgzFQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.54.0.tgz"; + sha512 = "4vOlG96fKgqmLMsguoKFdBkk2Fq8JttpgPts9d5Ox73+yQsa0VKrpLiD5OUPqgjGZcX2bilMKCAOBc2v3ESAHw=="; }; }; - "@aws-sdk/middleware-serde-3.52.0" = { + "@aws-sdk/middleware-serde-3.54.0" = { name = "_at_aws-sdk_slash_middleware-serde"; packageName = "@aws-sdk/middleware-serde"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.52.0.tgz"; - sha512 = "4ZooINTdOI4+T6pEiu8xte5EEhOqbE/wqOwBzvOASk3JKElZ93u6xKP2u7UKVD6asBBYK2mDrYSy1PsU4fNl4A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.54.0.tgz"; + sha512 = "O89/5aOiNegBP6Mv+gPr22Zawz2zF2v1o8kwFv2s4PWDzpmvrdF2by6e2Uh9sKzfpcwEW7Wr8kDTwajampVjgA=="; }; }; - "@aws-sdk/middleware-signing-3.52.0" = { + "@aws-sdk/middleware-signing-3.54.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.52.0.tgz"; - sha512 = "7FUqmZQ5DzaDJYCJ3YmOHRFEyFeohtsDQ1akWD2qekcjp16ftBtk05Fi9am5/L7pO8svVzobji/wg00Tlq183A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.54.0.tgz"; + sha512 = "KYxmRDh7D6ysAezlsDf3cN2h6OjH66x3NUdgUmW+78nkN9tRvvJEjhmu6IOkPd4E1V9P3JOLbq6zVjDVU12WDQ=="; }; }; - "@aws-sdk/middleware-ssec-3.52.0" = { + "@aws-sdk/middleware-ssec-3.54.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.52.0.tgz"; - sha512 = "lEswW+Hf5tvkPs6aNRbPF5/Iizh62lq4NK6bZjvQF6kqyUoIGhOehQOZMmTm6jw0058KVhrzNIKipBpi7LuF6w=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.54.0.tgz"; + sha512 = "wNQR5pRoN4wJq2IcFOXhRxvars4uWgdUnBQcJ5UDSJhUPwVDA4m+M83Q/54GWRHT+SVsobuNTmTeFnCbgsIq3A=="; }; }; - "@aws-sdk/middleware-stack-3.52.0" = { + "@aws-sdk/middleware-stack-3.54.0" = { name = "_at_aws-sdk_slash_middleware-stack"; packageName = "@aws-sdk/middleware-stack"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.52.0.tgz"; - sha512 = "4OTbQ+tWc6Le7es3kSnXBzCyddcUw6Sk2GupR/1+PD9v4/qvtKXXK+uD4bMDDMfi6dTNV+2riOGBniOtBVsayw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.54.0.tgz"; + sha512 = "38iit8VJ7jhFlMdwdDESEJOwbi8wIjF7Q1FOFIoCvURLGkTDQdabGXKwcFVfRuceLO+LJxWP3l0z0c10uZa6gQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.52.0" = { + "@aws-sdk/middleware-user-agent-3.54.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.52.0.tgz"; - sha512 = "sfdJvAp/f4PHmQvSklFAuCpD7gqloG502gSmBAMrXKqYykvQ5SAGyr6sCZPWf8CZxKtn5n4ftg8CLKywwrKwmg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.54.0.tgz"; + sha512 = "831GP5EBJdDxyq93dpgBZUwBWnZAID2aFvE/VN8c5X8U00ZT7GRt9cy5EL2b6AQN3Z4uWL1ZVDVkYmRAHs33Lg=="; }; }; - "@aws-sdk/node-config-provider-3.52.0" = { + "@aws-sdk/node-config-provider-3.54.0" = { name = "_at_aws-sdk_slash_node-config-provider"; packageName = "@aws-sdk/node-config-provider"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.52.0.tgz"; - sha512 = "vfeTzkfVtGaNQrnhCRMObqid0shxFtNFEnnU1Nnx7HsgBfag2/T6fnsDzdVGaliQ6nmfg+RMrhzw2VECyBTHQQ=="; + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.54.0.tgz"; + sha512 = "Q2a1vyoZa2UX/dItP3cqNdLUoTGdIY4hD5nA+mTg5mKlOWci35v8Rypr40tQz4ZwiDF6QQmK0tvD3bBUULm0wA=="; }; }; - "@aws-sdk/node-http-handler-3.52.0" = { + "@aws-sdk/node-http-handler-3.54.0" = { name = "_at_aws-sdk_slash_node-http-handler"; packageName = "@aws-sdk/node-http-handler"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.52.0.tgz"; - sha512 = "MjLkndwLuWye1kavyFnDw5BvK8Rg4YpMULTne++OL/uEsxWO786K+QQMyLWkirPe+ELMEYu/3eOrQTly2tqHsA=="; + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.54.0.tgz"; + sha512 = "g6+IXe4FCMrx4vrY73yvFNAUsBJ1vhjDshUCihBv5tEXsd45/MqmON/VWYoaQZts0m2wx2fKsdoDKSIZZY7AiQ=="; }; }; - "@aws-sdk/property-provider-3.52.0" = { + "@aws-sdk/property-provider-3.54.0" = { name = "_at_aws-sdk_slash_property-provider"; packageName = "@aws-sdk/property-provider"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.52.0.tgz"; - sha512 = "Ooam7CvGefHKhMwQ413MiEtDTFw70xbCduJCF7Bg1F0WKrf700M/Yte+q3E0ljlXWJ28rwJNgwW3ptZaSXMGPg=="; + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.54.0.tgz"; + sha512 = "8e+KXskwOhXF0MIdIcZLFsOTfMVGp41Y6kywgewQaHkZoMzZ6euRziyWNgnshUE794tjxxol9resudSUehPjIw=="; }; }; - "@aws-sdk/protocol-http-3.52.0" = { + "@aws-sdk/protocol-http-3.54.0" = { name = "_at_aws-sdk_slash_protocol-http"; packageName = "@aws-sdk/protocol-http"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.52.0.tgz"; - sha512 = "L6ITU9NG0L6nyYfzhSLa0EsgDlyL1vHNz+Om9o7TayUUF7O0f3UiZToWf2hdETQ04Os8625aZt0VH92ZnYyeEw=="; + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.54.0.tgz"; + sha512 = "v4CgQ2mBzEwNubM1duWP3Unu98EPNF2BuKWe4wT1HNG2MTkODS56fsgVT6sGGXS9nB/reEzB+3bXO5FS8+3SUg=="; }; }; - "@aws-sdk/querystring-builder-3.52.0" = { + "@aws-sdk/querystring-builder-3.54.0" = { name = "_at_aws-sdk_slash_querystring-builder"; packageName = "@aws-sdk/querystring-builder"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.52.0.tgz"; - sha512 = "RfNXqKeR6mdg2n2LO5Vs2Bz+f47/KN5k36HWk04bSwIbhnBtslXBp0F1KgSPkeP56KEgmmUWldRD7g8BvDkgAw=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.54.0.tgz"; + sha512 = "7rs2gGPpiIHntbYGPFkxkXQkSK7uVBqlWRl0m6fNngUEz2n8jRxytB6LlALMHbXeXh28+zzq0VxbAwqAAUQ4oQ=="; }; }; - "@aws-sdk/querystring-parser-3.52.0" = { + "@aws-sdk/querystring-parser-3.54.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.52.0.tgz"; - sha512 = "/A6PauieStZajbkxX3sZSBBDacGDc3I/Sk7rjJulmg1GnizeVcUgx1OUdDh1JasdqA1h9E3ks/Y2Lu3xUMctLw=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.54.0.tgz"; + sha512 = "OZ4mRJ9rXgBskPBSoXBw8tV4kfNK0f/pP55qE1eZIcQ1z7EvVz4NjldgqMfscT20Cx5VzUbus3q9EPcV+HbR1w=="; }; }; - "@aws-sdk/s3-request-presigner-3.52.0" = { + "@aws-sdk/s3-request-presigner-3.54.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.52.0.tgz"; - sha512 = "6TGPTP5L3+nfOR5K+AQNS1NDp1aYxozQ5vW4KGI+P1XVnLZZ36Ey3VoCdrmI2b6b8qy9pT3c3bXfPwEN4gSIOQ=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.54.0.tgz"; + sha512 = "xPIahWW1brKu3Cnphx/pYAB3nRAyAZH4Zh7n1zm9XUsqqsBc4ZkIKqC5tDvJ/lBOLrqks8oSh2wpckfCwO9EpA=="; }; }; - "@aws-sdk/service-error-classification-3.52.0" = { + "@aws-sdk/service-error-classification-3.54.0" = { name = "_at_aws-sdk_slash_service-error-classification"; packageName = "@aws-sdk/service-error-classification"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.52.0.tgz"; - sha512 = "2bpSIZCx5VGp2CBTeXK6PxlBYWrn2wiqxBVYstDRExZ8P7edcwPRgWi8qaKgPM2wvstZwJieF774niiuLddIpg=="; + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.54.0.tgz"; + sha512 = "XWANvjJJZNqsYhGmccSSuhsvINIUX1KckfDmvYtUR6cKM6nM6QWOg/QJeTFageTEpruJ5TqzW9vY414bIE883w=="; }; }; "@aws-sdk/shared-ini-file-loader-3.52.0" = { @@ -886,40 +895,40 @@ let sha512 = "tALb8u8IVcI4pT7yFZpl4O6kgeY5EAXyphZoRPgQSCDhmEyFUIi/sXbCN8HQiHjnHdWfXdaNE1YsZcW3GpcuoQ=="; }; }; - "@aws-sdk/signature-v4-3.52.0" = { + "@aws-sdk/signature-v4-3.54.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.52.0.tgz"; - sha512 = "lSlDASXGLup5v12kclzT2ZLoUnnVLknSRcMXrTVjnX7spmHMbs6s7LOcN0RXZzFIACs7vW+930KUzhBxt8UiFQ=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.54.0.tgz"; + sha512 = "22Bf8uQ0Q/I7WpLFU88G7WVpRw6tWUX9Ggr0Z++81uZF5YCPbWDNtFDHitoERaRc/M4vUMxNuTsX/JWOR3fFPg=="; }; }; - "@aws-sdk/smithy-client-3.52.0" = { + "@aws-sdk/smithy-client-3.54.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.52.0.tgz"; - sha512 = "GuOJuoA1kky/v2p7byOZGq7YOiu2Ov8DA3d58gM6L/q7XavBjnzwNB/BYU7SPU3Ly6S7qGxBJFeadufic4bCYg=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.54.0.tgz"; + sha512 = "zdYN5pwhJU7x8qZKWTZPsFD5YQkDt6kyCNRsNjSWJ0ON4R3wUlFIwT3YzeQ5nMOTD86cVIm1n2RaSTYHwelFXg=="; }; }; - "@aws-sdk/types-3.52.0" = { + "@aws-sdk/types-3.54.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.52.0.tgz"; - sha512 = "5deI1v6Fr7/a+TT9hPuiy6I/L/7uJTda3q3DEvUd0CsGbBB/fcDXJg8jlnMHcmw7mkfP9vE553ZJQS3Cb0v4vg=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.54.0.tgz"; + sha512 = "Jp2MHXnrM0pk0RIoSl5AHFm7TBk+7b8HTIcQ2X/6kGwwwnWw9qlg9ZFziegJTNTLJ4iVgZjz/yMlEvgrp7z9CA=="; }; }; - "@aws-sdk/url-parser-3.52.0" = { + "@aws-sdk/url-parser-3.54.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.52.0.tgz"; - sha512 = "/9OJwol/384jsISiAs5JX7fkgd9mv7hJsHFCVXnByim5qTZu1V9fMcJYJ1L3iRmfCRy0w75UDJljIx2RZnwAYw=="; + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.54.0.tgz"; + sha512 = "DJWdlkXq3rsOydxwR9htPUW4QXhmo75Hybg96D3F2uPUvPCm8gJFngXp/9hW1OYcgfNu13HXqUy+t6V23cC7Iw=="; }; }; "@aws-sdk/util-arn-parser-3.52.0" = { @@ -949,22 +958,22 @@ let sha512 = "V96YIXBuIiVu7Zk72Y9dly7Io9cYOT30Hjf77KAkBeizlFgT5gWklWYGcytPY8FxLuEy4dPLeHRmgwQnlDwgPA=="; }; }; - "@aws-sdk/util-body-length-browser-3.52.0" = { + "@aws-sdk/util-body-length-browser-3.54.0" = { name = "_at_aws-sdk_slash_util-body-length-browser"; packageName = "@aws-sdk/util-body-length-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.52.0.tgz"; - sha512 = "8omOgIGmopUtwg3XaeyvqacxrIrCsDKUVQp5n+8iLmyYt5mQM70vXbUC273GJzKDtibGDfxiN4FqSLBlo9F/oQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.54.0.tgz"; + sha512 = "hnY9cXbKWJ2Fjb4bK35sFdD4vK+sFe59JtxxI336yYzANulc462LU/J1RgONXYBW60d9iwJ7U+S+9oTJrEH6WQ=="; }; }; - "@aws-sdk/util-body-length-node-3.52.0" = { + "@aws-sdk/util-body-length-node-3.54.0" = { name = "_at_aws-sdk_slash_util-body-length-node"; packageName = "@aws-sdk/util-body-length-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.52.0.tgz"; - sha512 = "1WWsGh0hip4y1uvOLFV2v3Nvq3W35dmW5YniCi0gQDBLc5JHES8Zka7yoCDYOfaYFUodVH5mC/jFBjGRQ3TpDw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.54.0.tgz"; + sha512 = "BBQB3kqHqHQp2GAINJGuse9JBM7hfU0tMp9rfw0nym4C/VRooiJVrIb28tKseLtd7nihXvsZXPvEc2jQBe1Thg=="; }; }; "@aws-sdk/util-buffer-from-3.52.0" = { @@ -985,49 +994,49 @@ let sha512 = "1wonBNkOOLJpMZnz2Kn69ToFgSoTTyGzJInir8WC5sME3zpkb5j41kTuEVbImNJhVv9MKjmGYrMeZbBVniLRPw=="; }; }; - "@aws-sdk/util-create-request-3.52.0" = { + "@aws-sdk/util-create-request-3.54.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.52.0.tgz"; - sha512 = "j2KJf4SsAuMNZw92T+ti8VoJ1wILlZl81+3ZvIWho4k3hvjf05eXH/l4P0tZ7aCRfljx+NoaJbuKAT7XcpDQ5Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.54.0.tgz"; + sha512 = "Sa+t75YQnMXXcCruLBvKZ6B1DzyGAod1PZT+iDHwDDobDsUVG3Cjov9gJepYAH2EEmvZa9f0IT+W6lvGv3uL4w=="; }; }; - "@aws-sdk/util-credentials-3.52.0" = { + "@aws-sdk/util-credentials-3.53.0" = { name = "_at_aws-sdk_slash_util-credentials"; packageName = "@aws-sdk/util-credentials"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.52.0.tgz"; - sha512 = "fNcm2cNzDHWt5Pr6xD2FXA40jkcgClsbumuI0VBhLEyNLfoetwPImKTpqbxo1XfWVxhqIbT/ELnrbS2OYBRIXg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.53.0.tgz"; + sha512 = "XP/3mYOmSn5KpWv+PnBTP2UExXb+hx1ugbH4Gkveshdq9KBlVnpV5eVgIwSAnKBsplScfsNMJ5EOtHjz5Cvu5A=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.52.0" = { + "@aws-sdk/util-defaults-mode-browser-3.54.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.52.0.tgz"; - sha512 = "N2/DHJ/OfiQ5zP97k9cJ8jSGiWDjtR7oFqXR+wbKZzKOww6vencMPYlndU6v1uZOKEjoj+NBr5N0jPEjCz+6+g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.54.0.tgz"; + sha512 = "9QnRbTsD2MuEr59vaPAbC95ba7druMFRSZjpwc3L7U9zpsJruNDaL5aAmV0gCAIPZg7eSaJmipyWr0AvwwgroQ=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.52.0" = { + "@aws-sdk/util-defaults-mode-node-3.54.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.52.0.tgz"; - sha512 = "vmbvirg5edfNKBin8Mup2noxgqIYzYPnvk+BgIx3jFPvwT57WGRs/ahOMNqHgv/6xAdVaUjz8g7gw9Yy3mwP3A=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.54.0.tgz"; + sha512 = "kHFgEyAWCaR5uSmRwyVbWQnjiNib3EJSAG9y7bwMIHSOK/6TVOXGlb1KIoO6ZtLE1FZFlS55FIRFeOPmIFFZbA=="; }; }; - "@aws-sdk/util-format-url-3.52.0" = { + "@aws-sdk/util-format-url-3.54.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.52.0.tgz"; - sha512 = "Rkfz6dz4sPh0poMmaQIf7e0q2XrQic4D0Wx99N3+OtT/WHQCR8UAjyijxC5jDQwhyNkqNNdIYQd7Xz5o6X9eRQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.54.0.tgz"; + sha512 = "nnrXT0dQc+eRWJPgkqDK91NEluTFU9Tqs/LhIlIq+6Z8BELTN24lCi9feUKtw1s3a5ucUSs2unYyfHnl35PeeQ=="; }; }; "@aws-sdk/util-hex-encoding-3.52.0" = { @@ -1048,6 +1057,24 @@ let sha512 = "l10U2cLko6070A9DYLJG4NMtwYH8JBG2J/E+RH8uY3lad2o6fGEIkJU0jQbWbUeHYLG3IWuCxT47V4gxYrFj7g=="; }; }; + "@aws-sdk/util-stream-browser-3.54.0" = { + name = "_at_aws-sdk_slash_util-stream-browser"; + packageName = "@aws-sdk/util-stream-browser"; + version = "3.54.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.54.0.tgz"; + sha512 = "KVBRQcTie9Q231pdbO4gzGxHG8wNomGic3bHDnwfVdE+tq1Pbi8xNgUelmmd/uZvgMf8awuNN8OHzkex06HAHQ=="; + }; + }; + "@aws-sdk/util-stream-node-3.54.0" = { + name = "_at_aws-sdk_slash_util-stream-node"; + packageName = "@aws-sdk/util-stream-node"; + version = "3.54.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.54.0.tgz"; + sha512 = "h3kpLMYzGgPkCIq0sLlE70zAt75C6wcbZm4gPh5iN8KRmmhpktqKpBami9J5fY6cBPC5ZlEmv5iDdZrI90Imrw=="; + }; + }; "@aws-sdk/util-uri-escape-3.52.0" = { name = "_at_aws-sdk_slash_util-uri-escape"; packageName = "@aws-sdk/util-uri-escape"; @@ -1057,22 +1084,22 @@ let sha512 = "W9zw5tE8syjg17jiCYtyF99F0FgDIekQdLg+tQGobw9EtCxlUdg48UYhifPfnjvVyADRX2ntclHF9NmhusOQaQ=="; }; }; - "@aws-sdk/util-user-agent-browser-3.52.0" = { + "@aws-sdk/util-user-agent-browser-3.54.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.52.0.tgz"; - sha512 = "zmw9pJ91QAr1oF3uqLKuo/3++NrSEagLwz3xnuID5wN8WLAgbC6MkvM7FG+r11CHSoUX3IeB6YDqoBMQW8en8w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.54.0.tgz"; + sha512 = "pU5KL1Nnlc1igeED2R44k9GEIxlLBhwmUGIw8/Emfm8xAlGOX4NsVSfHK9EpJQth0z5ZJ4Lni6S5+nW4V16yLw=="; }; }; - "@aws-sdk/util-user-agent-node-3.52.0" = { + "@aws-sdk/util-user-agent-node-3.54.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.52.0.tgz"; - sha512 = "jqbyb6R4goWOTIESizmNPy1i3Xa25Q3QG0xt6Pct0DwLQUSVpnPHw07NmfRhql+eYBoD4uxpXDX9lWsuLUBi0w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.54.0.tgz"; + sha512 = "euKoYk1TfyV9XlJyAlGWdYqhQ5B4COwBxsV9OpwiAINUFm91NSv6uavFC/ZZQBXRks6j9pHDAXeXu7bHVolvlA=="; }; }; "@aws-sdk/util-utf8-browser-3.52.0" = { @@ -1093,13 +1120,13 @@ let sha512 = "fujr7zeobZ2y5nnOnQZrCPPc+lCAhtNF/LEVslsQfd+AQ0bYWiosrKNetodQVWlfh10E2+i6/5g+1SBJ5kjsLw=="; }; }; - "@aws-sdk/util-waiter-3.52.0" = { + "@aws-sdk/util-waiter-3.54.0" = { name = "_at_aws-sdk_slash_util-waiter"; packageName = "@aws-sdk/util-waiter"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.52.0.tgz"; - sha512 = "8Gx0NunIg1RFpnKSA3nwzDl5j8mJ42kWjy5sHgd4wfUyiXRSvTl69sV6O8qhleI9OMDV0iS4xHZBCLK11HdIoA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.54.0.tgz"; + sha512 = "+Gz5R14jWKsQtMCWbzWJe2Ac/CdMV/h5/R8uEZmwM3f6MHICPOftMQd0uDLdGezSBV9PuU3PCwiBZBTFzNSYBg=="; }; }; "@aws-sdk/xml-builder-3.52.0" = { @@ -1129,13 +1156,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.17.3" = { + "@babel/cli-7.17.6" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.17.3"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.3.tgz"; - sha512 = "1+WRlh1IqLocOp122CLx4if345RSHMspwIZNJTlqG/GA46HVZC6p49N1kolfdd2/GOdr+tu4nScbAR3ACJ2ZiA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.6.tgz"; + sha512 = "l4w608nsDNlxZhiJ5tE3DbNmr61fIKMZ6fTBo171VEFuFMIYuJ3mHRhTLEkKKyvx2Mizkkv/0a8OJOnZqkKYNA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1228,13 +1255,13 @@ let sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; }; - "@babel/helper-create-class-features-plugin-7.17.1" = { + "@babel/helper-create-class-features-plugin-7.17.6" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.17.1"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz"; - sha512 = "JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz"; + sha512 = "SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg=="; }; }; "@babel/helper-create-regexp-features-plugin-7.17.0" = { @@ -1318,13 +1345,13 @@ let sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.16.7" = { + "@babel/helper-module-transforms-7.17.6" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.16.7"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz"; - sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz"; + sha512 = "2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA=="; }; }; "@babel/helper-optimise-call-expression-7.16.7" = { @@ -1507,13 +1534,13 @@ let sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; }; }; - "@babel/plugin-proposal-class-static-block-7.16.7" = { + "@babel/plugin-proposal-class-static-block-7.17.6" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.16.7"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; - sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz"; + sha512 = "X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.16.7" = { @@ -2308,13 +2335,13 @@ let sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; }; }; - "@blueprintjs/colors-4.0.0-beta.3" = { + "@blueprintjs/colors-4.0.0-rc.0" = { name = "_at_blueprintjs_slash_colors"; packageName = "@blueprintjs/colors"; - version = "4.0.0-beta.3"; + version = "4.0.0-rc.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.0-beta.3.tgz"; - sha512 = "42i7qeyFZT/qJFj8iagVECB91HmqxiCY7rw+EaOHSKCwbasbJF0BmAMViZCrOhvw++ZQ2WXmu+CxH6jkvSeDtg=="; + url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.0-rc.0.tgz"; + sha512 = "+Iw5LUa9MtbEGtm09eAtGyalVS7n8wM1/nUmFl0CCq176wqRzS0/VyCo0qdweZqzypEtHnXaFNmr+Cgt4Ge1kQ=="; }; }; "@blueprintjs/core-3.53.0" = { @@ -2389,40 +2416,49 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@cdktf/hcl2cdk-0.9.1" = { + "@cdktf/hcl2cdk-0.9.4" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.9.1.tgz"; - sha512 = "0AOiSGa8qd0lcGwwayrl3N/mAeTFkNrKndILCDMuh9gLFfXLTxVEq2oqp5LbO5YX2i/cFMCjZ/vscXXQuCVjCQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.9.4.tgz"; + sha512 = "sUg9GsmaFpqqfoGcqibMEDHozMQhaDOxBT3Dz3ioNc0SSWhBpDRwrlctK3rNNKvWUetEeUr28L7SJR/I0TSd+Q=="; }; }; - "@cdktf/hcl2json-0.9.1" = { + "@cdktf/hcl2json-0.9.4" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.9.1.tgz"; - sha512 = "pM6cLkPl4hMTj9XhjKz7MEowUHnzq8hY8uk8ro32OQsZVZpsl9CDG83ox0VwgI1YSvXU7GyzP4iPOPn63U7PgQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.9.4.tgz"; + sha512 = "dZZUi94C7TFs0E8IubNYu38mBncVlQVUeGp6nA3tYxs/ue1igKqx7+mWfZP7NYVOSlggMGRNaTts6ZA0UAtOYQ=="; }; }; - "@cdktf/provider-generator-0.9.1" = { + "@cdktf/provider-generator-0.9.4" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.9.1.tgz"; - sha512 = "BF4Z7eiSFHKx0NrIiB2fHCq0G8Mx2q8bLbij9KBxAD80BwX1lNKEzut6JUhe6qOrC0yOkAV4PWElbK9g66pJgg=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.9.4.tgz"; + sha512 = "06sfpBTn3+PqiU/XP3RQ6FO6M+GxzmHo6yIJk9r5x1QmIlitDE9tdogXqmAVVHB4nGRL/v7SXefcrOHrOkl1YQ=="; }; }; - "@chemzqm/neovim-5.7.4" = { + "@chemzqm/neovim-5.7.5" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.7.4"; + version = "5.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.4.tgz"; - sha512 = "ajh2G+EhzqAHkAMsXsiNUG2cpGROO3RiAJbFQ0Px1cf9zE2YqWVZ8h7dFd7aj/zit+la9uTA1OPQkn4FZrHrjw=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.5.tgz"; + sha512 = "BlwPjCDjeSdwIk7vP3wU6kFI+ZJBji8j5QWy631r+aQM1t74AclUOWNQZT8/GX3y2hqmC9LZnFT/bTQtVxw24g=="; + }; + }; + "@chinachu/aribts-1.3.5-mirakurun.17" = { + name = "_at_chinachu_slash_aribts"; + packageName = "@chinachu/aribts"; + version = "1.3.5-mirakurun.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@chinachu/aribts/-/aribts-1.3.5-mirakurun.17.tgz"; + sha512 = "1rgl8GNttf8+Ru/lOhWmH36zYQwUBaKIChHXe66KdJXDF+lRUaFhD1cR5NBCOFR983xzrvTJtGp0GWoYbILd1Q=="; }; }; "@cnakazawa/watch-1.0.4" = { @@ -2731,13 +2767,13 @@ let sha512 = "WOHfjwMuLbo76khDsDa1lJvP/dXcwXVwonWwfUFRt82BL/GtyMalh1HEtCWwKDuK/9f8PCEt/EZMkHT3D5ZV3w=="; }; }; - "@cspell/dict-elixir-2.0.0" = { + "@cspell/dict-elixir-2.0.1" = { name = "_at_cspell_slash_dict-elixir"; packageName = "@cspell/dict-elixir"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-2.0.0.tgz"; - sha512 = "NeDObcqiYuqWRrzMAQLZDSrZlChTEZwTA2zHdI2nPtpeDl4FQcTz2BHP8zVt6Lj6G2QHJmNGmQtSmDguX86NYA=="; + url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-2.0.1.tgz"; + sha512 = "eTTTxZt1FqGkM780yFDxsGHvTbWqvlK8YISSccK8FyrB6ULW+uflQlNS5AnWg3uWKC48b7pQott+odYCsPJ+Ow=="; }; }; "@cspell/dict-en-gb-1.1.33" = { @@ -2920,13 +2956,13 @@ let sha512 = "Rp3d4sgD6izW9TW5yVI3D//3HTl9oOGBuzTvXRdoHksVPRvzIu2liVhj8MnQ3XIRe5Kc6IhLBAm6izuV2BpGwQ=="; }; }; - "@cspell/dict-ruby-2.0.0" = { + "@cspell/dict-ruby-2.0.1" = { name = "_at_cspell_slash_dict-ruby"; packageName = "@cspell/dict-ruby"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.0.tgz"; - sha512 = "ux73GEIZrApxIG/BDnpdxWE7r9TY3n+3HFAEp+LDJjSjpwpn2VXopd7GsjwsvmlAv5F3Jch8tzgzujFZkvqdoA=="; + url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.1.tgz"; + sha512 = "qGqhYfFeoBOashv/l0Kj5o4ilyvfq0s+t+r32juPOkOnbHz+hzxnJo2tMMg/L/UdjVV7Y8ovg4LDBC/seVrMYQ=="; }; }; "@cspell/dict-rust-2.0.0" = { @@ -2947,13 +2983,13 @@ let sha512 = "MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g=="; }; }; - "@cspell/dict-software-terms-2.1.1" = { + "@cspell/dict-software-terms-2.1.3" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.1.1.tgz"; - sha512 = "PmmqysKSvNwksjEfXrzD1wEVvctR6qppxDhwNc4IQQjwpjmtN8e+8HiXxIbCsBcll1rO0vOmnhpXUdl+d9apXQ=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.1.3.tgz"; + sha512 = "JmMfRa9Xl0MCD/z5gYUnY05BNxSMnx25Ky6kO/Cs0gBYZZdYzHZNqrbfnqBMsB9PpOzn2uqrYUmAEusoI1WyMQ=="; }; }; "@cspell/dict-swift-1.0.2" = { @@ -3100,13 +3136,13 @@ let sha512 = "HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g=="; }; }; - "@discoveryjs/json-ext-0.5.6" = { + "@discoveryjs/json-ext-0.5.7" = { name = "_at_discoveryjs_slash_json-ext"; packageName = "@discoveryjs/json-ext"; - version = "0.5.6"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz"; - sha512 = "ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA=="; + url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"; + sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; }; }; "@electron-forge/async-ora-6.0.0-beta.63" = { @@ -3370,13 +3406,22 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@eslint/eslintrc-1.1.0" = { + "@eslint/eslintrc-1.2.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.1.0"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz"; + sha512 = "igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w=="; + }; + }; + "@eslint/eslintrc-1.2.1" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.1.0.tgz"; - sha512 = "C1DfL7XX4nPqGd6jcP01W9pVM1HYCuUkFk1432D7F0v3JSlUIeOYn9oCoi3eoLZ+iwBSb29BMFxxny0YrrEZqg=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz"; + sha512 = "bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ=="; }; }; "@exodus/schemasafe-1.0.0-rc.6" = { @@ -3406,22 +3451,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-6.0.18" = { + "@expo/config-6.0.19" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "6.0.18"; + version = "6.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-6.0.18.tgz"; - sha512 = "60z0YICI9eJWlvajl/Wgq8+lKm0jfkZOMdATDQtWz6GvWshUxd+A8EYhtgjJ9eWMGqOYkwrCpRNLHz5TZtCKWA=="; + url = "https://registry.npmjs.org/@expo/config/-/config-6.0.19.tgz"; + sha512 = "UkLnnKnt4zP382K7s0UDnUNY646Gdw8PoDWnxaIGAL515R9IX8oWef7+7hX/dZMi27d/WLJPmWNRYsEL8Q/3rw=="; }; }; - "@expo/config-plugins-4.0.18" = { + "@expo/config-plugins-4.1.0" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "4.0.18"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.0.18.tgz"; - sha512 = "tW4bnrnKhn+PPHF8wf1KAoubICAVUHW8CcagvyFqaRIzeh6yavMIOsQShxOVTbgx7LzSyymZ1nEs45yCGAiMfA=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.1.0.tgz"; + sha512 = "+Uq7kzi1StUZZZivnnqNV6+v8b+SMF6MDgH+cEZxCoM9uwLXOK0rTAURzBGtl+C6EEbKnoZmnKGuzABBGPRP7A=="; }; }; "@expo/config-types-44.0.0" = { @@ -3433,22 +3478,22 @@ let sha512 = "d+gpdKOAhqaD5RmcMzGgKzNtvE1w+GCqpFQNSXLliYlXjj+Tv0eL8EPeAdPtvke0vowpPFwd5McXLA90dgY6Jg=="; }; }; - "@expo/dev-server-0.1.105" = { + "@expo/dev-server-0.1.106" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.105"; + version = "0.1.106"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.105.tgz"; - sha512 = "Glw+826+4eS3zCXAEg5ruQVK3fCk+aT5BG+AiOYW5Dzb6EmRVYcbkK93ZdXloiqarflum9bQY+rogItB0hjjrw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.106.tgz"; + sha512 = "MEB5YuOkew2O4K3GTDLHS1PT/Ca7B/tGx4J+eH74QK6051PlmrikPA5/buuZd23ww/cmOAAKBw509agcbrpajg=="; }; }; - "@expo/dev-tools-0.13.145" = { + "@expo/dev-tools-0.13.146" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.145"; + version = "0.13.146"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.145.tgz"; - sha512 = "GtqnA9rmmSqCrv893MWbzbAoDZnYaSXe4kKQ57tCWYeSTOKav74ofvZlUZalosPuPjE9yuMA47rH9XJY0YgC1g=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.146.tgz"; + sha512 = "3bZe8He2uLha2SY1vOp2YnwtuXDHXodQwdkYdN/IL6XBveIKaBR9HDhBg/kBvI+/aNcut6ymwSSo9IOEmvUk5g=="; }; }; "@expo/devcert-1.0.0" = { @@ -3478,13 +3523,13 @@ let sha512 = "ZxtBodAZGxdLtgKzmsC+8ViUxt1mhFW642Clu2OuG3f6PAyAFsU/SqEGag9wKFaD3x3Wt8VhL+3y5fMJmUFgPw=="; }; }; - "@expo/metro-config-0.3.11" = { + "@expo/metro-config-0.3.12" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.3.11"; + version = "0.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.11.tgz"; - sha512 = "F0Oe3JbRjbPA7LvZW969/6PTn7EXvXaudJq4fL8Fs4xfLgNHFv+t+NvlnoTj+y8IyY3z2jOfJkwpq64rzhx+6g=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.12.tgz"; + sha512 = "8cvsMMe68BfZqNYIXeYDVtf6ijEHmJ27llhFKFwS8XZwKaqcfSLRANK8I8xxTc00tzXaWyE1BKJIY6DMq/gbJA=="; }; }; "@expo/osascript-2.0.31" = { @@ -3514,13 +3559,13 @@ let sha512 = "5Ul3d/YOYE6mfum0jCE25XUnkKHZ5vGlU/X2275ZmCtGrpRn1Fl8Nq+jQKSaks3NqTfxdyXROi/TgH8Zxeg2wg=="; }; }; - "@expo/prebuild-config-3.0.18" = { + "@expo/prebuild-config-3.1.0" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "3.0.18"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.0.18.tgz"; - sha512 = "Eyb+HJCsxYba2sWlDi3rqXWQ3jDjN41rSiYmvApY121Zqdrrj/384ntHZh6cbz0LWPeHXjPZBM3SDbK0ri9FTw=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.1.0.tgz"; + sha512 = "Vwz2L3brsrvLVDBXj2gcB2QfeyAPKxa7rCOSFnPhyHf2qpxtmncv9IVrSdkHyWlPW7KmFVfiRsT3/nHXoataqQ=="; }; }; "@expo/rudder-sdk-node-1.1.1" = { @@ -3559,13 +3604,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.16.18" = { + "@expo/webpack-config-0.16.19" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.16.18"; + version = "0.16.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.18.tgz"; - sha512 = "zANXNW68EzQ5Q8FyEmfZz1z7050yOaqJOpByWOLJ3NE1TRzflyzjt55OXsggPxBz2wpmikq/NjlZuF92e18UGw=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.19.tgz"; + sha512 = "VB8QNJ4Kvt46cy/y+AbBrJViOH2QY+AEfELNZRDifokZg0wPauxQCz/3Dk7qQnjLYsVOszoH7AtgfOdy/5NSjg=="; }; }; "@expo/xcpretty-4.1.0" = { @@ -3595,67 +3640,130 @@ let sha512 = "uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA=="; }; }; - "@fluentui/date-time-utilities-7.9.1" = { + "@fluentui/date-time-utilities-8.4.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.9.1"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.9.1.tgz"; - sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.4.0.tgz"; + sha512 = "fEc8JMG0Y21De6kjD5xfP/ix7y3u0zbFTKgNWNASGpIYsZKXbJqeu8/DEqnc4x9Lf5pxiV+WhNcoMLbtjKTpmg=="; }; }; - "@fluentui/dom-utilities-1.1.2" = { + "@fluentui/dom-utilities-2.2.0" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "1.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.2.tgz"; - sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.0.tgz"; + sha512 = "M4SmXu428wwQLu1iw6ST07iACjdKY5HiU+xpcgD3IQMMQazgN616GDzc6KZ1ebuBsF7B4TyQS7KZh9mfxnnldg=="; }; }; - "@fluentui/keyboard-key-0.2.17" = { + "@fluentui/font-icons-mdl2-8.2.4" = { + name = "_at_fluentui_slash_font-icons-mdl2"; + packageName = "@fluentui/font-icons-mdl2"; + version = "8.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.2.4.tgz"; + sha512 = "Qep23/wpAwONuX0NSQa0D6RbGbEJQBjGMLdV4Qp6h4NKIGELsKJ1xEIa5ZCD68LzQHJsVtXDtOnSWi57Ug/P1A=="; + }; + }; + "@fluentui/foundation-legacy-8.2.4" = { + name = "_at_fluentui_slash_foundation-legacy"; + packageName = "@fluentui/foundation-legacy"; + version = "8.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.4.tgz"; + sha512 = "3pBUhKxkfJiRmTcTkkv/QvvF4it4hng7xx5GqcOD7WDzCVXUBTdWCbK/41kCOrTV8kfpu7hzJReCwZeBLlymuQ=="; + }; + }; + "@fluentui/keyboard-key-0.4.0" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.17"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.4.0.tgz"; + sha512 = "2jcD23FzOPaSXqWtfOSCzopkKtxTXUFuHZyVt4aqVRDEjPbkQ/7p37O1WL95xweWTR/9fEPO/gPtv9kOnXrJcA=="; + }; + }; + "@fluentui/merge-styles-8.5.0" = { + name = "_at_fluentui_slash_merge-styles"; + packageName = "@fluentui/merge-styles"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.17.tgz"; - sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.0.tgz"; + sha512 = "+WoaAaoYx/wfkrz1Ag40JqHvDUFfQcg+dQ3jaEOoau16y7EZGIe7oN8WYIXNMgWuMxH7r1QlanFbQZ+ziKjHmw=="; }; }; - "@fluentui/react-7.183.1" = { + "@fluentui/react-8.60.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.183.1"; + version = "8.60.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.183.1.tgz"; - sha512 = "skyvnVfsy/pJWJf1Tksa2lf+gNHFQFVOwM95Z+or+auGPfdpxKUN0nHbCnqyMLYoKdmKEUyciUzrQ2LxMOcU0A=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.60.3.tgz"; + sha512 = "KLxnvgz1+BvP4csqhShrdAxg7I9GXNcrhESgbEUoR5ILeK6O62/q8ElWWQzKqR9WQ6PKeSp9f2S3Ucdfpc6WiA=="; }; }; - "@fluentui/react-focus-7.18.2" = { + "@fluentui/react-focus-8.5.4" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.18.2"; + version = "8.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.5.4.tgz"; + sha512 = "SjCz1IJn1T6a6o6xcaEPd5Hou9B3QbpheHNxKWOJSQHG6wazwnHJRhNyTcgiX5+D1KEbnO757EoyOoxIVsnENQ=="; + }; + }; + "@fluentui/react-hooks-8.5.2" = { + name = "_at_fluentui_slash_react-hooks"; + packageName = "@fluentui/react-hooks"; + version = "8.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.18.2.tgz"; - sha512 = "Pwk5TVIfannsSZI540ytvQxJCFi5Qgp54QqKbouv9+jUTtgiNRh5VcEkkhT+NKmtlAKhwPi77bU8WQRGRPV61w=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.5.2.tgz"; + sha512 = "YqyLDa/1SbQSrfGQ+nBUvQYJo2wOWGDAhQbdWTwQGjG7jEmRfmScqMY+KJGjM/Gisn6v8CG5d1duSZLmbm0syA=="; }; }; - "@fluentui/react-window-provider-1.0.2" = { + "@fluentui/react-window-provider-2.2.0" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "1.0.2"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.0.tgz"; + sha512 = "1iZzfVQHZQn6IJSJD1pxnXi5H8T3vrZYi9aqKyVIPZ12DCTVE2gw8W3mnOjsfVuXMGdv1sA7dgd6v4xi9erBow=="; + }; + }; + "@fluentui/set-version-8.2.0" = { + name = "_at_fluentui_slash_set-version"; + packageName = "@fluentui/set-version"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.0.tgz"; + sha512 = "bqjpfhqaIkBy16vdYzdc7tER9Td7BTcmC+kCXuqkHOQVuG9LJfqVGRV0DA857KLhOxiy0GXwKMeDbNV5jJf6qQ=="; + }; + }; + "@fluentui/style-utilities-8.6.4" = { + name = "_at_fluentui_slash_style-utilities"; + packageName = "@fluentui/style-utilities"; + version = "8.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.2.tgz"; - sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.6.4.tgz"; + sha512 = "jWG5zq7nc37Q6O1LzaoU2U8Ki4Xo5ySm3d5uzefDsEIQpK9E22c1mpUI3hDWwWKILxF3S3dYkHNqbsGH72JYaw=="; }; }; - "@fluentui/theme-1.7.4" = { + "@fluentui/theme-2.6.3" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.7.4"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.4.tgz"; - sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.3.tgz"; + sha512 = "fqqRDnbbPjSbY8PdbsSJMYidhFdjdSoYuDab5n8yiePEHyWQ5OcQFkf1j6V7dg+2fZvW3XTWWSQEboQl+kTdNQ=="; + }; + }; + "@fluentui/utilities-8.8.0" = { + name = "_at_fluentui_slash_utilities"; + packageName = "@fluentui/utilities"; + version = "8.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.8.0.tgz"; + sha512 = "IwKN9ZkYMJApzcvJUlJd4ZURJCMwZG8FNsep05GAcDzynZygvH2Y1ECpIFn9VTSsrKxMKYFIQ61Rwg+AW/eBcw=="; }; }; "@gar/promisify-1.1.3" = { @@ -3775,13 +3883,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.3.1" = { + "@graphql-tools/batch-execute-8.3.2" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.3.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.3.1.tgz"; - sha512 = "63kHY8ZdoO5FoeDXYHnAak1R3ysMViMPwWC2XUblFckuVLMUPmB2ONje8rjr2CvzWBHAW8c1Zsex+U3xhKtGIA=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.3.2.tgz"; + sha512 = "ICWqM+MvEkIPHm18Q0cmkvm134zeQMomBKmTRxyxMNhL/ouz6Nqld52/brSlaHnzA3fczupeRJzZ0YatruGBcQ=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -3793,13 +3901,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-8.5.0" = { + "@graphql-tools/delegate-8.5.2" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "8.5.0"; + version = "8.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.5.0.tgz"; - sha512 = "P2LLahWpv8eFrqXQi9v/NDLxLBKAugd3rmB8lxeTnCqma19ZM/VaSpvGAgGyjjHKQe097mAeBEkM/7uYbG/NFg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.5.2.tgz"; + sha512 = "M7d1jY4orPUC7MBoSKZEP21HTVqVGX+mS0AL6UGxg1L7GCRtaYQeopyKXmnnEmBi5FNZ9KduJgHRtxkS4Hc6uA=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -3811,22 +3919,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.3.3" = { + "@graphql-tools/graphql-file-loader-7.3.4" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.3.tgz"; - sha512 = "6kUJZiNpYKVhum9E5wfl5PyLLupEDYdH7c8l6oMrk6c7EPEVs6iSUyB7yQoWrtJccJLULBW2CRQ5IHp5JYK0mA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.4.tgz"; + sha512 = "Q0/YtDq0APR6syRclsQMNguWKRlchd8nFTOpLhfc7Xeiy21VhEEi4Ik+quRySfb7ubDfJGhiUq4MQW43FhWJvg=="; }; }; - "@graphql-tools/import-6.6.5" = { + "@graphql-tools/import-6.6.6" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.6.5"; + version = "6.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.5.tgz"; - sha512 = "w0/cYuhrr2apn+iGoTToCqt65x2NN2iHQyqRNk/Zw1NJ+e8/C3eKVw0jmW4pYQvSocuPxL4UCSI56SdKO7m3+Q=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.6.tgz"; + sha512 = "a0aVajxqu1MsL8EwavA44Osw20lBOIhq8IM2ZIHFPP62cPAcOB26P+Sq57DHMsSyX5YQ0ab9XPM2o4e1dQhs0w=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -3838,13 +3946,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.3.3" = { + "@graphql-tools/json-file-loader-7.3.4" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.3.tgz"; - sha512 = "CN2Qk9rt+Gepa3rb3X/mpxYA5MIYLwZBPj2Njw6lbZ6AaxG+O1ArDCL5ACoiWiBimn1FCOM778uhRM9znd0b3Q=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.4.tgz"; + sha512 = "1AROMFh8Lyorf2gTWXgVaUbU3ic84gzAgpRmJCsCla/Nnvn6JiCs4aWHsalk4ZWVXCaK04c8gk8Px1uNQUj02Q=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -3856,13 +3964,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.5.1" = { + "@graphql-tools/load-7.5.2" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.5.1"; + version = "7.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.1.tgz"; - sha512 = "j9XcLYZPZdl/TzzqA83qveJmwcCxgGizt5L1+C1/Z68brTEmQHLdQCOR3Ma3ewESJt6DU05kSTu2raKaunkjRg=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.2.tgz"; + sha512 = "URPqVP77mYxdZxT895DzrWf2C23S3yC/oAmXD4D4YlxR5eVVH/fxu0aZR78WcEKF331fWSiFwWy9j7BZWvkj7g=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -3874,13 +3982,13 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.2.2" = { + "@graphql-tools/merge-8.2.3" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.2.2"; + version = "8.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.2.tgz"; - sha512 = "2DyqhIOMUMKbCPqo8p6xSdll2OBcBxGdOrxlJJlFQvinsSaYqp/ct3dhAxNtzaIcvSVgXvttQqfD7O2ziFtE7Q=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.3.tgz"; + sha512 = "XCSmL6/Xg8259OTWNp69B57CPWiVL69kB7pposFrufG/zaAlI9BS68dgzrxmmSqZV5ZHU4r/6Tbf6fwnEJGiSw=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -3892,13 +4000,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.3.1" = { + "@graphql-tools/schema-8.3.2" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.3.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.1.tgz"; - sha512 = "3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.2.tgz"; + sha512 = "77feSmIuHdoxMXRbRyxE8rEziKesd/AcqKV6fmxe7Zt+PgIQITxNDew2XJJg7qFTMNM43W77Ia6njUSBxNOkwg=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -3910,13 +4018,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.7.1" = { + "@graphql-tools/url-loader-7.9.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.7.1"; + version = "7.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.7.1.tgz"; - sha512 = "K/5amdeHtKYI976HVd/AXdSNvLL7vx5QVjMlwN0OHeYyxSgC+UOH+KkS7cshYgL13SekGu0Mxbg9ABfgQ34ECA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.1.tgz"; + sha512 = "UYKc0f8jw+MODDb79XKOG8wyvRCG/7KBYtRUfUKed4LBjftjZfF5VovAbF3axiTuzt2FSyPRu8YMEQ7kypkc8g=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -3946,13 +4054,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.6.1" = { + "@graphql-tools/utils-8.6.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.6.1"; + version = "8.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.1.tgz"; - sha512 = "uxcfHCocp4ENoIiovPxUWZEHOnbXqj3ekWc0rm7fUhW93a1xheARNHcNKhwMTR+UKXVJbTFQdGI1Rl5XdyvDBg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.2.tgz"; + sha512 = "x1DG0cJgpJtImUlNE780B/dfp8pxvVxOD6UeykFH5rHes26S4kGokbgU8F1IgrJ1vAPm/OVBHtd2kicTsPfwdA=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -3964,13 +4072,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-8.4.0" = { + "@graphql-tools/wrap-8.4.3" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "8.4.0"; + version = "8.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.0.tgz"; - sha512 = "fPB3+UnxLIPWDfMvAfBQnGmm8rrejeQjmCy7h9avWHBbkEELcvtrSWnKAvoKowe+WR9PVDM15XQ/PQvcddV0kQ=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.3.tgz"; + sha512 = "2bd3GtlqV72idEphLTM8SRiSxEDrMPGE556faW8N5Q2qK7qlCEu9AQK0HNKWKdtEPTHqahndZtIPcdpNN6xGig=="; }; }; "@grpc/grpc-js-1.4.4" = { @@ -3982,24 +4090,6 @@ let sha512 = "a6222b7Dl6fIlMgzVl7e+NiRoLiZFbpcwvBH2Oli56Bn7W4/3Ld+86hK4ffPn5rx2DlDidmIcvIJiOQXyhv9gA=="; }; }; - "@grpc/grpc-js-1.5.1" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.1.tgz"; - sha512 = "ItOqQ4ff7JrR9W6KDQm+LdsVjuZtV7Qq64Oy3Hjx8ZPBDDwBx7rD8hOL0Vnde0RbnsqLG86WOgF+tQDzf/nSzQ=="; - }; - }; - "@grpc/grpc-js-1.5.3" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.3.tgz"; - sha512 = "q0xgaZ3ymUM+ZOhe1hdocVSdKHCnJ6llLSXcP+MqMXMyYPUZ3mzQOCxZ3Zkg+QZ7sZ950sn7hvueQrIJZumPZg=="; - }; - }; "@grpc/grpc-js-1.5.4" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -4018,6 +4108,15 @@ let sha512 = "FTd27ItHlsSG/7hp62xgI9YnqSwRbHRSVmDVR8DwOoC+6t8JhHRXe2JL0U8N9GLc0jS0HrtEbO/KP5+G0ebjLQ=="; }; }; + "@grpc/grpc-js-1.5.7" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.7.tgz"; + sha512 = "RAlSbZ9LXo0wNoHKeUlwP9dtGgVBDUbnBKFpfAv5iSqMG4qWz9um2yLH215+Wow1I48etIa1QMS+WAGmsE/7HQ=="; + }; + }; "@grpc/proto-loader-0.6.6" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -4036,13 +4135,13 @@ let sha512 = "UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg=="; }; }; - "@gulp-sourcemaps/identity-map-1.0.2" = { + "@gulp-sourcemaps/identity-map-2.0.1" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz"; - sha512 = "ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ=="; + url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz"; + sha512 = "Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q=="; }; }; "@gulp-sourcemaps/map-sources-1.0.0" = { @@ -4063,6 +4162,33 @@ let sha512 = "maIyMJtYjA5e/R9nyA22Qd7Yw73MBSxClJvle0a8XWAS/5l6shc/OFpQqrmwMy4IXUCmywJ9ER0gOGz/YA720w=="; }; }; + "@hapi/address-2.1.4" = { + name = "_at_hapi_slash_address"; + packageName = "@hapi/address"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; + sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; + }; + }; + "@hapi/bourne-1.3.2" = { + name = "_at_hapi_slash_bourne"; + packageName = "@hapi/bourne"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; + sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; + }; + }; + "@hapi/hoek-8.5.1" = { + name = "_at_hapi_slash_hoek"; + packageName = "@hapi/hoek"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; + }; + }; "@hapi/hoek-9.2.1" = { name = "_at_hapi_slash_hoek"; packageName = "@hapi/hoek"; @@ -4072,6 +4198,24 @@ let sha512 = "gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw=="; }; }; + "@hapi/joi-15.1.1" = { + name = "_at_hapi_slash_joi"; + packageName = "@hapi/joi"; + version = "15.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; + sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; + }; + }; + "@hapi/topo-3.1.6" = { + name = "_at_hapi_slash_topo"; + packageName = "@hapi/topo"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; + sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; + }; + }; "@hapi/topo-5.1.0" = { name = "_at_hapi_slash_topo"; packageName = "@hapi/topo"; @@ -4108,13 +4252,13 @@ let sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; }; }; - "@humanwhocodes/config-array-0.9.3" = { + "@humanwhocodes/config-array-0.9.5" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.9.3"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz"; - sha512 = "3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ=="; + 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" = { @@ -4216,6 +4360,15 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; + "@intervolga/optimize-cssnano-plugin-1.0.6" = { + name = "_at_intervolga_slash_optimize-cssnano-plugin"; + packageName = "@intervolga/optimize-cssnano-plugin"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz"; + sha512 = "zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA=="; + }; + }; "@ionic/cli-framework-3.0.6" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; @@ -4513,22 +4666,22 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/check-node-1.54.0" = { + "@jsii/check-node-1.55.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.54.0.tgz"; - sha512 = "pogNR1vgiXgBK2DQF+RsCnJQ9QPe+y7lyoRlsTtUplIFB6ryWnSsmCyzkInSVoKAKCo5CHkuDy190MbYL4Ns4Q=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.55.0.tgz"; + sha512 = "vfBW/3ptY3emiBVrwk7ySwGyzOvwLxb66FMNTzyslYegH9RvIwE+UY8kC87zscuZSDOCwINwgD0KdqrrfnR5yg=="; }; }; - "@jsii/spec-1.54.0" = { + "@jsii/spec-1.55.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.54.0.tgz"; - sha512 = "IOspxWPC26+Re6DNJvaxCEkG1BYByiGSPlRxQpIpts+Hx2EZgAvuG+8rQoryNt7JqaAKpcJ6W3OdRmSw3x5Yrg=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.55.0.tgz"; + sha512 = "MsmAmi9+2s8p5jSypYFDTufkO2iAUWK7Ngq+btGDM6bMyQgqInMKNQcPcZAgWuwUCOU0ne/oYMVIbCR2njjAGA=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -5386,6 +5539,15 @@ let sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; }; }; + "@mdi/font-6.5.95" = { + name = "_at_mdi_slash_font"; + packageName = "@mdi/font"; + version = "6.5.95"; + src = fetchurl { + url = "https://registry.npmjs.org/@mdi/font/-/font-6.5.95.tgz"; + sha512 = "ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg=="; + }; + }; "@mdn/browser-compat-data-4.1.6" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; @@ -5602,13 +5764,13 @@ let sha512 = "BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg=="; }; }; - "@nestjs/schematics-8.0.6" = { + "@nestjs/schematics-8.0.8" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "8.0.6"; + version = "8.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.6.tgz"; - sha512 = "IgWuplXg3I+2lzQqy5jR45C+EpBiOuPQwh8zWCjlQDYU9/X/2a8B8byJXw3nuguZS/huuuXx3ZhfHJKQYk6uIA=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.8.tgz"; + sha512 = "xIIb5YnMQN/OJQ68+MCapy2bXvTxSWgINoqQbyZWkLL/yTIuROvZCdtV850NPGyr7f7l93VBP0ZPitbFIexy3Q=="; }; }; "@netflix/nerror-1.1.3" = { @@ -5674,6 +5836,132 @@ let sha512 = "tUGLGj3fTgOjWwhp9uK6M+LUb3rxIrU61DbA0fVpANCEeqk5UNJpje4vOag9dWmJS7hn/ONcDK7dslHLyOQUIQ=="; }; }; + "@node-rs/crc32-1.5.0" = { + name = "_at_node-rs_slash_crc32"; + packageName = "@node-rs/crc32"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32/-/crc32-1.5.0.tgz"; + sha512 = "TLVm7FR1QAjXlXkss3HSx3BG/CvVwl4NVEL/qLAgossq4FQsybkvt0RCISrkI3j5fI30gPaGI/qwHn8xkLctow=="; + }; + }; + "@node-rs/crc32-android-arm-eabi-1.5.0" = { + name = "_at_node-rs_slash_crc32-android-arm-eabi"; + packageName = "@node-rs/crc32-android-arm-eabi"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm-eabi/-/crc32-android-arm-eabi-1.5.0.tgz"; + sha512 = "Si3YKPAkT9IW2ZJfmFQg+9KJWDNgykk1vgybYljR3TJg9WzlrJQvPmJFsZ/Ci+79Htsb8a4auavBbmIkj+JpVQ=="; + }; + }; + "@node-rs/crc32-android-arm64-1.5.0" = { + name = "_at_node-rs_slash_crc32-android-arm64"; + packageName = "@node-rs/crc32-android-arm64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm64/-/crc32-android-arm64-1.5.0.tgz"; + sha512 = "2uJD7muLg6wXjPhcuuS+HZBgXGX8HsxJzDjVoe51uAoGx+Az0hyH2I6p/ObOIYzcW4xFML0rzlYM9XkMglJhfw=="; + }; + }; + "@node-rs/crc32-darwin-arm64-1.5.0" = { + name = "_at_node-rs_slash_crc32-darwin-arm64"; + packageName = "@node-rs/crc32-darwin-arm64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-arm64/-/crc32-darwin-arm64-1.5.0.tgz"; + sha512 = "E3dWA/fKu7FeDGBYB20/YEz28Fw/8sj4iuXgE4n1aoh8994AdbXdsJlmNip6/AkcEynC8Q9RdPS4HdfM7kBPiw=="; + }; + }; + "@node-rs/crc32-darwin-x64-1.5.0" = { + name = "_at_node-rs_slash_crc32-darwin-x64"; + packageName = "@node-rs/crc32-darwin-x64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-x64/-/crc32-darwin-x64-1.5.0.tgz"; + sha512 = "YjQ6y/3L1D2kOrNguB42sPf6HdEkqXcL2jxJ41QOfuIRV18lp7/5sM9OWRdjmLpQUUvmpqSSWxZFQ/2P/35EXw=="; + }; + }; + "@node-rs/crc32-freebsd-x64-1.5.0" = { + name = "_at_node-rs_slash_crc32-freebsd-x64"; + packageName = "@node-rs/crc32-freebsd-x64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-freebsd-x64/-/crc32-freebsd-x64-1.5.0.tgz"; + sha512 = "K+HfvordJrw0xkht9wElxIHGDm5qodOVzNa95I7ZW8BktHWC2QmPkcYRotrDnZLaOs8NfA0xWGiqp/ncAJ3XOw=="; + }; + }; + "@node-rs/crc32-linux-arm-gnueabihf-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm-gnueabihf"; + packageName = "@node-rs/crc32-linux-arm-gnueabihf"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm-gnueabihf/-/crc32-linux-arm-gnueabihf-1.5.0.tgz"; + sha512 = "MFwJlcIAmgtnWAluthAY2gyTbKIu5/+6PUSlOZ4xlSZIddb3ra3M/AQ0BkDSvEoDeQQ5ZdkcnVWzpqoCdUOe4Q=="; + }; + }; + "@node-rs/crc32-linux-arm64-gnu-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm64-gnu"; + packageName = "@node-rs/crc32-linux-arm64-gnu"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-gnu/-/crc32-linux-arm64-gnu-1.5.0.tgz"; + sha512 = "7JYsJXRUE6yrK/mt7uLX91ARLS3HOCggTSGD3Kw52lhJRPXTyJVVIhuLj8/neW8ENTgH3zgpQdeId0sKQtKrDg=="; + }; + }; + "@node-rs/crc32-linux-arm64-musl-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm64-musl"; + packageName = "@node-rs/crc32-linux-arm64-musl"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-musl/-/crc32-linux-arm64-musl-1.5.0.tgz"; + sha512 = "irOtNHrizI8toVCX92o/3FIIfz4O+Z5qiSlIwH3PxsOoak0mz6uEInYwPVnDDKfAYzCUA0oxcGV2QIR1uYpCKQ=="; + }; + }; + "@node-rs/crc32-linux-x64-gnu-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-x64-gnu"; + packageName = "@node-rs/crc32-linux-x64-gnu"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-gnu/-/crc32-linux-x64-gnu-1.5.0.tgz"; + sha512 = "KOevSXLbgs2htznP8jlsN6tZ4kmpGloBj00lo4X4H4Lm6eKeWyG9txbCGD0yK4ZX/XhrL6Qs4VIMCaVFpxFIsw=="; + }; + }; + "@node-rs/crc32-linux-x64-musl-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-x64-musl"; + packageName = "@node-rs/crc32-linux-x64-musl"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-musl/-/crc32-linux-x64-musl-1.5.0.tgz"; + sha512 = "e6ivD6MWVMp/FP6VVq3EBjiBXKN/qBsTn8bOsHtIf+Et6dEkITbEk26m5+w9TFHIHKJGvwytH7+RigK7N7o5VQ=="; + }; + }; + "@node-rs/crc32-win32-arm64-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-arm64-msvc"; + packageName = "@node-rs/crc32-win32-arm64-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-arm64-msvc/-/crc32-win32-arm64-msvc-1.5.0.tgz"; + sha512 = "PTvfUb08MAdQ0hab5OxXBauPocP09SG2rShRjwtmyRnze+Nd5JHJcsj5O0WhX/DCu8acK1sS0Q0Np3b1lIbwkg=="; + }; + }; + "@node-rs/crc32-win32-ia32-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-ia32-msvc"; + packageName = "@node-rs/crc32-win32-ia32-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-ia32-msvc/-/crc32-win32-ia32-msvc-1.5.0.tgz"; + sha512 = "+fUiXIUddPgoxPcBA4lpG7fQQgJGEkinnS1ne3+pySu1Z2Ej4vJFS5aJyKc56+1IV9ztrXo2H+b3r0IdnLvy7w=="; + }; + }; + "@node-rs/crc32-win32-x64-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-x64-msvc"; + packageName = "@node-rs/crc32-win32-x64-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-x64-msvc/-/crc32-win32-x64-msvc-1.5.0.tgz"; + sha512 = "FvgItAuN6eRHZDAPVlBZbzQjiRO0DFFFLgy2KFUjx+vLx20Auf5Hi0/D+dFLmH9jdESaoZqwZC5FpB7nfit1lQ=="; + }; + }; "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; @@ -5764,13 +6052,13 @@ let sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; - "@npmcli/map-workspaces-2.0.1" = { + "@npmcli/map-workspaces-2.0.2" = { name = "_at_npmcli_slash_map-workspaces"; packageName = "@npmcli/map-workspaces"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.1.tgz"; - sha512 = "awwkB/tSWWaCD8F0IbawBdmoPFlbXMaEPN9LyTuJcyJz404/QhB4B/vhQntpk6uxOAkM+bxR7qWMJghYg0tcYQ=="; + url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.2.tgz"; + sha512 = "ED54EslGsHFWBPN5x8JAOszuWywuoXYSi9E3HQRsgVkWnqsdTBJDSM4IFMRwmmBUbCHAxmP3wGLu1WMm4fhrOw=="; }; }; "@npmcli/metavuln-calculator-2.0.0" = { @@ -5845,6 +6133,15 @@ let sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig=="; }; }; + "@npmcli/run-script-3.0.1" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.1.tgz"; + sha512 = "o2fkld5hYwu9sKYzoXTpqEocMnDLaigobaPzLaGB63k/ExmLBTaB+KpfKlpcIePPnuP8RFR+0GDI4KopJCM6Xg=="; + }; + }; "@oclif/command-1.8.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; @@ -5926,13 +6223,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.6" = { + "@oclif/parser-3.8.7" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.6.tgz"; - sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz"; + sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q=="; }; }; "@oclif/plugin-autocomplete-0.1.5" = { @@ -6070,13 +6367,13 @@ let sha512 = "r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ=="; }; }; - "@octokit/plugin-throttling-3.5.2" = { + "@octokit/plugin-throttling-3.6.1" = { name = "_at_octokit_slash_plugin-throttling"; packageName = "@octokit/plugin-throttling"; - version = "3.5.2"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.5.2.tgz"; - sha512 = "Eu7kfJxU8vmHqWGNszWpg+GVp2tnAfax3XQV5CkYPEE69C+KvInJXW9WajgSeW+cxYe0UVdouzCtcreGNuJo7A=="; + url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.6.1.tgz"; + sha512 = "T5DOcDQP0K/Ng5pnOEqCHDFojsftYL5o91MNbbR3nj1yAOACoGj3wDYCx0+5yJkbvRjYUdU0GsUt5/wYBba1cA=="; }; }; "@octokit/request-5.6.3" = { @@ -6160,328 +6457,400 @@ let sha512 = "7XU1sfQ8uCVcXLxtAHA8r3qaLJ2oq7sKtEwzZhzuEXqYmjW+n+J4yM3kNo0HQo3Xp1eUe47UM6Wy6yuAvIyllg=="; }; }; - "@ot-builder/bin-composite-types-1.3.3" = { + "@ot-builder/bin-composite-types-1.4.0" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.3.3.tgz"; - sha512 = "E0l5ixtUowsGzGDP++wMQz64rm8IVCvcIz5NKHtOhs1RIzWT58O5EybSxGBvVBstP2jprMsiGCxjZJ9rhHmrqg=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.4.0.tgz"; + sha512 = "OzEsssOyEKy1setspPKun8E6tlDpFguLQwCAN1iK9HsrJwgK1lqcwA+PDUxwEIcKj6zaSDI9fb53v6WnsSSf5w=="; }; }; - "@ot-builder/bin-util-1.3.3" = { + "@ot-builder/bin-util-1.4.0" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.3.3.tgz"; - sha512 = "76pe9Wz431PyOek445P+j/CwcRJaIZqItLL+oe/HAsWNLeAudh/GF1NdK6jKrjJsGa1sGbJUWuGfklpvY9IoBA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.4.0.tgz"; + sha512 = "5OMGopgGimoKoHjag2YtPeAyGp3JzMaclzoh4Npelj1hNLebWfdmcKdE3zcixk5eMK2KTr1aKZMCvbbIPhUHFw=="; }; }; - "@ot-builder/cli-help-shower-1.3.3" = { + "@ot-builder/cli-help-shower-1.4.0" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.3.3.tgz"; - sha512 = "Judhkaz9m8dsjz/xESy3WJY7xmcnjD40A51Mg8H+EcA+Zyl2PsRguGjeYK5GP0YZpCDq73cPvt9IqXbU74HDKA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.4.0.tgz"; + sha512 = "1tPeg1TGW1EvJhseA0J12tfQhz1R+YocU0/9HpdUiw2Ny9f8KnY/Z4jM+6KrNXPBlqJf3U7h5D/Mqaa+8I6ROw=="; }; }; - "@ot-builder/cli-proc-1.3.3" = { + "@ot-builder/cli-proc-1.4.0" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.3.3.tgz"; - sha512 = "Afd6KU7iarOt8OJYJGWMU9tR2Hm4TCcvRHTq2kJns7rn7leJnJFvteRPLZwBFGIc0qlkeJ/w7uF0YBnnlSLWqw=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.4.0.tgz"; + sha512 = "IiUQNzhV4qWix6cG2gUjyJ0DEiphgOp4sFCNssMy5so1J1635qTYmkodTWgynVKQ31qCiamtS5+WMtNIwjlodg=="; }; }; - "@ot-builder/cli-shared-1.3.3" = { + "@ot-builder/cli-shared-1.4.0" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.3.3.tgz"; - sha512 = "9isYiHmyRNDBhU+Zg55DcHFn/9uzD8O46r3+6BPO8X8YWXp6cOpEKzhgf3yfzCcJxplGrOKoUTR2PWj3TIaO1A=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.4.0.tgz"; + sha512 = "PhYzNdTC5rTpwkT0PFmiWHVkJZBHZN82HPAtsEHyL3nPKK3ygxReNo1FYVQ5DfO9PJE1NxYKv9AqrMAjL1IhNQ=="; }; }; - "@ot-builder/common-impl-1.3.3" = { + "@ot-builder/common-impl-1.4.0" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.3.3.tgz"; - sha512 = "+ijxOzqDER1qC1uC9JwIo5xyoHPB4vdY1YMvqZD+6JLO7AkiUjqqJlihnp1Xq7s0+WpySru45P+2S+ZI6J4X8g=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.4.0.tgz"; + sha512 = "tK6UV2dEkWi4cj7v0miMVhGuHOhcAOoqNkzWoyNgbqevzvftvX+FR2TxDrRgDJ00928yaSpxs5Luk+nLZetDwA=="; }; }; - "@ot-builder/errors-1.3.3" = { + "@ot-builder/errors-1.4.0" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.3.3.tgz"; - sha512 = "i+i1/NFGysYbDeFSwikmbq/HLfpgJ7vXTviJMnZn1/JIYXscfrw01lqYpCnAmKrUXSbYqOc6pKWycS0IIzYEsA=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.4.0.tgz"; + sha512 = "DriKgSnAXxXFynOZHABycRdd42xLc7O45TGusTIo5r9HE8oF24IadBch1MWxQVuJtfakIcjy3lgIYmAjTkxzfw=="; }; }; - "@ot-builder/io-bin-cff-1.3.3" = { + "@ot-builder/io-bin-cff-1.4.0" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.3.3.tgz"; - sha512 = "qcqWuo2WtR+MCFsTS1a0ieLH8+0KUaqpkXbhVha5y1eeKRIYsPaLS5Uj5IAApuLX6F6eZgaKiZkR7CqeBMwIGw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.4.0.tgz"; + sha512 = "4qbs6oCwxdUFJYfnHgoyGRbRmH0if8XfIIbcpqfxaXOdNCI2tE+t49svUNmwwzx/tr3TvGH5Q98fvJghbkBtpg=="; }; }; - "@ot-builder/io-bin-encoding-1.3.3" = { + "@ot-builder/io-bin-encoding-1.4.0" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.3.3.tgz"; - sha512 = "fE+RI5fc1FqXr8q96Ne6x12UStz2m/RjS0PbKO9X5/lxg0JaTKHdtJ65M6RX1kxLUO783P1NlibLliiuXWTg4A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.4.0.tgz"; + sha512 = "7RWM4N5/TjIflBJ5i/Gvbis2A9yAnVPdS/MGJTbgfLQkRKaZPajpf3JlIiV7OSnixm89i3wmspHVeadueqDpMQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.3.3" = { + "@ot-builder/io-bin-ext-private-1.4.0" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.3.3.tgz"; - sha512 = "CyLwG038inIozQtn4bWclc13EWynWALO4LGPcgLMRmD1UsS4LbMRuoGJ02p70+uxsKLaHgA2RjC63g02IbIjmw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.4.0.tgz"; + sha512 = "amQJaRUMhgun9MzhJQkfkwH+P3RidMePeeBcMCexgMweouCcKMuAvju6rZsysybad3V/BdCwEap3wjiqkPQuWQ=="; }; }; - "@ot-builder/io-bin-font-1.3.3" = { + "@ot-builder/io-bin-font-1.4.0" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.3.3.tgz"; - sha512 = "b3aHYfGAwJShZe9mmZAJXFXpklZspUBjf69FuujkbA5teQl7w6GdwXOiwhavtsNwHuNC2We7Oh9wp1vnLSceXA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.4.0.tgz"; + sha512 = "sJ+rMKLH63H6spdsaSdTgYmFBDDoMy22YCINtOEQRmQgbV9nuiElsJr8LSA6LlXN5joQU3y12D2oA2m044y0Uw=="; }; }; - "@ot-builder/io-bin-glyph-store-1.3.3" = { + "@ot-builder/io-bin-glyph-store-1.4.0" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.3.3.tgz"; - sha512 = "yJPth9RyOLvyO/wGm+axfBSOPUqkgiVUeOSMSpLHM+ujhrZXW0OW9Xbxij+9QLsZrxI9mpEWkdWygWWBUceD/Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.4.0.tgz"; + sha512 = "NiQOkjDBQ8SLdX9vVu/9/7/IOowDGEBT/dkM3rzAOGJEj/DxRcWc5uR1z3nE2m/DaGWkTfigV4yk+HO+DQnoog=="; }; }; - "@ot-builder/io-bin-layout-1.3.3" = { + "@ot-builder/io-bin-layout-1.4.0" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.3.3.tgz"; - sha512 = "8fnXYL73O7GsvrQNqDtzbzChGVbyzH6J1a04I+M0H+BUW6u0XY0FJkUtfF68xzju4eyrkOZc/ElDbXouADKWug=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.4.0.tgz"; + sha512 = "rMpXHBYc7rft8HohcZw7OEs1FLphxbQ3UCgltB5PGvBZH7R2nfaYwdzXfXdStHJM0oiI3nx+C7VEl26hAqM6DA=="; }; }; - "@ot-builder/io-bin-metadata-1.3.3" = { + "@ot-builder/io-bin-metadata-1.4.0" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.3.3.tgz"; - sha512 = "onYKN6OrUBclDaZiyhXZhTcSf+KfvqW9lwsEaKyYTh0ZOZ/ButSvwxNtrMjzekGFzK0izIQft3oWhXkUyapnzg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.4.0.tgz"; + sha512 = "2ygSsCMTvjN5+sd//d+lnqmSwTA04yDYCSnYMQy8k37nJk2xo7VsKnKynUBJPmZ2Km70eT+XaYZyxqqQQw4Mew=="; }; }; - "@ot-builder/io-bin-metric-1.3.3" = { + "@ot-builder/io-bin-metric-1.4.0" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.3.3.tgz"; - sha512 = "fngm7u0BSyet87WijLs/TOXF4y/NkadxZK8NWvyRiEC6hU/d20Tfen6eqit+UB3RBBicbZdCjeJvUqTzq2BRhA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.4.0.tgz"; + sha512 = "ysgatN4dr16nYBFv4mAPbcs6DhbuW/roZtJyVFfil0JtmSa1AJfDbkAxLIA0Uuxay1j7d6ynhK4ojRd4C+rcOA=="; }; }; - "@ot-builder/io-bin-name-1.3.3" = { + "@ot-builder/io-bin-name-1.4.0" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.3.3.tgz"; - sha512 = "hWuqZyIdUjfxiVTZ9pa4KZe1srH+88lXkoIGupfz1cibMIM98sgwNkcjT0tjFiyH18SBMQBIxhwmfMRWBj4kKw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.4.0.tgz"; + sha512 = "gNLWNlUeIBDybRjT9lwVavbWrswGQ4ixy/SFuAC2D9qIbJeGxrMF9Bb7yid7+g9Z5CV4cPeoxc9s4GRW0viBOw=="; }; }; - "@ot-builder/io-bin-sfnt-1.3.3" = { + "@ot-builder/io-bin-sfnt-1.4.0" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.3.3.tgz"; - sha512 = "CkXXxwwvxgxHZwYx0Tv7cxcvT8yXCF8MusSV51n9On2h/YB3m/uCevna7/E6Jf5MpzHkyICiWYwe6tV+fv5xXA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.4.0.tgz"; + sha512 = "JsjkrKdMxo93LsNKCaB+ind7tr3kwQz3K/yvLktfteSPKwNkyB1Tl+knwsa3btk/M8v8t3mBazssQz5R2S6+lg=="; }; }; - "@ot-builder/io-bin-ttf-1.3.3" = { + "@ot-builder/io-bin-ttf-1.4.0" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.3.3.tgz"; - sha512 = "8stTcg6ulB5N/I3wXsM2Tq71Xnf13JehvXruwNfroYiNLtiWc8NRGlo/PDRB5xbLURv8QeyP0SxUy0ZV9VGXhQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.4.0.tgz"; + sha512 = "L57uAa6PkuZ5basqRHgV2YIam6oDM3UaelnTrskeiIdWBHuqutK3a8wFvG71fd3zcqITrrKghHIV6GrfgLWYPA=="; }; }; - "@ot-builder/io-bin-vtt-private-1.3.3" = { + "@ot-builder/io-bin-vtt-private-1.4.0" = { name = "_at_ot-builder_slash_io-bin-vtt-private"; packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.3.3.tgz"; - sha512 = "hPAibMtIX1WynkNDME+pWph/lU166XXJPrEkKLZ5kEl9XPbAzk+JS6TKnX38AEqGx5lWlc5Fx26slYyqksR48g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.4.0.tgz"; + sha512 = "lx37kO2n6pP3na+zwnSiqJ1XecI1sfF7nklclg8uoCROE87WbEmDbBzsgkqXBxHYZ3pVj1ZDydih6NaLXJ9w8w=="; }; }; - "@ot-builder/ot-1.3.3" = { + "@ot-builder/ot-1.4.0" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.3.3.tgz"; - sha512 = "e0apRiFxboGKw24eg8uTp0NxkI3KPtNIoztOmJWQTaSXMS78QbzWDAXX8yy94qnL6mu+aN7u1H8f67zNtMH1DA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.4.0.tgz"; + sha512 = "LCJOmacVoVJfeEPb+it3XtYkoz8Q/RBUBgmnHRmovaI0lGLSqK0hOfauaIRap9USS00hT17s7QDPeST+lvlAQA=="; }; }; - "@ot-builder/ot-encoding-1.3.3" = { + "@ot-builder/ot-encoding-1.4.0" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.3.3.tgz"; - sha512 = "syxPDRoAezIQA/Z/DDPSF2AQ3N9vWaypTvbUPmdLEqriOZFDAx4fR455B8gqZKIeg3FFAjXLMCtaDR1sftp74g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.4.0.tgz"; + sha512 = "qs8+zx1Ebj2sQyYJjv1BgTKYECNqvA7HZYdVjs2reHm27YwI5uoamQAJ0rQ6+H2xp1pxCI9qRNMAucKkF5Hx3Q=="; }; }; - "@ot-builder/ot-ext-private-1.3.3" = { + "@ot-builder/ot-ext-private-1.4.0" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.3.3.tgz"; - sha512 = "s5Se3iuiRyznjdO4Qlm1yimNI8NkPl/RRkbc8tC4hoq45KO78CCjU3tKllioTs5DGHtP2kpinseNbyL1zofykA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.4.0.tgz"; + sha512 = "L4HihtweRtlBfBOdjBGjUxhqTG/fEGbNgMcsbvrIJIpwglpziAoYosdXxtY5pMYi0TM8ZcWhDtIB2KXTYsy0+g=="; }; }; - "@ot-builder/ot-glyphs-1.3.3" = { + "@ot-builder/ot-glyphs-1.4.0" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.3.3.tgz"; - sha512 = "vqPrWqlfugwsnutphMz2od5VJRvsdnGjBU48rye4tKxRDkOQ+jv9XnrMiEhms0wfBR3G/z0LjNsQAayWIggpDA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.4.0.tgz"; + sha512 = "4ryJxvvX6v3A1g+aQXgpRlbuVQBSCjukxYMfhnWeLadVPM5Q6VKP0Q1VfZcbJFve/A82ltlGRwhresHy/hXiOw=="; }; }; - "@ot-builder/ot-layout-1.3.3" = { + "@ot-builder/ot-layout-1.4.0" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.3.3.tgz"; - sha512 = "h0JqUVYvSh77xoGI+PHaXnXOlYKrQCu7EXXDC8uUr2xrnQR4+LJzvt+NPpFwtlG1upc/muCFpDxp6ooQ8crErw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.4.0.tgz"; + sha512 = "DxLQ8jC/dn29pbCy5vKjHhmsLZ4uOJZjiFkSSoi7N4Di+DILiZfIcRJigbJsnqBF3XRUNpgUQs5HvJl65dMjcA=="; }; }; - "@ot-builder/ot-metadata-1.3.3" = { + "@ot-builder/ot-metadata-1.4.0" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.3.3.tgz"; - sha512 = "t/D9+MHsSd21laRKtC+M48mCKVODVjcMW8VIZLwA5Vsg9xtAkSSYU/ZXZjmUwahnaJRLAJCovD7B7WkIc8NX7A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.4.0.tgz"; + sha512 = "g64WKXevoJmlN8QyKL+Ew6DwEPNpdoC2Pn/GCBLoyW8KfEzUg/wUCykZu333X+vKSxqiqssLH/aoUOg6uf8BFA=="; }; }; - "@ot-builder/ot-name-1.3.3" = { + "@ot-builder/ot-name-1.4.0" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.3.3.tgz"; - sha512 = "g+flff2TZNeN6U4cq9T/JtOTi82NoTjVQrtxsdDTgL7UbfbpyBxloutnFVTdslEUAH2NgSJAeKLdUIuH7LwVjw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.4.0.tgz"; + sha512 = "CGTy3J9P2M03DFcEmR6y4nb3aK6sEaPgXcCR6rXa6gTIxfkVzhpijZzcKUcmzUwh6LYOX3w4RG6Vd9UVOmm+4g=="; }; }; - "@ot-builder/ot-sfnt-1.3.3" = { + "@ot-builder/ot-sfnt-1.4.0" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.3.3.tgz"; - sha512 = "reA2LMD5BI/1dsenrgfSmydY18jvu5Lq4p3DmQc/uMaEc5ReW4Vlu0AUoRPoqdhtE00pzwcyc9nuOBXivFl4qg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.4.0.tgz"; + sha512 = "smgt8TMtB+eMpA4mTzB2NwORcv1/+HhFmys2gr8cYorEvqIgRP15kiC7tVC2in2mKYxIq4+e3Z+MciCCdxTXfQ=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.3.3" = { + "@ot-builder/ot-standard-glyph-namer-1.4.0" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.3.3.tgz"; - sha512 = "6Ku8YiCVQxT2OwNBnWSrEJO76OtV8LtUCNS+1tdrDJpTzWeZqys0ypnXBLka/aBKUZUkJeXWflaxUNo1r4Tx+A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.4.0.tgz"; + sha512 = "dFGkdynJ4sMyPSQkWYJpuNFqAGMXDV4tu0mPevSwrJFudefBmuLIVlOc+rJq19CG+tYq787JJe0CTXIvoq+sNw=="; }; }; - "@ot-builder/ot-vtt-private-1.3.3" = { + "@ot-builder/ot-vtt-private-1.4.0" = { name = "_at_ot-builder_slash_ot-vtt-private"; packageName = "@ot-builder/ot-vtt-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.3.3.tgz"; - sha512 = "T1sdeXE83/IdRz7eRa182bAVYANmnoGiLlO3y/6e0sJSxgMzwr9eSjbf441edvjEMJPbCmBr6gqiJoQMzcIiCg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.4.0.tgz"; + sha512 = "nVg1Y/y3OzqpVz48oM9Ic6YzUJ8UrrT/5iVZMcQ99m5Zon9hcpp/RrYldOF58XuPO0MtgjLME2g4uFUJWSss7Q=="; }; }; - "@ot-builder/prelude-1.3.3" = { + "@ot-builder/prelude-1.4.0" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.3.3.tgz"; - sha512 = "GJSZOF13jqvVV4+LREhSo7ZRmikYVGPZl+Z1D4jHUFF7nDqX53KbGMt/tl3rhNMhub0/NTdV8tzdd2LTb/AJDQ=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.4.0.tgz"; + sha512 = "Q5kqu1DYOeRAcHS15gX1IpoyhR1rffrfKDUcex6nd+GizBPJBdbOtIWpuz7uaOR1zYBCOWuLsyW+h3vKqK0wEw=="; }; }; - "@ot-builder/primitive-1.3.3" = { + "@ot-builder/primitive-1.4.0" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.3.3.tgz"; - sha512 = "aEwB2TlorsArhqVQKL9cDyYiszl0wdvhFFgNHp3bmxw7D1w86pFdjAfUO7IyIF7k5JBPswHAzMfmotXcA51lUw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.4.0.tgz"; + sha512 = "Op+KrrhVUkFa7FXqTLbtdTYJbIZA4dHFRB7pE7YqEqfjtYv1tcMKGjQIneXi9kO3yG1T6SDdY9V5UTpIs/rfUQ=="; }; }; - "@ot-builder/rectify-1.3.3" = { + "@ot-builder/rectify-1.4.0" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.3.3.tgz"; - sha512 = "Ij9dpqhw0lOos2Z9mr7Z4Li+zQQ1xN9LSUIgfqtHFGVDnC66udYyHahOLMhjhODJVPtA25otADrM4LT/T4jGXQ=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.4.0.tgz"; + sha512 = "UMhDyFi00B/6Ols0/WJ8aYdNnHadnSTtc3tN97tjnEs0ZS6Tym6SaL044+ehINJA16kazqHqFJMbwLjA/KrFow=="; }; }; - "@ot-builder/stat-glyphs-1.3.3" = { + "@ot-builder/stat-glyphs-1.4.0" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.3.3.tgz"; - sha512 = "8vHTL/fhorFp1l2jFSGNT9R9tu0Rr8yQH/vslaOIvY8bBgJDQCqKExmF4lxiGMWMr05mKZhNrwV2vYMHWUP2mA=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.4.0.tgz"; + sha512 = "YgMHUivVuXLd+b2TXLHEQDiCjBnmDwDGTfFiGGbaM/XrCdYMzdHNjbpHWhNx4GODcAplkIQm3j3kwFdM4L1wwA=="; }; }; - "@ot-builder/trace-1.3.3" = { + "@ot-builder/trace-1.4.0" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.3.3.tgz"; - sha512 = "d4KsjCUgY4tlpfSY74Q2l/k1Fl82ROlt+IQhzl8weSeb/KVGVALltzEIyEmT3Kb5Yh3Clej9nlzzwKWX74dgZw=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.4.0.tgz"; + sha512 = "fNt9Nf03I7VuLbeziVA5c1pMx9gr8K92Z7UOUnx387eIjeeOLFY98oVSO+XGXFOd+z5lapR9LWhhhaVlIw+YzA=="; }; }; - "@ot-builder/var-store-1.3.3" = { + "@ot-builder/var-store-1.4.0" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.3.3.tgz"; - sha512 = "5LKBIWxB0Oe4QUeRHA3mGaHqlrgA9byeOQNMQxjGDF0fRVDyG40VW1g4xlUQYWzTitM2ML3dP0HlEoVvsTgwwg=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.4.0.tgz"; + sha512 = "IGCQqOeLezgGiohkQdsNJGIkyfV7iZVns83K3i+0tBgSaFOZyNLCjy02eHP6u6Z3a5z0NXjT0yalKNaRLLkGnA=="; }; }; - "@ot-builder/variance-1.3.3" = { + "@ot-builder/variance-1.4.0" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.3.3"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.4.0.tgz"; + sha512 = "TwlAMp8proF7/y3cWP8Vzxq4cbUUB0TzcS9s2vc4L/IGNdFtuIU7RiSO2A4cHoaBMdJSzCDm5CZ1DQopz/607A=="; + }; + }; + "@parcel/bundler-default-2.3.2" = { + name = "_at_parcel_slash_bundler-default"; + packageName = "@parcel/bundler-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.3.2.tgz"; + sha512 = "JUrto4mjSD0ic9dEqRp0loL5o3HVYHja1ZIYSq+rBl2UWRV6/9cGTb07lXOCqqm0BWE+hQ4krUxB76qWaF0Lqw=="; + }; + }; + "@parcel/cache-2.3.2" = { + name = "_at_parcel_slash_cache"; + packageName = "@parcel/cache"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.3.2.tgz"; + sha512 = "Xxq+ekgcFEme6Fn1v7rEOBkyMOUOUu7eNqQw0l6HQS+INZ2Q7YzzfdW7pI8rEOAAICVg5BWKpmBQZpgJlT+HxQ=="; + }; + }; + "@parcel/codeframe-2.3.2" = { + name = "_at_parcel_slash_codeframe"; + packageName = "@parcel/codeframe"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.3.3.tgz"; - sha512 = "kCd+aqpuF/Go+yHRc0WJ3GP9p1069WQBdG9b5GomQJhYfccGmNOl2P1BUtISAu467DVngc9bBx5ZJbDWn1luXg=="; + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.3.2.tgz"; + sha512 = "ireQALcxxrTdIEpzTOoMo/GpfbFm1qlyezeGl3Hce3PMvHLg3a5S6u/Vcy7SAjdld5GfhHEqVY+blME6Z4CyXQ=="; + }; + }; + "@parcel/compressor-raw-2.3.2" = { + name = "_at_parcel_slash_compressor-raw"; + packageName = "@parcel/compressor-raw"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.3.2.tgz"; + sha512 = "8dIoFwinYK6bOTpnZOAwwIv0v73y0ezsctPmfMnIqVQPn7wJwfhw/gbKVcmK5AkgQMkyid98hlLZoaZtGF1Mdg=="; + }; + }; + "@parcel/config-default-2.3.2" = { + name = "_at_parcel_slash_config-default"; + packageName = "@parcel/config-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.3.2.tgz"; + sha512 = "E7/iA7fGCYvXU3u6zF9nxjeDVsgjCN6MVvDjymjaxYMoDWTIsPV245SBEXqzgtmzbMAV+VAl4rVWLMB4pzMt9g=="; + }; + }; + "@parcel/core-2.3.2" = { + name = "_at_parcel_slash_core"; + packageName = "@parcel/core"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/core/-/core-2.3.2.tgz"; + sha512 = "gdJzpsgeUhv9H8T0UKVmyuptiXdduEfKIUx0ci+/PGhq8cCoiFnlnuhW6H7oLr79OUc+YJStabDJuG4U2A6ysw=="; + }; + }; + "@parcel/diagnostic-2.3.2" = { + name = "_at_parcel_slash_diagnostic"; + packageName = "@parcel/diagnostic"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.3.2.tgz"; + sha512 = "/xW93Az4AOiifuYW/c4CDbUcu3lx5FcUDAj9AGiR9NSTsF/ROC/RqnxvQ3AGtqa14R7vido4MXEpY3JEp6FsqA=="; + }; + }; + "@parcel/events-2.3.2" = { + name = "_at_parcel_slash_events"; + packageName = "@parcel/events"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/events/-/events-2.3.2.tgz"; + sha512 = "WiYIwXMo4Vd+pi58vRoHkul8TPE5VEfMY+3FYwVCKPl/LYqSD+vz6wMx9uG18mEbB1d/ofefv5ZFQNtPGKO4tQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -6493,6 +6862,42 @@ let sha512 = "86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA=="; }; }; + "@parcel/fs-2.3.2" = { + name = "_at_parcel_slash_fs"; + packageName = "@parcel/fs"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.3.2.tgz"; + sha512 = "XV+OsnRpN01QKU37lBN0TFKvv7uPKfQGbqFqYOrMbXH++Ae8rBU0Ykz+Yu4tv2h7shMlde+AMKgRnRTAJZpWEQ=="; + }; + }; + "@parcel/fs-search-2.3.2" = { + name = "_at_parcel_slash_fs-search"; + packageName = "@parcel/fs-search"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.3.2.tgz"; + sha512 = "u3DTEFnPtKuZvEtgGzfVjQUytegSSn3POi7WfwMwPIaeDPfYcyyhfl+c96z7VL9Gk/pqQ99/cGyAwFdFsnxxXA=="; + }; + }; + "@parcel/graph-2.3.2" = { + name = "_at_parcel_slash_graph"; + packageName = "@parcel/graph"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.3.2.tgz"; + sha512 = "ltTBM3IEqumgmy4ABBFETT8NtAwSsjD9mY3WCyJ5P8rUshfVCg093rvBPbpuJYMaH/TV1AHVaWfZqaZ4JQDIQQ=="; + }; + }; + "@parcel/hash-2.3.2" = { + name = "_at_parcel_slash_hash"; + packageName = "@parcel/hash"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.3.2.tgz"; + sha512 = "SMtYTsHihws/wqdVnOr0QAGyGYsW9rJSJkkoRujUxo8l2ctnBN1ztv89eOUrdtgHsmcnj/oz1yw6sN38X+BUng=="; + }; + }; "@parcel/logger-1.11.1" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; @@ -6502,6 +6907,330 @@ let sha512 = "9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA=="; }; }; + "@parcel/logger-2.3.2" = { + name = "_at_parcel_slash_logger"; + packageName = "@parcel/logger"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.3.2.tgz"; + sha512 = "jIWd8TXDQf+EnNWSa7Q10lSQ6C1LSH8OZkTlaINrfVIw7s+3tVxO3I4pjp7/ARw7RX2gdNPlw6fH4Gn/HvvYbw=="; + }; + }; + "@parcel/markdown-ansi-2.3.2" = { + name = "_at_parcel_slash_markdown-ansi"; + packageName = "@parcel/markdown-ansi"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.3.2.tgz"; + sha512 = "l01ggmag5QScCk9mYA0xHh5TWSffR84uPFP2KvaAMQQ9NLNufcFiU0mn/Mtr3pCb5L5dSzmJ+Oo9s7P1Kh/Fmg=="; + }; + }; + "@parcel/namer-default-2.3.2" = { + name = "_at_parcel_slash_namer-default"; + packageName = "@parcel/namer-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.3.2.tgz"; + sha512 = "3QUMC0+5+3KMKfoAxYAbpZtuRqTgyZKsGDWzOpuqwemqp6P8ahAvNPwSCi6QSkGcTmvtYwBu9/NHPSONxIFOfg=="; + }; + }; + "@parcel/node-resolver-core-2.3.2" = { + name = "_at_parcel_slash_node-resolver-core"; + packageName = "@parcel/node-resolver-core"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.3.2.tgz"; + sha512 = "wmrnMNzJN4GuHw2Ftho+BWgSWR6UCkW3XoMdphqcxpw/ieAdS2a+xYSosYkZgQZ6lGutSvLyJ1CkVvP6RLIdQQ=="; + }; + }; + "@parcel/optimizer-cssnano-2.3.2" = { + name = "_at_parcel_slash_optimizer-cssnano"; + packageName = "@parcel/optimizer-cssnano"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-cssnano/-/optimizer-cssnano-2.3.2.tgz"; + sha512 = "wTBOxMiBI38NAB9XIlQZRCjS59+EWjWR9M04D3TWyxl+dL5gYMc1cl4GNynUnmcPdz+3s1UbOdo5/8V90wjiiw=="; + }; + }; + "@parcel/optimizer-htmlnano-2.3.2" = { + name = "_at_parcel_slash_optimizer-htmlnano"; + packageName = "@parcel/optimizer-htmlnano"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.3.2.tgz"; + sha512 = "U8C0TDSxsx8HmHaLW0Zc7ha1fXQynzhvBjCRMGYnOiLiw0MOfLQxzQ2WKVSeCotmdlF63ayCwxWsd6BuqStiKQ=="; + }; + }; + "@parcel/optimizer-image-2.3.2" = { + name = "_at_parcel_slash_optimizer-image"; + packageName = "@parcel/optimizer-image"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.3.2.tgz"; + sha512 = "HOk3r5qdvY/PmI7Q3i2qEgFH3kP2QWG4Wq3wmC4suaF1+c2gpiQc+HKHWp4QvfbH3jhT00c5NxQyqPhbXeNI9Q=="; + }; + }; + "@parcel/optimizer-svgo-2.3.2" = { + name = "_at_parcel_slash_optimizer-svgo"; + packageName = "@parcel/optimizer-svgo"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.3.2.tgz"; + sha512 = "l7WvZ5+e7D1mVmLUxMVaSb29cviXzuvSY2OpQs0ukdPACDqag+C65hWMzwTiOSSRGPMIu96kQKpeVru2YjibhA=="; + }; + }; + "@parcel/optimizer-terser-2.3.2" = { + name = "_at_parcel_slash_optimizer-terser"; + packageName = "@parcel/optimizer-terser"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.3.2.tgz"; + sha512 = "dOapHhfy0xiNZa2IoEyHGkhhla07xsja79NPem14e5jCqY6Oi40jKNV4ab5uu5u1elWUjJuw69tiYbkDZWbKQw=="; + }; + }; + "@parcel/package-manager-2.3.2" = { + name = "_at_parcel_slash_package-manager"; + packageName = "@parcel/package-manager"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.3.2.tgz"; + sha512 = "pAQfywKVORY8Ee+NHAyKzzQrKbnz8otWRejps7urwhDaTVLfAd5C/1ZV64ATZ9ALYP9jyoQ8bTaxVd4opcSuwg=="; + }; + }; + "@parcel/packager-css-2.3.2" = { + name = "_at_parcel_slash_packager-css"; + packageName = "@parcel/packager-css"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.3.2.tgz"; + sha512 = "ByuF9xDnQnpVL1Hdu9aY6SpxOuZowd3TH7joh1qdRPLeMHTEvUywHBXoiAyNdrhnLGum8uPEdY8Ra5Xuo1U7kg=="; + }; + }; + "@parcel/packager-html-2.3.2" = { + name = "_at_parcel_slash_packager-html"; + packageName = "@parcel/packager-html"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.3.2.tgz"; + sha512 = "YqAptdU+uqfgwSii76mRGcA/3TpuC6yHr8xG+11brqj/tEFLsurmX0naombzd7FgmrTE9w+kb0HUIMl2vRBn0A=="; + }; + }; + "@parcel/packager-js-2.3.2" = { + name = "_at_parcel_slash_packager-js"; + packageName = "@parcel/packager-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.3.2.tgz"; + sha512 = "3OP0Ro9M1J+PIKZK4Ec2N5hjIPiqk++B2kMFeiUqvaNZjJgKrPPEICBhjS52rma4IE/NgmIMB3aI5pWqE/KwNA=="; + }; + }; + "@parcel/packager-raw-2.3.2" = { + name = "_at_parcel_slash_packager-raw"; + packageName = "@parcel/packager-raw"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.3.2.tgz"; + sha512 = "RnoZ7WgNAFWkEPrEefvyDqus7xfv9XGprHyTbfLittPaVAZpl+4eAv43nXyMfzk77Cgds6KcNpkosj3acEpNIQ=="; + }; + }; + "@parcel/packager-svg-2.3.2" = { + name = "_at_parcel_slash_packager-svg"; + packageName = "@parcel/packager-svg"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.3.2.tgz"; + sha512 = "iIC0VeczOXynS7M5jCi3naMBRyAznBVJ3iMg92/GaI9duxPlUMGAlHzLAKNtoXkc00HMXDH7rrmMb04VX6FYSg=="; + }; + }; + "@parcel/plugin-2.3.2" = { + name = "_at_parcel_slash_plugin"; + packageName = "@parcel/plugin"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.3.2.tgz"; + sha512 = "SaLZAJX4KH+mrAmqmcy9KJN+V7L+6YNTlgyqYmfKlNiHu7aIjLL+3prX8QRcgGtjAYziCxvPj0cl1CCJssaiGg=="; + }; + }; + "@parcel/reporter-cli-2.3.2" = { + name = "_at_parcel_slash_reporter-cli"; + packageName = "@parcel/reporter-cli"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.3.2.tgz"; + sha512 = "VYetmTXqW83npsvVvqlQZTbF3yVL3k/FCCl3kSWvOr9LZA0lmyqJWPjMHq37yIIOszQN/p5guLtgCjsP0UQw1Q=="; + }; + }; + "@parcel/reporter-dev-server-2.3.2" = { + name = "_at_parcel_slash_reporter-dev-server"; + packageName = "@parcel/reporter-dev-server"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.3.2.tgz"; + sha512 = "E7LtnjAX4iiWMw2qKUyFBi3+bDz0UGjqgHoPQylUYYLi6opXjJz/oC+cCcCy4e3RZlkrl187XonvagS59YjDxA=="; + }; + }; + "@parcel/resolver-default-2.3.2" = { + name = "_at_parcel_slash_resolver-default"; + packageName = "@parcel/resolver-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.3.2.tgz"; + sha512 = "y3r+xOwWsATrNGUWuZ6soA7q24f8E5tY1AZ9lHCufnkK2cdKZJ5O1cyd7ohkAiKZx2/pMd+FgmVZ/J3oxetXkA=="; + }; + }; + "@parcel/runtime-browser-hmr-2.3.2" = { + name = "_at_parcel_slash_runtime-browser-hmr"; + packageName = "@parcel/runtime-browser-hmr"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.3.2.tgz"; + sha512 = "nRD6uOyF1+HGylP9GASbYmvUDOsDaNwvaxuGTSh8+5M0mmCgib+hVBiPEKbwdmKjGbUPt9wRFPyMa/JpeQZsIQ=="; + }; + }; + "@parcel/runtime-js-2.3.2" = { + name = "_at_parcel_slash_runtime-js"; + packageName = "@parcel/runtime-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.3.2.tgz"; + sha512 = "SJepcHvYO/7CEe/Q85sngk+smcJ6TypuPh4D2R8kN+cAJPi5WvbQEe7+x5BEgbN+5Jumi/Uo3FfOOE5mYh+F6g=="; + }; + }; + "@parcel/runtime-react-refresh-2.3.2" = { + name = "_at_parcel_slash_runtime-react-refresh"; + packageName = "@parcel/runtime-react-refresh"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.3.2.tgz"; + sha512 = "P+GRPO2XVDSBQ4HmRSj2xfbHSQvL9+ahTE/AB74IJExLTITv5l4SHAV3VsiKohuHYUAYHW3A/Oe7tEFCAb6Cug=="; + }; + }; + "@parcel/runtime-service-worker-2.3.2" = { + name = "_at_parcel_slash_runtime-service-worker"; + packageName = "@parcel/runtime-service-worker"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.3.2.tgz"; + sha512 = "iREHj/eapphC4uS/zGUkiTJvG57q+CVbTrfE42kB8ECtf/RYNo5YC9htdvPZjRSXDPrEPc5NCoKp4X09ENNikw=="; + }; + }; + "@parcel/source-map-2.0.2" = { + name = "_at_parcel_slash_source-map"; + packageName = "@parcel/source-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.0.2.tgz"; + sha512 = "NnUrPYLpYB6qyx2v6bcRPn/gVigmGG6M6xL8wIg/i0dP1GLkuY1nf+Hqdf63FzPTqqT7K3k6eE5yHPQVMO5jcA=="; + }; + }; + "@parcel/transformer-babel-2.3.2" = { + name = "_at_parcel_slash_transformer-babel"; + packageName = "@parcel/transformer-babel"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.3.2.tgz"; + sha512 = "QpWfH2V6jJ+kcUBIMM/uBBG8dGFvNaOGS+8jD6b+eTP+1owzm83RoWgqhRV2D/hhv2qMXEQzIljoc/wg2y+X4g=="; + }; + }; + "@parcel/transformer-css-2.3.2" = { + name = "_at_parcel_slash_transformer-css"; + packageName = "@parcel/transformer-css"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.3.2.tgz"; + sha512 = "8lzvDny+78DIAqhcXam2Bf9FyaUoqzHdUQdNFn+PuXTHroG/QGPvln1kvqngJjn4/cpJS9vYmAPVXe+nai3P8g=="; + }; + }; + "@parcel/transformer-html-2.3.2" = { + name = "_at_parcel_slash_transformer-html"; + packageName = "@parcel/transformer-html"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.3.2.tgz"; + sha512 = "idT1I/8WM65IFYBqzRwpwT7sf0xGur4EDQDHhuPX1w+pIVZnh0lkLMAnEqs6ar1SPRMys4chzkuDNnqh0d76hg=="; + }; + }; + "@parcel/transformer-image-2.3.2" = { + name = "_at_parcel_slash_transformer-image"; + packageName = "@parcel/transformer-image"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.3.2.tgz"; + sha512 = "0K7cJHXysli6hZsUz/zVGO7WCoaaIeVdzAxKpLA1Yl3LKw/ODiMyXKt08LiV/ljQ2xT5qb9EsXUWDRvcZ0b96A=="; + }; + }; + "@parcel/transformer-js-2.3.2" = { + name = "_at_parcel_slash_transformer-js"; + packageName = "@parcel/transformer-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.3.2.tgz"; + sha512 = "U1fbIoAoqR5P49S+DMhH8BUd9IHRPwrTTv6ARYGsYnhuNsjTFhNYE0kkfRYboe/e0z7vEbeJICZXjnZ7eQDw5A=="; + }; + }; + "@parcel/transformer-json-2.3.2" = { + name = "_at_parcel_slash_transformer-json"; + packageName = "@parcel/transformer-json"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.3.2.tgz"; + sha512 = "Pv2iPaxKINtFwOk5fDbHjQlSm2Vza/NLimQY896FLxiXPNAJxWGvMwdutgOPEBKksxRx9LZPyIOHiRVZ0KcA3w=="; + }; + }; + "@parcel/transformer-postcss-2.3.2" = { + name = "_at_parcel_slash_transformer-postcss"; + packageName = "@parcel/transformer-postcss"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.3.2.tgz"; + sha512 = "Rpdxc1rt2aJFCh/y/ccaBc9J1crDjNY5o44xYoOemBoUNDMREsmg5sR5iO81qKKO5GxfoosGb2zh59aeTmywcg=="; + }; + }; + "@parcel/transformer-posthtml-2.3.2" = { + name = "_at_parcel_slash_transformer-posthtml"; + packageName = "@parcel/transformer-posthtml"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.3.2.tgz"; + sha512 = "tMdVExfdM+1G8A9KSHDsjg+S9xEGbhH5mApF2NslPnNZ4ciLKRNuHU2sSV/v8i0a6kacKvDTrwQXYBQJGOodBw=="; + }; + }; + "@parcel/transformer-raw-2.3.2" = { + name = "_at_parcel_slash_transformer-raw"; + packageName = "@parcel/transformer-raw"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.3.2.tgz"; + sha512 = "lY7eOCaALZ90+GH+4PZRmAPGQRXoZ66NakSdhEtH6JSSAYOmZKDvNLGTMRo/vK1oELzWMuAHGdqvbcPDtNLLVw=="; + }; + }; + "@parcel/transformer-react-refresh-wrap-2.3.2" = { + name = "_at_parcel_slash_transformer-react-refresh-wrap"; + packageName = "@parcel/transformer-react-refresh-wrap"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.3.2.tgz"; + sha512 = "FZaderyCExn0SBZ6D+zHPWc8JSn9YDcbfibv0wkCl+D7sYfeWZ22i7MRp5NwCe/TZ21WuxDWySCggEp/Waz2xg=="; + }; + }; + "@parcel/transformer-svg-2.3.2" = { + name = "_at_parcel_slash_transformer-svg"; + packageName = "@parcel/transformer-svg"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.3.2.tgz"; + sha512 = "k9My6bePsaGgUh+tidDjFbbVgKPTzwCAQfoloZRMt7y396KgUbvCfqDruk04k6k+cJn7Jl1o/5lUpTEruBze7g=="; + }; + }; + "@parcel/types-2.3.2" = { + name = "_at_parcel_slash_types"; + packageName = "@parcel/types"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/types/-/types-2.3.2.tgz"; + sha512 = "C77Ct1xNM7LWjPTfe/dQ/9rq1efdsX5VJu2o8/TVi6qoFh64Wp/c5/vCHwKInOTBZUTchVO6z4PGJNIZoUVJuA=="; + }; + }; "@parcel/utils-1.11.0" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; @@ -6511,6 +7240,15 @@ let sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ=="; }; }; + "@parcel/utils-2.3.2" = { + name = "_at_parcel_slash_utils"; + packageName = "@parcel/utils"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.3.2.tgz"; + sha512 = "xzZ+0vWhrXlLzGoz7WlANaO5IPtyWGeCZruGtepUL3yheRWb1UU4zFN9xz7Z+j++Dmf1Fgkc3qdk/t4O8u9HLQ=="; + }; + }; "@parcel/watcher-1.12.1" = { name = "_at_parcel_slash_watcher"; packageName = "@parcel/watcher"; @@ -6520,6 +7258,15 @@ let sha512 = "od+uCtCxC/KoNQAIE1vWx1YTyKYY+7CTrxBJPRh3cDWw/C0tCtlBMVlrbplscGoEpt6B27KhJDCv82PBxOERNA=="; }; }; + "@parcel/watcher-2.0.5" = { + name = "_at_parcel_slash_watcher"; + packageName = "@parcel/watcher"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.5.tgz"; + sha512 = "x0hUbjv891omnkcHD7ZOhiyyUqUUR6MNjq89JhEI3BxppeKWAm6NPQsqqRrAkCJBogdT/o/My21sXtTI9rJIsw=="; + }; + }; "@parcel/workers-1.11.0" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; @@ -6529,6 +7276,15 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; + "@parcel/workers-2.3.2" = { + name = "_at_parcel_slash_workers"; + packageName = "@parcel/workers"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.3.2.tgz"; + sha512 = "JbOm+Ceuyymd1SuKGgodC2EXAiPuFRpaNUSJpz3NAsS3lVIt2TDAPMOWBivS7sML/KltspUfl/Q9YwO0TPUFNw=="; + }; + }; "@pm2/agent-2.0.1" = { name = "_at_pm2_slash_agent"; packageName = "@pm2/agent"; @@ -6574,22 +7330,22 @@ let sha512 = "J3IlK0Ok88RQZVB//af7Lnl1Vw2buyyr5G3oEvK1wRSYTJi/E/HBm5JZUihmDAtm/unr85FC534DwA5e+4LR2w=="; }; }; - "@prisma/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" = { + "@prisma/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"; + version = "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009.tgz"; - sha512 = "qM+uJbkelB21bnK44gYE049YTHIjHysOuj0mj5U2gDGyNLfmiazlggzFPCgEjgme4U5YB2tYs6Z5Hq08Kl8pjA=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86.tgz"; + sha512 = "LjRssaWu9w2SrXitofnutRIyURI7l0veQYIALz7uY4shygM9nMcK3omXcObRm7TAcw3Z+9ytfK1B+ySOsOesxQ=="; }; }; - "@prisma/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" = { + "@prisma/prisma-fmt-wasm-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" = { name = "_at_prisma_slash_prisma-fmt-wasm"; packageName = "@prisma/prisma-fmt-wasm"; - version = "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"; + version = "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009.tgz"; - sha512 = "D+1BlYjBpj3mUGrB/druJ1St43jmldcTqSZ1RIOOnB15r+ZtteMJk0PrhVGEVPHCK2Qmbz2PG0/gNooTJHwSAQ=="; + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86.tgz"; + sha512 = "f0Srf2EasvBRKBlTUrqkW5hp889+SRrRkqu0MgcuTXlgHxVMj7DIo1JNylPb1y/HDwtjLWf6AL+sk+2R891SWA=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -6700,13 +7456,13 @@ let sha512 = "1ekKViRit0jo1IzDLSRSziU/OpX9ckoj8uWvSWzHLASyTqhKZL9Pdq628guq7yT3qFcJeeaeaA5T97a4w7fpqA=="; }; }; - "@putdotio/api-client-8.27.3" = { + "@putdotio/api-client-8.30.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.27.3"; + version = "8.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.27.3.tgz"; - sha512 = "i50+y+OTfqKdgE5QwrXDqzfQZKtpLqPYf6pr2u/xTTRS8/w8/nrWmE7N1Hh6WpTBa68XidgUBzqSjit7PYOyfA=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.30.0.tgz"; + sha512 = "J0OzprAIheo1/62NlhPkPVEyrLSewPaCQHZlidrkY1Ip60OtIwy/RojORR3Xm28I68wTUDMm3X1Ciz45aAUYww=="; }; }; "@reach/router-1.3.4" = { @@ -6763,13 +7519,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.82" = { + "@redocly/openapi-core-1.0.0-beta.87" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.82"; + version = "1.0.0-beta.87"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.82.tgz"; - sha512 = "bJ0WclpgkFv4aa5QWU83ARCv3VQJy9U94reb1chOTg9s2bsTHbYuUwRv6G370a7lFXX86AyB3dT5IzS6GytLlA=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.87.tgz"; + sha512 = "bGvINYT8jpcYEbibhd4AO0M5WPE1IQLNLS4LCNZbD7jkoSQB1EHWBZJDhfPd1kxKPPcQ7UJNUCJwtIIrRs5gTQ=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -6826,13 +7582,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-13.2.4" = { + "@schematics/angular-13.2.6" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "13.2.4"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.4.tgz"; - sha512 = "pAVuPmFklWVpNJkARs4aGYM5Mo4iez0eW0dDY+ugxZlt1KOLJQDmMK2Go60iEAQLlOw2pKO/jcmTttOP8PN0UQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.6.tgz"; + sha512 = "8NzHMX9+FSgaB0lJYxlTJv9OcBuolwZJqo9M/yX3RPSqSHghA33jWwgVbV551hBJOpbVEePerG1DQkIC99DXKA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -6853,13 +7609,22 @@ let sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA=="; }; }; - "@serverless/dashboard-plugin-6.1.0" = { + "@serverless/aws-lambda-otel-extension-dist-0.1.10" = { + name = "_at_serverless_slash_aws-lambda-otel-extension-dist"; + packageName = "@serverless/aws-lambda-otel-extension-dist"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/aws-lambda-otel-extension-dist/-/aws-lambda-otel-extension-dist-0.1.10.tgz"; + sha512 = "SPMmou6Bom/TcX69WcKXDiHPVQycfbocUW8vrXLU9oBxFY49Z0l70Yk7lOvtc1H/lc5taIfkcW0Eo12cOp9cvA=="; + }; + }; + "@serverless/dashboard-plugin-6.1.5" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "6.1.0"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.1.0.tgz"; - sha512 = "rbIWKRoqTIMl0ZOt6f0VIaEj+6slV18iEkW7tIBOKq6eQTkX2tHvBgVXrTh3ZKFNnMePGn4rtfbwB5G9oZ0Wig=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.1.5.tgz"; + sha512 = "RpZysQyCKzrtY4rJpK1qiQdambt2NrRYqlV9IEsGf5LaQu6f7G35VZrPoS6A2jD8Rt3nMK7t+0LOO5zfVmBMLA=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -6871,22 +7636,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.3.1" = { + "@serverless/platform-client-4.3.2" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.1.tgz"; - sha512 = "VPXeTTgXmWZtZmbzm9eh5FJcOoFgHkcwgfNA59FV3TE2Vcm5JZiXKtXl5AANu9LYcyOtJK7iBJXs8OUSwNbJZw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.2.tgz"; + sha512 = "DAa5Z0JAZc6UfrTZLYwqoZxgAponZpFwaqd7WzzMA+loMCkYWyJNwxrAmV6cr2UUJpkko4toPZuJ3vM9Ie+NDA=="; }; }; - "@serverless/utils-6.0.2" = { + "@serverless/utils-6.0.3" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.0.2.tgz"; - sha512 = "4vNv6nt4/w8wX79DN7OujR/Ih1wlJ9ZJnY28BtF69ehFwlGqnxlF2CXVGo3W7Xh4maK3hWnoc+L4akQX6nH+3g=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.0.3.tgz"; + sha512 = "6oKLqAkK6CG2zjAs2rfuHEOLoK11K/oep5bwGTEb5JmFP/92JQtvyb+FxP4DknL4jYpiYj1Dd5sCt5auHhOASg=="; }; }; "@sideway/address-4.1.3" = { @@ -6970,13 +7735,13 @@ let sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; }; }; - "@sindresorhus/is-4.4.0" = { + "@sindresorhus/is-4.6.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.4.0.tgz"; - sha512 = "QppPM/8l3Mawvh4rn9CNEYIU9bxpXUCRMaX9yUpvBk1nMKusLKpfXGDEKExKaPhLzcn3lzil7pR6rnJ11HgeRQ=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz"; + sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; }; "@sindresorhus/jimp-0.3.0" = { @@ -7024,6 +7789,42 @@ let sha512 = "dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ=="; }; }; + "@socket.io/component-emitter-3.0.0" = { + name = "_at_socket.io_slash_component-emitter"; + packageName = "@socket.io/component-emitter"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz"; + sha512 = "2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q=="; + }; + }; + "@soda/friendly-errors-webpack-plugin-1.8.1" = { + name = "_at_soda_slash_friendly-errors-webpack-plugin"; + packageName = "@soda/friendly-errors-webpack-plugin"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz"; + sha512 = "h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg=="; + }; + }; + "@soda/get-current-script-1.0.2" = { + name = "_at_soda_slash_get-current-script"; + packageName = "@soda/get-current-script"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz"; + sha512 = "T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w=="; + }; + }; + "@sqltools/formatter-1.2.3" = { + name = "_at_sqltools_slash_formatter"; + packageName = "@sqltools/formatter"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.3.tgz"; + sha512 = "O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg=="; + }; + }; "@squoosh/lib-0.4.1" = { name = "_at_squoosh_slash_lib"; packageName = "@squoosh/lib"; @@ -7150,6 +7951,15 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; + "@swc/helpers-0.2.14" = { + name = "_at_swc_slash_helpers"; + packageName = "@swc/helpers"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.2.14.tgz"; + sha512 = "wpCQMhf5p5GhNg2MmGKXzUNwxe7zRiCsmqYsamez2beP7mKPCSiu+BjZcdN95yYSzO857kr0VfQewmGpS77nqA=="; + }; + }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -7168,13 +7978,13 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; - "@textlint/ast-node-types-12.1.0" = { + "@textlint/ast-node-types-12.1.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.1.0.tgz"; - sha512 = "UlxqemrV/EnGTCl26OU7JhtFJpH7NZdgXvnsuII604orcIkvywUA1GGlg51grfbfqi+ar4zRsOb6fVbcbMZnKA=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.1.1.tgz"; + sha512 = "5/XK9S1177UYetOY6407o1RDuNVndaYfuzsZwhmo52V367s4ZuUD2064WhbmCd6TPyKD4dVr2zoWjfNDfzUZQg=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -7186,67 +7996,67 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.1.0" = { + "@textlint/ast-tester-12.1.1" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.1.0.tgz"; - sha512 = "s3VHRDaULFYhxjJ3vP9LUIt2aHLnUB4XFUSRhUVnW4/GDOb1EXCGWFd+wtYy6jTtBg/5TR5ApdC6sNu/SLcb5w=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.1.1.tgz"; + sha512 = "lPbpp9qZ/Me852OzWWOSwqbYa9clziRRRfX6qeRqJOuuc8qNOzvP2vC7quvQPSNcGpnDse2bNwePgxtWhWb5fQ=="; }; }; - "@textlint/ast-traverse-12.1.0" = { + "@textlint/ast-traverse-12.1.1" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.1.0.tgz"; - sha512 = "NJCCMS7lxZ6Ed15zsosbe/5i/SyynqQsxOYxhsMHuyU/adx27WzNWLoFbgTdz6Wmn3Ok1PSFf0442MpoS6SP7g=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.1.1.tgz"; + sha512 = "/hiESq9fwR+4X4U7VfkjhUtuIRuJwnJZpgA+WiSpIwK4Ps60WhB1VBxecyxgNmj3s3EsJn95nCCJntgpa3qQcA=="; }; }; - "@textlint/feature-flag-12.1.0" = { + "@textlint/feature-flag-12.1.1" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.1.0.tgz"; - sha512 = "pQfA2bUXimBQjxT5hVmGGuFf1Cwwx26kbrcwkGHsgxgXlXkg1zboby5UCMOjWda/TbJjynzqDO0JaU24Ms9fZg=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.1.1.tgz"; + sha512 = "NykyIJ7UCs3R1tjThAS6upScmZdia0N/prOT7j1HpMbn1QK61Kqz7M3KZb0T/nhko6jwfN0d3aNP3oMCb4Vyxg=="; }; }; - "@textlint/fixer-formatter-12.1.0" = { + "@textlint/fixer-formatter-12.1.1" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.1.0.tgz"; - sha512 = "ELG9ehkid+J0sRd0mVRbZ+2UOnLqowycrYsaHxDE+xf2s33OcogZa9i3Uact7y2oSCadX00oNLEhsQcwkAqvpw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.1.1.tgz"; + sha512 = "9+f3WG1raKqY+ynS1JS/ESLNgUaKK1gIgK9ENESvrJA0zfg5I774LjjJ65catrorTdv+HHDG40aiD67Pmxdk9A=="; }; }; - "@textlint/kernel-12.1.0" = { + "@textlint/kernel-12.1.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.1.0.tgz"; - sha512 = "6crFn0Ng4Y8PnUvD8HdGMZUlxURx3YgbDv/Grp+7kg8qLlNAkvbyJ1cE8ZYJTF+PfJ1dK1FZmmlZsvrieI4KBQ=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.1.1.tgz"; + sha512 = "5f/miUMLBLUhBy0sJeLVs+34O3GaYyG7hAuTQG9p0ERUnXdJIGtoYU5O0Sfm+xWXPUOeQadK6E7IR+7fsX4Hhw=="; }; }; - "@textlint/linter-formatter-12.1.0" = { + "@textlint/linter-formatter-12.1.1" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.1.0.tgz"; - sha512 = "OoDvn7wD+pAV+W2loCKgxO9V11rYo14GVKkp8UktsqzeOzxxRY5iZUOALMOOde19fOklb2mEvs8AJ4lDaRDJVQ=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.1.1.tgz"; + sha512 = "yE4g+OA+jVqEpF5NayuFoH4l3vvXPT3+gGD9TYhkjBUGmIZ0n4sMzOtmb9R+McujvENwk+7jTZ0pfHtZtpVSHQ=="; }; }; - "@textlint/markdown-to-ast-12.1.0" = { + "@textlint/markdown-to-ast-12.1.1" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.1.0.tgz"; - sha512 = "22FRiXRxTrNVe1gbE18V8TxAtrWb9rKUb1+2mt5vXdgByZ+rHUJuEc4UonAiye/8+0eTrJ4brjPNXgYsJGeMKg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.1.1.tgz"; + sha512 = "TmqFyNqi68YpkqKabrkMlPzeSJMfY/+Wsv1/r43uDFgSYyM9GiD0eIpP12uKyL8xLW+rgfbqXxeFwSo26Conqw=="; }; }; "@textlint/markdown-to-ast-6.1.7" = { @@ -7258,67 +8068,67 @@ let sha512 = "B0QtokeQR4a9+4q0NQr8T9l7A1fFihTN5Ze57tVgqW+3ymzXEouh8DvPHeNQ4T6jEkAThvdjk95mxAMpGRJ79w=="; }; }; - "@textlint/module-interop-12.1.0" = { + "@textlint/module-interop-12.1.1" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.1.0.tgz"; - sha512 = "J1VhFZ7lK1V3Ue7DCvZlGIFEuaongBCkir1XFL+f1yfhfQlgfM5TCp3OBBB6NhKPff8T6sPA9niBzMYr+NyKyA=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.1.1.tgz"; + sha512 = "SiF2NVMFny7OdZ3I+qclJXkuPLOylJVd+v3mPGF8Ri5yuDgOKrbqNyHFzz/Sn2AS0ZsIf04/pGNBQhB+fJOBRQ=="; }; }; - "@textlint/source-code-fixer-12.1.0" = { + "@textlint/source-code-fixer-12.1.1" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.1.0.tgz"; - sha512 = "3HEWCu8XlRpxK0UmUxGEzc4u0deaO0GtisqaEsCVHzlQFq6tzE+5VTdZ4ffon64UN8UV57EAC2ralEV/VgxkBQ=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.1.1.tgz"; + sha512 = "+p7NE5W2Ie+a5dSXGG0onDrqQM9Quj9t9zQruqxN3Qm7F8JD3qBTx9XNZkzQKlnGtrN4x6FUp5wwH/X4BhHh1A=="; }; }; - "@textlint/text-to-ast-12.1.0" = { + "@textlint/text-to-ast-12.1.1" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.1.0.tgz"; - sha512 = "s45+d0E9+gMKz+LC9+sJamU7SVrPyGYsXVLDRM5oxqjdb0MeIfjIFj7xl52MUpAHnywbPSgakB6HHiryiEAmqQ=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.1.1.tgz"; + sha512 = "L+Wf6omQ9u/A+H8kr8Dv1bKQ7j5TeBJX7ShdZz+z0T3oOPDrpCHID6N/NbzuM+a1Q9s9UAG5gkqiROHNjXqUug=="; }; }; - "@textlint/textlint-plugin-markdown-12.1.0" = { + "@textlint/textlint-plugin-markdown-12.1.1" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.1.0.tgz"; - sha512 = "bS67fq4Ea2JdKO4mJM4sGSATVI1bw9++IfOIsx2rc01NfZlTxwz4kM8lrhvNFHGY4URaN1kCULSgupeI/u/Seg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.1.1.tgz"; + sha512 = "gzQ205ClqECTblIdkpFkWL6M4nxr5oMON/jU6xbRdZ/Shy+OHLY7fP3R2L2RmAmMSE7C6ZWK5Lk7k9XaaUpgVA=="; }; }; - "@textlint/textlint-plugin-text-12.1.0" = { + "@textlint/textlint-plugin-text-12.1.1" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.1.0.tgz"; - sha512 = "ItqpVEYLDYQkEk0ixeD4wElqkgkDErAGGDN/QK4cmIvtBeVd/GSIQFS1pwC1/Abmd4dTK3j/9z/dov1gVFZB1Q=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.1.1.tgz"; + sha512 = "U3WFM2fPy0ifC9lVW0GXjF5h1Dquit3rLO6UisC9UF75Ic6JjelcypjHwpp1trx0/t5FXp+94R5uJEpM360A0g=="; }; }; - "@textlint/types-12.1.0" = { + "@textlint/types-12.1.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.1.0.tgz"; - sha512 = "O8RQUiGnBvBrwV/fLHp2vU+y3w223G+qKUzvW/k2eFwAdbtmCfordoKESXAIGuqAUZjgiM2+Mt3We1pY+tMR3g=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-12.1.1.tgz"; + sha512 = "s0TjnEwEwp3fa8yEhEH8w/lFpih15wtQy2CYaKx0eMScl1bSh+0e8WhiGZaTiiJXAGwNCw6erxB0reBScdU/hA=="; }; }; - "@textlint/utils-12.1.0" = { + "@textlint/utils-12.1.1" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.1.0.tgz"; - sha512 = "WE0bxQ/q+PgSslqEBuDi4Z8ZskBA0ZEehmKqcsd0hpDWU4VRU/R9o/WVXwia0APbQxgXPYWaHf1Rb7FAKUcVcg=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.1.1.tgz"; + sha512 = "ENAm6ro+OAh6XZZSeZIJQCrY07IHWB7DGM6SwtKEfxcA9joF1uS/sLPqKmcW9fyvLvMnloVUsfVlaoNsLJXDKA=="; }; }; "@tokenizer/token-0.1.1" = { @@ -7528,15 +8338,6 @@ let sha512 = "G4yqdVlhr6YhzLXFKy5F7HtRBU8Y23+iWy7UKthMq/OSQnL1hbsoeXESQ2LY8zEDlknipDG3nRGhUC9tkwvy/w=="; }; }; - "@types/basic-auth-1.1.3" = { - name = "_at_types_slash_basic-auth"; - packageName = "@types/basic-auth"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/basic-auth/-/basic-auth-1.1.3.tgz"; - sha512 = "W3rv6J0IGlxqgE2eQ2pTb0gBjaGtejQpJ6uaCjz3UQ65+TFTPC5/lAE+POfx1YLdjtxvejJzsIAfd3MxWiVmfg=="; - }; - }; "@types/bn.js-5.1.0" = { name = "_at_types_slash_bn.js"; packageName = "@types/bn.js"; @@ -7555,6 +8356,15 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; + "@types/body-parser-1.19.1" = { + name = "_at_types_slash_body-parser"; + packageName = "@types/body-parser"; + version = "1.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg=="; + }; + }; "@types/body-parser-1.19.2" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -7591,15 +8401,6 @@ let sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; }; }; - "@types/chart.js-2.9.24" = { - name = "_at_types_slash_chart.js"; - packageName = "@types/chart.js"; - version = "2.9.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.24.tgz"; - sha512 = "AQI7X+ow3SaONl44JrHoL/5B+lCsJyG31UHZ5RP98Uh15hI/zjEkDsAb4EIm4P9TGfNhZLXw/nMc5w0u10+/fQ=="; - }; - }; "@types/clone-2.1.1" = { name = "_at_types_slash_clone"; packageName = "@types/clone"; @@ -7780,15 +8581,6 @@ let sha512 = "qdBo/2Y8MXaJ/2spKjDZocuq79GpnOhkwMHnK2GnVFa8WYFgfA+ei6sil3aeWQPCreOKIx9ogPpR5+7MaOqYAA=="; }; }; - "@types/engine.io-3.1.7" = { - name = "_at_types_slash_engine.io"; - packageName = "@types/engine.io"; - version = "3.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.7.tgz"; - sha512 = "qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ=="; - }; - }; "@types/eslint-7.29.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; @@ -7861,15 +8653,6 @@ let sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-4.17.8" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz"; - sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; - }; - }; "@types/express-serve-static-core-4.17.28" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -7879,13 +8662,13 @@ let sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; }; - "@types/fancy-log-1.3.0" = { - name = "_at_types_slash_fancy-log"; - packageName = "@types/fancy-log"; - version = "1.3.0"; + "@types/file-type-10.9.1" = { + name = "_at_types_slash_file-type"; + packageName = "@types/file-type"; + version = "10.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-1.3.0.tgz"; - sha512 = "mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw=="; + url = "https://registry.npmjs.org/@types/file-type/-/file-type-10.9.1.tgz"; + sha512 = "oq0fy8Jqj19HofanFsZ56o5anMDUQtFO9B3wfLqM9o42RyCe1WT+wRbSvRbL2l8ARZXNaJturHk0b442+0yi+g=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -7951,13 +8734,13 @@ let sha512 = "wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g=="; }; }; - "@types/hls.js-0.13.1" = { + "@types/hls.js-0.13.3" = { name = "_at_types_slash_hls.js"; packageName = "@types/hls.js"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.1.tgz"; - sha512 = "5sr71YcHBVHJY8DhM+L6O9WjAGS3jrie2hpBldVpd8sqvRvNTgIikTE6RxKya1ZvJCvUkZR2ewQarZaC4TRZLg=="; + url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.3.tgz"; + sha512 = "Po8ZPCsAcPPuf5OODPEkb6cdWJ/w4BdX1veP7IIOc2WG0x1SW4GEQ1+FHKN1AMG2AePJfNUceJbh5PKtP92yRQ=="; }; }; "@types/html-minifier-terser-5.1.2" = { @@ -8068,13 +8851,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jquery-3.5.13" = { + "@types/jquery-3.5.14" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.13"; + version = "3.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.13.tgz"; - sha512 = "ZxJrup8nz/ZxcU0vantG+TPdboMhB24jad2uSap50zE7Q9rUeYlCF25kFMSmHR33qoeOgqcdHEp3roaookC0Sg=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz"; + sha512 = "X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg=="; }; }; "@types/js-levenshtein-1.1.1" = { @@ -8086,22 +8869,22 @@ let sha512 = "qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g=="; }; }; - "@types/js-yaml-3.12.5" = { + "@types/js-yaml-3.12.7" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; - version = "3.12.5"; + version = "3.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.5.tgz"; - sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.7.tgz"; + sha512 = "S6+8JAYTE1qdsc9HMVsfY7+SgSuUU/Tp6TYTmITW0PZxiyIMvol3Gy//y69Wkhs0ti4py5qgR3uZH6uz/DNzJQ=="; }; }; - "@types/js-yaml-3.12.7" = { + "@types/js-yaml-4.0.4" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; - version = "3.12.7"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.7.tgz"; - sha512 = "S6+8JAYTE1qdsc9HMVsfY7+SgSuUU/Tp6TYTmITW0PZxiyIMvol3Gy//y69Wkhs0ti4py5qgR3uZH6uz/DNzJQ=="; + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.4.tgz"; + sha512 = "AuHubXUmg0AzkXH0Mx6sIxeY/1C110mm/EkE/gB1sTRz3h2dao2W/63q42SlVST+lICxz5Oki2hzYA6+KnnieQ=="; }; }; "@types/js-yaml-4.0.5" = { @@ -8131,6 +8914,15 @@ let sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; }; + "@types/json-stable-stringify-1.0.33" = { + name = "_at_types_slash_json-stable-stringify"; + packageName = "@types/json-stable-stringify"; + version = "1.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.33.tgz"; + sha512 = "qEWiQff6q2tA5gcJGWwzplQcXdJtm+0oy6IHGHzlOf3eFAkGE/FIPXZK9ofWgNSHVp8AFFI33PJJshS0ei3Gvw=="; + }; + }; "@types/json5-0.0.29" = { name = "_at_types_slash_json5"; packageName = "@types/json5"; @@ -8185,13 +8977,13 @@ let sha512 = "HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA=="; }; }; - "@types/lodash-4.14.161" = { + "@types/lodash-4.14.176" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.161"; + version = "4.14.176"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz"; - sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz"; + sha512 = "xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ=="; }; }; "@types/lodash-4.14.178" = { @@ -8203,6 +8995,15 @@ let sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="; }; }; + "@types/lodash-4.14.179" = { + name = "_at_types_slash_lodash"; + packageName = "@types/lodash"; + version = "4.14.179"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz"; + sha512 = "uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w=="; + }; + }; "@types/long-4.0.1" = { name = "_at_types_slash_long"; packageName = "@types/long"; @@ -8230,15 +9031,6 @@ let sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; }; }; - "@types/material-design-lite-1.1.16" = { - name = "_at_types_slash_material-design-lite"; - packageName = "@types/material-design-lite"; - version = "1.1.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/material-design-lite/-/material-design-lite-1.1.16.tgz"; - sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA=="; - }; - }; "@types/mdast-3.0.10" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; @@ -8284,15 +9076,6 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/minimist-1.2.0" = { - name = "_at_types_slash_minimist"; - packageName = "@types/minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz"; - sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; - }; - }; "@types/minimist-1.2.2" = { name = "_at_types_slash_minimist"; packageName = "@types/minimist"; @@ -8302,22 +9085,13 @@ let sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; }; }; - "@types/mithril-2.0.3" = { - name = "_at_types_slash_mithril"; - packageName = "@types/mithril"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mithril/-/mithril-2.0.3.tgz"; - sha512 = "cZHOdO2IiXYeyjeDYdbOisSdfaJRzfmRo3zVzgu33IWTMA0KEQObp9fdvqcuYdPz93iJ1yCl19GcEjo/9yv+yA=="; - }; - }; - "@types/mkdirp-1.0.1" = { + "@types/mkdirp-1.0.2" = { name = "_at_types_slash_mkdirp"; packageName = "@types/mkdirp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz"; - sha512 = "HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q=="; + url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.2.tgz"; + sha512 = "o0K1tSO0Dx5X6xlU5F1D6625FawhC3dU3iqr25lluNv/+/QIVH8RLNEiVokgIZo+mz+87w/3Mkg/VvQS+J51fQ=="; }; }; "@types/mocha-7.0.2" = { @@ -8338,6 +9112,15 @@ let sha512 = "ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw=="; }; }; + "@types/mongodb-4.0.6" = { + name = "_at_types_slash_mongodb"; + packageName = "@types/mongodb"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mongodb/-/mongodb-4.0.6.tgz"; + sha512 = "XTbn1Z1j7fHzC1Vkd9LYO48lO2C581r+oRCi/KNzcTHIri7hEaya8r9vxoHJiKr+oeUWVK69+9xr84Mp+aReaw=="; + }; + }; "@types/ms-0.7.31" = { name = "_at_types_slash_ms"; packageName = "@types/ms"; @@ -8347,22 +9130,13 @@ let sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; }; }; - "@types/multer-1.4.4" = { + "@types/multer-1.4.7" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.4.tgz"; - sha512 = "wdfkiKBBEMTODNbuF3J+qDDSqJxt50yB9pgDiTcFew7f97Gcc7/sM4HR66ofGgpJPOALWOqKAch4gPyqEXSkeQ=="; - }; - }; - "@types/mysql-2.15.15" = { - name = "_at_types_slash_mysql"; - packageName = "@types/mysql"; - version = "2.15.15"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.15.tgz"; - sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; + url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.7.tgz"; + sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; "@types/nlcst-1.0.0" = { @@ -8401,13 +9175,13 @@ let sha512 = "Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="; }; }; - "@types/node-12.20.46" = { + "@types/node-12.20.47" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.46"; + version = "12.20.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.46.tgz"; - sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz"; + sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg=="; }; }; "@types/node-13.13.52" = { @@ -8419,15 +9193,6 @@ let sha512 = "s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="; }; }; - "@types/node-14.11.1" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz"; - sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; - }; - }; "@types/node-14.17.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -8455,31 +9220,31 @@ let sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; }; }; - "@types/node-16.11.25" = { + "@types/node-16.11.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.25"; + version = "16.11.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.25.tgz"; - sha512 = "NrTwfD7L1RTc2qrHQD4RTTy4p0CO2LatKBEKEds3CaVuhoM/+DJzmWZl5f+ikR8cm8F5mfJxK+9rQq07gRiSjQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz"; + sha512 = "GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="; }; }; - "@types/node-16.11.7" = { + "@types/node-16.11.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.7"; + version = "16.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz"; - sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz"; + sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="; }; }; - "@types/node-17.0.10" = { + "@types/node-16.11.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.10"; + version = "16.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.10.tgz"; - sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz"; + sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="; }; }; "@types/node-17.0.14" = { @@ -8500,15 +9265,6 @@ let sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; }; }; - "@types/node-17.0.16" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "17.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.16.tgz"; - sha512 = "ydLaGVfQOQ6hI1xK2A5nVh8bl0OGoIfYMxPWHqqYe9bTkWCfqiVvZoh2I/QF2sNSkZzZyROBoTefIEI+PB6iIA=="; - }; - }; "@types/node-17.0.17" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -8527,22 +9283,13 @@ let sha512 = "eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA=="; }; }; - "@types/node-17.0.19" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "17.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.19.tgz"; - sha512 = "PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA=="; - }; - }; - "@types/node-17.0.8" = { + "@types/node-17.0.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.8"; + version = "17.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz"; - sha512 = "YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"; + sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; }; }; "@types/node-6.14.13" = { @@ -8626,24 +9373,6 @@ let sha512 = "Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ=="; }; }; - "@types/pg-7.14.5" = { - name = "_at_types_slash_pg"; - packageName = "@types/pg"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.5.tgz"; - sha512 = "wqTKZmqkqXd1YiVRBT2poRrMIojwEi2bKTAAjUX6nEbzr98jc3cfR/7o7ZtubhH5xT7YJ6LRdRr1GZOgs8OUjg=="; - }; - }; - "@types/pg-types-2.2.0" = { - name = "_at_types_slash_pg-types"; - packageName = "@types/pg-types"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "a+fLdul8OczRvPWPf8eTb6wPhxzyWQwRGhNN0ugtOtk6yFOG53i2LwXaA0d2D6bsJlWxi6eCuGZLGoCcdOlWZA=="; - }; - }; "@types/prop-types-15.7.4" = { name = "_at_types_slash_prop-types"; packageName = "@types/prop-types"; @@ -8698,22 +9427,22 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/rc-1.2.0" = { + "@types/rc-1.2.1" = { name = "_at_types_slash_rc"; packageName = "@types/rc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.0.tgz"; - sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; + url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.1.tgz"; + sha512 = "+TRLFmHLnpoV0uw4O/PzqMbPT6bhQM0q2KO0l+R7M3sHYRndPpNL6kv8p7Ee9ZxgQ6noYB18/t+heQi7eijOHA=="; }; }; - "@types/react-16.14.23" = { + "@types/react-16.14.24" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.23"; + version = "16.14.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.23.tgz"; - sha512 = "WngBZLuSkP4IAgPi0HOsGCHo6dn3CcuLQnCfC17VbA7YBgipZiZoTOhObwl/93DsFW0Y2a/ZXeonpW4DxirEJg=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.24.tgz"; + sha512 = "e7U2WC8XQP/xfR7bwhOhNFZKPTfW1ph+MiqtudKb8tSV8RyCsovQx2sNVtKoOryjxFKpHPPC/yNiGfdeVM5Gyw=="; }; }; "@types/react-dom-16.9.14" = { @@ -8743,15 +9472,6 @@ let sha512 = "V8g8sBDLVeJJAfEENJS7VXZK+DRJ+jzPNtk8jpj2G+obhf+iqGNUDGwNWCbBhLiD+KpHhf3kWQlKBRi0tAeU4Q=="; }; }; - "@types/request-2.48.5" = { - name = "_at_types_slash_request"; - packageName = "@types/request"; - version = "2.48.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz"; - sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ=="; - }; - }; "@types/request-2.48.7" = { name = "_at_types_slash_request"; packageName = "@types/request"; @@ -8851,22 +9571,31 @@ let sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; }; }; - "@types/socket.io-2.1.11" = { + "@types/smoothscroll-polyfill-0.3.1" = { + name = "_at_types_slash_smoothscroll-polyfill"; + packageName = "@types/smoothscroll-polyfill"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/smoothscroll-polyfill/-/smoothscroll-polyfill-0.3.1.tgz"; + sha512 = "+KkHw4y+EyeCtVXET7woHUhIbfWFCflc0E0mZnSV+ZdjPQeHt/9KPEuT7gSW/kFQ8O3EG30PLO++YhChDt8+Ag=="; + }; + }; + "@types/socket.io-3.0.1" = { name = "_at_types_slash_socket.io"; packageName = "@types/socket.io"; - version = "2.1.11"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.11.tgz"; - sha512 = "bVprmqPhJMLb9ZCm8g0Xy8kwBFRbnanOWSxzWkDkkIwxTvud5tKMfAJymXX6LQbizUKCS1yima7JM4BeLqjNqA=="; + url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-3.0.1.tgz"; + sha512 = "XSma2FhVD78ymvoxYV4xGXrIH/0EKQ93rR+YR0Y+Kw1xbPzLDCip/UWSejZ08FpxYeYNci/PZPQS9anrvJRqMA=="; }; }; - "@types/socket.io-client-1.4.33" = { + "@types/socket.io-client-1.4.36" = { name = "_at_types_slash_socket.io-client"; packageName = "@types/socket.io-client"; - version = "1.4.33"; + version = "1.4.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.33.tgz"; - sha512 = "m4LnxkljsI9fMsjwpW5QhRpMixo2BeeLpFmg0AE+sS4H1pzAd/cs/ftTiL60FLZgfFa8PFRPx5KsHu8O0bADKQ=="; + url = "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.36.tgz"; + sha512 = "ZJWjtFBeBy1kRSYpVbeGYTElf6BqPQUkXDlHHD4k/42byCN5Rh027f4yARHCink9sKAkbtGZXEAmR0ZCnc2/Ag=="; }; }; "@types/sockjs-0.3.33" = { @@ -8887,13 +9616,22 @@ let sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; }; }; - "@types/sqlite3-3.1.6" = { + "@types/source-map-support-0.5.4" = { + name = "_at_types_slash_source-map-support"; + packageName = "@types/source-map-support"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.4.tgz"; + sha512 = "9zGujX1sOPg32XLyfgEB/0G9ZnrjthL/Iv1ZfuAjj8LEilHZEpQSQs1scpRXPhHzGYgWiLz9ldF1cI8JhL+yMw=="; + }; + }; + "@types/sqlite3-3.1.7" = { name = "_at_types_slash_sqlite3"; packageName = "@types/sqlite3"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.6.tgz"; - sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA=="; + url = "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.7.tgz"; + sha512 = "8FHV/8Uzd7IwdHm5mvmF2Aif4aC/gjrt4axWD9SmfaxITnOjtOhCbOSTuqv/VbH1uq0QrwlaTj9aTz3gmR6u4w=="; }; }; "@types/stack-utils-2.0.1" = { @@ -8986,13 +9724,13 @@ let sha512 = "PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="; }; }; - "@types/url-join-4.0.0" = { + "@types/url-join-4.0.1" = { name = "_at_types_slash_url-join"; packageName = "@types/url-join"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.0.tgz"; - sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; + url = "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.1.tgz"; + sha512 = "wDXw9LEEUHyV+7UWy7U315nrJGJ7p1BzaCxDpEoLr789Dk1WDVMMlf3iBfbG2F8NdWnYyFbtTxUn2ZNbm1Q4LQ=="; }; }; "@types/url-parse-1.4.8" = { @@ -9004,6 +9742,15 @@ let sha512 = "zqqcGKyNWgTLFBxmaexGUKQyWqeG7HjXj20EuQJSJWwXe54BjX0ihIo5cJB9yAQzH8dNugJ9GvkBYMjPXs/PJw=="; }; }; + "@types/uuid-3.4.10" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "3.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.10.tgz"; + sha512 = "BgeaZuElf7DEYZhWYDTc/XcLZXdVgFkVSTa13BqKvbnmUrxr3TJFKofUxCtDO9UQOdhnV+HPOESdHiHKZOJV1A=="; + }; + }; "@types/vfile-3.0.2" = { name = "_at_types_slash_vfile"; packageName = "@types/vfile"; @@ -9031,13 +9778,22 @@ let sha512 = "ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g=="; }; }; - "@types/vscode-1.64.0" = { + "@types/vscode-1.65.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.64.0"; + version = "1.65.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.65.0.tgz"; + sha512 = "wQhExnh2nEzpjDMSKhUvnNmz3ucpd3E+R7wJkOhBNK3No6fG3VUdmVmMOKD0A8NDZDDDiQcLNxe3oGmX5SjJ5w=="; + }; + }; + "@types/webidl-conversions-6.1.1" = { + name = "_at_types_slash_webidl-conversions"; + packageName = "@types/webidl-conversions"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.64.0.tgz"; - sha512 = "bSlAWz5WtcSL3cO9tAT/KpEH9rv5OBnm93OIIFwdCshaAiqr2bp1AUyEwW9MWeCvZBHEXc3V0fTYVdVyzDNwHA=="; + url = "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-6.1.1.tgz"; + sha512 = "XAahCdThVuCFDQLT7R7Pk/vqeObFNL3YqRyFZg+AqAP/W1/w3xHaIxuW7WszQqTbIBOPRcItYJIou3i/mppu3Q=="; }; }; "@types/webpack-4.41.32" = { @@ -9049,6 +9805,24 @@ let sha512 = "cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg=="; }; }; + "@types/webpack-dev-server-3.11.6" = { + name = "_at_types_slash_webpack-dev-server"; + packageName = "@types/webpack-dev-server"; + version = "3.11.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz"; + sha512 = "XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ=="; + }; + }; + "@types/webpack-env-1.16.3" = { + name = "_at_types_slash_webpack-env"; + packageName = "@types/webpack-env"; + version = "1.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.3.tgz"; + sha512 = "9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw=="; + }; + }; "@types/webpack-sources-3.2.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; @@ -9076,6 +9850,24 @@ let sha512 = "NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ=="; }; }; + "@types/whatwg-url-8.2.1" = { + name = "_at_types_slash_whatwg-url"; + packageName = "@types/whatwg-url"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.1.tgz"; + sha512 = "2YubE1sjj5ifxievI5Ge1sckb9k/Er66HyR2c+3+I6VDUUg1TLPdYYTEbQ+DjRkS4nTxMJhgWfSfMRD2sl2EYQ=="; + }; + }; + "@types/ws-6.0.4" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; + sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; + }; + }; "@types/ws-7.4.7" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -9103,13 +9895,13 @@ let sha512 = "NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg=="; }; }; - "@types/ws-8.2.3" = { + "@types/ws-8.5.2" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.2.3"; + version = "8.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.2.3.tgz"; - sha512 = "ahRJZquUYCdOZf/rCsWg88S0/+cb9wazUBHv6HZEe3XdYaBe2zr/slM8J28X07Hn88Pnm4ezo7N8/ofnOgrPVQ=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.2.tgz"; + sha512 = "VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw=="; }; }; "@types/yargs-15.0.14" = { @@ -9130,13 +9922,13 @@ let sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw=="; }; }; - "@types/yargs-parser-20.2.1" = { + "@types/yargs-parser-21.0.0" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "20.2.1"; + version = "21.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; "@types/yauzl-2.9.2" = { @@ -9220,69 +10012,6 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@uifabric/foundation-7.10.1" = { - name = "_at_uifabric_slash_foundation"; - packageName = "@uifabric/foundation"; - version = "7.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.10.1.tgz"; - sha512 = "Op05qHLBFEieT4+fG8OgpzqDHTQyei1dgVXDd6M4VS6CFJ5ZIPtC7Lwi+ZlkPkwUwccQ9mijuQumzpNKdv035A=="; - }; - }; - "@uifabric/icons-7.6.2" = { - name = "_at_uifabric_slash_icons"; - packageName = "@uifabric/icons"; - version = "7.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.6.2.tgz"; - sha512 = "q7jEIwB5Tt2Egw9fqdgNPlBqBQ6hNNMQ3qs5y4S4YETRluB+AQTdKbrbYMsXo3Pm0FsJnRfiDojMzxusGX+MWA=="; - }; - }; - "@uifabric/merge-styles-7.19.2" = { - name = "_at_uifabric_slash_merge-styles"; - packageName = "@uifabric/merge-styles"; - version = "7.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.2.tgz"; - sha512 = "kTlhwglDqwVgIaJq+0yXgzi65plGhmFcPrfme/rXUGMJZoU+qlGT5jXj5d3kuI59p6VB8jWEg9DAxHozhYeu0g=="; - }; - }; - "@uifabric/react-hooks-7.14.0" = { - name = "_at_uifabric_slash_react-hooks"; - packageName = "@uifabric/react-hooks"; - version = "7.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.14.0.tgz"; - sha512 = "Ndu/DEKHF4gFXEZa2AGgSkdWaj+njVrsSyXbkWRh2UZReFWnH1LMko9p/ZCwk1i9kAd5CUmyIfURUzIEya9YCg=="; - }; - }; - "@uifabric/set-version-7.0.24" = { - name = "_at_uifabric_slash_set-version"; - packageName = "@uifabric/set-version"; - version = "7.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.24.tgz"; - sha512 = "t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg=="; - }; - }; - "@uifabric/styling-7.20.0" = { - name = "_at_uifabric_slash_styling"; - packageName = "@uifabric/styling"; - version = "7.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.20.0.tgz"; - sha512 = "SoaK5J4cwn8D9DWejRlWo+TmKZaHIiVlkIH+B2zLXE8Uc4ZYcotwYGxaSc1gCA16viLvGQkQU+ieWFq91RxdRw=="; - }; - }; - "@uifabric/utilities-7.33.5" = { - name = "_at_uifabric_slash_utilities"; - packageName = "@uifabric/utilities"; - version = "7.33.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.5.tgz"; - sha512 = "I+Oi0deD/xltSluFY8l2EVd/J4mvOaMljxKO2knSD9/KoGDlo/o5GN4gbnVo8nIt76HWHLAk3KtlJKJm6BhbIQ=="; - }; - }; "@ungap/promise-all-settled-1.1.2" = { name = "_at_ungap_slash_promise-all-settled"; packageName = "@ungap/promise-all-settled"; @@ -9355,6 +10084,78 @@ let sha512 = "98PTOukChScYXekWbDxPQEUCoX66W4188yx4Q4qiLTJgYRHsvQ5oWtNL5N0sz80mmYCk6aJglwnPE1d7tvgAmQ=="; }; }; + "@vscode/emmet-helper-2.8.4" = { + name = "_at_vscode_slash_emmet-helper"; + packageName = "@vscode/emmet-helper"; + version = "2.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz"; + sha512 = "lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg=="; + }; + }; + "@vue/cli-overlay-4.5.15" = { + name = "_at_vue_slash_cli-overlay"; + packageName = "@vue/cli-overlay"; + version = "4.5.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.5.15.tgz"; + sha512 = "0zI0kANAVmjFO2LWGUIzdGPMeE3+9k+KeRDXsUqB30YfRF7abjfiiRPq5BU9pOzlJbVdpRkisschBrvdJqDuDg=="; + }; + }; + "@vue/cli-plugin-eslint-4.5.12" = { + name = "_at_vue_slash_cli-plugin-eslint"; + packageName = "@vue/cli-plugin-eslint"; + version = "4.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.12.tgz"; + sha512 = "nbjGJkWxo/xdD32DwvnEAUwkWYsObpqNk9NuU7T62ehdzHPzz58o3j03YZ7a7T7Le8bYyOWMYsdNfz63F+XiZQ=="; + }; + }; + "@vue/cli-plugin-router-4.5.15" = { + name = "_at_vue_slash_cli-plugin-router"; + packageName = "@vue/cli-plugin-router"; + version = "4.5.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.15.tgz"; + sha512 = "q7Y6kP9b3k55Ca2j59xJ7XPA6x+iSRB+N4ac0ZbcL1TbInVQ4j5wCzyE+uqid40hLy4fUdlpl4X9fHJEwuVxPA=="; + }; + }; + "@vue/cli-plugin-typescript-4.5.13" = { + name = "_at_vue_slash_cli-plugin-typescript"; + packageName = "@vue/cli-plugin-typescript"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-typescript/-/cli-plugin-typescript-4.5.13.tgz"; + sha512 = "CpLlIdFNV1gn9uC4Yh6QgWI42uk2x5Z3cb2ScxNSwWsR1vgSdr0/1DdNzoBm68aP8RUtnHHO/HZfPnvXiq42xA=="; + }; + }; + "@vue/cli-plugin-vuex-4.5.13" = { + name = "_at_vue_slash_cli-plugin-vuex"; + packageName = "@vue/cli-plugin-vuex"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.13.tgz"; + sha512 = "I1S9wZC7iI0Wn8kw8Zh+A2Qkf6s1M6vTGBkx8boXjuzfwEEyEHRxadsVCecZc8Mkpydo0nykj+MyYF96TKFuVA=="; + }; + }; + "@vue/cli-service-4.5.13" = { + name = "_at_vue_slash_cli-service"; + packageName = "@vue/cli-service"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.5.13.tgz"; + sha512 = "CKAZN4iokMMsaUyJRU22oUAz3oS/X9sVBSKAF2/shFBV5xh3jqAlKl8OXZYz4cXGFLA6djNuYrniuLAo7Ku97A=="; + }; + }; + "@vue/cli-shared-utils-4.5.15" = { + name = "_at_vue_slash_cli-shared-utils"; + packageName = "@vue/cli-shared-utils"; + version = "4.5.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.15.tgz"; + sha512 = "SKaej9hHzzjKSOw1NlFmc6BSE0vcqUQMQiv1cxQ2DhVyy4QxZXBmzmiLBUBe+hYZZs1neXW7n//udeN9bCAY+Q=="; + }; + }; "@vue/cli-shared-utils-5.0.1" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -9409,6 +10210,42 @@ let sha512 = "60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg=="; }; }; + "@vue/component-compiler-utils-3.3.0" = { + name = "_at_vue_slash_component-compiler-utils"; + packageName = "@vue/component-compiler-utils"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"; + sha512 = "97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ=="; + }; + }; + "@vue/eslint-config-prettier-6.0.0" = { + name = "_at_vue_slash_eslint-config-prettier"; + packageName = "@vue/eslint-config-prettier"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz"; + sha512 = "wFQmv45c3ige5EA+ngijq40YpVcIkAy0Lihupnsnd1Dao5CBbPyfCzqtejFLZX1EwH/kCJdpz3t6s+5wd3+KxQ=="; + }; + }; + "@vue/eslint-config-typescript-7.0.0" = { + name = "_at_vue_slash_eslint-config-typescript"; + packageName = "@vue/eslint-config-typescript"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-7.0.0.tgz"; + sha512 = "UxUlvpSrFOoF8aQ+zX1leYiEBEm7CZmXYn/ZEM1zwSadUzpamx56RB4+Htdjisv1mX2tOjBegNUqH3kz2OL+Aw=="; + }; + }; + "@vue/preload-webpack-plugin-1.1.2" = { + name = "_at_vue_slash_preload-webpack-plugin"; + packageName = "@vue/preload-webpack-plugin"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"; + sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; + }; + }; "@vue/shared-3.2.31" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; @@ -9418,6 +10255,15 @@ let sha512 = "ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="; }; }; + "@vue/web-component-wrapper-1.3.0" = { + name = "_at_vue_slash_web-component-wrapper"; + packageName = "@vue/web-component-wrapper"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"; + sha512 = "Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="; + }; + }; "@webassemblyjs/ast-1.11.1" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -10219,13 +11065,13 @@ let sha512 = "3SIr/jmyHDMkCzOtcH03YG9qTAJeE7auPg/V7e9tJrhiW329hNMhg8+VAO72Tp1AOi5bMhma09ACRS2Y9bMOKA=="; }; }; - "@xstate/fsm-1.6.4" = { + "@xstate/fsm-1.6.5" = { name = "_at_xstate_slash_fsm"; packageName = "@xstate/fsm"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.4.tgz"; - sha512 = "JvoozDB1ndz+byxXsQYW150gAJQIAKZt8MfU2a4dqGhhxfvHBKNj5e1rqb+adVCLtB+F/McyUBe4jRauFhTCTQ=="; + url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.5.tgz"; + sha512 = "b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -10363,6 +11209,15 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; + "abortcontroller-polyfill-1.7.3" = { + name = "abortcontroller-polyfill"; + packageName = "abortcontroller-polyfill"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz"; + sha512 = "zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q=="; + }; + }; "abstract-extension-3.1.1" = { name = "abstract-extension"; packageName = "abstract-extension"; @@ -10777,13 +11632,13 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "agentkeepalive-4.2.0" = { + "agentkeepalive-4.2.1" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz"; - sha512 = "0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; }; }; "aggregate-error-3.1.0" = { @@ -11623,6 +12478,15 @@ let sha1 = "2af5c2b544a40e15fc1ac55548314397460845d0"; }; }; + "app-root-path-3.0.0" = { + name = "app-root-path"; + packageName = "app-root-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz"; + sha512 = "qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw=="; + }; + }; "appdata-path-1.0.0" = { name = "appdata-path"; packageName = "appdata-path"; @@ -11902,13 +12766,31 @@ let sha1 = "6e7207b4ecdb39b0af88303fa5ae22bda8df61cb"; }; }; - "aribts-1.3.5" = { - name = "aribts"; - packageName = "aribts"; - version = "1.3.5"; + "arib-mpeg2ts-parser-3.0.13" = { + name = "arib-mpeg2ts-parser"; + packageName = "arib-mpeg2ts-parser"; + version = "3.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/arib-mpeg2ts-parser/-/arib-mpeg2ts-parser-3.0.13.tgz"; + sha512 = "QgNZghj9R4dafXeBJbKZ0Ff5f7YENqQP/CDLAhWEWXdPoOOPUcQCu5zs3KHqeTKxg3/ip6i8a+aIu+J6QYICOg=="; + }; + }; + "arib-subtitle-timedmetadater-4.0.9" = { + name = "arib-subtitle-timedmetadater"; + packageName = "arib-subtitle-timedmetadater"; + version = "4.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/arib-subtitle-timedmetadater/-/arib-subtitle-timedmetadater-4.0.9.tgz"; + sha512 = "bfLMCjJlon8+GdOMP7gMIzTHaoxWBFTypREYsaTMlqgFw4O5WnYtU8xrDbeafp792zylvw2xHMIayXtgbRoj7Q=="; + }; + }; + "aribb24.js-1.8.8" = { + name = "aribb24.js"; + packageName = "aribb24.js"; + version = "1.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/aribts/-/aribts-1.3.5.tgz"; - sha512 = "fvDR4iYpZkbMqMbTfKynPGfpXDhFTxzZWSS7C3c70xQ8ElmFkjwVrg/NLcEA+R3s4Jz6mVrz/1vOLEAI+ycrSQ=="; + url = "https://registry.npmjs.org/aribb24.js/-/aribb24.js-1.8.8.tgz"; + sha512 = "7tCEIOzDoDxvr5UuGTVDpszRYNcJFLRqAXf/lIbJi6DmeeDnfbYQdfr0DiRokG/MUSPx5rqyxRSyVSoWDanGNw=="; }; }; "aribts-2.1.12" = { @@ -13072,22 +13954,31 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1077.0" = { + "aws-sdk-2.1085.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1077.0"; + version = "2.1085.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1077.0.tgz"; - sha512 = "orJvJROs8hJaQRfHsX7Zl5PxEgrD/uTXyqXz9Yu9Io5VVxzvnOty9oHmvEMSlgTIf1qd01gnev/vpvP1HgzKtw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1085.0.tgz"; + sha512 = "zL20v5QXoSsb2S6RKAhDmfnZYUIRldR93ihJ6mCYrw6Zl+Dir2SVmALy++U/zduDbKB4NaU72mscumx2RWc7Hg=="; }; }; - "aws-sdk-2.920.0" = { + "aws-sdk-2.1091.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.920.0"; + version = "2.1091.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.920.0.tgz"; - sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1091.0.tgz"; + sha512 = "DSidFjHdZZopF2kBt6I5wlkxeV5xhXWWXtLtZVQw9g9RQxFnmm+B3iBf1mQtw9fPspfyKyQwnBUNnvMtPku3Yw=="; + }; + }; + "aws-sdk-2.1092.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.1092.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1092.0.tgz"; + sha512 = "8PH2rOgZazGT3VfGPkKcvzz2K9ylVfDniJH4WfJXHEBGxu0+XEMDbjuYpe8k/L1C7w0UTP6CuChjqCxgJznrxg=="; }; }; "aws-sign2-0.6.0" = { @@ -13189,15 +14080,6 @@ let sha512 = "XDG91XzLZ15reP12s3jFkKS8oiagSICjnLwxEYieme4+4h3ZveFOFRA4iYIG40RyHXsiI0mefFYYMFIJbMpWcg=="; }; }; - "b24.js-1.0.3" = { - name = "b24.js"; - packageName = "b24.js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/b24.js/-/b24.js-1.0.3.tgz"; - sha512 = "j2hHu0asf6HxacVmGJKFSsrfoG8nC0JEjujIpsmRVkr74nC6o5gs6YF6AQD3e7YyJ8PaKuA7k2uSL9A2mAG9Og=="; - }; - }; "b4a-1.3.1" = { name = "b4a"; packageName = "b4a"; @@ -13495,13 +14377,13 @@ let sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; }; }; - "babel-plugin-styled-components-2.0.3" = { + "babel-plugin-styled-components-2.0.6" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "2.0.3"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.3.tgz"; - sha512 = "lMrl3GdPrTl9daQJ70eRCPM9fHlvQx6YJNM7RqojKGbRnvG2AL7qvURlZ3L0GzRGnGr19SjvBKWcnlZZkgQ8/Q=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.6.tgz"; + sha512 = "Sk+7o/oa2HfHv3Eh8sxoz75/fFvEdHsXV4grdeHufX0nauCmymlnN0rGhIvfpMQSJMvGutJ85gvCGea4iqmDpg=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -13648,15 +14530,6 @@ let sha512 = "VTtHsmvwRBkX3yLK4e+pFwk88BC6iNFqS2J8CCx2ddQc7RjXoRhuXXIgYCng21DYNty9IicCwDdTDjdr+TM7eg=="; }; }; - "babel-polyfill-6.23.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz"; - sha1 = "8364ca62df8eafb830499f699177466c3b03499d"; - }; - }; "babel-preset-current-node-syntax-0.1.4" = { name = "babel-preset-current-node-syntax"; packageName = "babel-preset-current-node-syntax"; @@ -14674,13 +15547,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.18.3" = { + "bittorrent-tracker-9.18.4" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.18.3"; + version = "9.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.3.tgz"; - sha512 = "IhLKp8wUgA7WXTfJggw/HB8qxhwlLNDWRraUFxXRHTgOQXcMiKITGcErzvC7B7mMOcUnk0wiUsZdaaQ8lzz3LQ=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.4.tgz"; + sha512 = "QpGYWMUab4CykgyJX/XcLdfQRp/Dg4qtGZqQTQlDtIXYHj9wnsO6dCH1jHWdGTyFfeofnuEjahUpaxquPZlyBQ=="; }; }; "bitwise-xor-0.0.0" = { @@ -15628,13 +16501,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.19.3" = { + "browserslist-4.20.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.19.3"; + version = "4.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz"; - sha512 = "XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz"; + sha512 = "bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ=="; }; }; "brq-0.1.8" = { @@ -15727,6 +16600,15 @@ let sha512 = "66UkjoB9f7lhT+WKgYq8MQa6nkr96mlX64JYMlIsXe/X4VeqNwvsx7UOE3ZqD6lkwg8GvBhapRTWj0qWO3Pw8w=="; }; }; + "bson-4.6.1" = { + name = "bson"; + packageName = "bson"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-4.6.1.tgz"; + sha512 = "I1LQ7Hz5zgwR4QquilLNZwbhPw0Apx7i7X9kGMBTsqPdml/03Q9NBtD9nt/19ahjlphktQImrnderxqpzeVDjw=="; + }; + }; "btc-rpc-client-git://github.com/btc21/btc-rpc-client" = { name = "bitcoin-core"; packageName = "bitcoin-core"; @@ -16016,15 +16898,6 @@ let sha1 = "3d253fe2f0ab70e851d728712e8cd6f914a8c002"; }; }; - "buffer-writer-2.0.0" = { - name = "buffer-writer"; - packageName = "buffer-writer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; - sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; - }; - }; "buffer-xor-1.0.3" = { name = "buffer-xor"; packageName = "buffer-xor"; @@ -16412,6 +17285,15 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; + "cache-loader-4.1.0" = { + name = "cache-loader"; + packageName = "cache-loader"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz"; + sha512 = "ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw=="; + }; + }; "cacheable-lookup-2.0.1" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; @@ -16511,13 +17393,13 @@ let sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; - "caller-0.0.1" = { + "caller-1.0.1" = { name = "caller"; packageName = "caller"; - version = "0.0.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/caller/-/caller-0.0.1.tgz"; - sha1 = "f37a1d6ea10e829d94721ae29a90bb4fb52ab767"; + url = "https://registry.npmjs.org/caller/-/caller-1.0.1.tgz"; + sha1 = "b851860f70e195db3d277395aa1a7e23ea30ecf5"; }; }; "caller-callsite-2.0.0" = { @@ -16763,13 +17645,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001312" = { + "caniuse-lite-1.0.30001314" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001312"; + version = "1.0.30001314"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz"; - sha512 = "Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz"; + sha512 = "0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw=="; }; }; "canvas-2.9.0" = { @@ -16925,31 +17807,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.5.22" = { + "cdk8s-1.5.39" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.5.22"; + version = "1.5.39"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.22.tgz"; - sha512 = "MVvvrRQPhQYK6EJ2RiyGZvGNihuqf//K03ga7R+otyTl8jDwEEoaOOfIXeemhXXqLixfqKOSUO1VJIALAt6/iQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.39.tgz"; + sha512 = "xwb0PxV5u3/Bubc1vda1Rz2hQcDiC2kiNBie/vgCyYt+Z70KGi5i5Cz9X3ZEHGb7yuAU4jk0LyVBQdPfUu3qIw=="; }; }; - "cdk8s-plus-22-1.0.0-beta.123" = { + "cdk8s-plus-22-1.0.0-beta.142" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.123"; + version = "1.0.0-beta.142"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.123.tgz"; - sha512 = "ZEtP1rIhgdHONpR3JyANQwoKT5TfcaFIo41C4SF/Cbd/TbRMQLPc2BT+/+oc+/i/6J1IYuqTiY6H7HLFci84IA=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.142.tgz"; + sha512 = "Ted9JMqKBdKdXZp2kLaeWfYOU1/a7Fy8FnqGraxkzXYS7Gd6Cx/3PHT3SVl0sAnV9a0uhy/DLRVKWA+J6Dc+5w=="; }; }; - "cdktf-0.9.1" = { + "cdktf-0.9.4" = { name = "cdktf"; packageName = "cdktf"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.9.1.tgz"; - sha512 = "GOt29nXb2eM7DoqnErp98m1j4crPcplhK+kjb5ACF2hHXSgK4VWNNIxoYLDZBB/FtPJRXDLWwuI7mugBi0vncQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.9.4.tgz"; + sha512 = "CuTCNVV3Goptnq3daPVfs9boODEoIrjy09XAj9nkApcozgidPkNIkDcaJCo/7q3rxnoblsK9u2nj6CDUB8cTIg=="; }; }; "center-align-0.1.3" = { @@ -17087,13 +17969,13 @@ let sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; - "chalk-5.0.0" = { + "chalk-5.0.1" = { name = "chalk"; packageName = "chalk"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-5.0.0.tgz"; - sha512 = "/duVOqst+luxCQRKEo4bNxinsOQtMP80ZYm7mMqzuh5PociNL0PvmHFvREJ9ueYL2TxlHjBcmLCdmocx9Vg+IQ=="; + url = "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz"; + sha512 = "Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w=="; }; }; "chance-1.0.18" = { @@ -17240,15 +18122,6 @@ let sha512 = "6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg=="; }; }; - "chart.js-2.9.3" = { - name = "chart.js"; - packageName = "chart.js"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chart.js/-/chart.js-2.9.3.tgz"; - sha512 = "+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw=="; - }; - }; "chart.js-3.7.1" = { name = "chart.js"; packageName = "chart.js"; @@ -17258,24 +18131,6 @@ let sha512 = "8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA=="; }; }; - "chartjs-color-2.4.1" = { - name = "chartjs-color"; - packageName = "chartjs-color"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz"; - sha512 = "haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w=="; - }; - }; - "chartjs-color-string-0.6.0" = { - name = "chartjs-color-string"; - packageName = "chartjs-color-string"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz"; - sha512 = "TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A=="; - }; - }; "charwise-3.0.1" = { name = "charwise"; packageName = "charwise"; @@ -17690,6 +18545,15 @@ let sha512 = "4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA=="; }; }; + "clarify-error-1.0.0" = { + name = "clarify-error"; + packageName = "clarify-error"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clarify-error/-/clarify-error-1.0.0.tgz"; + sha512 = "f96oT3/Cdwz1eB+7RaH/XRR42lwGqVPnDl9NAm9ugT+BwAFoUS/pVnkgXUo/5UaUmwMMs6/GNFP8A8gCgmgvog=="; + }; + }; "clarinet-0.11.0" = { name = "clarinet"; packageName = "clarinet"; @@ -17735,15 +18599,6 @@ let sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; - "clean-css-4.2.3" = { - name = "clean-css"; - packageName = "clean-css"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; - sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; - }; - }; "clean-css-4.2.4" = { name = "clean-css"; packageName = "clean-css"; @@ -17897,6 +18752,15 @@ let sha512 = "VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="; }; }; + "cli-highlight-2.1.11" = { + name = "cli-highlight"; + packageName = "cli-highlight"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"; + sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; + }; + }; "cli-list-0.2.0" = { name = "cli-list"; packageName = "cli-list"; @@ -18536,13 +19400,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.54.0" = { + "codemaker-1.55.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.54.0.tgz"; - sha512 = "83iPWGyIa089xWAomeTOmBVqgTa0p3k5KGav4kIVZzTLXqh5JiPCjpJr89kuts4O9vLSuvkCBCl8n0MVYP6nlQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.55.0.tgz"; + sha512 = "oVCJ3PUqkMf65pS8TtstLSn5AAGmuDTfrjlZjG8qOcOMHvG/w12iJ4ZlJt/wULaAqlYh9bTemXaGIzT5YbX43A=="; }; }; "codepage-1.4.0" = { @@ -19319,15 +20183,6 @@ let sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; }; }; - "concat-with-sourcemaps-1.1.0" = { - name = "concat-with-sourcemaps"; - packageName = "concat-with-sourcemaps"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"; - sha512 = "4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg=="; - }; - }; "conf-1.4.0" = { name = "conf"; packageName = "conf"; @@ -19553,6 +20408,15 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; + "consolidate-0.15.1" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; + sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; + }; + }; "constantinople-3.1.2" = { name = "constantinople"; packageName = "constantinople"; @@ -19580,22 +20444,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.68" = { + "constructs-10.0.84" = { name = "constructs"; packageName = "constructs"; - version = "10.0.68"; + version = "10.0.84"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.68.tgz"; - sha512 = "UoHYvlQDEXpSKHDJ5n5e2kcJwojswF0ASvuSyQDesziZN0QjSZBViylRknK1AJuWCelC9sad/ghk4E4a+D8axw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.84.tgz"; + sha512 = "7Id7kN3oIlsr0IQ2ghC1I4xLWOUMorC9P0he007/TvrnA+2nmUjODRNYq536m/1tRV668H78dvZ4VQ6+ExOHIw=="; }; }; - "constructs-3.3.223" = { + "constructs-3.3.239" = { name = "constructs"; packageName = "constructs"; - version = "3.3.223"; + version = "3.3.239"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.223.tgz"; - sha512 = "WCCR/my4MohLT/OQWioU+0fOzXnMZMD5PHsxT4tnB3iKluGVJynDFCuQ7uNAfLs3rwSx09BIeJHc5B7ZUTVbbQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.239.tgz"; + sha512 = "Is6qgAkws98ZtOBro4E9Mjp6p4mkElvdURXNWx0ho40RbSBAOe/hYklP7nn1+k6hA1H/fcFkVZedgQrs2igj/A=="; }; }; "consume-http-header-1.0.0" = { @@ -20094,6 +20958,15 @@ let sha512 = "XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw=="; }; }; + "copy-webpack-plugin-5.1.2" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"; + sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; + }; + }; "copy-webpack-plugin-6.0.4" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; @@ -20310,13 +21183,13 @@ let sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA=="; }; }; - "cosmiconfig-typescript-loader-1.0.5" = { + "cosmiconfig-typescript-loader-1.0.6" = { name = "cosmiconfig-typescript-loader"; packageName = "cosmiconfig-typescript-loader"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.5.tgz"; - sha512 = "FL/YR1nb8hyN0bAcP3MBaIoZravfZtVsN/RuPnoo6UVjqIrDxSNIpXHCGgJe0ZWy5yImpyD6jq5wCJ5f1nUv8g=="; + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.6.tgz"; + sha512 = "2nEotziYJWtNtoTjKbchj9QrdTT6DBxCvqjNKoDKARw+e2yZmTQCa07uRrykLIZuvSgp69YXLH89UHc0WhdMfQ=="; }; }; "couch-login-0.1.20" = { @@ -20337,13 +21210,13 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; - "cp-file-7.0.0" = { + "cp-file-9.1.0" = { name = "cp-file"; packageName = "cp-file"; - version = "7.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz"; - sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; + url = "https://registry.npmjs.org/cp-file/-/cp-file-9.1.0.tgz"; + sha512 = "3scnzFj/94eb7y4wyXRWwvzLFaQp87yyfTnChIjlfYrVqp5lVO3E2hIJMeQIltUT0K2ZAB3An1qXcBmwGyvuwA=="; }; }; "cpu-percentage-1.0.3" = { @@ -20364,13 +21237,13 @@ let sha512 = "PXHBvGLuL69u55IkLa5e5838fLhIMHxmkV4ge42a8alGyn7BtawYgI0hQ849EedvtHIOLNNH3i6eQU1BiE9SUA=="; }; }; - "cpy-8.1.2" = { + "cpy-9.0.1" = { name = "cpy"; packageName = "cpy"; - version = "8.1.2"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz"; - sha512 = "dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg=="; + url = "https://registry.npmjs.org/cpy/-/cpy-9.0.1.tgz"; + sha512 = "D9U0DR5FjTCN3oMTcFGktanHnAG5l020yvOCR1zKILmAyPP7I/9pl6NFgRbDcmSENtbK1sQLBz1p9HIOlroiNg=="; }; }; "crc-0.2.0" = { @@ -20445,13 +21318,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-2.7.0" = { + "create-gatsby-2.9.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.7.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.7.0.tgz"; - sha512 = "Le7r71ycNiPLq6RrOKXeONsotC57viwuajFuVfhAzXAgUmJSraHSeHT8S4Ydoa3nML1SyJiZaPB4CLC+Ju3gPQ=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.9.0.tgz"; + sha512 = "xl4bMKm4Buz4btVcU8FenspTJQdegv/4G2z7REKsTempdUWAU6wh8nyKlMWGNUJV2K8oQ6oGLXSJbL4a0LTglQ=="; }; }; "create-graphback-1.0.1" = { @@ -20499,13 +21372,13 @@ let sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; }; }; - "create-torrent-5.0.1" = { + "create-torrent-5.0.2" = { name = "create-torrent"; packageName = "create-torrent"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.1.tgz"; - sha512 = "fVvg1YYSogo3TlU1WFeTt937nhGQlf5KtB6M2HyDa/U02dbeMBE2AY9PcPlMufXNQoM/UCO28y26EmuApM7ZmA=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.2.tgz"; + sha512 = "tNelixVeEkjiyeAuCW7uWFl1ARA+YapyZvdSWw6U3AXe/VXpxR4ihFNfjOzmvc5TBqK5EkGdsoKXAEKfQ8xlmQ=="; }; }; "cron-parser-2.18.0" = { @@ -20634,13 +21507,13 @@ let sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw=="; }; }; - "cross-undici-fetch-0.1.24" = { + "cross-undici-fetch-0.1.25" = { name = "cross-undici-fetch"; packageName = "cross-undici-fetch"; - version = "0.1.24"; + version = "0.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.24.tgz"; - sha512 = "83KDV6+8pYCn51zSM2cFAwqQ5UQtDaPm89RkUwHxEMDq/cdqYgqo1q+2eM/Xhmd8HeAsGTtecsC4crrQkCn0zg=="; + url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.25.tgz"; + sha512 = "KS6hm/VuRO+3jIrg4uidz3mQ8NWvCbiTTOg3yoH30zuGVUvjqZlnXw66h0kuzyfP21hDkrdIbufXCW6BAQdSNw=="; }; }; "crossroads-0.12.2" = { @@ -20823,6 +21696,15 @@ let sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; }; }; + "css-declaration-sorter-6.1.4" = { + name = "css-declaration-sorter"; + packageName = "css-declaration-sorter"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz"; + sha512 = "lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw=="; + }; + }; "css-functions-list-3.0.1" = { name = "css-functions-list"; packageName = "css-functions-list"; @@ -20868,15 +21750,6 @@ let sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4"; }; }; - "css-ripple-effect-1.0.5" = { - name = "css-ripple-effect"; - packageName = "css-ripple-effect"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/css-ripple-effect/-/css-ripple-effect-1.0.5.tgz"; - sha1 = "6963b752aaf59babbd3fea3ec0da5d44e9122efb"; - }; - }; "css-select-1.0.0" = { name = "css-select"; packageName = "css-select"; @@ -21039,6 +21912,15 @@ let sha512 = "6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g=="; }; }; + "cssnano-5.1.3" = { + name = "cssnano"; + packageName = "cssnano"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.3.tgz"; + sha512 = "bdf+sY2w4XV+F5LOCEd7fWnSeMeKBO4lKgoAKVWZOSTR7CmWEk1UW/s9ibTMMnsTsinBmIdgZs755sAGa1eoXQ=="; + }; + }; "cssnano-preset-default-4.0.8" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; @@ -21048,6 +21930,15 @@ let sha512 = "LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ=="; }; }; + "cssnano-preset-default-5.2.3" = { + name = "cssnano-preset-default"; + packageName = "cssnano-preset-default"; + version = "5.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.3.tgz"; + sha512 = "e4pzD/FnsvRywKO3i2Ti4jgAcJO5MhQPudrex92HXAJoMyQfS8lZHIzzC1yZ1t+d2zdkLXFY1sHdsZaT7lKoCQ=="; + }; + }; "cssnano-util-get-arguments-4.0.0" = { name = "cssnano-util-get-arguments"; packageName = "cssnano-util-get-arguments"; @@ -21084,6 +21975,15 @@ let sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; + "cssnano-utils-3.1.0" = { + name = "cssnano-utils"; + packageName = "cssnano-utils"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"; + sha512 = "JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="; + }; + }; "csso-2.0.0" = { name = "csso"; packageName = "csso"; @@ -21156,13 +22056,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-3.0.10" = { + "csstype-3.0.11" = { name = "csstype"; packageName = "csstype"; - version = "3.0.10"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz"; - sha512 = "2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="; + url = "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz"; + sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="; }; }; "csurf-1.11.0" = { @@ -22407,13 +23307,13 @@ let sha512 = "eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="; }; }; - "date-format-4.0.3" = { + "date-format-4.0.4" = { name = "date-format"; packageName = "date-format"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz"; - sha512 = "7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ=="; + url = "https://registry.npmjs.org/date-format/-/date-format-4.0.4.tgz"; + sha512 = "/jyf4rhB17ge328HJuJjAcmRtCsGd+NDeAtahRBTaK6vSPR6MO5HlrAit3Nn7dVjaa6sowW0WXt8yQtLyZQFRg=="; }; }; "date-now-0.1.4" = { @@ -22452,13 +23352,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.10.7" = { + "dayjs-1.10.8" = { name = "dayjs"; packageName = "dayjs"; - version = "1.10.7"; + version = "1.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz"; - sha512 = "P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.8.tgz"; + sha512 = "wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="; }; }; "dayjs-1.8.36" = { @@ -22470,6 +23370,15 @@ let sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; + "de-indent-1.0.2" = { + name = "de-indent"; + packageName = "de-indent"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; + sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; + }; + }; "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; @@ -22686,6 +23595,15 @@ let sha1 = "6f6df6b85d7e7c4410a932ffc26489b78e9acd13"; }; }; + "decache-4.6.1" = { + name = "decache"; + packageName = "decache"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decache/-/decache-4.6.1.tgz"; + sha512 = "ohApBM8u9ygepJCjgBrEZSSxPjc0T/PJkD+uNyxXPkqudyUpdXpwJYp0VISm2WrPVzASU6DZyIi6BWdyw7uJ2Q=="; + }; + }; "decamelize-1.2.0" = { name = "decamelize"; packageName = "decamelize"; @@ -22893,15 +23811,6 @@ let sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; }; }; - "deep-equal-0.1.2" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; - sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; - }; - }; "deep-equal-0.2.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -23010,6 +23919,15 @@ let sha512 = "8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ=="; }; }; + "deepmerge-1.5.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; + sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; + }; + }; "deepmerge-2.1.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -23073,6 +23991,15 @@ let sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; + "default-gateway-5.0.5" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz"; + sha512 = "z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA=="; + }; + }; "default-gateway-6.0.3" = { name = "default-gateway"; packageName = "default-gateway"; @@ -23244,15 +24171,6 @@ let sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; }; - "del-5.1.0" = { - name = "del"; - packageName = "del"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz"; - sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA=="; - }; - }; "del-6.0.0" = { name = "del"; packageName = "del"; @@ -23280,15 +24198,6 @@ let sha512 = "AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw=="; }; }; - "delay-4.4.1" = { - name = "delay"; - packageName = "delay"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/delay/-/delay-4.4.1.tgz"; - sha512 = "aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ=="; - }; - }; "delay-5.0.0" = { name = "delay"; packageName = "delay"; @@ -23487,13 +24396,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "destroy-1.1.0" = { + "destroy-1.1.1" = { name = "destroy"; packageName = "destroy"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.1.0.tgz"; - sha512 = "R5QZrOXxSs0JDUIU/VANvRJlQVMts9C0L76HToQdPdlftfZCE7W6dyH0G4GZ5UW9fRqUOhAoCE2aGekuu+3HjQ=="; + url = "https://registry.npmjs.org/destroy/-/destroy-1.1.1.tgz"; + sha512 = "jxwFW+yrVOLdwqIWvowFOM8UPdhZnvOF6mhXQQLXMxBDLtv2JVJlVJPEwkDv9prqscEtGtmnxuuI6pQKStK1vA=="; }; }; "detab-1.0.2" = { @@ -23622,13 +24531,13 @@ let sha512 = "4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ=="; }; }; - "devtools-protocol-0.0.960912" = { + "devtools-protocol-0.0.969999" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.960912"; + version = "0.0.969999"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.960912.tgz"; - sha512 = "I3hWmV9rWHbdnUdmMKHF2NuYutIM2kXz2mdXW8ha7TbRlGTVs+PF+PsB5QWvpCek4Fy9B+msiispCfwlhG5Sqg=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.969999.tgz"; + sha512 = "6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ=="; }; }; "dezalgo-1.0.3" = { @@ -23883,13 +24792,13 @@ let sha512 = "cK6rH1PuGjSjpmEQbnpuTxq1Yv8B89SotyKUFcr4RhnsiZnfBfDOev7DD7v5vhtEyyj51NuMWFoRJzgy/m08Uw=="; }; }; - "diskusage-1.1.3" = { - name = "diskusage"; - packageName = "diskusage"; - version = "1.1.3"; + "diskusage-ng-1.0.2" = { + name = "diskusage-ng"; + packageName = "diskusage-ng"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/diskusage/-/diskusage-1.1.3.tgz"; - sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ=="; + url = "https://registry.npmjs.org/diskusage-ng/-/diskusage-ng-1.0.2.tgz"; + sha512 = "IO+Dbvxf5kXGuOEAHFCSf/aW9z/E96OwUH1Szstf2Rjzy+AP6sr/Y5yQh70fdX8SEFKdkTMpVG+b5jR7Uw3Q1Q=="; }; }; "diveSync-0.3.0" = { @@ -24387,6 +25296,15 @@ let sha512 = "HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="; }; }; + "dotenv-7.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz"; + sha512 = "M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g=="; + }; + }; "dotenv-8.6.0" = { name = "dotenv"; packageName = "dotenv"; @@ -24855,13 +25773,22 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.71" = { + "electron-to-chromium-1.4.81" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.71"; + version = "1.4.81"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz"; - sha512 = "Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.81.tgz"; + sha512 = "Gs7xVpIZ7tYYSDA+WgpzwpPvfGwUk3KSIjJ0akuj5XQHFdyQnsUoM76EA4CIHXNLPiVwTwOFay9RMb0ChG3OBw=="; + }; + }; + "electron-to-chromium-1.4.82" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.82"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.82.tgz"; + sha512 = "Ks+ANzLoIrFDUOJdjxYMH6CMKB8UQo5modAwvSZTxgF+vEs/U7G5IbWFUp6dS4klPkTDVdxbORuk8xAXXhMsWw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -25208,13 +26135,22 @@ let sha512 = "t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ=="; }; }; - "engine.io-6.1.2" = { + "engine.io-6.0.1" = { name = "engine.io"; packageName = "engine.io"; - version = "6.1.2"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz"; - sha512 = "v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.0.1.tgz"; + sha512 = "Y53UaciUh2Rmx5MiogtMxOQcfh7pnemday+Bb4QDg0Wjmnvo/VTvuEyNGQgYmh8L7VOe8Je1QuiqjLNDelMqLA=="; + }; + }; + "engine.io-6.1.3" = { + name = "engine.io"; + packageName = "engine.io"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz"; + sha512 = "rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA=="; }; }; "engine.io-client-1.3.1" = { @@ -25253,6 +26189,15 @@ let sha512 = "QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA=="; }; }; + "engine.io-client-6.0.3" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.0.3.tgz"; + sha512 = "IH8ZhDIwiLv0d/wXVzmjfV9Y82hbJIDhCGSVUV8o1kcpDe2I6Y3bZA3ZbJy4Ls7k7IVmcy/qn4k9RKWFhUGf5w=="; + }; + }; "engine.io-parser-1.0.6" = { name = "engine.io-parser"; packageName = "engine.io-parser"; @@ -25316,13 +26261,13 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.9.0" = { + "enhanced-resolve-5.9.2" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.9.0"; + version = "5.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz"; - sha512 = "weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz"; + sha512 = "GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA=="; }; }; "enquirer-2.3.6" = { @@ -25397,6 +26342,15 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; + "entities-3.0.1" = { + name = "entities"; + packageName = "entities"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz"; + sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; + }; + }; "env-editor-0.4.2" = { name = "env-editor"; packageName = "env-editor"; @@ -25523,6 +26477,15 @@ let sha512 = "d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ=="; }; }; + "error-stack-parser-2.0.7" = { + name = "error-stack-parser"; + packageName = "error-stack-parser"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz"; + sha512 = "chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA=="; + }; + }; "errorhandler-1.5.1" = { name = "errorhandler"; packageName = "errorhandler"; @@ -25577,13 +26540,13 @@ let sha1 = "5dae3e650e5be3684b88066513d528d092629862"; }; }; - "es5-ext-0.10.53" = { + "es5-ext-0.10.58" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.53"; + version = "0.10.58"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; - sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.58.tgz"; + sha512 = "LHO+KBBaHGwjy32ibSaMY+ZzjpC4K4I5bPoijICMBL7gXEXfrEUrzssmNP+KigbQEp1dRUnGkry/vUnxOqptLQ=="; }; }; "es6-error-4.1.1" = { @@ -25892,6 +26855,15 @@ let sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; + "eslint-6.8.0" = { + name = "eslint"; + packageName = "eslint"; + version = "6.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"; + sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; + }; + }; "eslint-7.32.0" = { name = "eslint"; packageName = "eslint"; @@ -25910,6 +26882,24 @@ let sha512 = "H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ=="; }; }; + "eslint-config-prettier-6.15.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; + version = "6.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz"; + sha512 = "a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw=="; + }; + }; + "eslint-config-prettier-8.3.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; + sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; + }; + }; "eslint-formatter-pretty-4.1.0" = { name = "eslint-formatter-pretty"; packageName = "eslint-formatter-pretty"; @@ -25919,6 +26909,15 @@ let sha512 = "IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ=="; }; }; + "eslint-loader-2.2.1" = { + name = "eslint-loader"; + packageName = "eslint-loader"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz"; + sha512 = "RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg=="; + }; + }; "eslint-plugin-no-unsanitized-4.0.1" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; @@ -25928,6 +26927,15 @@ let sha512 = "y/lAMWnPPC7RYuUdxlEL/XiCL8FehN9h9s3Kjqbp/Kv0i9NZs+IXSC2kS546Fa4Bumwy31HlVS/OdWX0Kxb5Xg=="; }; }; + "eslint-plugin-prettier-3.4.1" = { + name = "eslint-plugin-prettier"; + packageName = "eslint-plugin-prettier"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz"; + sha512 = "htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="; + }; + }; "eslint-plugin-vue-6.2.2" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -26549,15 +27557,6 @@ let sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; }; }; - "eventemitter3-3.1.0" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz"; - sha512 = "ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="; - }; - }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -26891,13 +27890,13 @@ let sha512 = "bILEG0Fg+ZhIhdEaShHzsEN1WC0hUmXJ5Kcd4cd+8rVk1Ead9vRZxA/yLx1cNBDCOwMe0GAMrhF7TKT+A1P+YA=="; }; }; - "expo-pwa-0.0.113" = { + "expo-pwa-0.0.114" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.113"; + version = "0.0.114"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.113.tgz"; - sha512 = "uKmNgSMrZs/dUy1yIqXBFELmjuVtvSJzNoscTMN1ehdBa8QJqz/d3QGdu/IVlYNWxqCvAaqHXY/x6WseA3X3dg=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.114.tgz"; + sha512 = "vJCpKROPULPrTnLTCytZuxBkm23yS9CBXBald2BDeizgKsJV19vOc2+lmTk4fL5hh+TgHQybwtt6UwEy3ORjgg=="; }; }; "express-2.5.11" = { @@ -27008,22 +28007,22 @@ let sha1 = "dbe1e8139aecb234fb6adb5c0059c75db9733d2a"; }; }; - "express-openapi-6.0.0" = { + "express-openapi-8.0.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "6.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-6.0.0.tgz"; - sha512 = "WQGmghzn+loQsIQUEnLZ0HVKCLhIBVcURvrAhyt6mOqsFsG2tBYhaNKX728EOz2aMXRhEQhkQ+RXQsIFpbS6IA=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-8.0.0.tgz"; + sha512 = "MUntG3qQKdU5eRG51WLglaUfIXrVagQHNmStwl44lzu6XKiMj4TBDm/cIbubO49HAMCqNkX5BaiKCOK6pvP5Wg=="; }; }; - "express-openapi-7.0.1" = { + "express-openapi-9.3.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.0.1"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.0.1.tgz"; - sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-9.3.0.tgz"; + sha512 = "92H8nuvO1vVMutapDqQXESOxFnaC4/tZAXSi7kJMD+xWXZwNwmuinCxbfQc7JyUY6Y3+vjFXqJ7xeTCpsUhSiA=="; }; }; "express-prom-bundle-6.3.0" = { @@ -27566,13 +28565,13 @@ let sha1 = "a45aff345196006d406ca6cdcd05f69051ef35b8"; }; }; - "fast-redact-3.1.0" = { + "fast-redact-3.1.1" = { name = "fast-redact"; packageName = "fast-redact"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.0.tgz"; - sha512 = "dir8LOnvialLxiXDPESMDHGp82CHi6ZEYTVkcvdn5d7psdv9ZkkButXrOeXST4aqreIRR+N7CYlsrwFuorurVg=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.1.tgz"; + sha512 = "odVmjC8x8jNeMZ3C+rPMESzXVSEU8tSWSHv9HFxP2mm89G/1WwqhrerJDQm9Zus8X6aoRgQDThKqptdNA6bt+A=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -27836,6 +28835,15 @@ let sha512 = "ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww=="; }; }; + "figlet-1.5.2" = { + name = "figlet"; + packageName = "figlet"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/figlet/-/figlet-1.5.2.tgz"; + sha512 = "WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ=="; + }; + }; "figures-1.7.0" = { name = "figures"; packageName = "figures"; @@ -27917,6 +28925,15 @@ let sha512 = "4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw=="; }; }; + "file-loader-4.3.0" = { + name = "file-loader"; + packageName = "file-loader"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz"; + sha512 = "aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA=="; + }; + }; "file-loader-6.0.0" = { name = "file-loader"; packageName = "file-loader"; @@ -27926,6 +28943,15 @@ let sha512 = "/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ=="; }; }; + "file-loader-6.2.0" = { + name = "file-loader"; + packageName = "file-loader"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz"; + sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="; + }; + }; "file-or-stdin-1.0.2" = { name = "file-or-stdin"; packageName = "file-or-stdin"; @@ -28241,6 +29267,15 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; + "find-cache-dir-0.1.1" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz"; + sha1 = "c8defae57c8a52a8a784f9e31c57c742e993a0b9"; + }; + }; "find-cache-dir-2.1.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -28565,13 +29600,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.172.0" = { + "flow-parser-0.173.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.172.0"; + version = "0.173.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.172.0.tgz"; - sha512 = "WWqgvuJgD9Y1n2su9D73m0g5kQ4XVl8Dwk6DeW5V6bjt4XMtVLzSHg35s3iiZOvShY+7w7l8FzlK81PGXRcIYQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.173.0.tgz"; + sha512 = "gikomjo+jzdehhOCHP2Ca5y1HGK3jkODhUdTxk4a3SdyLAMBsEwb7KJETHzB4KQs7HhHcqhyT7mGmd9iT8B5Hg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -28835,6 +29870,15 @@ let sha512 = "7YGDo0UlbMy++6G3lzncWISDaT5CVp+yPVAkZ7FDFF0ec+0HKgBOWOhPGKpMF0hjcm3Ps/HbtrETrQLYREZ7YQ=="; }; }; + "fork-ts-checker-webpack-plugin-3.1.1" = { + name = "fork-ts-checker-webpack-plugin"; + packageName = "fork-ts-checker-webpack-plugin"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; + 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"; @@ -28844,13 +29888,22 @@ let sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; }; }; - "fork-ts-checker-webpack-plugin-6.5.0" = { + "fork-ts-checker-webpack-plugin-7.2.1" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "6.5.0"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.1.tgz"; + sha512 = "uOfQdg/iQ8iokQ64qcbu8iZb114rOmaKLQFu7hU14/eJaKgsP91cQ7ts7v2iiDld6TzDe84Meksha8/MkWiCyw=="; + }; + }; + "fork-ts-checker-webpack-plugin-v5-5.2.1" = { + name = "fork-ts-checker-webpack-plugin-v5"; + packageName = "fork-ts-checker-webpack-plugin-v5"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz"; - sha512 = "cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz"; + sha512 = "SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw=="; }; }; "form-data-1.0.0-rc3" = { @@ -29015,13 +30068,13 @@ let sha512 = "WQT6rP6Jt3TxMdQB3IKzvfZKLuldumntgumLhIUhvPrukTHdWNI4JgEHY04Bd0LIOR9IQRpB+7RuxgUU0Vhmcg=="; }; }; - "fraction.js-4.1.3" = { + "fraction.js-4.2.0" = { name = "fraction.js"; packageName = "fraction.js"; - version = "4.1.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.3.tgz"; - sha512 = "pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg=="; + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"; + sha512 = "MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="; }; }; "fragment-cache-0.2.1" = { @@ -29186,6 +30239,15 @@ let sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; }; + "fs-extra-10.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz"; + sha512 = "NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag=="; + }; + }; "fs-extra-3.0.1" = { name = "fs-extra"; packageName = "fs-extra"; @@ -29312,22 +30374,22 @@ let sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="; }; }; - "fs-routes-2.0.0" = { + "fs-routes-8.0.0" = { name = "fs-routes"; packageName = "fs-routes"; - version = "2.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-routes/-/fs-routes-2.0.0.tgz"; - sha512 = "oITW9GoYFZwYWR2aMDdUvr6W9O5mtzSizIVEUdeCQaFD6+BylwPSEP2+ZFWv1UYpE9kiPS3Hb0knh2PmFJcj6A=="; + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-8.0.0.tgz"; + sha512 = "EezW71GPu+VK2ZOnX0Aljaref63+mvhkkz55DqUp5xryV/mJraA2t/XFmBxNMwgRq6tFUOYuQOlr+RQh4nq5kQ=="; }; }; - "fs-routes-7.0.1" = { + "fs-routes-9.0.3" = { name = "fs-routes"; packageName = "fs-routes"; - version = "7.0.1"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fs-routes/-/fs-routes-7.0.1.tgz"; - sha512 = "kSAfx/P8oLSi5+tblecTETcJJ/Q+qL+xzGx4hns/+gHXMkTOZEzG73/2dBDW1FFy5+ZW080XoMaBAN2kCN55aQ=="; + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-9.0.3.tgz"; + sha512 = "Y5tkylY9fQ1jm11FdJoptzqIG3OyzqrOF16W5odNlIdqFqb2355IbNB3jQkE+C268mSShLmIur8ynYCgL/Yg/g=="; }; }; "fs-write-stream-atomic-1.0.10" = { @@ -29528,22 +30590,22 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.7.0" = { + "gatsby-core-utils-3.9.1" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.7.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.7.0.tgz"; - sha512 = "CboIzpEFbaD4+WrozKl3fMpxUetcaDq0aWPfrfzAtc8l0JMlD3GS2Q/uW7HpcvTAlSGv2ZomTzd2ySLV/AgpTQ=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.9.1.tgz"; + sha512 = "DNf7NhhH0WrFuoBvyURjsw4w+eKbp1GlRA0cchYHJwVTaDPvLvX1o7zxN76xIBx+m0kttpnO3KuJ9LDOSli3ag=="; }; }; - "gatsby-telemetry-3.7.0" = { + "gatsby-telemetry-3.9.1" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.7.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.7.0.tgz"; - sha512 = "jhtUGZynyHM3r9a7po/rKffj5AjacmU0rqqarsee9dxlDqsamqRtyFPTjn7JubRrc958M6qzNW+z/Zi0hoeFHg=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.9.1.tgz"; + sha512 = "ChXTshfvo5njd/u6kSZErDUvc/uSmtOEuo7wrt/68Xjz2JVG6nsLlRxaZpx0DxnDAInouItMVX0VF40RAU7qKg=="; }; }; "gauge-1.2.7" = { @@ -29573,13 +30635,13 @@ let sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; }; }; - "gauge-4.0.1" = { + "gauge-4.0.3" = { name = "gauge"; packageName = "gauge"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-4.0.1.tgz"; - sha512 = "zJ4jePUHR8cceduZ53b6temRalyGpkC2Kc2r3ecNphmL+uWNoJ3YcOcUjpbG6WwoE/Ef6/+aEZz63neI2WIa1Q=="; + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.3.tgz"; + sha512 = "ICw1DhAwMtb22rYFwEHgJcx1JCwJGv3x6G0OQUq56Nge+H4Q8JEwr8iveS0XFlsUNSI67F5ffMGK25bK4Pmskw=="; }; }; "gaxios-2.3.4" = { @@ -29798,6 +30860,15 @@ let sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; }; }; + "get-port-4.2.0" = { + name = "get-port"; + packageName = "get-port"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz"; + sha512 = "/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw=="; + }; + }; "get-port-5.1.1" = { name = "get-port"; packageName = "get-port"; @@ -30537,6 +31608,15 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; + "globals-12.4.0" = { + name = "globals"; + packageName = "globals"; + version = "12.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; + sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + }; + }; "globals-13.12.1" = { name = "globals"; packageName = "globals"; @@ -30726,13 +31806,13 @@ let sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ=="; }; }; - "google-auth-library-7.13.0" = { + "google-auth-library-7.14.0" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.13.0"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.13.0.tgz"; - sha512 = "6Q2/ZijxVKt9I6TgljUa4oMiRvQcul0lm3g6faEvWHZ9ql9gOmlAJPAmV/BKQ/GiMFtD2llF6codS350d0GjlQ=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.0.tgz"; + sha512 = "or8r7qUqGVI3W8lVSdPh0ZpeFyQHeE73g5c0p+bLNTTUFXJ+GSeDQmZRZ2p4H8cF/RJYa4PNvi/A1ar1uVNLFA=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -30771,13 +31851,13 @@ let sha512 = "l/TFSW7IRFcb7wF641BlmuP8Ox1ncuzJk5Fcs2947otlGBm5ktDxFhPkmrcNDaG+LWPQsuDwP1ojL0xV39cpmw=="; }; }; - "googleapis-common-5.0.5" = { + "googleapis-common-5.1.0" = { name = "googleapis-common"; packageName = "googleapis-common"; - version = "5.0.5"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-5.0.5.tgz"; - sha512 = "o2dgoW4x4fLIAN+IVAOccz3mEH8Lj1LP9c9BSSvkNJEn+U7UZh0WSr4fdH08x5VH7+sstIpd1lOYFZD0g7j4pw=="; + url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-5.1.0.tgz"; + sha512 = "RXrif+Gzhq1QAzfjxulbGvAY3FPj8zq/CYcvgjzDbaBNCD6bUl+86I7mUs4DKWHGruuK26ijjR/eDpWIDgNROA=="; }; }; "goosig-0.10.0" = { @@ -30987,13 +32067,13 @@ let sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; - "graphology-0.23.2" = { + "graphology-0.24.1" = { name = "graphology"; packageName = "graphology"; - version = "0.23.2"; + version = "0.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphology/-/graphology-0.23.2.tgz"; - sha512 = "RHcLpAP4M+KPShLQEvgkT1Y4vxl+FFbmmy3D0mupO+VXIuYC8zdmMcHs40D9m3mmN067zGS+lUaHjDq06Td7PQ=="; + url = "https://registry.npmjs.org/graphology/-/graphology-0.24.1.tgz"; + sha512 = "6lNz1PNTAe9Q6ioHKrXu0Lp047sgvOoHa4qmP/8mnJWCGv2iIZPQkuHPUb2/OWDWCqHpw2hKgJLJ55X/66xmHg=="; }; }; "graphology-types-0.21.2" = { @@ -31140,13 +32220,13 @@ let sha512 = "Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA=="; }; }; - "graphql-sse-1.0.6" = { + "graphql-sse-1.1.0" = { name = "graphql-sse"; packageName = "graphql-sse"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.0.6.tgz"; - sha512 = "y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w=="; + url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.1.0.tgz"; + sha512 = "xE8AGPJa5X+g7iFmRQw/8H+7lXIDJvSkW6lou/XSSq17opPQl+dbKOMiqraHMx52VrDgS061ZVx90OSuqS6ykA=="; }; }; "graphql-subscriptions-1.2.1" = { @@ -31203,13 +32283,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.6.0" = { + "graphql-ws-5.6.2" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.6.0"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.6.0.tgz"; - sha512 = "Kz/4z1u9yGKWMtzlvia9wW8AJGjx68OyCCV40dabYq1OeyUxgU9t8Ll43vLAje7TYiLwZSwGbvtHviHaPyGYxw=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.6.2.tgz"; + sha512 = "TsjovINNEGfv52uKWYSVCOLX9LFe6wAhf9n7hIsV3zjflky1dv/mAP+kjXAXsnzV1jH5Sx0S73CtBFNvxus+SQ=="; }; }; "gray-matter-4.0.3" = { @@ -31320,15 +32400,6 @@ let sha512 = "dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA=="; }; }; - "gulp-clean-css-4.3.0" = { - name = "gulp-clean-css"; - packageName = "gulp-clean-css"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz"; - sha512 = "mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg=="; - }; - }; "gulp-cli-2.3.0" = { name = "gulp-cli"; packageName = "gulp-cli"; @@ -31338,24 +32409,6 @@ let sha512 = "zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A=="; }; }; - "gulp-concat-2.6.1" = { - name = "gulp-concat"; - packageName = "gulp-concat"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz"; - sha1 = "633d16c95d88504628ad02665663cee5a4793353"; - }; - }; - "gulp-dart-sass-1.0.2" = { - name = "gulp-dart-sass"; - packageName = "gulp-dart-sass"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-dart-sass/-/gulp-dart-sass-1.0.2.tgz"; - sha512 = "8fLttA824mbuc0jRVlGs00zWYZXBckat6INawx5kp66Eqsz5srNWTA51t0mbfB4C8a/a/GZ9muYLwXGklgAHlw=="; - }; - }; "gulp-eslint-3.0.1" = { name = "gulp-eslint"; packageName = "gulp-eslint"; @@ -31365,6 +32418,15 @@ let sha1 = "04e57e3e18c6974267c12cf6855dc717d4a313bd"; }; }; + "gulp-eslint-6.0.0" = { + name = "gulp-eslint"; + packageName = "gulp-eslint"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz"; + sha512 = "dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig=="; + }; + }; "gulp-plumber-1.2.1" = { name = "gulp-plumber"; packageName = "gulp-plumber"; @@ -31374,22 +32436,13 @@ let sha512 = "mctAi9msEAG7XzW5ytDVZ9PxWMzzi1pS2rBH7lA095DhMa6KEXjm+St0GOCc567pJKJ/oCvosVAZEpAey0q2eQ=="; }; }; - "gulp-sourcemaps-2.6.5" = { + "gulp-sourcemaps-3.0.0" = { name = "gulp-sourcemaps"; packageName = "gulp-sourcemaps"; - version = "2.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz"; - sha512 = "SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg=="; - }; - }; - "gulp-tslint-8.1.4" = { - name = "gulp-tslint"; - packageName = "gulp-tslint"; - version = "8.1.4"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.4.tgz"; - sha512 = "wBoZIEMJRz9urHwolsvQpngA9l931p6g/Liwz1b/KrsVP6jEBFZv/o0NS1TFCQZi/l8mXxz8+v3twhf4HOXxPQ=="; + url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz"; + sha512 = "RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ=="; }; }; "gulp-typescript-5.0.1" = { @@ -31644,15 +32697,6 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-glob-1.0.0" = { - name = "has-glob"; - packageName = "has-glob"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz"; - sha1 = "9aaa9eedbffb1ba3990a7b0010fb678ee0081207"; - }; - }; "has-gulplog-0.1.0" = { name = "has-gulplog"; packageName = "has-gulplog"; @@ -31689,13 +32733,13 @@ let sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; }; }; - "has-symbols-1.0.2" = { + "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; }; "has-to-string-tag-x-1.4.1" = { @@ -31788,6 +32832,15 @@ let sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; }; + "hash-sum-1.0.2" = { + name = "hash-sum"; + packageName = "hash-sum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; + sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; + }; + }; "hash-sum-2.0.0" = { name = "hash-sum"; packageName = "hash-sum"; @@ -32193,6 +33246,15 @@ let sha512 = "oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="; }; }; + "highlight.js-10.7.3" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "10.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"; + sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; + }; + }; "highlight.js-11.4.0" = { name = "highlight.js"; packageName = "highlight.js"; @@ -32247,13 +33309,13 @@ let sha1 = "6f36e770769275113a57ae1a6007001af771cff6"; }; }; - "hls-b24.js-0.12.3" = { - name = "hls-b24.js"; - packageName = "hls-b24.js"; - version = "0.12.3"; + "hls.js-1.1.2" = { + name = "hls.js"; + packageName = "hls.js"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/hls-b24.js/-/hls-b24.js-0.12.3.tgz"; - sha512 = "C8nwzS33zKvR7grYIoHvp8wPxBvk9sEJ6dsh3Bx+T/4jNNhDksqLS73NIWqHvInjRiOsrXgEY4+h/NjNbzzh0g=="; + url = "https://registry.npmjs.org/hls.js/-/hls.js-1.1.2.tgz"; + sha512 = "ujditC4vvBmZd00RRNfNPLgFVlqEeUX4sAFv5lGhBHuql8iAZodOdlZTD3em/1zo7vyjQp12up/lCVqQk8dvxA=="; }; }; "hmac-blake2b-2.0.0" = { @@ -32607,6 +33669,15 @@ let sha512 = "jWTtP3dCd7R8x/tt9DK3pvpcQd7HDMcRPUqPxr/i9989q2k5RHIhmlRDFeyQ/LSd8IKrteG8Ce5g0Ig4eGIipg=="; }; }; + "htmlnano-2.0.0" = { + name = "htmlnano"; + packageName = "htmlnano"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.0.tgz"; + sha512 = "thKQfhcp2xgtsWNE27A2bliEeqVL5xjAgGn0wajyttvFFsvFWWah1ntV9aEX61gz0T6MBQ5xK/1lXuEumhJTcg=="; + }; + }; "htmlparser2-3.10.1" = { name = "htmlparser2"; packageName = "htmlparser2"; @@ -32652,6 +33723,15 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; + "htmlparser2-7.2.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz"; + sha512 = "H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog=="; + }; + }; "http-assert-1.5.0" = { name = "http-assert"; packageName = "http-assert"; @@ -32751,6 +33831,15 @@ let sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; + "http-errors-2.0.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; + }; + }; "http-headers-3.0.2" = { name = "http-headers"; packageName = "http-headers"; @@ -32778,13 +33867,13 @@ let sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"; }; }; - "http-parser-js-0.5.5" = { + "http-parser-js-0.5.6" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz"; - sha512 = "x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA=="; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz"; + sha512 = "vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA=="; }; }; "http-proxy-1.18.1" = { @@ -32832,6 +33921,15 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; + "http-proxy-middleware-1.3.1" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"; + sha512 = "13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="; + }; + }; "http-proxy-middleware-2.0.3" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; @@ -33237,13 +34335,13 @@ let sha512 = "bESly7s6X7cLMWCn4dsAVE/ttNbbB13o6jku2B7fV2wIV/g7NVC/yF7S3NiknGlftKn/uLU3fhMmbOfdBvQ5IA=="; }; }; - "hypertrie-5.1.2" = { + "hypertrie-5.1.3" = { name = "hypertrie"; packageName = "hypertrie"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.2.tgz"; - sha512 = "kdzigFUWrCX5NTFvi28q5o3P7faP3QliAQpMfKRSrP5jtitqPfhTgXwstcxS+Vj7mP93R+unZlPYiwu6N9whzA=="; + url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.3.tgz"; + sha512 = "UllKwlFn6Vh268Y0LCD5isvDeCeaaNm9mJC4OFCcb5imv6nyBf/aHirJwUTOm9u01v6GZCXmCI9kKZnpNkm6nA=="; }; }; "i-0.3.7" = { @@ -33606,6 +34704,15 @@ let sha512 = "CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ=="; }; }; + "import-from-4.0.0" = { + name = "import-from"; + packageName = "import-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz"; + sha512 = "P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ=="; + }; + }; "import-global-0.1.0" = { name = "import-global"; packageName = "import-global"; @@ -33975,15 +35082,6 @@ let sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; - "inquirer-3.0.6" = { - name = "inquirer"; - packageName = "inquirer"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz"; - sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347"; - }; - }; "inquirer-3.3.0" = { name = "inquirer"; packageName = "inquirer"; @@ -34038,6 +35136,15 @@ let sha512 = "0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ=="; }; }; + "inquirer-8.2.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.1.tgz"; + sha512 = "pxhBaw9cyTFMjwKtkjePWDhvwzvrNGAw7En4hottzlPvz80GZaMZthdDU35aA6/f5FRZf3uhE057q8w1DE3V2g=="; + }; + }; "inquirer-autocomplete-prompt-1.4.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -34326,6 +35433,15 @@ let sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ=="; }; }; + "inversify-6.0.1" = { + name = "inversify"; + packageName = "inversify"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inversify/-/inversify-6.0.1.tgz"; + sha512 = "B3ex30927698TJENHR++8FfEaJGqoWOgI6ZY5Ht/nLUsFCwHn6akbwtnUAPCgUepAnTpe2qHxhDNjoKLyz6rgQ=="; + }; + }; "invert-kv-1.0.0" = { name = "invert-kv"; packageName = "invert-kv"; @@ -34416,6 +35532,15 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; + "ip-num-1.3.4" = { + name = "ip-num"; + packageName = "ip-num"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-num/-/ip-num-1.3.4.tgz"; + sha512 = "ZlO1YqjR87dsMFTxUJGj1iZR+UV+0QHWeOAMZfTBpGocBsKGc7fJdlFoa7F5xpK/guKW7dkfT6UAVDwvWjLK1Q=="; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -35262,6 +36387,15 @@ let sha1 = "307a855b3cf1a938b44ea70d2c61106053714f34"; }; }; + "is-json-2.0.1" = { + name = "is-json"; + packageName = "is-json"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-json/-/is-json-2.0.1.tgz"; + sha1 = "6be166d144828a131d686891b983df62c39491ff"; + }; + }; "is-lambda-1.0.1" = { name = "is-lambda"; packageName = "is-lambda"; @@ -35298,13 +36432,13 @@ let sha1 = "3258fb69f78c14d5b815d664336b4cffb6441591"; }; }; - "is-my-ip-valid-1.0.0" = { + "is-my-ip-valid-1.0.1" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; - sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; + url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz"; + sha512 = "jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg=="; }; }; "is-my-json-valid-2.20.6" = { @@ -36000,13 +37134,13 @@ let sha512 = "Yd9oD7sgCycVvH8CHy5U4fLXibPwxVw2+diudYbT8ZfAiQDtW1H9WvPRR4+rtN9qOll+r+KAfO4SjO28OPpitA=="; }; }; - "is-valid-domain-0.1.5" = { + "is-valid-domain-0.1.6" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.5.tgz"; - sha512 = "ilzfGo1kXzoVpSLplJWOexoiuAc6mRK+vPlNAeEPVJ29RagETpCz0izg6CZfY72DCuA+PCrEAEJeaecRLMNq5Q=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.6.tgz"; + sha512 = "ZKtq737eFkZr71At8NxOFcP9O1K89gW3DkdrGMpp1upr/ueWjj+Weh4l9AI4rN0Gt8W2M1w7jrG2b/Yv83Ljpg=="; }; }; "is-valid-glob-1.0.0" = { @@ -36585,15 +37719,6 @@ let sha1 = "a3abe2718af241a2b2904f84a625970f389ae32a"; }; }; - "jmespath-0.15.0" = { - name = "jmespath"; - packageName = "jmespath"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"; - sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; - }; - }; "jmespath-0.16.0" = { name = "jmespath"; packageName = "jmespath"; @@ -36721,13 +37846,13 @@ let sha512 = "2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA=="; }; }; - "jquery.terminal-2.31.1" = { + "jquery.terminal-2.32.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.31.1"; + version = "2.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.31.1.tgz"; - sha512 = "JVCL3mOmE+NQ1SvwHyRtJ18ICEylHoLqh0mmi0HResjeE7v/85rREfoLDtYfJxDxCNpTrznGl3HEoUCfjHnycA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.32.1.tgz"; + sha512 = "AbaZfSuNPQSBpUEP2jqNix5H7wS3fqUQGe+k6D8umBAOA3XxIVJpXTcGitfs1df7AZ52DruOQnV+p5+s+E3QqQ=="; }; }; "js-base64-2.6.3" = { @@ -37054,49 +38179,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.54.0" = { + "jsii-1.55.0" = { name = "jsii"; packageName = "jsii"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.54.0.tgz"; - sha512 = "XuqGpmGIxFcX2GvX3zjcHBzBeZ7+tJ7hr5tu/7qV6wQ/thXuZFdAoj2znSgBkpGOt6mjtRuqv01HIRl25Nys5g=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.55.0.tgz"; + sha512 = "OpY67STJMTqF/pQRYMXx8xaA1lCnKoQCnraB043tkx6F3reyUNzlIzSIkQIgTEFoBa/OEYANHdtHJCfw6Y3nzA=="; }; }; - "jsii-pacmak-1.54.0" = { + "jsii-pacmak-1.55.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.54.0.tgz"; - sha512 = "1uvHzdrUiTL7Z6QLaoY5F4iK+JbVh8BL4dJrZRikd+ntVWW8sh0CIxAAtlwYgAMER8HihZ1AZUzngdZ/zO2AFw=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.55.0.tgz"; + sha512 = "2i1VQVGQIC0JUSryw9gV2VqcMNbR/KLQOwsfNb7gTs6qKccR5Pmf4eXuIC+HxpyIiecu1UeEbToz5q8fMdVcig=="; }; }; - "jsii-reflect-1.54.0" = { + "jsii-reflect-1.55.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.54.0.tgz"; - sha512 = "wB4hxHTAN4LEBVg/Y5sr3Sbh3Xe2+jrYIftnhT+2mmhMexHj3U0RhjPW/MFXxRTbiSgDad1fbw5VkJYDWnpGXw=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.55.0.tgz"; + sha512 = "PLrRTqkE0FJ9locNabIOnmXh/fX+JaKhWD9ktPmYmZzPyPL7pfHGUUnFJhtk+0yXZ9vwg/Bp5qr/l3HH2Bq+uA=="; }; }; - "jsii-rosetta-1.54.0" = { + "jsii-rosetta-1.55.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.54.0.tgz"; - sha512 = "fxgx9L5eWzyMC1IEkDitxgcraHUuZbQQVQztJtZHw/QlZ9n0DUjfbKrefJQ2HpobtI9ZV2fDEYjuwZDBAVBdsA=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.55.0.tgz"; + sha512 = "LOw8i5ypoJ8A2D24Za3fIWeiNbPa6q0wuLuu0LAr+VWvu4f2A5A9SJfzsB39CXwDVKjrAVVvCy83Fgdv3/2VFw=="; }; }; - "jsii-srcmak-0.1.482" = { + "jsii-srcmak-0.1.499" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.482"; + version = "0.1.499"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.482.tgz"; - sha512 = "Dr7eCmWXtYSPMODMxJxbzf6m5+iFH9WcKtmwWDFwcUke5bxTndovEKkK/GKHKD1sNZcF6FHX2Nak5Lib0bPUTw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.499.tgz"; + sha512 = "FJ8ovnFkrWL2BgseeGDkpCsx5+AfWYp0vyihtiKWvb3x/uQhB0N5q90oOhJn1uRLpwv4+UOTG3d41t4ZtCQzKg=="; }; }; "json-bigint-1.0.0" = { @@ -37324,6 +38449,15 @@ let sha1 = "28e4ffd51c8d893295280eb4064d9703594de5a2"; }; }; + "json-source-map-0.6.1" = { + name = "json-source-map"; + packageName = "json-source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-source-map/-/json-source-map-0.6.1.tgz"; + sha512 = "1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg=="; + }; + }; "json-stable-stringify-0.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -37387,13 +38521,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.142" = { + "json2jsii-0.2.159" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.142"; + version = "0.2.159"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.142.tgz"; - sha512 = "voi+j4VtuhgI7aKq9WbGv8g4OiQd33JyCDyGHc+M/v+pp8mvzXja9sWvBa4F3zKRazwSERXvP1yS61CTztW8Xg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.159.tgz"; + sha512 = "zbMiuYG79Azg3zXzVA/hP20XtDJO1obIiAbYvYzB+eXIP3YPNn/BIITiLRi6g55oCW8TaLlSRgBJDBNaTt5/tg=="; }; }; "json3-3.2.6" = { @@ -37612,6 +38746,15 @@ let sha512 = "PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="; }; }; + "jsonrpc2-ws-1.0.0-beta9" = { + name = "jsonrpc2-ws"; + packageName = "jsonrpc2-ws"; + version = "1.0.0-beta9"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonrpc2-ws/-/jsonrpc2-ws-1.0.0-beta9.tgz"; + sha512 = "0KA+ufhSy7gN2/jGXagXLz4V5m+vymmNTI5IpNBIUiunday45P6dspdaOO0wwt2JJyrACC/BKMH154OqsuB80w=="; + }; + }; "jsonschema-1.4.0" = { name = "jsonschema"; packageName = "jsonschema"; @@ -37756,6 +38899,15 @@ let sha512 = "pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="; }; }; + "junk-4.0.0" = { + name = "junk"; + packageName = "junk"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/junk/-/junk-4.0.0.tgz"; + sha512 = "ojtSU++zLJ3jQG9bAYjg94w+/DOJtRyD7nPaerMFrBhmdVmiV5/exYH5t4uHga4G/95nT6hr1OJoKIFbYbrW5w=="; + }; + }; "just-debounce-1.1.0" = { name = "just-debounce"; packageName = "just-debounce"; @@ -38404,6 +39556,15 @@ let sha512 = "3QrsCXejlWYHjBPFXTyGNhPj4rrQdB+5+r5r3wArpLH201aR+nWUgw/zKKkTmilCfY/sv6u8qo98pNvtg8LUTA=="; }; }; + "launch-editor-middleware-2.3.0" = { + name = "launch-editor-middleware"; + packageName = "launch-editor-middleware"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.3.0.tgz"; + sha512 = "GJR64trLdFFwCoL9DMn/d1SZX0OzTDPixu4mcfWTShQ4tIqCHCGvlg9fOEYQXyBlrSMQwylsJfUWncheShfV2w=="; + }; + }; "layered-graph-1.1.3" = { name = "layered-graph"; packageName = "layered-graph"; @@ -38764,13 +39925,13 @@ let sha1 = "22c59bcaefaa9a8ef359cf759784e4bf106aea1b"; }; }; - "libnested-1.5.1" = { + "libnested-1.5.2" = { name = "libnested"; packageName = "libnested"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/libnested/-/libnested-1.5.1.tgz"; - sha512 = "mA68lhvC5NypD/21rBNziTmqWaukivdbbDkWnXrry8iCV0/PuD8GSxa8W+ZtJwAOzvu/AdOx/YEb9NbqPq6s5Q=="; + url = "https://registry.npmjs.org/libnested/-/libnested-1.5.2.tgz"; + sha512 = "DbiwHL8454goYRp5Xn9vUA5XU6x8rNh8BmZ7ywSTUhVBIiDS7ev/FT6+AwU2/ZKW2jEOC7WKhpkJfExaQwosRA=="; }; }; "libnpmaccess-4.0.3" = { @@ -38881,24 +40042,6 @@ let sha512 = "5i0XgY+PSaGmMQTuVdtnzDg0LiTp1krfH4seefFLJNFb6Hunxic00D/roybGgd9hlbqeGmGYXZ+YQpATKQtblA=="; }; }; - "lightning-5.3.3" = { - name = "lightning"; - packageName = "lightning"; - version = "5.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.3.3.tgz"; - sha512 = "/piN0cPoXe3wfKJxIwlclOEC3es0VhqFFKpPw5Z1AahpDs1UA/0+czaDiwUrwWPYnlM/6gh92Tu4iXDYNWipng=="; - }; - }; - "lightning-5.3.4" = { - name = "lightning"; - packageName = "lightning"; - version = "5.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.3.4.tgz"; - sha512 = "zUHlFFSS+KJhndoZkjkXPWpvlXAgYGWS2SxzXpiiwnXZKCNmT+IkQFQmp2oIpbF7K93oqlpxgafZMZDeReX5pQ=="; - }; - }; "lightning-5.6.1" = { name = "lightning"; packageName = "lightning"; @@ -38917,15 +40060,6 @@ let sha512 = "1Bfrq+FK4/yuBStMzmiFnAG//YewN9Fznm2qn86z87/u6UcWqdpWvBCRS5njtq5bG6eWgxM4DOfaw9LptyXSog=="; }; }; - "lightning-5.6.3" = { - name = "lightning"; - packageName = "lightning"; - version = "5.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.6.3.tgz"; - sha512 = "esDBNfA2FoLiQrrOmAYrrjMfO7qz624m3X81aLODgqV4pNAIxEmXYD1fiDg3EBdAD1h07xoGna+xKT2oYDAuUw=="; - }; - }; "lightning-5.7.1" = { name = "lightning"; packageName = "lightning"; @@ -38944,6 +40078,15 @@ let sha512 = "j3m+M50fY9bZ+OSRKzJLon7dkxL+guAOp8ppDd3CLlvrba5ldbs8QbkXuYMXlwLi3Aw4ztSyEUyh69aaSfEXyg=="; }; }; + "lightning-5.8.2" = { + name = "lightning"; + packageName = "lightning"; + version = "5.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-5.8.2.tgz"; + sha512 = "ryJlD9qhbUSq4ZS6Q0WXnTgmj3IMqN1iBfUJoGAMzSbSGZAS8E8eejci88naBbbDA0N34hALpSsa5Ok7JayAdQ=="; + }; + }; "lilconfig-2.0.4" = { name = "lilconfig"; packageName = "lilconfig"; @@ -39124,6 +40267,15 @@ let sha512 = "a7Jipme3XIBIryJluWP5LQrEAvhobDPyScBe+q+MYwxBiMT2Ck7msy4tAdF8TAa33FMdJqX4guP81Yhiu6BkmQ=="; }; }; + "lmdb-2.2.4" = { + name = "lmdb"; + packageName = "lmdb"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb/-/lmdb-2.2.4.tgz"; + sha512 = "gto+BB2uEob8qRiTlOq+R3uX0YNHsX9mjxj9Sbdue/LIKqu6IlZjrsjKeGyOMquc/474GEqFyX2pdytpydp0rQ=="; + }; + }; "ln-accounting-5.0.5" = { name = "ln-accounting"; packageName = "ln-accounting"; @@ -39142,24 +40294,6 @@ let sha512 = "20ZIPPyGI4odh/Jxq6Lawtc+Zx7MkPuxnn34TuhZpM6ppwVbSGJSuJPctLrhZvWdaYYeboz3BITiqI/o4KvChQ=="; }; }; - "ln-service-53.5.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.5.0.tgz"; - sha512 = "W6x/uM0K1hHEMadW4YvXcucUc2hjIm+jMIxs0ujNaeRH6uVFEtlfPmEwnYV9EzU3Ns+NOp/juuN/fvF0DqeXhQ=="; - }; - }; - "ln-service-53.5.1" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.5.1.tgz"; - sha512 = "EXLhYeu1qvhk+yzuH6qBZyGvqBPWT71FnmsbOxKjWofW6SGQBbJuNru6Ub2NIMhJnXqD7qvMvswZ54ho/oPvGQ=="; - }; - }; "ln-service-53.7.2" = { name = "ln-service"; packageName = "ln-service"; @@ -39178,15 +40312,6 @@ let sha512 = "iA+G0yn3j74BcGdKxhHRCDphMSgGg4NWzFNy9r484WPBjq6KQgCRcxE0I8A0Rgi73kqMckKZmYEKrJMUuJyNYw=="; }; }; - "ln-service-53.8.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.8.0.tgz"; - sha512 = "W7HReWocdZLSiQaVHvbzFvzEVyftnBuqcm8joEpxLnSpTU6qhJCuIVwEyLYKqhgDKWx2rn5rOnrZ0xKua8j6TQ=="; - }; - }; "ln-service-53.8.1" = { name = "ln-service"; packageName = "ln-service"; @@ -39196,22 +40321,22 @@ let sha512 = "yEKEsDRsPQyBNzS7kpEaYCIhsxSsQzpf+ABov44RvbDKJONf4qMZOiy+IkqhqLP5IwlHFuLdnz/aHCLMSYtuqA=="; }; }; - "ln-service-53.9.1" = { + "ln-service-53.9.2" = { name = "ln-service"; packageName = "ln-service"; - version = "53.9.1"; + version = "53.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.1.tgz"; - sha512 = "0s0auOxItb5xFKA5yzAU+0eXKFLyWCbv9BrFnqxRrAIXY7wJYT8jFSL609BuFqwmUYkSdsIwe8EYr9WgPohWgQ=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.2.tgz"; + sha512 = "ISbIBxbRIBKDPDFuWj3pINZXFRAmHTTeEWdeq7pXJxeFH8JlnrwS8ETSJ1AfgHeeUIHK1D4xo3TNAnkSrRpH/A=="; }; }; - "ln-sync-3.10.0" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "3.10.0"; + "ln-service-53.9.3" = { + name = "ln-service"; + packageName = "ln-service"; + version = "53.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.10.0.tgz"; - sha512 = "iRYFVwHF6gyBKO8/WJfR+6jlsjPSsevFz/cbOQbOwBzMVaCmXIyWw95SGHEJLcZR2jNadEfP3k10oYa+hWou3A=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.3.tgz"; + sha512 = "vB7pnTJveZSMHbyO6qyGbxNqo+rNTYexb3PONon2+Ow4fBUQW5eeBTj+LguuQdN7AgpXX/PHZUQM0TPFeHlVWw=="; }; }; "ln-sync-3.10.1" = { @@ -39223,22 +40348,22 @@ let sha512 = "mib9y2c36Gz6oQ7sUzAmLV3a8wt52Rm1zKo7ldxBN49Tnh0gGQXbM69jOhLsy7DbB2TCjUJEh1d8OGMsbGuBqg=="; }; }; - "ln-sync-3.7.0" = { + "ln-sync-3.11.0" = { name = "ln-sync"; packageName = "ln-sync"; - version = "3.7.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.7.0.tgz"; - sha512 = "1aTlSSLiIULG4AOhOLdMd/VQYhUBEvTdA+8Bp2xe1YolOralVW/x/50fzIxzkKolCwXQ6elecUuH4nw1z0tqkg=="; + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.11.0.tgz"; + sha512 = "YqtS0v6zsDvv7rA51bSbXnB7Il4HQida+FpPD9KTAXdEiJW1L/NiyV4B+oosaygdUbT2oYgM3xw++L7XVBkPvA=="; }; }; - "ln-telegram-3.17.3" = { + "ln-telegram-3.19.1" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.17.3"; + version = "3.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.17.3.tgz"; - sha512 = "zGapeGsiRaK308l1gSyz0Cq9xU/S4jf0leFwxI5jwlAjgNGYzRpakk3f8mJETw6uxw+Cgn1kdl4dcnCC8SjyUg=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.19.1.tgz"; + sha512 = "PvSVXwMK5XCL5DpXlAGRvhUJxn1seLsteLEpL/+iS9N3XdpB288kSOH0dBUWznoVbzJgQbykf1p3Rskx7acctg=="; }; }; "load-bmfont-1.4.1" = { @@ -39331,6 +40456,15 @@ let sha512 = "OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw=="; }; }; + "loader-fs-cache-1.0.3" = { + name = "loader-fs-cache"; + packageName = "loader-fs-cache"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha512 = "ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA=="; + }; + }; "loader-runner-2.4.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -40024,6 +41158,15 @@ let sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; }; }; + "lodash.defaultsdeep-4.6.1" = { + name = "lodash.defaultsdeep"; + packageName = "lodash.defaultsdeep"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"; + sha512 = "3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="; + }; + }; "lodash.difference-4.5.0" = { name = "lodash.difference"; packageName = "lodash.difference"; @@ -40357,6 +41500,15 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; + "lodash.mapvalues-4.6.0" = { + name = "lodash.mapvalues"; + packageName = "lodash.mapvalues"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; + sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; + }; + }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -40573,6 +41725,15 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; + "lodash.transform-4.6.0" = { + name = "lodash.transform"; + packageName = "lodash.transform"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz"; + sha1 = "12306422f63324aed8483d3f38332b5f670547a0"; + }; + }; "lodash.truncate-4.4.2" = { name = "lodash.truncate"; packageName = "lodash.truncate"; @@ -40762,13 +41923,13 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "log4js-6.4.1" = { + "log4js-6.4.2" = { name = "log4js"; packageName = "log4js"; - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz"; - sha512 = "iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg=="; + url = "https://registry.npmjs.org/log4js/-/log4js-6.4.2.tgz"; + sha512 = "k80cggS2sZQLBwllpT1p06GtfvzMmSdUCkW96f0Hj83rKGJDAu2vZjt9B9ag2vx8Zz1IXzxoLgqvRJCdMKybGg=="; }; }; "logform-2.4.0" = { @@ -41122,13 +42283,13 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-cache-7.3.1" = { + "lru-cache-7.4.4" = { name = "lru-cache"; packageName = "lru-cache"; - version = "7.3.1"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.3.1.tgz"; - sha512 = "nX1x4qUrKqwbIAhv4s9et4FIUVzNOpeY07bsjGUy8gwJrXH/wScImSQqXErmo/b2jZY2r0mohbLA9zVj7u1cNw=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.4.tgz"; + sha512 = "2XbUJmlpIbmc9JvNNmtLzHlF31srxoDxuiQiwBHic7RZyHyltbTdzoO6maRqpdEhOOG5GD80EXvzAU0wR15ccg=="; }; }; "lru-queue-0.1.0" = { @@ -41204,13 +42365,13 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; - "luxon-2.3.0" = { + "luxon-2.3.1" = { name = "luxon"; packageName = "luxon"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.0.tgz"; - sha512 = "gv6jZCV+gGIrVKhO90yrsn8qXPKD8HYZJtrUDSfEbow8Tkw84T9OnCyJhWvnJIaIF/tBuiAjZuQHUt1LddX2mg=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz"; + sha512 = "I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA=="; }; }; "lzma-native-8.0.6" = { @@ -41294,6 +42455,15 @@ let sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="; }; }; + "magic-string-0.25.9" = { + name = "magic-string"; + packageName = "magic-string"; + version = "0.25.9"; + src = fetchurl { + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"; + sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; + }; + }; "magicli-0.0.5" = { name = "magicli"; packageName = "magicli"; @@ -41384,13 +42554,13 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "make-fetch-happen-10.0.3" = { + "make-fetch-happen-10.0.5" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "10.0.3"; + version = "10.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.3.tgz"; - sha512 = "CzarPHynPpHjhF5in/YapnO44rSZeYX5VCMfdXa99+gLwpbfFLh20CWa6dP/taV9Net9PWJwXNKtp/4ZTCQnag=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.5.tgz"; + sha512 = "0JQ0daMRDFEv14DelmcFlprdhSDNG7WEgInTjBeWYWZ78W0jfDqygZdPLhcrQ4s/G8skNhBrS4fiF6xA+YlFjQ=="; }; }; "make-fetch-happen-8.0.14" = { @@ -41915,22 +43085,13 @@ let sha512 = "YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g=="; }; }; - "material-design-icons-3.0.1" = { - name = "material-design-icons"; - packageName = "material-design-icons"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz"; - sha1 = "9a71c48747218ebca51e51a66da682038cdcb7bf"; - }; - }; - "material-design-lite-1.3.0" = { - name = "material-design-lite"; - packageName = "material-design-lite"; - version = "1.3.0"; + "material-design-icons-iconfont-6.1.1" = { + name = "material-design-icons-iconfont"; + packageName = "material-design-icons-iconfont"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/material-design-lite/-/material-design-lite-1.3.0.tgz"; - sha1 = "d004ce3fee99a1eeb74a78b8a325134a5f1171d3"; + url = "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.1.1.tgz"; + sha512 = "nkoXybeXoofanNagj4tbM6+/LALWpWxYX5ee861to5VQrKgb0/TskTw28Svwn0OGDKajuqK7ShFOsIBxIygGKA=="; }; }; "math-random-1.0.4" = { @@ -42608,15 +43769,6 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.1.1" = { - name = "meow"; - packageName = "meow"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz"; - sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; - }; - }; "meow-7.1.1" = { name = "meow"; packageName = "meow"; @@ -42671,6 +43823,15 @@ let sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f"; }; }; + "merge-source-map-1.1.0" = { + name = "merge-source-map"; + packageName = "merge-source-map"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; + sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; + }; + }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -42734,6 +43895,15 @@ let sha512 = "E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ=="; }; }; + "meros-1.2.0" = { + name = "meros"; + packageName = "meros"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meros/-/meros-1.2.0.tgz"; + sha512 = "3QRZIS707pZQnijHdhbttXRWwrHhZJ/gzolneoxKVz9N/xmsvY/7Ls8lpnI9gxbgxjcHsAVEW3mgwiZCo6kkJQ=="; + }; + }; "metals-languageclient-0.4.2" = { name = "metals-languageclient"; packageName = "metals-languageclient"; @@ -43409,6 +44579,15 @@ let sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; + "mime-db-1.52.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.52.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; + }; + }; "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; @@ -43553,13 +44732,22 @@ let sha512 = "IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw=="; }; }; - "mini-svg-data-uri-1.4.3" = { + "mini-css-extract-plugin-0.9.0" = { + name = "mini-css-extract-plugin"; + packageName = "mini-css-extract-plugin"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; + sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; + }; + }; + "mini-svg-data-uri-1.4.4" = { name = "mini-svg-data-uri"; packageName = "mini-svg-data-uri"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.3.tgz"; - sha512 = "gSfqpMRC8IxghvMcxzzmMnWpXAChSA+vy4cia33RgerMS8Fex95akUyQZPbxJJmeBGiGmK7n/1OpUX8ksRjIdA=="; + url = "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz"; + sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="; }; }; "minicap-prebuilt-2.3.0" = { @@ -43634,13 +44822,22 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimatch-5.0.0" = { + "minimatch-4.2.1" = { name = "minimatch"; packageName = "minimatch"; - version = "5.0.0"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz"; + sha512 = "9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g=="; + }; + }; + "minimatch-5.0.1" = { + name = "minimatch"; + packageName = "minimatch"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.0.tgz"; - sha512 = "EU+GCVjXD00yOUf1TwAHVP7v3fBD3A8RkkPYsWWKGWesxM/572sL53wJQnHxquHlRhYUV36wHkqrN8cdikKc2g=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz"; + sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g=="; }; }; "minimist-0.0.10" = { @@ -43661,15 +44858,6 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; "minimist-1.2.3" = { name = "minimist"; packageName = "minimist"; @@ -43760,6 +44948,15 @@ let sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; }; }; + "minipass-fetch-2.0.3" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.0.3.tgz"; + sha512 = "VA+eiiUtaIvpQJXISwE3OiMvQwAWrgKb97F0aXlCS1Ahikr8fEQq8m3Hf7Kv9KT3nokuHigJKsDMB6atU04olQ=="; + }; + }; "minipass-flush-1.0.5" = { name = "minipass-flush"; packageName = "minipass-flush"; @@ -43823,13 +45020,13 @@ let sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; - "mirakurun-3.3.1" = { + "mirakurun-3.9.0-beta.26" = { name = "mirakurun"; packageName = "mirakurun"; - version = "3.3.1"; + version = "3.9.0-beta.26"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.1.tgz"; - sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.9.0-beta.26.tgz"; + sha512 = "w1yetqCebn8G4RRBnPEWLiVeLCOL1r/6t6E/81REOjF27yasxOo8duydpzd2aYWHsMDNr/+yc0xqlRdA64X6Tw=="; }; }; "mired-0.0.0" = { @@ -43868,15 +45065,6 @@ let sha1 = "53d500266cbd09cda9d94c4cf392e60589b5b324"; }; }; - "mithril-2.0.4" = { - name = "mithril"; - packageName = "mithril"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mithril/-/mithril-2.0.4.tgz"; - sha512 = "mgw+DMZlhMS4PpprF6dl7ZoeZq5GGcAuWnrg5e12MvaGauc4jzWsDZtVGRCktsiQczOEUr2K5teKbE5k44RlOg=="; - }; - }; "mitt-1.2.0" = { name = "mitt"; packageName = "mitt"; @@ -43967,13 +45155,13 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mobx-6.4.1" = { + "mobx-6.4.2" = { name = "mobx"; packageName = "mobx"; - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.4.1.tgz"; - sha512 = "NFXx0uMbGBgsa0uxhH099L8cMuoRQWh01q6Sf0ZX/3hFU7svJ7yfTD+1LnLMa5wzY/b7gImAeMsR1p0wordDnA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.4.2.tgz"; + sha512 = "b4xQJYiH8sb0sEbfq/Ws3N77DEJtSihUFD1moeiz2jNoJ5B+mqJutt54ouO9iEfkp7Wk4jQDsVUOh7DPEW3wEw=="; }; }; "mobx-react-7.3.0" = { @@ -44012,13 +45200,13 @@ let sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; }; - "mocha-9.2.1" = { + "mocha-9.2.2" = { name = "mocha"; packageName = "mocha"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz"; - sha512 = "T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz"; + sha512 = "L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="; }; }; "mock-require-3.0.3" = { @@ -44120,6 +45308,24 @@ let sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; }; }; + "mongodb-4.4.1" = { + name = "mongodb"; + packageName = "mongodb"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.4.1.tgz"; + sha512 = "IAD3nFtCR4s22vi5qjqkCBnuyDDrOW8WVSSmgHquOvGaP1iTD+XpC5tr8wAUbZ2EeZkaswwBKQFHDvl4qYcKqQ=="; + }; + }; + "mongodb-connection-string-url-2.5.2" = { + name = "mongodb-connection-string-url"; + packageName = "mongodb-connection-string-url"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.2.tgz"; + sha512 = "tWDyIG8cQlI5k3skB6ywaEA5F9f5OntrKKsT/Lteub2zgwSUlhqEN2inGgBTm8bpYJf8QYBdA/5naz65XDpczA=="; + }; + }; "moniker-0.1.2" = { name = "moniker"; packageName = "moniker"; @@ -44237,6 +45443,15 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; + "mpegts.js-1.6.10" = { + name = "mpegts.js"; + packageName = "mpegts.js"; + version = "1.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/mpegts.js/-/mpegts.js-1.6.10.tgz"; + sha512 = "ZgX4b93cWk+EazOFRV4lekLqmc4rV7P+WMisG8N0F2M4/EiluPMNNWjuaurQfitak++AIc/ZVQ3IgM3cBcH7WA=="; + }; + }; "mqtt-4.3.5" = { name = "mqtt"; packageName = "mqtt"; @@ -44354,13 +45569,31 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "multer-1.4.2" = { + "msgpackr-1.5.4" = { + name = "msgpackr"; + packageName = "msgpackr"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.4.tgz"; + sha512 = "Z7w5Jg+2Q9z9gJxeM68d7tSuWZZGnFIRhZnyqcZCa/1dKkhOCNvR1TUV3zzJ3+vj78vlwKRzUgVDlW4jiSOeDA=="; + }; + }; + "msgpackr-extract-1.0.16" = { + name = "msgpackr-extract"; + packageName = "msgpackr-extract"; + version = "1.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.0.16.tgz"; + sha512 = "fxdRfQUxPrL/TizyfYfMn09dK58e+d65bRD/fcaVH4052vj30QOzzqxcQIS7B0NsqlypEQ/6Du3QmP2DhWFfCA=="; + }; + }; + "multer-1.4.3" = { name = "multer"; packageName = "multer"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.4.2.tgz"; - sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; + url = "https://registry.npmjs.org/multer/-/multer-1.4.3.tgz"; + sha512 = "np0YLKncuZoTzufbkM6wEKp68EhWJXcU6fq6QqrSwkckd2LlMgd1UqhUJLj6NS/5sZ8dE8LYDWslsltJznnXlg=="; }; }; "multer-1.4.4" = { @@ -44390,22 +45623,22 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "multiblob-1.13.7" = { + "multiblob-1.13.8" = { name = "multiblob"; packageName = "multiblob"; - version = "1.13.7"; + version = "1.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.7.tgz"; - sha512 = "+vZLrxhuAJFOl9EFUkFviYpz8nIOdoM3Hzq8Mzx0uJkaRWd61QxIp68wglTM8ZtABXYgE0YowD98XqthCRxSow=="; + url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.8.tgz"; + sha512 = "YXNUflHc7I7iUiLctHMTvwDQOjMbCv+Pdbf+1lScFOsjP/CSZgwblRknPntcD+KEPGFudXPBtJR10TIrun3zmQ=="; }; }; - "multiblob-http-1.2.0" = { + "multiblob-http-1.2.1" = { name = "multiblob-http"; packageName = "multiblob-http"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.2.0.tgz"; - sha512 = "bTW9D4NcgvWO/vFXakTUV5JN7p2fTG0o4Flg2zZFF44fDBUnq4FkZKbFNnkci+zkdfYAo9HqZPxvnMwS58mtjQ=="; + url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.2.1.tgz"; + sha512 = "ZNgfHZkC1A1xec7aUE7Tq6ArIXE7pygzbf3jNX1wlK15STqenGGURrqM79puk3j2cscC9Keu/ULQM3dET3xLCQ=="; }; }; "multicast-dns-4.0.1" = { @@ -44534,15 +45767,6 @@ let sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw=="; }; }; - "munin-plugin-0.0.9" = { - name = "munin-plugin"; - packageName = "munin-plugin"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/munin-plugin/-/munin-plugin-0.0.9.tgz"; - sha1 = "ca17e1eafb3b9155b5e4c21062210e348a9dbe91"; - }; - }; "murmurhash-js-1.0.0" = { name = "murmurhash-js"; packageName = "murmurhash-js"; @@ -44651,13 +45875,13 @@ let sha512 = "pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg=="; }; }; - "muxrpc-6.7.0" = { + "muxrpc-6.7.2" = { name = "muxrpc"; packageName = "muxrpc"; - version = "6.7.0"; + version = "6.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.7.0.tgz"; - sha512 = "1jdziESUd2ajBUJ/tvLRdm9TJQiN+JuN0NHtvubposhVUi8T5PF6ODfit6lg30l4iDxK4/z52wvbnHbsfvzT/w=="; + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.7.2.tgz"; + sha512 = "tmaQl2h6OB4ofvOex/DQpKOiMOktnRAe9bvBmYCd9BnE3QmwOSpZey2n7P5gWlKDTRgjunJZiISlGOKIOXbHZg=="; }; }; "muxrpc-usage-2.1.0" = { @@ -44849,15 +46073,6 @@ let sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; - "nanoid-3.2.0" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"; - sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; - }; - }; "nanoid-3.3.1" = { name = "nanoid"; packageName = "nanoid"; @@ -45101,13 +46316,13 @@ let sha512 = "SIrthcL5Wc0sps+2e1xGj3zceEa68TgNZDLuCx0daxmfTP7sFTB3/mtE2pYhlFsCxWoMn+JfID5E1NlzvvbRJg=="; }; }; - "near-ledger-js-0.2.0" = { + "near-ledger-js-0.2.1" = { name = "near-ledger-js"; packageName = "near-ledger-js"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/near-ledger-js/-/near-ledger-js-0.2.0.tgz"; - sha512 = "6YcK7o+GcsUoGevjVqDotVZE3hvCcr9cRxFx/+PyR7JrDbzbVhavXQInqJxdZnqYC7K/dh/YZKhwhtXHXEF1iQ=="; + url = "https://registry.npmjs.org/near-ledger-js/-/near-ledger-js-0.2.1.tgz"; + sha512 = "8anZb6e96gJNBOKUR/HReLN/x8BmBhCpyPq+XxFbx8jxmsRz+M1Hxq085+ROYaMI2EDJqatrjjLAdArk13BOhA=="; }; }; "near-seed-phrase-0.2.0" = { @@ -45237,13 +46452,13 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; - "nel-1.2.0" = { + "nel-1.3.0" = { name = "nel"; packageName = "nel"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nel/-/nel-1.2.0.tgz"; - sha512 = "yt96hdYomrZC5ZvYHMCsRF5KIaZ8Aue5Gff4sH+6GmPDMJft097x5JG1DicLnfgSYE56CLP6ztZEfb+3St91Yw=="; + url = "https://registry.npmjs.org/nel/-/nel-1.3.0.tgz"; + sha512 = "LvnlJC5lg6MRazqzfRtIMvLmtOhCm9z/dkdVaHuCxQHLmD7NzLsExnqv7VMuRfL4tC0mXcLlnFsh9SF0PdIjSw=="; }; }; "neo-async-2.6.2" = { @@ -45381,15 +46596,6 @@ let sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "next-tick-1.0.0" = { - name = "next-tick"; - packageName = "next-tick"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; - }; - }; "next-tick-1.1.0" = { name = "next-tick"; packageName = "next-tick"; @@ -45714,15 +46920,6 @@ let sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; }; }; - "node-fetch-1.6.3" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz"; - sha1 = "dc234edd6489982d58e8f0db4f695029abcd8c04"; - }; - }; "node-fetch-1.7.3" = { name = "node-fetch"; packageName = "node-fetch"; @@ -45759,13 +46956,13 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-fetch-3.2.0" = { + "node-fetch-3.2.3" = { name = "node-fetch"; packageName = "node-fetch"; - version = "3.2.0"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.0.tgz"; - sha512 = "8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.3.tgz"; + sha512 = "AXP18u4pidSZ1xYXRDPY/8jdv3RAozIt/WLNR/MBGZAz+xjtlr90RvCnsvHQRiXyWliZF/CpytExp32UU67/SA=="; }; }; "node-fetch-h2-2.3.0" = { @@ -45858,6 +47055,15 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; + "node-gyp-9.0.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz"; + sha512 = "Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw=="; + }; + }; "node-gyp-build-4.1.1" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -46353,6 +47559,15 @@ let sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; }; }; + "normalize-path-1.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz"; + sha1 = "32d0e472f91ff345701c15a8311018d3b0a90379"; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -46686,13 +47901,13 @@ let sha512 = "Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA=="; }; }; - "npm-registry-fetch-13.0.0" = { + "npm-registry-fetch-13.0.1" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "13.0.0"; + version = "13.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.0.0.tgz"; - sha512 = "MmiMuV9DU5gRuAU0jia952Qq+E4h7ZoUaeltCXivhClcqfOVKqNLZEQsRUOb6a8WQY+um8x97JcUuaWFoPoBBw=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.0.1.tgz"; + sha512 = "Ak+LXVtSrCLOdscFW/apUw67OPNph8waHsPKM9UOJosL7i59EF5XoSWQMEsXEOeifM9Bb4/2+WrQC4t/pd8DGg=="; }; }; "npm-registry-fetch-9.0.0" = { @@ -46839,6 +48054,15 @@ let sha512 = "A8A8+PtlH937KWXJnfct6ubGPfgHOe3lwFkkmrT5xW8+aRBnDWqSiW5NRuiVuh/k/auLGsZdu+WrIU2epL/FHg=="; }; }; + "null-loader-4.0.1" = { + name = "null-loader"; + packageName = "null-loader"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/null-loader/-/null-loader-4.0.1.tgz"; + sha512 = "pxqVbi4U6N26lq+LmgIbB5XATP0VdZKOG25DhHi8btMmJJefGArFyDg1yc4U3hWCJbMqSrw0qyrz1UQX+qYXqg=="; + }; + }; "nullthrows-1.1.1" = { name = "nullthrows"; packageName = "nullthrows"; @@ -46866,13 +48090,13 @@ let sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; }; }; - "number-allocator-1.0.9" = { + "number-allocator-1.0.10" = { name = "number-allocator"; packageName = "number-allocator"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.9.tgz"; - sha512 = "sIIF0dZKMs3roPUD7rLreH8H3x47QKV9dHZ+PeSnH24gL0CxKxz/823woGZC0hLBSb2Ar/rOOeHiNbnPBum/Mw=="; + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.10.tgz"; + sha512 = "K4AvNGKo9lP6HqsZyfSr9KDaqnwFzW203inhQEOwFrmFaYevpdX4VNwdOLk197aHujzbT//z6pCBrCOUYSM5iw=="; }; }; "number-is-nan-1.0.1" = { @@ -47362,15 +48586,6 @@ let sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="; }; }; - "office-ui-fabric-react-7.183.1" = { - name = "office-ui-fabric-react"; - packageName = "office-ui-fabric-react"; - version = "7.183.1"; - src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.183.1.tgz"; - sha512 = "2C0fmVPYi7kuMa0e+0Cw37C5SxOb4I//e5zwoBgOPagODYO/yhxZAxOt6VTOkn1Nr3zTZeYAfN7mjUNrjfyvFA=="; - }; - }; "omggif-1.0.10" = { name = "omggif"; packageName = "omggif"; @@ -47416,6 +48631,15 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; + "on-finished-2.4.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; + }; + }; "on-headers-1.0.2" = { name = "on-headers"; packageName = "on-headers"; @@ -47542,13 +48766,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.54.0" = { + "oo-ascii-tree-1.55.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.54.0.tgz"; - sha512 = "EAk5I5GHidk2lvqwcfR1bl/EeK1Pns8BMzzFKle6clapov3LX54l3k70VGHQDLsHo42dy9UJe23mJPVpg9iTcg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.55.0.tgz"; + sha512 = "oC+v1W4giMwOU19ZZmT89culEvqRlpGxoKAPirk4URHdOEWROSJy+xbuemiKRxrQwbmLMqgZw0Uq2PkiaBmtDw=="; }; }; "open-0.0.2" = { @@ -47614,157 +48838,157 @@ let sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; }; }; - "openapi-default-setter-2.1.0" = { + "openapi-default-setter-8.0.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; - version = "2.1.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-2.1.0.tgz"; - sha512 = "2ZNlX1B/J9Q/bsM/vZKh8alC0Pn04KtDGbMN30qLRu3GkaOJH3dDMKxqJzCpYj8BOAa8G3BEsQq6kqWzkEsM7A=="; + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz"; + sha512 = "Ro0hg8w+lTPe18r5noVUjHgYMXZ3mPe5evW6fA0hdahqLns444wR/Cuvcykb/FHteqaq0WooQrsoKObO4lIHWA=="; }; }; - "openapi-default-setter-7.2.3" = { + "openapi-default-setter-9.3.1" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.2.3.tgz"; - sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw=="; + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-9.3.1.tgz"; + sha512 = "Tc/qpL7H2urJAilmb1wLqHJ8BjjJYudodRFl3RbTkWPSzwalZwPEo4VRP6WnEGvaRgkzLFaT62XgTHRGT8G9lw=="; }; }; - "openapi-framework-0.26.0" = { + "openapi-framework-8.0.0" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "0.26.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-0.26.0.tgz"; - sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-8.0.0.tgz"; + sha512 = "T9rP8onTa5xU+7+FCiiBO/p0DLjbHlcfhu+8yUEWFlmlCyihqjbsH0YiH7cCQYNOLgKZUCQZOaxJDiYBlVIaQQ=="; }; }; - "openapi-framework-7.5.0" = { + "openapi-framework-9.3.1" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.5.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.5.0.tgz"; - sha512 = "t+sGVNMs2apX6d/rf5oq/3S6tCyBTgCjgFY0EDEIKKWepO4v3wM+kjy/Ve9iU92Ui5GeWbGR6ceFKY6VP/OKfQ=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-9.3.1.tgz"; + sha512 = "cnDQQSHNhwS4jn5IE1gTO4mMTolbPbMf3EzVCMNmEcN09IKGQYmtiVSxxL+uGFiHHlpPfOTSsWrvTCiwbhRtyA=="; }; }; - "openapi-jsonschema-parameters-1.2.0" = { + "openapi-jsonschema-parameters-8.0.0" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "1.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-1.2.0.tgz"; - sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz"; + sha512 = "yBBShgxPyo1M33q6RHNAvhTH6AydMDyDl7e89YUA/VkAf1wrU2HO/7Nok65R0vGbZFF43yml4i8sIak3GGnqVA=="; }; }; - "openapi-jsonschema-parameters-7.2.3" = { + "openapi-jsonschema-parameters-9.3.1" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.2.3.tgz"; - sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-9.3.1.tgz"; + sha512 = "WeP/7nh4VAZFhtf5+FbA2HQQPD/a13+xf8uCd3QqpynSzBmcdkstb/kg8Uk4Hmqh5WlNkTGpxnjMxqSw6sHcWw=="; }; }; - "openapi-request-coercer-2.4.0" = { + "openapi-request-coercer-8.0.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "2.4.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-2.4.0.tgz"; - sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz"; + sha512 = "CTWZJT6rAPiLO7kvBpN9CJ7TXbCTlZzE7Z/Id/gegK/5FlxYIoB+ybx4tYC4IwJEjfm/lxY7Xv2CRp6RLJfKPw=="; }; }; - "openapi-request-coercer-7.5.0" = { + "openapi-request-coercer-9.3.1" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "7.5.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.5.0.tgz"; - sha512 = "wvrh3xSEpmgKaHiAnVhPxL6Yp9IXW+NEI192z6X5RiU6xe+jszn6A3v8vJcceyNsvDBA4tkm4I3mFndDlhc6Zw=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-9.3.1.tgz"; + sha512 = "4rIT/3H5k/zVSXSbxnLQvmHw4BXyCv4ocPjweybDxlVN6ryk+eIaMWiJzFoOf7RI86w++742HOECyzaLoBHftQ=="; }; }; - "openapi-request-validator-4.2.0" = { + "openapi-request-validator-8.0.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "4.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-4.2.0.tgz"; - sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz"; + sha512 = "7gqNp4MvYu+pbdbq8Pw0qMsKqlhWQeYdKCHiu1OeOgBG8YkjlNGGeTuX028TsBEB/jGw7PgMCggaHuMl/W3bmQ=="; }; }; - "openapi-request-validator-7.4.0" = { + "openapi-request-validator-9.3.1" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "7.4.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.4.0.tgz"; - sha512 = "0rnslY82Btw5nM6rUEuXkvupav4ujvP+e9WziZvcMrE+VZ6IxRGDP8F7w0XmtPBwMS2nJGgt/J7BnRXAFTx5tw=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-9.3.1.tgz"; + sha512 = "YhX942jTNWH3V/C+ysYcgchyjulT5ZJ1l0c9++isSnF0SKyEiIA+uUiSyAE+pKTc+Oel3ad8mXiy6rFFHoIKaQ=="; }; }; - "openapi-response-validator-4.0.0" = { + "openapi-response-validator-8.0.0" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "4.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-4.0.0.tgz"; - sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz"; + sha512 = "h41hcEIgT7ldowLafcWlaE2m3+ss9IgRRrBfEzTtdBab2SyefYeXBV5keicL/muC1msmhT2p2rftjQnvfQN2jA=="; }; }; - "openapi-response-validator-7.4.0" = { + "openapi-response-validator-9.3.1" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "7.4.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.4.0.tgz"; - sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-9.3.1.tgz"; + sha512 = "2AOzHAbrwdj5DNL3u+BadhfmL3mlc3mmCv6cSAsEjoMncpOOVd95JyMf0j0XUyJigJ8/ILxnhETfg35vt1pGSQ=="; }; }; - "openapi-sampler-1.2.0" = { + "openapi-sampler-1.2.1" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.2.0.tgz"; - sha512 = "Y0tFg2iH7NWnNHYnesxhMfkXc7wWXyJXYMUTTxkGkfpl0U9u/ZOf6BxrdEXBD4sgs9uMlVWsbWLDLesVmSUU7Q=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.2.1.tgz"; + sha512 = "mHrYmyvcLD0qrfqPkPRBAL2z16hGT2rW0d0B7nklfoTcc3pmkJLkSZlKSeFgerUM41E5c7jlxf0Y19xrM7mWQQ=="; }; }; - "openapi-schema-validator-3.0.3" = { + "openapi-schema-validator-8.0.0" = { name = "openapi-schema-validator"; packageName = "openapi-schema-validator"; - version = "3.0.3"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-3.0.3.tgz"; - sha512 = "KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA=="; + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz"; + sha512 = "cxacCVE/pIhlfzDPjhMREEVgWsFFUxU/+bKU258LKDmgXcdbbajtWtRT63VarXPnQ0sS4Bhl3V4ZKWxdJMiOXA=="; }; }; - "openapi-schema-validator-7.2.3" = { + "openapi-schema-validator-9.3.1" = { name = "openapi-schema-validator"; packageName = "openapi-schema-validator"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.2.3.tgz"; - sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA=="; + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-9.3.1.tgz"; + sha512 = "5wpFKMoEbUcjiqo16jIen3Cb2+oApSnYZpWn8WQdRO2q/dNQZZl8Pz6ESwCriiyU5AK4i5ZI6+7O3bHQr6+6+g=="; }; }; - "openapi-security-handler-2.0.4" = { + "openapi-security-handler-8.0.0" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; - version = "2.0.4"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-2.0.4.tgz"; - sha512 = "blz/UftEqYQLAByuEVITePUI9hV5Rd91CEK8yrsKDUaf3zk6cmIMafJ2qvagHqjXRRtL7fOqvsSKIeFrai+HfQ=="; + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz"; + sha512 = "XWD15AQSZA3OQFS1gqupC9KoxOuUacyG8PUEna91sihPvZdO5lVcAfqHkJ1tqOKcn5k8Y8EsSoCwlr0d5njCaw=="; }; }; - "openapi-security-handler-7.2.3" = { + "openapi-security-handler-9.3.1" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.2.3.tgz"; - sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg=="; + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-9.3.1.tgz"; + sha512 = "q9rzMCwo3hia/56eBVkCUURQXZBlP/2DzplVd9Gvi3fgCXrgjnp+eY0W9EcmTJU5unb8rOuMExKsEI2cdEziVg=="; }; }; "openapi-to-graphql-2.2.5" = { @@ -47776,40 +49000,40 @@ let sha512 = "HlCCs/D7wMtraNZVYR8fgqv2Fr4afWgWKVf38uwwMEdhTuVHadn+1ILYfmZV6AdejFw7ViQpjNGVRcdrN2wzFg=="; }; }; - "openapi-types-1.3.4" = { + "openapi-types-7.2.3" = { name = "openapi-types"; packageName = "openapi-types"; - version = "1.3.4"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.4.tgz"; - sha512 = "h8rADpW3k/wepLdERKF0VKMAPdoFYNQCLGPmc/f8sgQ2dxUy+7sY4WAX2XDUDjhKTjbJVbxxofLkzy7f1/tE4g=="; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.2.3.tgz"; + sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; }; }; - "openapi-types-1.3.5" = { + "openapi-types-8.0.0" = { name = "openapi-types"; packageName = "openapi-types"; - version = "1.3.5"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz"; - sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-8.0.0.tgz"; + sha512 = "dcHYyCDOAy4QQTrur5Sn1L3lPVspB7rd04Rw/Q7AsMvfV797IiWgmKziFCbq8VhnBoREU/SPPSBDxtK9Biwa1g=="; }; }; - "openapi-types-7.0.1" = { + "openapi-types-9.3.0" = { name = "openapi-types"; packageName = "openapi-types"; - version = "7.0.1"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.0.1.tgz"; - sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A=="; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-9.3.0.tgz"; + sha512 = "sR23YjmuwDSMsQVZDHbV9mPgi0RyniQlqR0AQxTC2/F3cpSjRFMH3CFPjoWvNqhC4OxPkDYNb2l8Mc1Me6D/KQ=="; }; }; - "openapi-types-7.2.3" = { + "openapi-types-9.3.1" = { name = "openapi-types"; packageName = "openapi-types"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.2.3.tgz"; - sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-9.3.1.tgz"; + sha512 = "/Yvsd2D7miYB4HLJ3hOOS0+vnowQpaT75FsHzr/y5M9P4q9bwa7RcbW2YdH6KZBn8ceLbKGnHxMZ1CHliGHUFw=="; }; }; "openapi3-ts-2.0.2" = { @@ -47821,15 +49045,6 @@ let sha512 = "TxhYBMoqx9frXyOgnRHufjQfPXomTIHYKhSKJ6jHfj13kS8OEIhvmE8CTuQyKtjjWttAjX5DPxM1vmalEpo8Qw=="; }; }; - "opencollective-1.0.3" = { - name = "opencollective"; - packageName = "opencollective"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/opencollective/-/opencollective-1.0.3.tgz"; - sha1 = "aee6372bc28144583690c3ca8daecfc120dd0ef1"; - }; - }; "opencollective-postinstall-2.0.3" = { name = "opencollective-postinstall"; packageName = "opencollective-postinstall"; @@ -47893,15 +49108,6 @@ let sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a"; }; }; - "opn-4.0.2" = { - name = "opn"; - packageName = "opn"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"; - sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; - }; - }; "opn-5.3.0" = { name = "opn"; packageName = "opn"; @@ -48100,6 +49306,15 @@ let sha512 = "CxEP6845hLK+NHFWZ+LplGO4zfw4QSfxTlqMfvlJ988GoiUeZDMzCvqsZkFHv69sPICmJH1MDxZoQFOKXerAVw=="; }; }; + "ordered-binary-1.2.4" = { + name = "ordered-binary"; + packageName = "ordered-binary"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.4.tgz"; + sha512 = "A/csN0d3n+igxBPfUrjbV5GC69LWj2pjZzAAeeHXLukQ4+fytfP4T1Lg0ju7MSPSwq7KtHkGaiwO8URZN5IpLg=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -48226,22 +49441,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.3.3" = { + "ot-builder-1.4.0" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.3.3.tgz"; - sha512 = "MRagUwE9VN5++ptJXPd5RqK6YbDUe6i+I7RWRpsgo2aD2ZbvktfoJ1FJGzLbaRucsWw4X3d6xKf8xIQ5SnjMJA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.4.0.tgz"; + sha512 = "aNXKQr0+ztCBcb0VF7RtNJ2rcUq7jaJWr7PHs47gWVME5O+e+H/pBPh54LFBi9nm17LZGBo/gH+ETiDuMcZj8Q=="; }; }; - "otb-ttc-bundle-1.3.3" = { + "otb-ttc-bundle-1.4.0" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.3.3.tgz"; - sha512 = "Aezn4zk5RFET7R7KONsKRvspOBpdJvVqTg6t2NZ6/sIpCeiwSIe3nUtOpn+PGvM11zMq7x3ulhWFrWdNRO9A/g=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.4.0.tgz"; + sha512 = "gZ/8LxA+YTovx/ZcU/iz9vpzpV1PSClDaWLd5ELn2amCLASMy0Icp2CNPateIwl1Z2O2pW9TTCC0Uu/0OsnKgA=="; }; }; "ow-0.21.0" = { @@ -48253,15 +49468,6 @@ let sha512 = "dlsoDe39g7mhdsdrC1R/YwjT7yjVqE3svWwOlMGvN690waBkgEZBmKBdkmKvSt5/wZ6E0Jn/nIesPqMZOpPKqw=="; }; }; - "p-all-2.1.0" = { - name = "p-all"; - packageName = "p-all"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz"; - sha512 = "HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA=="; - }; - }; "p-any-2.1.0" = { name = "p-any"; packageName = "p-any"; @@ -48361,13 +49567,13 @@ let sha512 = "KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ=="; }; }; - "p-filter-2.1.0" = { + "p-filter-3.0.0" = { name = "p-filter"; packageName = "p-filter"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz"; - sha512 = "ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw=="; + url = "https://registry.npmjs.org/p-filter/-/p-filter-3.0.0.tgz"; + sha512 = "QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg=="; }; }; "p-finally-1.0.0" = { @@ -48838,15 +50044,6 @@ let sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; }; }; - "packet-reader-1.0.0" = { - name = "packet-reader"; - packageName = "packet-reader"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; - sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; - }; - }; "packet-stream-2.0.6" = { name = "packet-stream"; packageName = "packet-stream"; @@ -48883,13 +50080,13 @@ let sha512 = "CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow=="; }; }; - "pacote-13.0.2" = { + "pacote-13.0.3" = { name = "pacote"; packageName = "pacote"; - version = "13.0.2"; + version = "13.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-13.0.2.tgz"; - sha512 = "3LyfvDk2BSJNFQZIcDqnLNa7IsYb6KwX3H9uZPwaHJFIX6Gv5N9QHU+s7mEs/RbN4/ta6KUT39LAi2l6EkBi5A=="; + url = "https://registry.npmjs.org/pacote/-/pacote-13.0.3.tgz"; + sha512 = "8thQ06YoO01O1k5rvSpHS/XPJZucw2DPiiT1jI+ys8QaTN6ifAyxfyoABHBa8nIt/4wPdzly4GEPqshctHFoYA=="; }; }; "pad-0.0.5" = { @@ -48910,22 +50107,22 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "paid-services-3.11.0" = { + "paid-services-3.12.1" = { name = "paid-services"; packageName = "paid-services"; - version = "3.11.0"; + version = "3.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.11.0.tgz"; - sha512 = "G0Enb7xcOpZlOmoK7h7Anym0nFG+t7JPMoTie5HoeUfwfm/mtNfUXyJvtom930Dg9l/g/rVk5CbivwzSS8ccUw=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.12.1.tgz"; + sha512 = "byws4+Ap+z8n/lLoZ8miW0WqaYkH/3DMmggdPmfrbYLLmSGkJEBYDnUMICX6941h1/j5KN6EC7l/MTSKaWg7/g=="; }; }; - "paid-services-3.11.4" = { + "paid-services-3.12.2" = { name = "paid-services"; packageName = "paid-services"; - version = "3.11.4"; + version = "3.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.11.4.tgz"; - sha512 = "f31e2RMh6LiLs+P+k1r/ZsN9SDTD4U3KmEtk2IMMAsUADjb9U9KkFA9fHmMBmVZyjsLDVa4CDKWY93OiNJ1n1A=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.12.2.tgz"; + sha512 = "1Eg1uF7Jil8w2S8Fx1vFnqhDrN4DznNunZMah3LKynsaQGDmYmBX4ryyQZshoXv8gAQ8YaqFSTdw+wipsym3lQ=="; }; }; "pako-0.2.9" = { @@ -49009,6 +50206,15 @@ let sha512 = "uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg=="; }; }; + "parent-require-1.0.0" = { + name = "parent-require"; + packageName = "parent-require"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz"; + sha1 = "746a167638083a860b0eef6732cb27ed46c32977"; + }; + }; "parents-1.0.1" = { name = "parents"; packageName = "parents"; @@ -50035,69 +51241,6 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.3.3" = { - name = "pg"; - packageName = "pg"; - version = "8.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.3.3.tgz"; - sha512 = "wmUyoQM/Xzmo62wgOdQAn5tl7u+IA1ZYK7qbuppi+3E+Gj4hlUxVHjInulieWrd0SfHi/ADriTb5ILJ/lsJrSg=="; - }; - }; - "pg-connection-string-2.5.0" = { - name = "pg-connection-string"; - packageName = "pg-connection-string"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz"; - sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; - }; - }; - "pg-int8-1.0.1" = { - name = "pg-int8"; - packageName = "pg-int8"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; - sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; - }; - }; - "pg-pool-3.5.1" = { - name = "pg-pool"; - packageName = "pg-pool"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz"; - sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="; - }; - }; - "pg-protocol-1.5.0" = { - name = "pg-protocol"; - packageName = "pg-protocol"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; - }; - }; - "pg-types-2.2.0" = { - name = "pg-types"; - packageName = "pg-types"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; - }; - }; - "pgpass-1.0.5" = { - name = "pgpass"; - packageName = "pgpass"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz"; - sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug=="; - }; - }; "phin-2.9.3" = { name = "phin"; packageName = "phin"; @@ -50359,6 +51502,15 @@ let sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; }; }; + "pkg-dir-1.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz"; + sha1 = "7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"; + }; + }; "pkg-dir-3.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -50801,6 +51953,15 @@ let sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="; }; }; + "postcss-8.4.8" = { + name = "postcss"; + packageName = "postcss"; + version = "8.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz"; + sha512 = "2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ=="; + }; + }; "postcss-calc-7.0.5" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -50810,6 +51971,15 @@ let sha512 = "1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg=="; }; }; + "postcss-calc-8.2.4" = { + name = "postcss-calc"; + packageName = "postcss-calc"; + version = "8.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"; + sha512 = "SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="; + }; + }; "postcss-colormin-4.0.3" = { name = "postcss-colormin"; packageName = "postcss-colormin"; @@ -50819,6 +51989,15 @@ let sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; }; }; + "postcss-colormin-5.3.0" = { + name = "postcss-colormin"; + packageName = "postcss-colormin"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz"; + sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg=="; + }; + }; "postcss-convert-values-4.0.1" = { name = "postcss-convert-values"; packageName = "postcss-convert-values"; @@ -50828,6 +52007,15 @@ let sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; }; }; + "postcss-convert-values-5.1.0" = { + name = "postcss-convert-values"; + packageName = "postcss-convert-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz"; + sha512 = "GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g=="; + }; + }; "postcss-discard-comments-4.0.2" = { name = "postcss-discard-comments"; packageName = "postcss-discard-comments"; @@ -50837,6 +52025,15 @@ let sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; }; }; + "postcss-discard-comments-5.1.1" = { + name = "postcss-discard-comments"; + packageName = "postcss-discard-comments"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz"; + sha512 = "5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ=="; + }; + }; "postcss-discard-duplicates-4.0.2" = { name = "postcss-discard-duplicates"; packageName = "postcss-discard-duplicates"; @@ -50846,6 +52043,15 @@ let sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; }; }; + "postcss-discard-duplicates-5.1.0" = { + name = "postcss-discard-duplicates"; + packageName = "postcss-discard-duplicates"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"; + sha512 = "zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="; + }; + }; "postcss-discard-empty-4.0.1" = { name = "postcss-discard-empty"; packageName = "postcss-discard-empty"; @@ -50855,6 +52061,15 @@ let sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; }; }; + "postcss-discard-empty-5.1.1" = { + name = "postcss-discard-empty"; + packageName = "postcss-discard-empty"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"; + sha512 = "zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="; + }; + }; "postcss-discard-overridden-4.0.1" = { name = "postcss-discard-overridden"; packageName = "postcss-discard-overridden"; @@ -50864,6 +52079,15 @@ let sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; }; }; + "postcss-discard-overridden-5.1.0" = { + name = "postcss-discard-overridden"; + packageName = "postcss-discard-overridden"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"; + sha512 = "21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="; + }; + }; "postcss-flexbugs-fixes-4.2.1" = { name = "postcss-flexbugs-fixes"; packageName = "postcss-flexbugs-fixes"; @@ -50945,6 +52169,15 @@ let sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; }; }; + "postcss-merge-longhand-5.1.1" = { + name = "postcss-merge-longhand"; + packageName = "postcss-merge-longhand"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.1.tgz"; + sha512 = "JLtqAY1LvxiD2aej6hcAk/TkXvEPM+Gs1aOkOIZub2MDEiB5NMtpMe/Ir2seIMMM245bsuHggzIhQBv6qFBm4A=="; + }; + }; "postcss-merge-rules-4.0.3" = { name = "postcss-merge-rules"; packageName = "postcss-merge-rules"; @@ -50954,6 +52187,15 @@ let sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; }; }; + "postcss-merge-rules-5.1.0" = { + name = "postcss-merge-rules"; + packageName = "postcss-merge-rules"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz"; + sha512 = "NecukEJovQ0mG7h7xV8wbYAkXGTO3MPKnXvuiXzOKcxoOodfTTKYjeo8TMhAswlSkjcPIBlnKbSFcTuVSDaPyQ=="; + }; + }; "postcss-minify-font-values-4.0.2" = { name = "postcss-minify-font-values"; packageName = "postcss-minify-font-values"; @@ -50963,6 +52205,15 @@ let sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; }; }; + "postcss-minify-font-values-5.1.0" = { + name = "postcss-minify-font-values"; + packageName = "postcss-minify-font-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"; + sha512 = "el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA=="; + }; + }; "postcss-minify-gradients-4.0.2" = { name = "postcss-minify-gradients"; packageName = "postcss-minify-gradients"; @@ -50972,6 +52223,15 @@ let sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; }; }; + "postcss-minify-gradients-5.1.0" = { + name = "postcss-minify-gradients"; + packageName = "postcss-minify-gradients"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz"; + sha512 = "J/TMLklkONn3LuL8wCwfwU8zKC1hpS6VcxFkNUNjmVt53uKqrrykR3ov11mdUYyqVMEx67slMce0tE14cE4DTg=="; + }; + }; "postcss-minify-params-4.0.2" = { name = "postcss-minify-params"; packageName = "postcss-minify-params"; @@ -50981,6 +52241,15 @@ let sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; }; }; + "postcss-minify-params-5.1.1" = { + name = "postcss-minify-params"; + packageName = "postcss-minify-params"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.1.tgz"; + sha512 = "WCpr+J9Uz8XzMpAfg3UL8z5rde6MifBbh5L8bn8S2F5hq/YDJJzASYCnCHvAB4Fqb94ys8v95ULQkW2EhCFvNg=="; + }; + }; "postcss-minify-selectors-4.0.2" = { name = "postcss-minify-selectors"; packageName = "postcss-minify-selectors"; @@ -50990,6 +52259,15 @@ let sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; + "postcss-minify-selectors-5.2.0" = { + name = "postcss-minify-selectors"; + packageName = "postcss-minify-selectors"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz"; + sha512 = "vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA=="; + }; + }; "postcss-modules-extract-imports-1.1.0" = { name = "postcss-modules-extract-imports"; packageName = "postcss-modules-extract-imports"; @@ -51098,6 +52376,15 @@ let sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; }; }; + "postcss-normalize-charset-5.1.0" = { + name = "postcss-normalize-charset"; + packageName = "postcss-normalize-charset"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"; + sha512 = "mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="; + }; + }; "postcss-normalize-display-values-4.0.2" = { name = "postcss-normalize-display-values"; packageName = "postcss-normalize-display-values"; @@ -51107,6 +52394,15 @@ let sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; }; }; + "postcss-normalize-display-values-5.1.0" = { + name = "postcss-normalize-display-values"; + packageName = "postcss-normalize-display-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"; + sha512 = "WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA=="; + }; + }; "postcss-normalize-positions-4.0.2" = { name = "postcss-normalize-positions"; packageName = "postcss-normalize-positions"; @@ -51116,6 +52412,15 @@ let sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; }; }; + "postcss-normalize-positions-5.1.0" = { + name = "postcss-normalize-positions"; + packageName = "postcss-normalize-positions"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz"; + sha512 = "8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ=="; + }; + }; "postcss-normalize-repeat-style-4.0.2" = { name = "postcss-normalize-repeat-style"; packageName = "postcss-normalize-repeat-style"; @@ -51125,6 +52430,15 @@ let sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; }; }; + "postcss-normalize-repeat-style-5.1.0" = { + name = "postcss-normalize-repeat-style"; + packageName = "postcss-normalize-repeat-style"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz"; + sha512 = "IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw=="; + }; + }; "postcss-normalize-string-4.0.2" = { name = "postcss-normalize-string"; packageName = "postcss-normalize-string"; @@ -51134,6 +52448,15 @@ let sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; }; }; + "postcss-normalize-string-5.1.0" = { + name = "postcss-normalize-string"; + packageName = "postcss-normalize-string"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"; + sha512 = "oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w=="; + }; + }; "postcss-normalize-timing-functions-4.0.2" = { name = "postcss-normalize-timing-functions"; packageName = "postcss-normalize-timing-functions"; @@ -51143,6 +52466,15 @@ let sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; }; }; + "postcss-normalize-timing-functions-5.1.0" = { + name = "postcss-normalize-timing-functions"; + packageName = "postcss-normalize-timing-functions"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"; + sha512 = "DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg=="; + }; + }; "postcss-normalize-unicode-4.0.1" = { name = "postcss-normalize-unicode"; packageName = "postcss-normalize-unicode"; @@ -51152,6 +52484,15 @@ let sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; }; }; + "postcss-normalize-unicode-5.1.0" = { + name = "postcss-normalize-unicode"; + packageName = "postcss-normalize-unicode"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz"; + sha512 = "J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ=="; + }; + }; "postcss-normalize-url-4.0.1" = { name = "postcss-normalize-url"; packageName = "postcss-normalize-url"; @@ -51161,6 +52502,15 @@ let sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; }; }; + "postcss-normalize-url-5.1.0" = { + name = "postcss-normalize-url"; + packageName = "postcss-normalize-url"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"; + sha512 = "5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew=="; + }; + }; "postcss-normalize-whitespace-4.0.2" = { name = "postcss-normalize-whitespace"; packageName = "postcss-normalize-whitespace"; @@ -51170,6 +52520,15 @@ let sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; }; }; + "postcss-normalize-whitespace-5.1.1" = { + name = "postcss-normalize-whitespace"; + packageName = "postcss-normalize-whitespace"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"; + sha512 = "83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="; + }; + }; "postcss-ordered-values-4.1.2" = { name = "postcss-ordered-values"; packageName = "postcss-ordered-values"; @@ -51179,6 +52538,15 @@ let sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; }; }; + "postcss-ordered-values-5.1.0" = { + name = "postcss-ordered-values"; + packageName = "postcss-ordered-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz"; + sha512 = "wU4Z4D4uOIH+BUKkYid36gGDJNQtkVJT7Twv8qH6UyfttbbJWyw4/xIPuVEkkCtQLAJ0EdsNSh8dlvqkXb49TA=="; + }; + }; "postcss-reduce-initial-4.0.3" = { name = "postcss-reduce-initial"; packageName = "postcss-reduce-initial"; @@ -51188,6 +52556,15 @@ let sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; }; }; + "postcss-reduce-initial-5.1.0" = { + name = "postcss-reduce-initial"; + packageName = "postcss-reduce-initial"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz"; + sha512 = "5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw=="; + }; + }; "postcss-reduce-transforms-4.0.2" = { name = "postcss-reduce-transforms"; packageName = "postcss-reduce-transforms"; @@ -51197,6 +52574,15 @@ let sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; + "postcss-reduce-transforms-5.1.0" = { + name = "postcss-reduce-transforms"; + packageName = "postcss-reduce-transforms"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"; + sha512 = "2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="; + }; + }; "postcss-reporter-7.0.5" = { name = "postcss-reporter"; packageName = "postcss-reporter"; @@ -51287,6 +52673,15 @@ let sha512 = "NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw=="; }; }; + "postcss-svgo-5.1.0" = { + name = "postcss-svgo"; + packageName = "postcss-svgo"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"; + sha512 = "D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="; + }; + }; "postcss-syntax-0.36.2" = { name = "postcss-syntax"; packageName = "postcss-syntax"; @@ -51305,6 +52700,15 @@ let sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; }; }; + "postcss-unique-selectors-5.1.1" = { + name = "postcss-unique-selectors"; + packageName = "postcss-unique-selectors"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"; + sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; + }; + }; "postcss-value-parser-3.3.1" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; @@ -51323,42 +52727,6 @@ let sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; }; }; - "postgres-array-2.0.0" = { - name = "postgres-array"; - packageName = "postgres-array"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; - sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; - }; - }; - "postgres-bytea-1.0.0" = { - name = "postgres-bytea"; - packageName = "postgres-bytea"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; - sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; - }; - }; - "postgres-date-1.0.7" = { - name = "postgres-date"; - packageName = "postgres-date"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; - sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; - }; - }; - "postgres-interval-1.2.0" = { - name = "postgres-interval"; - packageName = "postgres-interval"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; - sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; - }; - }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -51377,6 +52745,33 @@ let sha512 = "YugEJ5ze/0DLRIVBjCpDwANWL4pPj1kHJ/2llY8xuInr0nbkon3qTiMPe5LQa+cCwNjxS7nAZZTp+1M+6mT4Zg=="; }; }; + "posthtml-0.16.6" = { + name = "posthtml"; + packageName = "posthtml"; + version = "0.16.6"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz"; + sha512 = "JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ=="; + }; + }; + "posthtml-parser-0.10.2" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.10.2.tgz"; + sha512 = "PId6zZ/2lyJi9LiKfe+i2xv57oEjJgWbsHGGANwos5AvdQp98i6AtamAl8gzSVFGfQ43Glb5D614cvZf012VKg=="; + }; + }; + "posthtml-parser-0.11.0" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz"; + sha512 = "QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw=="; + }; + }; "posthtml-parser-0.4.2" = { name = "posthtml-parser"; packageName = "posthtml-parser"; @@ -51404,6 +52799,15 @@ let sha512 = "W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw=="; }; }; + "posthtml-render-3.0.0" = { + name = "posthtml-render"; + packageName = "posthtml-render"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-3.0.0.tgz"; + sha512 = "z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA=="; + }; + }; "potpack-1.0.2" = { name = "potpack"; packageName = "potpack"; @@ -51791,6 +53195,15 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; + "prettier-2.4.1" = { + name = "prettier"; + packageName = "prettier"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz"; + sha512 = "9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA=="; + }; + }; "prettier-2.5.1" = { name = "prettier"; packageName = "prettier"; @@ -51818,6 +53231,15 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; + "prettier-linter-helpers-1.0.0" = { + name = "prettier-linter-helpers"; + packageName = "prettier-linter-helpers"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; + sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; + }; + }; "prettier-plugin-svelte-2.6.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; @@ -52880,13 +54302,13 @@ let sha512 = "yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ=="; }; }; - "pull-abortable-4.0.0" = { + "pull-abortable-4.1.1" = { name = "pull-abortable"; packageName = "pull-abortable"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.0.0.tgz"; - sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843"; + url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.1.1.tgz"; + sha1 = "b3ad5aefb4116b25916d26db89393ac98d0dcea1"; }; }; "pull-async-1.0.0" = { @@ -53096,13 +54518,13 @@ let sha1 = "eef915dde644bddbea8dd2e0106d544aacbcd5c2"; }; }; - "pull-goodbye-0.0.2" = { + "pull-goodbye-0.0.3" = { name = "pull-goodbye"; packageName = "pull-goodbye"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.2.tgz"; - sha1 = "8d8357db55e22a710dfff0f16a8c90b45efe4171"; + url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.3.tgz"; + sha512 = "fl3RcIHKsxFaygdU3dcwSznLr73HYGOEU9IshpiatYSV+PW3TOUEjtfdu1L8uIsUoDajJz3HM/+mG0mFD4+v5A=="; }; }; "pull-handshake-1.1.4" = { @@ -53141,13 +54563,13 @@ let sha1 = "5f99af15e8846d48ecf625edc248ec2cf57f6b0d"; }; }; - "pull-inactivity-2.1.3" = { + "pull-inactivity-2.1.4" = { name = "pull-inactivity"; packageName = "pull-inactivity"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.3.tgz"; - sha512 = "swJ/jwkIN/O1bQCE3iY7Xy9r3gYuJ50MXaxZilw/HIduAy4tJu+vcz2/If0L+xNK7Ku/FfjtVbTpRTe7sf3hmA=="; + url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.4.tgz"; + sha512 = "W2Q+6Jk0oRMICYXBXom3/ipz2U5YPUSQUfLvVgUqL/daHop7QQB3Jz5XpnnxsekCPoM61lGvXc7kFDZt0uWzMg=="; }; }; "pull-kvdiff-0.0.0" = { @@ -53330,15 +54752,6 @@ let sha1 = "7ea97413c1619c20bc3bdf9e10e91347b03253e4"; }; }; - "pull-stream-3.5.0" = { - name = "pull-stream"; - packageName = "pull-stream"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; - sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; - }; - }; "pull-stream-3.6.14" = { name = "pull-stream"; packageName = "pull-stream"; @@ -53546,13 +54959,13 @@ let sha512 = "2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w=="; }; }; - "puppeteer-13.3.2" = { + "puppeteer-13.5.1" = { name = "puppeteer"; packageName = "puppeteer"; - version = "13.3.2"; + version = "13.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.3.2.tgz"; - sha512 = "TIt8/R0eaUwY1c0/O0sCJpSglvGEWVoWFfGZ2dNtxX3eHuBo1ln9abaWfxTjZfsrkYATLSs8oqEdRZpMNnCsvg=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.5.1.tgz"; + sha512 = "wWxO//vMiqxlvuzHMAJ0pRJeDHvDtM7DQpW1GKdStz2nZo2G42kOXBDgkmQ+zqjwMCFofKGesBeeKxIkX9BO+w=="; }; }; "purest-3.1.0" = { @@ -53609,13 +55022,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.223" = { + "pyright-1.1.228" = { name = "pyright"; packageName = "pyright"; - version = "1.1.223"; + version = "1.1.228"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.223.tgz"; - sha512 = "EGLKMQRmSkKNe/eDy6MEkqq5lF91C5MCMYxvmCgKGUjZHIa+HByJIiRY2cOTm7g2CAv0eE7Ift701VxLM5Q0iQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.228.tgz"; + sha512 = "Q/LnDoZK6bxc7u60kFjFwi9X3s79kLaGd/g23T0c6T1CUdrRxDyRTvNRLjLPSLaX8EuPIdcXuPXAzXgSjBz/Mw=="; }; }; "q-0.9.7" = { @@ -54347,6 +55760,15 @@ let sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; }; + "raw-body-2.5.1" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; + }; + }; "raw-loader-3.1.0" = { name = "raw-loader"; packageName = "raw-loader"; @@ -54428,13 +55850,13 @@ let sha512 = "wuygyq8TXUlSdVXv2kigXxQNOgdb9m7LbIjwfTNGSpaY1riLd5e+VeQjlQMyUtrk0oiyhi1AqIVynworl3qxHA=="; }; }; - "re2-1.17.3" = { + "re2-1.17.4" = { name = "re2"; packageName = "re2"; - version = "1.17.3"; + version = "1.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/re2/-/re2-1.17.3.tgz"; - sha512 = "Dp5iWVR8W3C7Nm9DziMY4BleMPRb/pe6kvfbzLv80dVYaXRc9jRnwwNqU0oE/taRm0qYR1+Qrtzk9rPjS9ecaQ=="; + url = "https://registry.npmjs.org/re2/-/re2-1.17.4.tgz"; + sha512 = "xyZ4h5PqE8I9tAxTh3G0UttcK5ufrcUxReFjGzfX61vtanNbS1XZHjnwRSyPcLgChI4KLxVgOT/ioZXnUAdoTA=="; }; }; "reachdown-1.1.0" = { @@ -54473,22 +55895,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.23.0" = { + "react-devtools-core-4.24.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.23.0"; + version = "4.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.23.0.tgz"; - sha512 = "KkzneT1LczFtebbTJlvRphIRvzuHLhI9ghfrseVv9ktBs+l2cXy8Svw5U16lzQnwU9okVEcURmGPgH79WWrlaw=="; - }; - }; - "react-dom-16.14.0" = { - name = "react-dom"; - packageName = "react-dom"; - version = "16.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz"; - sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.0.tgz"; + sha512 = "Rw7FzYOOzcfyUPaAm9P3g0tFdGqGq2LLiAI+wjYcp6CsF3DeeMrRS3HZAho4s273C29G/DJhx0e8BpRE/QZNGg=="; }; }; "react-dom-17.0.2" = { @@ -54599,6 +56012,15 @@ let sha512 = "nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q=="; }; }; + "react-refresh-0.9.0" = { + name = "react-refresh"; + packageName = "react-refresh"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz"; + sha512 = "Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="; + }; + }; "react-side-effect-2.1.1" = { name = "react-side-effect"; packageName = "react-side-effect"; @@ -54779,13 +56201,13 @@ let sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng=="; }; }; - "read-package-json-4.1.1" = { + "read-package-json-4.1.2" = { name = "read-package-json"; packageName = "read-package-json"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.1.tgz"; - sha512 = "P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw=="; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.2.tgz"; + sha512 = "Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ=="; }; }; "read-package-json-fast-2.0.3" = { @@ -55301,13 +56723,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.63" = { + "redoc-2.0.0-rc.64" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.63"; + version = "2.0.0-rc.64"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.63.tgz"; - sha512 = "PsoPqRyNqHi7+jKUyFBwJhHrzjMl4N5vieTeBloRGbhWuY3PPH2DJ3ihgrLfdEV0glzq/LMTaqfarm8WLqCc4Q=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.64.tgz"; + sha512 = "zrM/vcONpbmyDUOpk7Ai7R/yZrT7W1+8ANJUB3b5kzaLQUx4VbrDoT4D6HHHquOnKx+5We4nOPPAi8fi/cqa8g=="; }; }; "reduce-component-1.0.1" = { @@ -55391,15 +56813,6 @@ let sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -56597,13 +58010,13 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; - "requestretry-4.1.2" = { + "requestretry-7.0.2" = { name = "requestretry"; packageName = "requestretry"; - version = "4.1.2"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-4.1.2.tgz"; - sha512 = "N1WAp+8eOy8NfsVBChcSxNCKvPY1azOpliQ4Sby4WDe0HFEhdKywlNZeROMBQ+BI3Jpc0eNOT1KVFGREawtahA=="; + url = "https://registry.npmjs.org/requestretry/-/requestretry-7.0.2.tgz"; + sha512 = "Zz8z7G2OuVs4F0wR0shKMEMm7lNvPNHM0UIHNns9qfyuBDKSExoTsZGtSjKst6nPEwlMrbA9G+m/yC0AbGj+8w=="; }; }; "require-directory-2.1.1" = { @@ -57362,6 +58775,15 @@ let sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; }; + "roboto-fontface-0.10.0" = { + name = "roboto-fontface"; + packageName = "roboto-fontface"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz"; + sha512 = "OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g=="; + }; + }; "robust-predicates-3.0.1" = { name = "robust-predicates"; packageName = "robust-predicates"; @@ -57704,13 +59126,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.5.4" = { + "rxjs-7.5.5" = { name = "rxjs"; packageName = "rxjs"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz"; - sha512 = "h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz"; + sha512 = "sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw=="; }; }; "s3-stream-upload-2.0.2" = { @@ -57902,13 +59324,40 @@ let sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; }; }; - "sass-1.49.8" = { + "saslprep-1.0.3" = { + name = "saslprep"; + packageName = "saslprep"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz"; + sha512 = "/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag=="; + }; + }; + "sass-1.32.12" = { name = "sass"; packageName = "sass"; - version = "1.49.8"; + version = "1.32.12"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.49.8.tgz"; - sha512 = "NoGOjvDDOU9og9oAxhRnap71QaTjjlzrvLnKecUJ3GxhaQBrV6e7gPuSPF28u1OcVAArVojPAe4ZhOXwwC4tGw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.12.tgz"; + sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; + }; + }; + "sass-1.49.9" = { + name = "sass"; + packageName = "sass"; + version = "1.49.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz"; + sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A=="; + }; + }; + "sass-loader-10.2.0" = { + name = "sass-loader"; + packageName = "sass-loader"; + version = "10.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-10.2.0.tgz"; + sha512 = "kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw=="; }; }; "sax-0.5.8" = { @@ -57974,15 +59423,6 @@ let sha512 = "agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ=="; }; }; - "scheduler-0.19.1" = { - name = "scheduler"; - packageName = "scheduler"; - version = "0.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz"; - sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; - }; - }; "scheduler-0.20.2" = { name = "scheduler"; packageName = "scheduler"; @@ -58082,22 +59522,22 @@ let sha512 = "NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA=="; }; }; - "secret-handshake-1.1.20" = { + "secret-handshake-1.1.21" = { name = "secret-handshake"; packageName = "secret-handshake"; - version = "1.1.20"; + version = "1.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.20.tgz"; - sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA=="; + url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.21.tgz"; + sha512 = "e02+IddZv40tNJmaRZNZ6aYje95h9MvmpmbOg2PVjLKRA5p9QnrQypJlVE2dU516TyYc9jikBjqhXV1IlkwNUw=="; }; }; - "secret-stack-6.4.0" = { + "secret-stack-6.4.1" = { name = "secret-stack"; packageName = "secret-stack"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.4.0.tgz"; - sha512 = "Vnc2bItbjMw5WUtQtxLL4Atl17KaUHdLdxIb3a89CQTAo/1G1YjmiNe2GAAgZHSBi6UYRoB/oRmuJz8HLZmnmA=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.4.1.tgz"; + sha512 = "7rRcTEj7t0H3ShMKQvv7QGYAUFjVRmDqNNgrvpdedVlVnEIyfkZu0RaFPpes6yUSiE9Iwi0lHi03+6HsltLCMA=="; }; }; "secretstream-stream-2.0.0" = { @@ -58217,15 +59657,6 @@ let sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; }; }; - "semver-4.3.2" = { - name = "semver"; - packageName = "semver"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz"; - sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; - }; - }; "semver-4.3.6" = { name = "semver"; packageName = "semver"; @@ -59045,13 +60476,13 @@ let sha512 = "xhdh7fHyMsr0m/w2kDfRJuBFRS96b9l8ZPNWGaQ+PMvnUnZ/Eh+gJJ9NsHBd7P9k0399WYlCLzsy18EaMfyadA=="; }; }; - "shush-1.0.0" = { + "shush-1.0.1" = { name = "shush"; packageName = "shush"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/shush/-/shush-1.0.0.tgz"; - sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; + url = "https://registry.npmjs.org/shush/-/shush-1.0.1.tgz"; + sha512 = "baDDBPaPcFwVeQNfj1lYkE/NkqQr1WkXUlOePHnA5I8hw9Fz0Tu72ZC0XENeV4tM9tesaGA/Wi2mW07EOeKRuQ=="; }; }; "side-channel-1.0.4" = { @@ -59549,6 +60980,15 @@ let sha512 = "hLdVp5vqzrEEJSAQKSmURvBVImQj9oVbp7zBP6JLEmSenUGhc6kl9nrSXUj14JHiQcnKF80eRAWPsdUcV6YXFw=="; }; }; + "smoothscroll-polyfill-0.4.4" = { + name = "smoothscroll-polyfill"; + packageName = "smoothscroll-polyfill"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz"; + sha512 = "TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg=="; + }; + }; "snabbdom-0.7.0" = { name = "snabbdom"; packageName = "snabbdom"; @@ -59684,6 +61124,15 @@ let sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; }; + "socket.io-4.3.1" = { + name = "socket.io"; + packageName = "socket.io"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.3.1.tgz"; + sha512 = "HC5w5Olv2XZ0XJ4gOLGzzHEuOCfj3G0SmoW3jLHYYh34EVsIr3EkW9h6kgfW+K3TFEcmYy8JcPWe//KUkBp5jA=="; + }; + }; "socket.io-4.4.1" = { name = "socket.io"; packageName = "socket.io"; @@ -59765,6 +61214,15 @@ let sha512 = "M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ=="; }; }; + "socket.io-client-4.3.2" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.3.2.tgz"; + sha512 = "2B9LqSunN60yV8F7S84CCEEcgbYNfrn7ejIInZtLZ7ppWtiX8rGZAjvdCvbnC8bqo/9RlCNOUsORLyskxSFP1g=="; + }; + }; "socket.io-parser-2.1.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; @@ -59819,6 +61277,15 @@ let sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g=="; }; }; + "socket.io-parser-4.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.1.2.tgz"; + sha512 = "j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog=="; + }; + }; "sockjs-0.3.20" = { name = "sockjs"; packageName = "sockjs"; @@ -59846,13 +61313,13 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; - "sockjs-client-1.5.2" = { + "sockjs-client-1.6.0" = { name = "sockjs-client"; packageName = "sockjs-client"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.2.tgz"; - sha512 = "ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ=="; + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.0.tgz"; + sha512 = "qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ=="; }; }; "socks-2.6.2" = { @@ -60314,6 +61781,15 @@ let sha512 = "0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig=="; }; }; + "spark-md5-3.0.2" = { + name = "spark-md5"; + packageName = "spark-md5"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.2.tgz"; + sha512 = "wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw=="; + }; + }; "sparkles-1.0.1" = { name = "sparkles"; packageName = "sparkles"; @@ -60755,31 +62231,31 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; - "ssb-bendy-butt-0.12.4" = { + "ssb-bendy-butt-0.12.5" = { name = "ssb-bendy-butt"; packageName = "ssb-bendy-butt"; - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.4.tgz"; - sha512 = "zyVPwizCuW6T3Q2j8XerTPpdhNYY9tLlIVieg/FFQb5wlda3Ce360mYjGngx7586HXgysBi010JpM9emMQhhtA=="; + url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.5.tgz"; + sha512 = "8K3qi9fIr6PYQCWWPDTijDThZ89tYRkIKO7xpS/kM8dDuDfx4FsBoMsBkgl8VOV3TB24UnAF0IbcxRBNL5Pf4w=="; }; }; - "ssb-bfe-3.1.1" = { + "ssb-bfe-3.1.3" = { name = "ssb-bfe"; packageName = "ssb-bfe"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.1.tgz"; - sha512 = "0Z1xxYG618sccFJGNIN9om5sokRFJRv/QlIhlnFwiafNLYFdyLP/KGZ8YDZSUP/pyMWZuL8+o++v3Ro6EkIJNA=="; + url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.3.tgz"; + sha512 = "peX4B+Exp5OokaOnxP8atPd0jhig1AaCQyLY+MykxXIzTEim7yWAavzSDHaZ+7PNHS9fbM7E2s+h3h/R3oSfTA=="; }; }; - "ssb-bfe-spec-0.3.0" = { + "ssb-bfe-spec-0.4.0" = { name = "ssb-bfe-spec"; packageName = "ssb-bfe-spec"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.3.0.tgz"; - sha512 = "gmsjEKrcKfR7d/926Oq7ijrd4l0CkjtFampk7rqsE+Gzr1ZpzGmHl1YxXn6GdBYy55M1i0V+w+fYAqsgxl5o4Q=="; + url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.4.0.tgz"; + sha512 = "KhUl8MZ14JQ00rmsrddSTDIfy5ez4O9nZOrJ8A+Kg5VdG9ENOpLCqc+CzsZpSdhDeUfFUicSMH1mUhJNlRyIAQ=="; }; }; "ssb-blobs-1.2.2" = { @@ -60836,13 +62312,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.8.9" = { + "ssb-db2-2.8.11" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.8.9"; + version = "2.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.9.tgz"; - sha512 = "0v6EIq+MrQbe5wO+0JGeNUY9fs8dA2/vcgGOQSqYKl2dkxKB4uu8g6z6GRtlcSP7iGxW+Zv7jk/09b3p1ahE4g=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.11.tgz"; + sha512 = "XrKVxgWa2kumephDdUMCFY/chdELeUumJyR6S5NVagtVv/aEdHV8cOJXkt5IP3AxNNJB6i/Kk2P4adsdVWGBeg=="; }; }; "ssb-ebt-5.6.7" = { @@ -61097,13 +62573,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-uri2-1.7.0" = { + "ssb-uri2-1.7.2" = { name = "ssb-uri2"; packageName = "ssb-uri2"; - version = "1.7.0"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.7.0.tgz"; - sha512 = "mdQEo4AT9cusd5+eXpS/rh8UjVVt0A9kLXfs/JMIVcMHEsOciK4ThIzQCqK8hVrxHRGpb09+t/DluVvXuN8/JQ=="; + url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.7.2.tgz"; + sha512 = "bw6nkLkpOqiVxYXqYm/7XMnIgTIbIs4crRutCkworysMr08gjFNhkIgOeEm1uG4y1Rm0FIigWaBQnOLqPmXAPQ=="; }; }; "ssb-validate-4.1.4" = { @@ -61142,13 +62618,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.208" = { + "sscaff-1.2.225" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.208"; + version = "1.2.225"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.208.tgz"; - sha512 = "zZbWds7b7zh2x+TATQ4SM1Grqw9INsf4jB0pZ9CWtgGAFLM4aWGhSGscUMLqigCu2+MxCIAIwG2CRDOTVD4G+w=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.225.tgz"; + sha512 = "hpbhRLb5pC9zsEpQgfaAKI+a6/JUIKvEIQ1B2THIMDZZbfUyXZIW5Sn/u1/nhqPbvo2j+aslar8ewqRwI2eWbw=="; }; }; "ssh-config-1.1.6" = { @@ -61421,6 +62897,15 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; + "statuses-2.0.1" = { + name = "statuses"; + packageName = "statuses"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; + sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; + }; + }; "stealthy-require-1.1.1" = { name = "stealthy-require"; packageName = "stealthy-require"; @@ -61790,13 +63275,13 @@ let sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ=="; }; }; - "streamroller-3.0.2" = { + "streamroller-3.0.4" = { name = "streamroller"; packageName = "streamroller"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz"; - sha512 = "ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-3.0.4.tgz"; + sha512 = "GI9NzeD+D88UFuIlJkKNDH/IsuR+qIN7Qh8EsmhoRZr9bQoehTraRgwtLUkZbpcAw+hLPfHOypmppz8YyGK68w=="; }; }; "streamsearch-0.1.2" = { @@ -61817,13 +63302,13 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; - "streamx-2.12.2" = { + "streamx-2.12.4" = { name = "streamx"; packageName = "streamx"; - version = "2.12.2"; + version = "2.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.12.2.tgz"; - sha512 = "NjGPzm2tnLOOPvbE/yxFoAgdYzvgjZkb9i4LgJokAfhLinMv2M7jevpIja+aP/ridUIfge9DGbB223kVzdrEzA=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.12.4.tgz"; + sha512 = "K3xdIp8YSkvbdI0PrCcP0JkniN8cPCyeKlcZgRFSl1o1xKINCYM93FryvTSOY57x73pz5/AjO5B8b9BYf21wWw=="; }; }; "strftime-0.10.1" = { @@ -62006,13 +63491,13 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string-width-5.1.0" = { + "string-width-5.1.2" = { name = "string-width"; packageName = "string-width"; - version = "5.1.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-5.1.0.tgz"; - sha512 = "7x54QnN21P+XL/v8SuNKvfgsUre6PXpN7mc77N3HlZv+f1SBRGmjxtOud2Z6FZ8DmdkD/IdjCaf9XXbnqmTZGQ=="; + url = "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz"; + sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; }; }; "string.prototype.repeat-0.2.0" = { @@ -62555,6 +64040,15 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; + "stylehacks-5.1.0" = { + name = "stylehacks"; + packageName = "stylehacks"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz"; + sha512 = "SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q=="; + }; + }; "stylelint-13.13.1" = { name = "stylelint"; packageName = "stylelint"; @@ -62924,13 +64418,13 @@ let sha512 = "qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg=="; }; }; - "svelte-preprocess-4.10.3" = { + "svelte-preprocess-4.10.4" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.10.3"; + version = "4.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.3.tgz"; - sha512 = "ttw17lJfb/dx2ZJT9sesaXT5l7mPQ9Apx1H496Kli3Hkk7orIRGpOw6rCPkRNzr6ueVPqb4vzodS5x7sBFhKHw=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.4.tgz"; + sha512 = "fuwol0N4UoHsNQolLFbMqWivqcJ9N0vfWO9IuPAiX/5okfoGXURyJ6nECbuEIv0nU3M8Xe2I1ONNje2buk7l6A=="; }; }; "svelte2tsx-0.5.5" = { @@ -62996,6 +64490,15 @@ let sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; + "svgo-2.8.0" = { + name = "svgo"; + packageName = "svgo"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"; + sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; + }; + }; "swagger-converter-0.1.7" = { name = "swagger-converter"; packageName = "swagger-converter"; @@ -63077,13 +64580,22 @@ let sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; - "swagger-ui-dist-3.34.0" = { + "swagger-ui-dist-3.52.5" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.34.0"; + version = "3.52.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.34.0.tgz"; - sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.52.5.tgz"; + sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="; + }; + }; + "swagger-ui-dist-4.6.2" = { + name = "swagger-ui-dist"; + packageName = "swagger-ui-dist"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.6.2.tgz"; + sha512 = "BSt+ukOGkGZ2uHV4jyyCAzt60ysyQpGZAAhtIh7AMHT4MH1xXGkoXm2tfr1oRqO1N4IEY6qqNAlmcfMo/dAYuw=="; }; }; "swagger2openapi-7.0.8" = { @@ -63221,13 +64733,22 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.11.4" = { + "systeminformation-5.11.7" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.11.4"; + version = "5.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.4.tgz"; - sha512 = "rh7bjpjP5whUaTknim5CiGdAiKZcgWhmbmxjzBRXDWqUc/k67bz2OP+03DdcX6/SN/CDSAi/NeUwM5o2gjHJoA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.7.tgz"; + sha512 = "MI6HtSoBF2e1pTpRGQC8b5X5QDln8mazQTD3KyFFlLGkk7291kQv+mjeriz30TDVTcWEnEfKPxZwHnZBFYnr6w=="; + }; + }; + "systeminformation-5.11.8" = { + name = "systeminformation"; + packageName = "systeminformation"; + version = "5.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.8.tgz"; + sha512 = "u30rM0KwGKiJof44Ak25WeSh9661NU2GshXpHPpv/zGXvvSGI5eALjpVJ3EYnIroceToWzy9+xkuMfjHIx6OiQ=="; }; }; "sywac-1.3.0" = { @@ -63375,15 +64896,6 @@ let sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; }; }; - "tape-2.3.3" = { - name = "tape"; - packageName = "tape"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz"; - sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; - }; - }; "tape-4.15.0" = { name = "tape"; packageName = "tape"; @@ -63762,13 +65274,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.10.0" = { + "terser-5.12.0" = { name = "terser"; packageName = "terser"; - version = "5.10.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; - sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz"; + sha512 = "R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -63789,15 +65301,6 @@ let sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA=="; }; }; - "terser-webpack-plugin-4.2.2" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.2.tgz"; - sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; - }; - }; "terser-webpack-plugin-5.3.1" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; @@ -63996,13 +65499,22 @@ let sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; }; }; - "thread-stream-0.13.1" = { + "thread-loader-2.1.3" = { + name = "thread-loader"; + packageName = "thread-loader"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz"; + sha512 = "wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg=="; + }; + }; + "thread-stream-0.13.2" = { name = "thread-stream"; packageName = "thread-stream"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/thread-stream/-/thread-stream-0.13.1.tgz"; - sha512 = "+KNCqNxOSwYfXLtCIRDKQq29x9jvqnOFjYCPdB38sf4pT3QanPSNc8vRqMj+Q3z4tYIctb5opNZrMK/GwmgsAQ=="; + url = "https://registry.npmjs.org/thread-stream/-/thread-stream-0.13.2.tgz"; + sha512 = "woZFt0cLFkPdhsa+IGpRo1jiSouaHxMIljzTgt30CMjBWoUYbbcHqnunW5Yv+BXko9H05MVIcxMipI3Jblallw=="; }; }; "thriftrw-3.12.0" = { @@ -64113,15 +65625,6 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; - "through2-3.0.1" = { - name = "through2"; - packageName = "through2"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; - sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; - }; - }; "through2-3.0.2" = { name = "through2"; packageName = "through2"; @@ -64347,6 +65850,15 @@ let sha512 = "2hPuUGCroLrxh6xxwoe+1RgPpOOK1w2uTnhgiHBpvoutBR+krNuT4hOXQyOaaYnZgoXBB6hBYkuAJHxyeBOPzQ=="; }; }; + "tiny-secp256k1-2.2.1" = { + name = "tiny-secp256k1"; + packageName = "tiny-secp256k1"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-2.2.1.tgz"; + sha512 = "/U4xfVqnVxJXN4YVsru0E6t5wVncu2uunB8+RVR40fYUxkKYUPS10f+ePQZgFBoE/Jbf9H1NBveupF2VmB58Ng=="; + }; + }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -64716,13 +66228,13 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; - "token-types-4.1.1" = { + "token-types-4.2.0" = { name = "token-types"; packageName = "token-types"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-4.1.1.tgz"; - sha512 = "hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w=="; + url = "https://registry.npmjs.org/token-types/-/token-types-4.2.0.tgz"; + sha512 = "P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w=="; }; }; "too-hot-1.0.0" = { @@ -64779,13 +66291,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.4.7" = { + "torrent-discovery-9.4.9" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.4.7"; + version = "9.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.7.tgz"; - sha512 = "7Zw474LJE5r3Momi4ykBYkjgcFhENbUxcAFs5cBllUkv9ErJPzPEGmpEuqX7V8TkLS+Clmt/l5CjV5IFHg/A/A=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.9.tgz"; + sha512 = "xU5zLDdX6QMm4zJ+wceunk9nhs3Q/2Lewj/yCLx15lnfugf3Ir4bo/axM3IEwDl+lkH7zWYe/iy2+r/2yyILgQ=="; }; }; "torrent-piece-1.1.2" = { @@ -65121,15 +66633,6 @@ let sha512 = "rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="; }; }; - "trough-2.0.2" = { - name = "trough"; - packageName = "trough"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-2.0.2.tgz"; - sha512 = "FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w=="; - }; - }; "trough-2.1.0" = { name = "trough"; packageName = "trough"; @@ -65202,13 +66705,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-loader-8.0.4" = { + "ts-loader-6.2.2" = { name = "ts-loader"; packageName = "ts-loader"; - version = "8.0.4"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.4.tgz"; - sha512 = "5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ=="; + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz"; + sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; }; }; "ts-loader-8.3.0" = { @@ -65220,6 +66723,15 @@ let sha512 = "MgGly4I6cStsJy27ViE32UoqxPTN9Xly4anxxVyaIWR+9BGxboV4EyJBGfR3RePV7Ksjj3rHmPZJeIt+7o4Vag=="; }; }; + "ts-loader-9.2.6" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "9.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.6.tgz"; + sha512 = "QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw=="; + }; + }; "ts-log-2.2.4" = { name = "ts-log"; packageName = "ts-log"; @@ -65238,13 +66750,22 @@ let sha512 = "WHXLtFDcIRwoqaiu0elAoZ/AmI+SwwDafnPKjgJmdwJ2gRVO0jMKBt88rV2liT/c6MTsXyuWbGFiHe9MRddWJw=="; }; }; - "ts-node-10.5.0" = { + "ts-node-10.4.0" = { name = "ts-node"; packageName = "ts-node"; - version = "10.5.0"; + version = "10.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-10.5.0.tgz"; - sha512 = "6kEJKwVxAJ35W4akuiysfKwKmjkbYxwQMTBaAxo9KKAx/Yd26mPUyhGz3ji+EsJoAgrLqVsYHNuuYwQe22lbtw=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz"; + sha512 = "g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A=="; + }; + }; + "ts-node-10.7.0" = { + name = "ts-node"; + packageName = "ts-node"; + version = "10.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz"; + sha512 = "TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A=="; }; }; "ts-node-8.9.1" = { @@ -65769,15 +67290,6 @@ let sha512 = "yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="; }; }; - "type-fest-2.10.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.10.0.tgz"; - sha512 = "u2yreDMllFI3VCpWt0rKrGs/E2LO0YHBwiiOIj+ilQh9+ALMaa4lNBSdoDvuHN3cbKcYk9L1BXP49x9RT+o/SA=="; - }; - }; "type-fest-2.11.1" = { name = "type-fest"; packageName = "type-fest"; @@ -65805,15 +67317,6 @@ let sha512 = "Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA=="; }; }; - "type-fest-2.9.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.9.0.tgz"; - sha512 = "uC0hJKi7eAGXUJ/YKk53RhnKxMwzHWgzf4t92oz8Qez28EBgVTfpDTB59y9hMYLzc/Wl85cD7Tv1hLZZoEJtrg=="; - }; - }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -65877,6 +67380,15 @@ let sha512 = "B2B+wo5gC7VRAqcFEiUCjS6CJ1vmeYZ7uzY3Jsu6UNStHiF+W0vkhZAmQaj5m9sC2KVrpyHGRzGuhz3M6+n/8A=="; }; }; + "typeface-roboto-1.1.13" = { + name = "typeface-roboto"; + packageName = "typeface-roboto"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-1.1.13.tgz"; + sha512 = "YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw=="; + }; + }; "typeforce-1.18.0" = { name = "typeforce"; packageName = "typeforce"; @@ -65895,6 +67407,15 @@ let sha512 = "MdlbWu0HfmgFJf4+xj6eqGYuanV2LJxBYTzLrD0kTV+woQ5dxDD2k8UVVjYnbBGkAagAyxzQevPiFZRWLFHSBw=="; }; }; + "typeorm-0.2.38" = { + name = "typeorm"; + packageName = "typeorm"; + version = "0.2.38"; + src = fetchurl { + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.38.tgz"; + sha512 = "M6Y3KQcAREQcphOVJciywf4mv6+A0I/SeR+lWNjKsjnQ+a3XcMwGYMGL0Jonsx3H0Cqlf/3yYqVki1jIXSK/xg=="; + }; + }; "typescript-2.9.2" = { name = "typescript"; packageName = "typescript"; @@ -65931,22 +67452,22 @@ let sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; }; }; - "typescript-4.0.3" = { + "typescript-4.3.4" = { name = "typescript"; packageName = "typescript"; - version = "4.0.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; - sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; + sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; }; }; - "typescript-4.3.4" = { + "typescript-4.4.4" = { name = "typescript"; packageName = "typescript"; - version = "4.3.4"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; - sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz"; + sha512 = "DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="; }; }; "typescript-4.5.5" = { @@ -65958,6 +67479,15 @@ let sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; + "typescript-4.6.2" = { + name = "typescript"; + packageName = "typescript"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz"; + sha512 = "HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -66102,6 +67632,15 @@ let sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; }; }; + "uglify-js-3.15.3" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz"; + sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -66219,6 +67758,15 @@ let sha512 = "aIvEHNRX1AlOYAr6qSUjQBn4mCduxx6MtC967aRDTb2UUBPj0Ix2ZFQDcmXUUO/UxRPHcw1f5a5nVbCSKDSOqA=="; }; }; + "uint8array-tools-0.0.7" = { + name = "uint8array-tools"; + packageName = "uint8array-tools"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/uint8array-tools/-/uint8array-tools-0.0.7.tgz"; + sha512 = "vrrNZJiusLWoFWBqz5Y5KMCgP9W9hnjZHzZiZRT8oNAkq3d5Z5Oe76jAvVVSRh4U8GGR90N2X1dWtrhvx6L8UQ=="; + }; + }; "ultron-1.0.2" = { name = "ultron"; packageName = "ultron"; @@ -66426,13 +67974,13 @@ let sha1 = "5e4bda308e4a8a2ae584f9b9a4359a499825cc50"; }; }; - "undici-4.14.1" = { + "undici-4.15.1" = { name = "undici"; packageName = "undici"; - version = "4.14.1"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-4.14.1.tgz"; - sha512 = "WJ+g+XqiZcATcBaUeluCajqy4pEDcQfK1vy+Fo+bC4/mqXI9IIQD/XWHLS70fkGUT6P52Drm7IFslO651OdLPQ=="; + url = "https://registry.npmjs.org/undici/-/undici-4.15.1.tgz"; + sha512 = "h8LJybhMKD09IyQZoQadNtIR/GmugVhTOVREunJrpV6RStriKBFdSVoFzEzTihwXi/27DIBO+Z0OGF+Mzfi0lA=="; }; }; "unherit-1.1.3" = { @@ -66525,13 +68073,13 @@ let sha1 = "afb10e4ef1eeddc711417bbb652bc885da9d4171"; }; }; - "unified-10.1.1" = { + "unified-10.1.2" = { name = "unified"; packageName = "unified"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-10.1.1.tgz"; - sha512 = "v4ky1+6BN9X3pQrOdkFIPWAaeDsHPE1svRDxq7YpTc2plkIqFMwukfqM+l0ewpP9EfwARlt9pPFAeWYhHm8X9w=="; + url = "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz"; + sha512 = "pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q=="; }; }; "unified-2.1.4" = { @@ -66957,13 +68505,13 @@ let sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g=="; }; }; - "unist-util-stringify-position-3.0.0" = { + "unist-util-stringify-position-3.0.2" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz"; - sha512 = "SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA=="; + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz"; + sha512 = "7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg=="; }; }; "unist-util-to-list-of-char-0.1.3" = { @@ -67434,13 +68982,13 @@ let sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; - "urijs-1.19.8" = { + "urijs-1.19.10" = { name = "urijs"; packageName = "urijs"; - version = "1.19.8"; + version = "1.19.10"; src = fetchurl { - url = "https://registry.npmjs.org/urijs/-/urijs-1.19.8.tgz"; - sha512 = "iIXHrjomQ0ZCuDRy44wRbyTZVnfVNLVo3Ksz1yxNyE5wV1IDZW2S5Jszy45DTlw/UdsnRT7DyDhIz7Gy+vJumw=="; + url = "https://registry.npmjs.org/urijs/-/urijs-1.19.10.tgz"; + sha512 = "EzauQlgKuJgsXOqoMrCiePBf4At5jVqRhXykF3Wfb8ZsOBMxPcfiVBcsHXug4Aepb/ICm2PIgqAUGMelgdrWEg=="; }; }; "urix-0.1.0" = { @@ -67533,13 +69081,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.5.9" = { + "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.9.tgz"; - sha512 = "HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; "url-parse-as-address-1.0.0" = { @@ -67587,15 +69135,6 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "url-toolkit-2.2.5" = { - name = "url-toolkit"; - packageName = "url-toolkit"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz"; - sha512 = "mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg=="; - }; - }; "url-value-parser-2.1.0" = { name = "url-value-parser"; packageName = "url-value-parser"; @@ -67705,13 +69244,13 @@ let sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb"; }; }; - "utf-8-validate-5.0.8" = { + "utf-8-validate-5.0.9" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "5.0.8"; + version = "5.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.8.tgz"; - sha512 = "k4dW/Qja1BYDl2qD4tOMB9PFVha/UJtxTc1cXYOe3WwA/2m0Yn4qB7wLMpJyLJ/7DR0XnTut3HsCSzDT4ZvKgA=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.9.tgz"; + sha512 = "Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q=="; }; }; "utf7-1.0.2" = { @@ -67885,6 +69424,15 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; + "utility-types-3.10.0" = { + name = "utility-types"; + packageName = "utility-types"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz"; + sha512 = "O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="; + }; + }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -68002,6 +69550,15 @@ let sha512 = "brFwqA3FXzilmtnIyJ+CxdkInkY/i4ErvP7uV0DnUVxQcQ55reuHphorpF+tZoVHK2MniZ/VJzI7zJQoc9T9Yw=="; }; }; + "uws-9.148.0" = { + name = "uws"; + packageName = "uws"; + version = "9.148.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uws/-/uws-9.148.0.tgz"; + sha512 = "vWt+e8dOdwLM4neb1xIeZuQ7ZUN3l7n0qTKrOUtU1EZrV4BpmrSnsEL30d062/ocqRMGtLpwzVFsLKFgXomA9g=="; + }; + }; "v8-compile-cache-2.3.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -68641,13 +70198,13 @@ let sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA=="; }; }; - "vfile-5.3.0" = { + "vfile-5.3.2" = { name = "vfile"; packageName = "vfile"; - version = "5.3.0"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-5.3.0.tgz"; - sha512 = "Tj44nY/48OQvarrE4FAjUfrv7GZOYzPbl5OD65HxVKwLJKMPU7zmfV8cCgCnzKWnSfYG2f3pxu+ALqs7j22xQQ=="; + url = "https://registry.npmjs.org/vfile/-/vfile-5.3.2.tgz"; + sha512 = "w0PLIugRY3Crkgw89TeMvHCzqCs/zpreR31hl4D92y6SOE07+bfJe+dK5Q2akwS+i/c801kzjoOr9gMcTe6IAA=="; }; }; "vfile-find-down-1.0.0" = { @@ -68731,13 +70288,13 @@ let sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; }; }; - "vfile-message-3.1.0" = { + "vfile-message-3.1.2" = { name = "vfile-message"; packageName = "vfile-message"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.0.tgz"; - sha512 = "4QJbBk+DkPEhBXq3f260xSaWtjE4gPKOfulzfMFF8ZNwaPZieWsg3iVlcmF04+eebzpcpeXOOFMfrYzJHVYg+g=="; + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz"; + sha512 = "QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA=="; }; }; "vfile-reporter-1.5.0" = { @@ -68902,15 +70459,6 @@ let sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; }; }; - "vinyl-sourcemaps-apply-0.2.1" = { - name = "vinyl-sourcemaps-apply"; - packageName = "vinyl-sourcemaps-apply"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; - sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; - }; - }; "vizion-2.2.1" = { name = "vizion"; packageName = "vizion"; @@ -68956,13 +70504,13 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vm2-3.9.8" = { + "vm2-3.9.9" = { name = "vm2"; packageName = "vm2"; - version = "3.9.8"; + version = "3.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz"; - sha512 = "/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz"; + sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; }; }; "voc-1.2.0" = { @@ -69064,15 +70612,6 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-emmet-helper-2.1.2" = { - name = "vscode-emmet-helper"; - packageName = "vscode-emmet-helper"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.2.tgz"; - sha512 = "Fy6UNawSgxE3Kuqi54vSXohf03iOIrp1A74ReAgzvGP9Yt7fUAvkqF6No2WAc34/w0oWAHAeqoBNqmKKWh6U5w=="; - }; - }; "vscode-emmet-helper-2.6.4" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; @@ -69109,13 +70648,13 @@ let sha512 = "rrDyCiOgMwOPgchpPGAeLzjYVVEW/Ror2/a1BWUEI3S9+NQhA9vj4SQkzmH6g2Bq9S9SV0OQeadD+xphOf1N3w=="; }; }; - "vscode-html-languageservice-4.2.1" = { + "vscode-html-languageservice-4.2.2" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.1.tgz"; - sha512 = "PgaToZVXJ44nFWEBuSINdDgVV6EnpC3MnXBsysR3O5TKcAfywbYeRGRy+Y4dVR7YeUgDvtb+JkJoSkaYC0mxXQ=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.2.tgz"; + sha512 = "4ICwlpplGbiNQq6D/LZr4qLbPZuMmnSQeX/57UAYP7jD1LOvKeru4lVI+f6d6Eyd7uS46nLJ5DUY4AAlq35C0g=="; }; }; "vscode-json-languageservice-3.11.0" = { @@ -69217,13 +70756,13 @@ let sha512 = "gxUyTBAjmwGkiHW/UaRScre2s4i98P8M7gnc3VB4DrVQUm3vQ0idi2cN9nbkfcjATx+uEt8C22j+MLN/8UzsJA=="; }; }; - "vscode-jsonrpc-8.0.0-next.6" = { + "vscode-jsonrpc-8.0.0-next.7" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "8.0.0-next.6"; + version = "8.0.0-next.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.6.tgz"; - sha512 = "6Ld3RYjygn5Ih7CkAtcAwiDQC+rakj2O+PnASfNyYv3sLmm44eJpEKzuPUN30Iy2UB09AZg8T6LBKWTJTEJDVw=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.7.tgz"; + sha512 = "JX/F31LEsims0dAlOTKFE4E+AJMiJvdRSRViifFJSqSN7EzeYyWlfuDchF7g91oRNPZOIWfibTkDf3/UMsQGzQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -69325,13 +70864,13 @@ let sha512 = "/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw=="; }; }; - "vscode-languageserver-8.0.0-next.8" = { + "vscode-languageserver-8.0.0-next.9" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "8.0.0-next.8"; + version = "8.0.0-next.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.8.tgz"; - sha512 = "Gq0uqKbOgw7YNwPxMoNCeh7mHKMhG5j6EuoSh+w5pnKd7Eu9a74cagqf9aZDVFWW6GRpqR/Z+1o6EXqDK+g2Tg=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.9.tgz"; + sha512 = "PO+ijJdI9NGXklkZlvEHLpVloBd0iBiOi2EXuh2QfT4bOlx2qvsWu+nBISuw0X8ZfXA4grtaPPGcrXudmlezLg=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -69370,13 +70909,13 @@ let sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; }; }; - "vscode-languageserver-protocol-3.17.0-next.14" = { + "vscode-languageserver-protocol-3.17.0-next.15" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.17.0-next.14"; + version = "3.17.0-next.15"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.14.tgz"; - sha512 = "iangobY8dL6sFZkOx4OhRPJM9gN0I1caUsOVR+MnPozsqQUtwMXmbIcfaIf0Akp0pd3KhJDPf/tdwRX68QGeeA=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.15.tgz"; + sha512 = "73LffxyP/0TRyk3J7bCYt0BuFBzk4Qvo5TqZndOsP+uBDbRV4IT7ebu4M/XoPDSCyZ+jDIxW7if/JbhBznmwBg=="; }; }; "vscode-languageserver-protocol-3.17.0-next.5" = { @@ -69496,13 +71035,13 @@ let sha512 = "VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg=="; }; }; - "vscode-languageserver-types-3.17.0-next.7" = { + "vscode-languageserver-types-3.17.0-next.8" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.17.0-next.7"; + version = "3.17.0-next.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.7.tgz"; - sha512 = "KH4zdG1qBXxoso61ChgpeoZYyHGJo8bV7Jv4I+fwQ1Ryy59JAxoZ9GAbhR5TeeafHctLcg6RFvY3m8Jqfu17cg=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.8.tgz"; + sha512 = "Mwj+FemiEk4QUUms1GGvXwDC+laJGVFuA4glbMVJTxfXdfOFZaEuyVlLobjccBo+NzD+5oEzzejTX7nWGNajjQ=="; }; }; "vscode-languageserver-types-3.5.0" = { @@ -69631,6 +71170,24 @@ let sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; + "vue-class-component-7.2.6" = { + name = "vue-class-component"; + packageName = "vue-class-component"; + version = "7.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz"; + sha512 = "+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w=="; + }; + }; + "vue-cli-plugin-vuetify-2.4.3" = { + name = "vue-cli-plugin-vuetify"; + packageName = "vue-cli-plugin-vuetify"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.3.tgz"; + sha512 = "dT9KpH1rXT6UWzBDFLMB69sgrNCoWFcxWiIyDDZ4vikv85JDweMHh2dT5n6QaAt7qsGlvL4IMOopjcyUTiPW9g=="; + }; + }; "vue-codemod-0.0.5" = { name = "vue-codemod"; packageName = "vue-codemod"; @@ -69667,6 +71224,33 @@ let sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; }; }; + "vue-hot-reload-api-2.3.4" = { + name = "vue-hot-reload-api"; + packageName = "vue-hot-reload-api"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"; + sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; + }; + }; + "vue-loader-15.9.8" = { + name = "vue-loader"; + packageName = "vue-loader"; + version = "15.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz"; + sha512 = "GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog=="; + }; + }; + "vue-loader-v16-16.8.3" = { + name = "vue-loader-v16"; + packageName = "vue-loader-v16"; + version = "16.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz"; + sha512 = "7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA=="; + }; + }; "vue-onsenui-helper-json-1.0.2" = { name = "vue-onsenui-helper-json"; packageName = "vue-onsenui-helper-json"; @@ -69676,6 +71260,78 @@ let sha512 = "ikg8ruE17tIXF9mrVvKoOR3oyM9nk0TcmUHyeBWod5ILEH9DRN0+seX4gwsSbjdxMYlIIvmnCFPQeMdlcJqPJQ=="; }; }; + "vue-property-decorator-9.1.2" = { + name = "vue-property-decorator"; + packageName = "vue-property-decorator"; + version = "9.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz"; + sha512 = "xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ=="; + }; + }; + "vue-router-3.5.3" = { + name = "vue-router"; + packageName = "vue-router"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz"; + sha512 = "FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="; + }; + }; + "vue-style-loader-4.1.3" = { + name = "vue-style-loader"; + packageName = "vue-style-loader"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz"; + sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; + }; + }; + "vue-template-compiler-2.6.14" = { + name = "vue-template-compiler"; + packageName = "vue-template-compiler"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz"; + sha512 = "ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="; + }; + }; + "vue-template-es2015-compiler-1.9.1" = { + name = "vue-template-es2015-compiler"; + packageName = "vue-template-es2015-compiler"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"; + sha512 = "4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="; + }; + }; + "vuetify-2.5.10" = { + name = "vuetify"; + packageName = "vuetify"; + version = "2.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify/-/vuetify-2.5.10.tgz"; + sha512 = "UODZQrib36l7i1WGg0MUvurczLspYTe0nKAmfbwyMs6dC2lG1Q1VV9caqPbCAB9zgG6QIJaOmRQKSKduw9eZTw=="; + }; + }; + "vuetify-datetime-picker-2.1.1" = { + name = "vuetify-datetime-picker"; + packageName = "vuetify-datetime-picker"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify-datetime-picker/-/vuetify-datetime-picker-2.1.1.tgz"; + sha512 = "xY3YCVNxoe/5Chbm7G2BXrkg12CWLWwnDJZdhNPVKe1p8S72H8NomYOB6SSBzMMEHisRGIRzAQTDwDfDU06x/Q=="; + }; + }; + "vuetify-loader-1.7.3" = { + name = "vuetify-loader"; + packageName = "vuetify-loader"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.7.3.tgz"; + sha512 = "1Kt6Rfvuw3i9BBlxC9WTMnU3WEU7IBWQmDX+fYGAVGpzWCX7oHythUIwPCZGShHSYcPMKSDbXTPP8UvT5RNw8Q=="; + }; + }; "vuvuzela-1.0.3" = { name = "vuvuzela"; packageName = "vuvuzela"; @@ -69865,6 +71521,15 @@ let sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; + "weak-lru-cache-1.2.2" = { + name = "weak-lru-cache"; + packageName = "weak-lru-cache"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz"; + sha512 = "DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw=="; + }; + }; "weasel-words-0.1.1" = { name = "weasel-words"; packageName = "weasel-words"; @@ -69955,13 +71620,13 @@ let sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; }; }; - "web3-utils-1.7.0" = { + "web3-utils-1.7.1" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.0.tgz"; - sha512 = "O8Tl4Ky40Sp6pe89Olk2FsaUkgHyb5QAXuaKo38ms3CxZZ4d3rPGfjP9DNKGm5+IUgAZBNpF1VmlSmNCqfDI1w=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.1.tgz"; + sha512 = "fef0EsqMGJUgiHPdX+KN9okVWshbIumyJPmR+btnD1HgvoXijKEkuKBv0OmUqjbeqmLKP2/N9EiXKJel5+E1Dw=="; }; }; "webassemblyjs-1.11.1" = { @@ -70045,15 +71710,6 @@ let sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; - "webpack-4.44.2" = { - name = "webpack"; - packageName = "webpack"; - version = "4.44.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; - sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; - }; - }; "webpack-4.46.0" = { name = "webpack"; packageName = "webpack"; @@ -70072,13 +71728,13 @@ let sha512 = "NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg=="; }; }; - "webpack-5.69.1" = { + "webpack-5.70.0" = { name = "webpack"; packageName = "webpack"; - version = "5.69.1"; + version = "5.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.69.1.tgz"; - sha512 = "+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz"; + sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -70090,6 +71746,15 @@ let sha512 = "Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA=="; }; }; + "webpack-chain-6.5.1" = { + name = "webpack-chain"; + packageName = "webpack-chain"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz"; + sha512 = "7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA=="; + }; + }; "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -70180,6 +71845,15 @@ let sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; + "webpack-merge-4.2.2" = { + name = "webpack-merge"; + packageName = "webpack-merge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"; + sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + }; + }; "webpack-merge-5.8.0" = { name = "webpack-merge"; packageName = "webpack-merge"; @@ -70225,15 +71899,6 @@ let sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; }; }; - "webpack-stream-6.1.0" = { - name = "webpack-stream"; - packageName = "webpack-stream"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-stream/-/webpack-stream-6.1.0.tgz"; - sha512 = "kFMnDzFTzyvVmn4ajaj0xEJavvYizd3I/KmQ6C5aUstcAkNwZUidxkk/uEaEPSydaAn66v8ZcP1+bhKSshNJUQ=="; - }; - }; "webrtc-adapter-7.7.1" = { name = "webrtc-adapter"; packageName = "webrtc-adapter"; @@ -70279,13 +71944,22 @@ let sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; }; }; - "webtorrent-1.8.2" = { + "webtorrent-1.8.6" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.8.2"; + version = "1.8.6"; + src = fetchurl { + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.6.tgz"; + sha512 = "yx/y2O+IeTtkvkkjqTh5tyBjk+C/u8IqE6evOKllLs1kerVzMcbbHQMU7vgU05tThb1vRjbq3FAuU20g+HoEUg=="; + }; + }; + "webworkify-webpack-2.1.5" = { + name = "webworkify-webpack"; + packageName = "webworkify-webpack"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.2.tgz"; - sha512 = "rQfrYF/2pq81c8whgTEQtqMlp0HosA4yB7R4EUq+6Q0087bO2GbDxiBKTIZuBcMUgK+2jq/+TgTdXnZ9cBabcw=="; + url = "https://registry.npmjs.org/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz"; + sha512 = "2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="; }; }; "whatwg-encoding-1.0.5" = { @@ -70342,6 +72016,15 @@ let sha512 = "CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w=="; }; }; + "whatwg-url-11.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz"; + sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; + }; + }; "whatwg-url-5.0.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -70396,15 +72079,6 @@ let sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; }; }; - "when-3.7.8" = { - name = "when"; - packageName = "when"; - version = "3.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; - sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; - }; - }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -71305,13 +72979,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.2.29" = { + "xdl-59.2.30" = { name = "xdl"; packageName = "xdl"; - version = "59.2.29"; + version = "59.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.2.29.tgz"; - sha512 = "qwLdMdv7AR3Tz9rud/Dro2TQFlhZHLN9GIN4+TKKcz9M9mkeoqZAFbDEt+7MyDUKQ644iBpSvShjMdyRA7M+aQ=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.2.30.tgz"; + sha512 = "Id4b3prDMPlW9OuycaeQwXeD/3tAgTmJY0N1blRL5Xr3KXhybXkyCsnvOaFyvQ+luqnmsOUdJQkfzL0JuyIauw=="; }; }; "xenvar-0.5.1" = { @@ -71603,6 +73277,15 @@ let sha512 = "3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="; }; }; + "xmlhttprequest-ssl-2.0.0" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz"; + sha512 = "QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="; + }; + }; "xor-distance-2.0.0" = { name = "xor-distance"; packageName = "xor-distance"; @@ -71693,13 +73376,13 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; - "xss-1.0.10" = { + "xss-1.0.11" = { name = "xss"; packageName = "xss"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz"; - sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz"; + sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ=="; }; }; "xstream-11.14.0" = { @@ -71729,6 +73412,15 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; + "xxhash-wasm-0.4.2" = { + name = "xxhash-wasm"; + packageName = "xxhash-wasm"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz"; + sha512 = "/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA=="; + }; + }; "y18n-3.2.2" = { name = "y18n"; packageName = "y18n"; @@ -71846,6 +73538,15 @@ let sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ=="; }; }; + "yargonaut-1.1.4" = { + name = "yargonaut"; + packageName = "yargonaut"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz"; + sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA=="; + }; + }; "yargs-1.3.3" = { name = "yargs"; packageName = "yargs"; @@ -72080,13 +73781,13 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "yargs-parser-21.0.0" = { + "yargs-parser-21.0.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "21.0.0"; + version = "21.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; + sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; }; }; "yargs-parser-4.2.1" = { @@ -72296,6 +73997,15 @@ let sha512 = "YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g=="; }; }; + "yorkie-2.0.0" = { + name = "yorkie"; + packageName = "yorkie"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz"; + sha512 = "jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw=="; + }; + }; "yosay-2.0.2" = { name = "yosay"; packageName = "yosay"; @@ -72341,6 +74051,15 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; + "zen-observable-ts-1.2.3" = { + name = "zen-observable-ts"; + packageName = "zen-observable-ts"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.2.3.tgz"; + sha512 = "hc/TGiPkAWpByykMwDcem3SdUgA4We+0Qb36bItSuJC9xD0XVBZoFHYoadAomDSNf64CG8Ydj0Qb8Od8BUWz5g=="; + }; + }; "zeromq-5.2.8" = { name = "zeromq"; packageName = "zeromq"; @@ -72437,15 +74156,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "13.2.4"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-13.2.4.tgz"; - sha512 = "Llk0RzrpzCsAIgX4wk8QIB7xZInyLT07r6gF9dc9b0latHsJyRpeZXdPcFmT2wny0cin+1Y9q6HsBe4Srs19SA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-13.2.6.tgz"; + sha512 = "xIjEaQI5sWemXXc7GXLm4u9UL5sjtrQL/y1PJvvk/Jsa8+kIT+MutOfZfC7zcdAh9fqHd8mokH3guFV8BJdFxA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1302.4" - sources."@angular-devkit/core-13.2.4" - sources."@angular-devkit/schematics-13.2.4" + sources."@angular-devkit/architect-0.1302.6" + sources."@angular-devkit/core-13.2.6" + sources."@angular-devkit/schematics-13.2.6" sources."@gar/promisify-1.1.3" sources."@npmcli/fs-1.1.1" sources."@npmcli/git-2.1.0" @@ -72454,12 +74173,12 @@ in sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-2.0.0" - sources."@schematics/angular-13.2.4" + sources."@schematics/angular-13.2.6" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-8.9.0" sources."ajv-formats-2.1.1" @@ -72510,7 +74229,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" @@ -72532,7 +74251,7 @@ in sources."ini-2.0.0" (sources."inquirer-8.2.0" // { dependencies = [ - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."tslib-2.3.1" ]; }) @@ -72580,8 +74299,12 @@ in dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.3.1" - sources."make-fetch-happen-10.0.3" + sources."lru-cache-7.4.4" + (sources."make-fetch-happen-10.0.5" // { + dependencies = [ + sources."minipass-fetch-2.0.3" + ]; + }) ]; }) sources."npmlog-6.0.1" @@ -72653,10 +74376,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.13.1.tgz"; - sha512 = "n9frAWnm14iweBtISggohUVuU0bmE0i2wUgGWS1qUqqCNV9lUwYnhxU04OymrMeWpVTtKpk3MR6E+iQIi1i12w=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.13.2.tgz"; + sha512 = "iKhPlNUE6fs0g7iRdTJzWFB8XoQb4AbCT46V0mrMsdF1RzyvwnOuzxSjISHQdYzpfirihVG9XpAUy/X540qavg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72702,7 +74425,7 @@ in sources."duplexify-4.1.2" sources."end-of-stream-1.4.4" sources."escape-string-regexp-1.0.5" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fast-safe-stringify-2.1.1" sources."has-flag-3.0.0" sources."inherits-2.0.4" @@ -72736,7 +74459,7 @@ in sources."string_decoder-1.3.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."type-fest-1.4.0" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -72826,7 +74549,7 @@ in sources."escape-string-regexp-1.0.5" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fast-safe-stringify-2.1.1" sources."fd-slicer-1.1.0" sources."fill-range-7.0.1" @@ -72851,7 +74574,7 @@ in sources."handlebars-4.7.7" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hpagent-0.1.2" sources."ignore-5.2.0" sources."inflight-1.0.6" @@ -72953,7 +74676,7 @@ in sources."string_decoder-1.1.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -72965,7 +74688,7 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."type-fest-1.4.0" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unxhr-1.0.1" @@ -73005,12 +74728,13 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.8.8"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.8.8.tgz"; - sha512 = "XgBSVpqXEqGTdst+CnM03/nXYw9PYNAfTl27BaJuUhEtqA/iDlyM7wLnQMsJzwWVmoLqp0bCumHkb62NtfeDNA=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.11.0.tgz"; + sha512 = "rDpbvfhjM1BF2r1U64A2TLxUTrvdT9yKunjzhDDDoR4b5OBgyclhCvbdbWuq7wR3RCOl+P6bI+TGdYDwYnNd1g=="; }; dependencies = [ + sources."@astrojs/svelte-language-integration-0.1.1" sources."@emmetio/abbreviation-2.2.3" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" @@ -73018,11 +74742,17 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@ts-morph/common-0.11.1" + (sources."@vscode/emmet-helper-2.8.4" // { + dependencies = [ + sources."vscode-uri-2.1.2" + ]; + }) sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."code-block-writer-10.1.1" sources."concat-map-0.0.1" + sources."dedent-js-1.0.1" sources."emmet-2.3.6" sources."fast-glob-3.2.11" sources."fastq-1.13.0" @@ -73033,25 +74763,26 @@ in sources."is-number-7.0.0" sources."jsonc-parser-2.3.1" sources."lodash-4.17.21" + sources."lower-case-2.0.2" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."minimatch-3.1.2" sources."mkdirp-1.0.4" + sources."no-case-3.0.4" + sources."pascal-case-3.1.2" sources."path-browserify-1.0.1" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-0.7.3" + sources."svelte-3.46.4" + sources."svelte2tsx-0.5.5" sources."to-regex-range-5.0.1" sources."ts-morph-12.2.0" - sources."typescript-4.5.5" + sources."tslib-2.3.1" + sources."typescript-4.6.2" sources."vscode-css-languageservice-5.1.13" - (sources."vscode-emmet-helper-2.1.2" // { - dependencies = [ - sources."vscode-uri-2.1.2" - ]; - }) (sources."vscode-html-languageservice-3.2.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" @@ -73068,6 +74799,7 @@ in ]; buildInputs = globalBuildInputs; meta = { + description = "The Astro language server, implement the [language server protocol](https://microsoft.github.io/language-server-protocol/)"; license = "MIT"; }; production = true; @@ -73366,7 +75098,7 @@ in sources."@tsconfig/node14-1.0.1" sources."@tsconfig/node16-1.0.2" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."JSONStream-1.3.5" @@ -73389,7 +75121,7 @@ in sources."conventional-changelog-angular-5.0.13" sources."conventional-commits-parser-3.2.4" sources."cosmiconfig-7.0.1" - sources."cosmiconfig-typescript-loader-1.0.5" + sources."cosmiconfig-typescript-loader-1.0.6" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" @@ -73409,7 +75141,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."find-up-4.1.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" @@ -73509,9 +75241,9 @@ in sources."through-2.3.8" sources."through2-4.0.2" sources."trim-newlines-3.0.1" - sources."ts-node-10.5.0" + sources."ts-node-10.7.0" sources."type-fest-0.18.1" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -73524,7 +75256,7 @@ in sources."yaml-1.10.2" (sources."yargs-17.3.1" // { dependencies = [ - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -73589,13 +75321,13 @@ in sources."supports-color-5.5.0" ]; }) - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -73660,7 +75392,7 @@ in sources."figures-3.2.0" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" @@ -73669,16 +75401,16 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" sources."glob-parent-5.1.2" - sources."google-auth-library-7.13.0" + sources."google-auth-library-7.14.0" sources."google-p12-pem-3.1.3" sources."googleapis-76.0.0" - sources."googleapis-common-5.0.5" + sources."googleapis-common-5.1.0" sources."got-11.8.3" sources."graceful-fs-4.2.9" sources."gtoken-5.3.2" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" @@ -73687,7 +75419,7 @@ in sources."ieee754-1.2.1" sources."indent-string-4.0.0" sources."inherits-2.0.4" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" (sources."inquirer-autocomplete-prompt-ipt-2.0.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -73727,7 +75459,7 @@ in sources."lodash-4.17.21" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."loud-rejection-2.2.0" @@ -73808,7 +75540,7 @@ in sources."restore-cursor-3.1.0" sources."router-ips-1.0.0" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -73837,9 +75569,9 @@ in }) sources."tslib-2.3.1" sources."type-fest-0.21.3" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" sources."url-template-2.0.8" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" @@ -73880,7 +75612,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."acorn-8.7.0" @@ -74025,7 +75757,7 @@ in ]; }) sources."hyperswarm-2.15.3" - sources."hypertrie-5.1.2" + sources."hypertrie-5.1.3" sources."identify-filetype-1.0.0" sources."ieee754-1.2.1" sources."immediate-3.3.0" @@ -74151,7 +75883,7 @@ in sources."stream-collector-1.0.1" sources."stream-equal-1.1.1" sources."stream-shift-1.0.1" - sources."streamx-2.12.2" + sources."streamx-2.12.4" (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -74205,7 +75937,7 @@ in ]; }) sources."varint-5.0.0" - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."which-1.3.1" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -74274,7 +76006,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -75075,7 +76807,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uc.micro-1.0.6" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."underscore-1.13.2" sources."union-value-1.0.1" (sources."universal-url-2.0.0" // { @@ -75171,7 +76903,7 @@ in sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.13.0" sources."@octokit/plugin-retry-3.0.9" - sources."@octokit/plugin-throttling-3.5.2" + sources."@octokit/plugin-throttling-3.6.1" sources."@octokit/request-5.6.3" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" @@ -75262,19 +76994,19 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.1.tgz"; - sha512 = "GnwpORSIkGl6N6yWPONq1wwZ8+zltr3vF1M/2qzupDnXOAvSSCh1otDQRAmeOf3uIIeCiCsJEEx79kRnT7Zdrw=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.2.tgz"; + sha512 = "ZonmNLCHfTVrZGgYf4mrpivnKGaRzVRAcux+WDbzhQDNIz70s7mdOPShXW1Vpq+7uRJDxlgO1vOMhmg4uEUIDg=="; }; dependencies = [ - sources."@angular-devkit/core-13.2.3" - sources."@angular-devkit/schematics-13.2.3" - (sources."@angular-devkit/schematics-cli-13.2.3" // { + sources."@angular-devkit/core-13.2.5" + sources."@angular-devkit/schematics-13.2.5" + (sources."@angular-devkit/schematics-cli-13.2.5" // { dependencies = [ sources."chalk-4.1.2" sources."inquirer-8.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."tslib-2.3.1" ]; }) @@ -75290,18 +77022,13 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-8.0.6" // { - dependencies = [ - sources."@angular-devkit/core-13.2.2" - sources."@angular-devkit/schematics-13.2.2" - ]; - }) + sources."@nestjs/schematics-8.0.8" sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" sources."@types/json5-0.0.29" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -75324,24 +77051,23 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-8.9.0" sources."ajv-formats-2.1.1" - sources."ajv-keywords-3.5.2" + sources."ajv-keywords-5.1.0" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -75356,18 +77082,14 @@ in sources."colors-1.4.0" sources."commander-4.1.1" sources."concat-map-0.0.1" - sources."cosmiconfig-6.0.0" + sources."cosmiconfig-7.0.1" sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.81" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-5.9.0" // { - dependencies = [ - sources."tapable-2.2.1" - ]; - }) + sources."enhanced-resolve-5.9.2" sources."error-ex-1.3.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -75386,13 +77108,12 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" - (sources."fork-ts-checker-webpack-plugin-6.5.0" // { + (sources."fork-ts-checker-webpack-plugin-7.2.1" // { dependencies = [ sources."chalk-4.1.2" - sources."fs-extra-9.1.0" ]; }) - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-monkey-1.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -75496,12 +77217,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."schema-utils-2.7.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - ]; - }) + sources."schema-utils-4.0.0" sources."semver-7.3.5" sources."serialize-javascript-6.0.0" sources."shebang-command-2.0.0" @@ -75523,8 +77239,8 @@ in sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" - sources."tapable-1.1.3" - (sources."terser-5.10.0" // { + sources."tapable-2.2.1" + (sources."terser-5.12.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -75532,6 +77248,7 @@ in (sources."terser-webpack-plugin-5.3.1" // { dependencies = [ sources."ajv-6.12.6" + sources."ajv-keywords-3.5.2" sources."json-schema-traverse-0.4.1" sources."schema-utils-3.1.1" sources."source-map-0.6.1" @@ -75549,7 +77266,7 @@ in }) sources."tslib-1.14.1" sources."type-fest-0.21.3" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -75558,9 +77275,9 @@ in (sources."webpack-5.66.0" // { dependencies = [ sources."ajv-6.12.6" + sources."ajv-keywords-3.5.2" sources."json-schema-traverse-0.4.1" sources."schema-utils-3.1.1" - sources."tapable-2.2.1" ]; }) sources."webpack-node-externals-3.0.0" @@ -75659,13 +77376,13 @@ in "@tailwindcss/forms" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_forms"; packageName = "@tailwindcss/forms"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.4.0.tgz"; - sha512 = "DeaQBx6EgEeuZPQACvC+mKneJsD8am1uiJugjgQK1+/Vt+Ai0GpFBC2T2fqnUad71WgOxyrZPE6BG1VaI6YqfQ=="; + url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.0.tgz"; + sha512 = "KzWugryEBFkmoaYcBE18rs6gthWCFHHO7cAZm2/hv3hwD67AzwP7udSCa22E7R1+CEJL/FfhYsJWrc0b1aeSzw=="; }; dependencies = [ - sources."mini-svg-data-uri-1.4.3" + sources."mini-svg-data-uri-1.4.4" ]; buildInputs = globalBuildInputs; meta = { @@ -75738,10 +77455,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.3.0.tgz"; - sha512 = "/TF95YAYNcuuyfxuYDm+82ployEafonT8MDP5oVZr1zdqRGjyrAiOfAWiCjONPWVKVa/mp6Jj8WPgnzLzuA13Q=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.3.1.tgz"; + sha512 = "ke+qyGzYpUWsOgqSbwM6Ok3f6nqXmh4WdfFa3LGKgaNs8mHv4ss/06a3NwAYEGrUSaCNOCNa3+snwUE4rMQ5OA=="; }; dependencies = [ sources."@purest/config-1.0.1" @@ -75761,7 +77478,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1091.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -75862,7 +77579,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."helmet-4.6.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" @@ -76017,7 +77734,7 @@ in ]; }) sources."url-0.10.3" - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" sources."url-value-parser-2.1.0" sources."utils-merge-1.0.1" sources."uuid-8.1.0" @@ -76076,7 +77793,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ @@ -76090,7 +77807,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -76117,7 +77834,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -76246,7 +77963,7 @@ in sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -76350,7 +78067,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -76369,7 +78086,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -76490,7 +78207,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.81" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -76590,7 +78307,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.172.0" + sources."flow-parser-0.173.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forwarded-0.2.0" @@ -76648,7 +78365,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-4.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -76675,7 +78392,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."internal-slot-1.0.3" sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" @@ -76950,7 +78667,7 @@ in sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -77167,7 +78884,7 @@ in sources."ws-7.5.7" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - (sources."xss-1.0.10" // { + (sources."xss-1.0.11" // { dependencies = [ sources."commander-2.20.3" ]; @@ -77424,7 +79141,7 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-6.0.3" sources."@types/supports-color-8.1.1" @@ -77791,12 +79508,12 @@ in sources."to-readable-stream-1.0.0" sources."to-vfile-7.2.3" sources."trim-newlines-4.0.2" - sources."trough-2.0.2" + sources."trough-2.1.0" sources."type-fest-1.4.0" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-3.0.0" - (sources."unified-10.1.1" // { + (sources."unified-10.1.2" // { dependencies = [ sources."is-plain-obj-4.0.0" ]; @@ -77821,7 +79538,7 @@ in sources."unist-util-position-4.0.1" sources."unist-util-position-from-estree-1.1.1" sources."unist-util-remove-position-4.0.1" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.2" (sources."unist-util-visit-4.1.0" // { dependencies = [ sources."unist-util-visit-parents-5.1.0" @@ -77843,15 +79560,15 @@ in sources."util-deprecate-1.0.2" sources."uvu-0.5.3" sources."validate-npm-package-license-3.0.4" - sources."vfile-5.3.0" + sources."vfile-5.3.2" sources."vfile-find-up-6.0.0" sources."vfile-location-4.0.1" - sources."vfile-message-3.1.0" + sources."vfile-message-3.1.2" (sources."vfile-reporter-7.0.3" // { dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."strip-ansi-7.0.1" sources."supports-color-9.2.1" ]; @@ -77910,7 +79627,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" @@ -77931,8 +79648,8 @@ in sources."async-3.2.3" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.3" - sources."caniuse-lite-1.0.30001312" + sources."browserslist-4.20.0" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -77942,7 +79659,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.3" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -78068,7 +79785,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-2.0.0" - sources."destroy-1.1.0" + sources."destroy-1.1.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" @@ -78089,7 +79806,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-assert-1.5.0" (sources."http-errors-1.8.1" // { @@ -78150,7 +79867,7 @@ in }) sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."only-0.0.2" sources."parseurl-1.3.3" sources."passthrough-counter-1.0.0" @@ -78191,7 +79908,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."uri-js-4.4.1" - sources."urijs-1.19.8" + sources."urijs-1.19.10" sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -78204,7 +79921,7 @@ in }) sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."ylru-1.2.1" ]; buildInputs = globalBuildInputs; @@ -78228,7 +79945,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -78312,11 +80029,11 @@ in sha512 = "9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ=="; }; dependencies = [ - sources."browserslist-4.19.3" - sources."caniuse-lite-1.0.30001312" - sources."electron-to-chromium-1.4.71" + sources."browserslist-4.20.0" + sources."caniuse-lite-1.0.30001314" + sources."electron-to-chromium-1.4.82" sources."escalade-3.1.1" - sources."fraction.js-4.1.3" + sources."fraction.js-4.2.0" sources."node-releases-2.0.2" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" @@ -78342,14 +80059,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1091.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -78388,7 +80105,7 @@ in sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."degenerator-2.2.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."devtools-protocol-0.0.901419" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" @@ -78426,7 +80143,7 @@ in sources."graceful-fs-4.2.9" sources."has-flag-4.0.0" sources."htmlparser2-6.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -78434,7 +80151,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."ip-1.1.5" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -78484,12 +80201,12 @@ in ]; }) sources."querystring-0.2.0" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -78499,7 +80216,7 @@ in sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -78967,10 +80684,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.53.7"; + version = "11.57.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.53.7.tgz"; - sha512 = "ZvKd1pri9FOVt59imBWNLoY8GfP4Mld1Ci9SHFZF6VesRnkxYDvmnj+bNfCw9KDj/7EvkwlDM4PluN6YoDc67w=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.57.1.tgz"; + sha512 = "4VZ0wtEhVxobxcQuXnnWMKWp+lFCaYNwy24gLx38Jm634/ry3vQ1V5T2Y2OIrA0ea6h6CanL7mryjZRmaLwiqw=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.0" // { @@ -79019,7 +80736,7 @@ in sources."@types/express-serve-static-core-4.17.28" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" @@ -79230,7 +80947,7 @@ in sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.1" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" @@ -79363,70 +81080,75 @@ in sources."ws-8.2.3" ]; }) - (sources."ln-service-53.9.1" // { + (sources."ln-service-53.9.3" // { dependencies = [ - sources."@grpc/grpc-js-1.5.5" + sources."@grpc/grpc-js-1.5.7" + sources."@types/ws-8.5.2" sources."body-parser-1.19.2" sources."bolt09-0.2.2" sources."bytes-3.1.2" - sources."lightning-5.8.1" + sources."cookie-0.4.2" + sources."express-4.17.3" + sources."lightning-5.8.2" sources."qs-6.9.7" sources."raw-body-2.4.3" - sources."type-fest-2.11.2" + sources."safe-buffer-5.2.1" + sources."tiny-secp256k1-2.2.1" + sources."type-fest-2.12.0" + sources."uint8array-tools-0.0.7" sources."ws-8.5.0" ]; }) - (sources."ln-sync-3.10.1" // { + (sources."ln-sync-3.11.0" // { dependencies = [ - sources."@grpc/grpc-js-1.5.5" - sources."@types/node-17.0.17" - sources."lightning-5.7.1" - sources."ln-service-53.8.1" - sources."type-fest-2.11.2" - sources."ws-8.5.0" + sources."tiny-secp256k1-2.2.1" + sources."uint8array-tools-0.0.7" ]; }) - (sources."ln-telegram-3.17.3" // { + (sources."ln-telegram-3.19.1" // { dependencies = [ - sources."@grpc/grpc-js-1.5.3" - sources."@types/node-17.0.16" - sources."bech32-1.1.4" - sources."bitcoinjs-lib-5.2.0" - sources."bn.js-4.12.0" - sources."invoices-2.0.3" - sources."lightning-5.6.3" - sources."ln-service-53.8.0" - (sources."ln-sync-3.10.0" // { - dependencies = [ - sources."@types/node-17.0.15" - sources."lightning-5.6.2" - sources."ln-service-53.7.3" - sources."ws-8.4.2" - ]; - }) - (sources."paid-services-3.11.0" // { + sources."@grpc/grpc-js-1.5.5" + sources."@types/node-17.0.18" + sources."body-parser-1.19.2" + sources."bolt09-0.2.2" + sources."bytes-3.1.2" + sources."cookie-0.4.2" + sources."express-4.17.3" + (sources."lightning-5.8.1" // { dependencies = [ - sources."@types/node-17.0.10" - sources."bech32-2.0.0" - sources."bitcoinjs-lib-6.0.1" - sources."bn.js-5.2.0" - sources."lightning-5.3.4" - sources."ln-service-53.5.1" - (sources."ln-sync-3.7.0" // { + sources."bytes-3.1.1" + sources."cookie-0.4.1" + (sources."express-4.17.2" // { dependencies = [ - sources."@grpc/grpc-js-1.5.1" - sources."@types/node-17.0.8" - sources."lightning-5.3.3" - sources."ln-service-53.5.0" - sources."type-fest-2.9.0" + sources."body-parser-1.19.1" ]; }) - sources."ws-8.4.2" + sources."qs-6.9.6" + sources."raw-body-2.4.2" ]; }) - sources."psbt-1.1.10" - sources."tiny-secp256k1-1.1.6" - sources."type-fest-2.10.0" + sources."ln-service-53.9.2" + (sources."ln-sync-3.10.1" // { + dependencies = [ + sources."@types/node-17.0.17" + sources."body-parser-1.19.1" + sources."bolt09-0.2.1" + sources."bytes-3.1.1" + sources."cookie-0.4.1" + sources."express-4.17.2" + sources."lightning-5.7.1" + sources."ln-service-53.8.1" + sources."qs-6.9.6" + sources."raw-body-2.4.2" + ]; + }) + sources."paid-services-3.12.1" + sources."qs-6.9.7" + sources."raw-body-2.4.3" + sources."safe-buffer-5.2.1" + sources."tiny-secp256k1-2.2.1" + sources."type-fest-2.11.2" + sources."uint8array-tools-0.0.7" sources."ws-8.5.0" ]; }) @@ -79449,7 +81171,7 @@ in sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."luxon-2.3.0" + sources."luxon-2.3.1" sources."macaroon-3.0.4" (sources."make-dir-3.1.0" // { dependencies = [ @@ -79511,7 +81233,12 @@ in sources."semver-6.3.0" ]; }) - sources."paid-services-3.11.4" + (sources."paid-services-3.12.2" // { + dependencies = [ + sources."tiny-secp256k1-2.2.1" + sources."uint8array-tools-0.0.7" + ]; + }) sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."pinkie-2.0.4" @@ -79553,7 +81280,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" @@ -79786,7 +81513,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uri-js-4.4.1" - sources."urijs-1.19.8" + sources."urijs-1.19.10" sources."uuid-3.4.0" sources."verror-1.10.0" sources."vscode-jsonrpc-6.0.0" @@ -80065,7 +81792,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.51.0" + sources."mime-db-1.52.0" sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -80226,7 +81953,7 @@ in sources."glob-7.2.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -80424,7 +82151,7 @@ in sources."cookie-0.4.2" sources."debug-3.1.0" sources."decamelize-1.2.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."destroy-1.0.4" sources."dev-ip-1.0.1" sources."dlv-1.1.3" @@ -80463,9 +82190,9 @@ in sources."has-ansi-2.0.0" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - (sources."http-errors-1.8.1" // { + (sources."http-errors-2.0.0" // { dependencies = [ - sources."statuses-1.5.0" + sources."statuses-2.0.1" ]; }) sources."http-proxy-1.18.1" @@ -80516,7 +82243,7 @@ in sources."portscanner-2.1.1" sources."qs-6.2.3" sources."range-parser-1.2.1" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -80532,6 +82259,7 @@ in (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" @@ -80541,6 +82269,7 @@ in (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" @@ -80810,7 +82539,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -81090,7 +82819,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -81631,7 +83360,7 @@ in }) ]; }) - sources."depd-1.1.2" + sources."depd-2.0.0" sources."dir-glob-2.0.0" sources."dom-walk-0.1.2" sources."dot-prop-4.2.1" @@ -81720,7 +83449,7 @@ in ]; }) sources."hosted-git-info-2.8.9" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" (sources."https-proxy-agent-2.2.4" // { dependencies = [ sources."debug-3.2.7" @@ -81909,7 +83638,7 @@ in }) sources."query-string-6.14.1" sources."quick-lru-1.1.0" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."rc-1.2.8" sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" @@ -81998,7 +83727,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."strict-uri-encode-2.0.0" (sources."string-width-2.1.1" // { dependencies = [ @@ -82097,18 +83826,18 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.104"; + version = "1.0.120"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.104.tgz"; - sha512 = "/JiR7ynoMTH8G3efHuzvdpWI2VX+3W2XRRWOILoSLquV97o4g2P9QD1ElpgLRysOarcxHHfb3hvbYSUAI6OYug=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.120.tgz"; + sha512 = "2Ik+JGf5Pt+6V4tBDSFicqxRb0mRv5u+x7lOiegoeRku467VH4I6Vk4Di+MDLr9lt2OEmJftAxXpvAMv0DBCfQ=="; }; dependencies = [ - sources."@jsii/check-node-1.54.0" - sources."@jsii/spec-1.54.0" + sources."@jsii/check-node-1.55.0" + sources."@jsii/spec-1.55.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-12.20.46" + sources."@types/node-12.20.47" sources."@xmldom/xmldom-0.8.1" sources."ajv-8.10.0" sources."ansi-regex-5.0.1" @@ -82119,12 +83848,12 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.5.22" - sources."cdk8s-plus-22-1.0.0-beta.123" + sources."cdk8s-1.5.39" + sources."cdk8s-plus-22-1.0.0-beta.142" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.54.0" // { + (sources."codemaker-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -82133,8 +83862,8 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.223" - sources."date-format-4.0.3" + sources."constructs-3.3.239" + sources."date-format-4.0.4" sources."debug-4.3.3" sources."decamelize-5.0.1" sources."deep-equal-2.0.5" @@ -82171,7 +83900,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" @@ -82196,42 +83925,42 @@ in sources."is-weakref-1.0.2" sources."is-weakset-2.0.2" sources."isarray-2.0.5" - (sources."jsii-1.54.0" // { + (sources."jsii-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.54.0" // { + (sources."jsii-pacmak-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.54.0" // { + (sources."jsii-reflect-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.54.0" // { + (sources."jsii-rosetta-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.482" // { + (sources."jsii-srcmak-0.1.499" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.142" + sources."json2jsii-0.2.159" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" - sources."log4js-6.4.1" + sources."log4js-6.4.2" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" @@ -82245,7 +83974,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.54.0" + sources."oo-ascii-tree-1.55.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -82271,10 +84000,10 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.1" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.208" - (sources."streamroller-3.0.2" // { + sources."sscaff-1.2.225" + (sources."streamroller-3.0.4" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" ]; }) sources."string-width-4.2.3" @@ -82323,10 +84052,10 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.9.1.tgz"; - sha512 = "Qa542vXUXn8tzqGkcAvLWGSpFbhOXalOystXu8sSZn82eCpCTo2CxEpoHOFeUgNkymUOFwWawl5+CIMYr7V1+Q=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.9.4.tgz"; + sha512 = "C7nL+AVA2ltmRhFdAb6yinXzjumRIAyaNi1p5QyZpythrg6+GThxZS/We+s8GIA000uIrPMvesuHCE+dGxkssw=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -82336,10 +84065,10 @@ in sources."@babel/parser-7.17.3" sources."@babel/template-7.16.7" sources."@babel/types-7.17.0" - sources."@cdktf/hcl2cdk-0.9.1" - sources."@cdktf/hcl2json-0.9.1" - sources."@cdktf/provider-generator-0.9.1" - (sources."@jsii/check-node-1.54.0" // { + sources."@cdktf/hcl2cdk-0.9.4" + sources."@cdktf/hcl2json-0.9.4" + sources."@cdktf/provider-generator-0.9.4" + (sources."@jsii/check-node-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -82349,11 +84078,11 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jsii/spec-1.54.0" + sources."@jsii/spec-1.55.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/node-fetch-2.6.1" sources."@xmldom/xmldom-0.8.1" sources."ansi-regex-5.0.1" @@ -82367,7 +84096,7 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.9.1" + sources."cdktf-0.9.4" sources."chalk-2.4.2" sources."cliui-6.0.0" sources."clone-2.1.2" @@ -82381,8 +84110,8 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.68" - sources."date-format-4.0.3" + sources."constructs-10.0.84" + sources."date-format-4.0.4" sources."debug-4.3.3" sources."decamelize-1.2.0" sources."deep-equal-2.0.5" @@ -82414,12 +84143,12 @@ in sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.9" - sources."graphology-0.23.2" + sources."graphology-0.24.1" sources."graphology-types-0.21.2" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -82442,14 +84171,14 @@ in sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.8" - sources."is-valid-domain-0.1.5" + sources."is-valid-domain-0.1.6" sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.54.0" // { + (sources."jsii-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -82467,11 +84196,11 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-pacmak-1.54.0" // { + (sources."jsii-pacmak-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" - sources."codemaker-1.54.0" + sources."codemaker-1.55.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."decamelize-5.0.1" @@ -82485,7 +84214,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.54.0" // { + (sources."jsii-reflect-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -82503,7 +84232,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.54.0" // { + (sources."jsii-rosetta-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -82518,7 +84247,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.482" // { + (sources."jsii-srcmak-0.1.499" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -82529,7 +84258,7 @@ in sources."jsonfile-4.0.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" - sources."log4js-6.4.1" + sources."log4js-6.4.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" @@ -82547,7 +84276,7 @@ in sources."object.assign-4.1.2" sources."obliterator-2.0.2" sources."once-1.4.0" - sources."oo-ascii-tree-1.54.0" + sources."oo-ascii-tree-1.55.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -82575,9 +84304,9 @@ in sources."sort-json-2.0.1" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - (sources."streamroller-3.0.2" // { + (sources."streamroller-3.0.4" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."jsonfile-6.1.0" sources."universalify-2.0.0" ]; @@ -82620,7 +84349,7 @@ in sources."color-name-1.1.4" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) (sources."yargs-parser-18.1.3" // { @@ -82957,10 +84686,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.6.tgz"; - sha512 = "FXi6gZE0NpiPeFoc3BW4BBv33KA2Vl8JFltWb2i9TXS3zXWXfIilRFh7iQiFclIAYaQxO/i6qbaSqatd6+BksA=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.7.tgz"; + sha512 = "QA6ZdSnW9ZHmQcaDF0+KZj9FnoJJFksk6t76VpXtBZUhzlRPoEWkpNPoVaN4uXwefMN6br4eLBxhVWW8gp8w4w=="; }; buildInputs = globalBuildInputs; meta = { @@ -83057,10 +84786,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.4.7"; + version = "2.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.7.tgz"; - sha512 = "rtt2W7g8oTfg1ZAIu+Y3gDqI305j68edgJJjWpdTSQHZXq2i9T0keaWHZAIdgV819wxTcBoaghCLNjDf1rPHJA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.9.tgz"; + sha512 = "erTk5v3v8MRPCvgkBJ8K4YtUOiVU31oZz8HN+ioNG9PdcIwJzGMRyMgj8qYPsiNk2nhg63kyyl5x762q2FgjyQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -83126,7 +84855,7 @@ in sha512 = "HtFYiBx2ZIFairTsfDwLsMUTGwlH498VzAipWZeCOIGf7ZXetEbv0t+wr7IAy2KMIwhlmzoMsi5aHSlUupxGHA=="; }; dependencies = [ - sources."typescript-4.5.5" + sources."typescript-4.6.2" ]; buildInputs = globalBuildInputs; meta = { @@ -83247,13 +84976,13 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.12.tgz"; - sha512 = "mRjStj+wjmqp9Lb3cDYegz+cavykWNYQf1ecdwrF2HEtbKVIcc+k62NS5wM6QVB5Y6FD2OxjPNWcoQmIFM1cfQ=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.14.tgz"; + sha512 = "zFExh1wGAZl4LXSp76NAjWORO9Tyhfw8WtALnhDv741p4tjWjVSEl6GmXTQN0U0tXz8UZ8ln2rL2OaxOdgMCTA=="; }; dependencies = [ - sources."@chemzqm/neovim-5.7.4" + sources."@chemzqm/neovim-5.7.5" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -83282,7 +85011,7 @@ in sources."which-1.3.1" ]; }) - sources."date-format-4.0.3" + sources."date-format-4.0.4" sources."debounce-1.2.1" sources."debug-4.3.3" sources."deep-extend-0.6.0" @@ -83298,7 +85027,7 @@ in sources."flatted-3.2.5" sources."follow-redirects-1.14.9" sources."fp-ts-2.11.8" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" (sources."fstream-1.0.12" // { @@ -83315,7 +85044,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" @@ -83351,7 +85080,7 @@ in ]; }) sources."lodash-4.17.21" - sources."log4js-6.4.1" + sources."log4js-6.4.2" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" sources."minimatch-3.1.2" @@ -83401,7 +85130,7 @@ in sources."shell-quote-1.7.3" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."streamroller-3.0.2" + sources."streamroller-3.0.4" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" (sources."string_decoder-1.1.1" // { @@ -83466,10 +85195,10 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "9.2.2"; + version = "9.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-9.2.2.tgz"; - sha512 = "0GjqQhdKO/5auaoZVnnUbgf1eyxfBcTmHJ7jj0eApzVCYwMLcXk52HVMfDSUpeB1ySEzhwQrxBbGZZyStdISjQ=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-9.2.3.tgz"; + sha512 = "LkwQTBlD/chH0BTl7zFMw+M1CKbVIy8W49nVLuB+wmgS3dqnKZo58PRTYkcX2X25/FIWOh/oMSjWoZ8cTck8zQ=="; }; dependencies = [ sources."prettier-2.5.1" @@ -83487,13 +85216,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.220"; + version = "1.1.228"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.220.tgz"; - sha512 = "M0GVuo8jgQxI/YqkExByeAkjwEvu8uqGicYD4zRctxU/THd1CQUvIWWFDKB1a7co8sCntZlMnhqqxAF4CLyYQw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.228.tgz"; + sha512 = "msCM17jXDDyaTW+wmSRq9DSgkIwj6foeOdQwn37Ny7B2+7iKCsWv0/GmLYj7fZe+is9hXjeGety9dF6tQq+4Wg=="; }; dependencies = [ - sources."pyright-1.1.223" + sources."pyright-1.1.228" ]; buildInputs = globalBuildInputs; meta = { @@ -83567,10 +85296,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.60.0"; + version = "0.60.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.60.0.tgz"; - sha512 = "GbRP3O/ZmnjiAnPDtqoQ+jJIzgCwinENp8lxlQdSPkXjW2vwgd4DTkYLU2p3/0BMoHn9zNCzM5iBO+OLei5upA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.60.1.tgz"; + sha512 = "wEVUE817neA7EpWGZwCYhzUbcJTHyFBihyfljCPIqTTxWF/zcctuhKhzsPzyhrKk18sbX0pBFO+/aubgwBQrow=="; }; buildInputs = globalBuildInputs; meta = { @@ -83603,10 +85332,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.8"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.8.tgz"; - sha512 = "Ku7Hf2MYJwYGuGMz6Qt9k46NQd+9+VcF0MeKuVTpIPtVIaKqRtKg6alDL+less7r6U2twIKWQTdYeqRCZBLnag=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.0.2.tgz"; + sha512 = "AQslAPlptSdPE0kTlM146EFnpeS491MqJmYa/O/vmlhd30aQidJmC79wBgrmpGj8T5ergsetb59uFnE3iuW+GQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -83654,7 +85383,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" @@ -83701,11 +85430,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -83742,7 +85471,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -83983,10 +85712,10 @@ in coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.6.tgz"; - sha512 = "6yKBny54MoGpm2bWwx2SX8O8cYjFgcQtfxg8klZoh1Nhxjamo2eNALjyvtOc/N9o7Mh+w/hn4nApXiwoJZqy0g=="; + url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.7.tgz"; + sha512 = "aLh9A6/r1/1QZT/1lJnaLdShGHRrCCb3HA57UYeFR0cD1xjRY3YupfmsOwVSbpqv6AufEXeOdbA2enoVhRFY8g=="; }; buildInputs = globalBuildInputs; meta = { @@ -84113,13 +85842,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.9.12"; + version = "1.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.12.tgz"; - sha512 = "6eLxc/n1kfGPZz6hQNr4rT2b8CYHOsYSdrylJ3bxhdjA9sUmzF5Rjutjyz/4WKY7saVu30wmvfjdtPZDTyQUFw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.14.tgz"; + sha512 = "MiyV1Tq5Jpj6P0t3PVb3IFyrfOm93E29Oz90nCfSdMBW+yY0U4H4uE5V9AKO3zhVFhzHRwalYfaFxf/6VCmkgA=="; }; dependencies = [ - sources."typescript-4.5.5" + sources."typescript-4.6.2" ]; buildInputs = globalBuildInputs; meta = { @@ -84250,7 +85979,7 @@ in sources."globals-13.12.1" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -84330,7 +86059,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.6" @@ -84376,10 +86105,10 @@ in coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.1.tgz"; - sha512 = "mSnoYlb0J41LG6uTgGlLOj/jM4wEYKv1IhP0p7LUo+eZSzdlWuuP2r+zmNbd+MeN/k5ftcgahVSLaUv5QVtpsA=="; + url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.4.tgz"; + sha512 = "w3bJrPoNkx5uiydRRPQ5Xqx01voizi0CxTh7/V7MJsuTP+2KNHRselm3cZcit79OyzO9rF1R0PGlDwLgPf54gg=="; }; buildInputs = globalBuildInputs; meta = { @@ -84455,7 +86184,7 @@ in sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; }; dependencies = [ - sources."@xstate/fsm-1.6.4" + sources."@xstate/fsm-1.6.5" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -84984,7 +86713,7 @@ in sources."through2-4.0.2" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -85033,7 +86762,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { @@ -85240,7 +86969,7 @@ in sources."form-data-2.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -85468,7 +87197,7 @@ in }) sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."read-package-json-4.1.1" + sources."read-package-json-4.1.2" sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" @@ -85535,7 +87264,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.11.4" + sources."systeminformation-5.11.7" sources."tar-6.1.11" sources."through-2.3.8" sources."tmp-0.2.1" @@ -85618,362 +87347,123 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "3.1.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.1.tgz"; - sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-4.1.0.tgz"; + sha512 = "JA6bth6/mxPCa19SrWkIuPEBrea8vO9g1v0qhmCLnAKOfTcsNk5/X3W1o9aZuOHgugRcxdyR67rO4Gw/DA+4Qg=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@types/glob-7.2.0" - sources."@types/minimatch-3.0.5" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" sources."@types/normalize-package-data-2.4.1" - sources."aggregate-error-3.1.0" + sources."aggregate-error-4.0.0" sources."ansi-styles-3.2.1" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."arrify-2.0.1" - sources."assign-symbols-1.0.0" - sources."atob-2.1.2" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."cache-base-1.0.1" - sources."call-me-maybe-1.0.1" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."chalk-2.4.2" - (sources."class-utils-0.3.6" // { + sources."arrify-3.0.0" + sources."braces-3.0.2" + sources."camelcase-6.3.0" + sources."camelcase-keys-7.0.2" + (sources."chalk-2.4.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."escape-string-regexp-1.0.5" ]; }) - sources."clean-stack-2.2.0" - sources."collection-visit-1.0.0" + sources."clean-stack-4.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."copy-descriptor-0.1.1" - sources."cp-file-7.0.0" - sources."cpy-8.1.2" - sources."debug-2.6.9" - sources."decamelize-1.2.0" + sources."cp-file-9.1.0" + sources."cpy-9.0.1" + sources."decamelize-5.0.1" (sources."decamelize-keys-1.1.0" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) - sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" - sources."dir-glob-2.2.2" + sources."dir-glob-3.0.1" sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - 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."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-glob-2.2.7" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."find-up-4.1.0" - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" - sources."fs.realpath-1.0.0" + sources."escape-string-regexp-5.0.0" + sources."fast-glob-3.2.11" + sources."fastq-1.13.0" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" sources."function-bind-1.1.1" - sources."get-value-2.0.6" - sources."glob-7.2.0" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."glob-to-regexp-0.3.0" - sources."globby-9.2.0" + sources."glob-parent-5.1.2" + sources."globby-13.1.1" sources."graceful-fs-4.2.9" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - (sources."has-glob-1.0.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."hosted-git-info-2.8.9" - sources."ignore-4.0.6" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-accessor-descriptor-1.0.0" + sources."hosted-git-info-4.1.0" + sources."ignore-5.2.0" + sources."indent-string-5.0.0" sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" sources."is-core-module-2.8.1" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-7.0.0" sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isobject-3.0.1" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."junk-3.1.0" + sources."junk-4.0.0" sources."kind-of-6.0.3" sources."lines-and-columns-1.2.4" - sources."locate-path-5.0.0" + sources."locate-path-6.0.0" + sources."lru-cache-6.0.0" sources."make-dir-3.1.0" - sources."map-cache-0.2.2" sources."map-obj-4.3.0" - sources."map-visit-1.0.0" - sources."meow-6.1.1" + sources."meow-10.1.2" sources."merge2-1.4.1" - sources."micromatch-3.1.10" + sources."micromatch-4.0.4" sources."min-indent-1.0.1" - sources."minimatch-3.1.2" (sources."minimist-options-4.1.0" // { dependencies = [ sources."arrify-1.0.1" ]; }) - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."ms-2.0.0" - sources."nanomatch-1.2.13" sources."nested-error-stacks-2.1.0" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.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-visit-1.0.1" - sources."object.pick-1.3.0" - sources."once-1.4.0" - (sources."p-all-2.1.0" // { + (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."p-map-2.1.0" + sources."semver-7.3.5" ]; }) sources."p-event-4.2.0" - (sources."p-filter-2.1.0" // { - dependencies = [ - sources."p-map-2.1.0" - ]; - }) + sources."p-filter-3.0.0" sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-3.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."p-map-5.3.0" sources."p-timeout-3.2.0" - sources."p-try-2.2.0" sources."parse-json-5.2.0" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-4.0.1" - sources."posix-character-classes-0.1.1" - sources."quick-lru-4.0.1" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) - sources."redent-3.0.0" - sources."regex-not-1.0.2" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."resolve-1.22.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."safe-regex-1.1.0" + sources."path-type-4.0.0" + sources."picomatch-2.3.1" + sources."queue-microtask-1.2.3" + sources."quick-lru-5.1.1" + sources."read-pkg-6.0.0" + sources."read-pkg-up-8.0.0" + sources."redent-4.0.0" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" sources."semver-6.3.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."slash-2.0.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - 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."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."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" + sources."slash-4.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."strip-indent-3.0.0" + sources."strip-indent-4.0.0" sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."trim-newlines-3.0.1" - sources."type-fest-0.13.1" - sources."union-value-1.0.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."urix-0.1.0" - sources."use-3.1.1" + sources."to-regex-range-5.0.1" + sources."trim-newlines-4.0.2" + sources."type-fest-1.4.0" sources."validate-npm-package-license-3.0.4" - sources."wrappy-1.0.2" - sources."yargs-parser-18.1.3" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.9" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -86004,7 +87494,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -86035,7 +87525,7 @@ in sources."debug-3.2.7" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -86062,7 +87552,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" (sources."inquirer-3.3.0" // { @@ -86091,7 +87581,7 @@ in sources."minimist-1.2.5" sources."ms-2.1.3" sources."mute-stream-0.0.7" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."object-assign-4.1.1" sources."object-inspect-1.12.0" sources."object-keys-1.1.1" @@ -86177,7 +87667,7 @@ in sources."debug-2.6.9" sources."duplexer2-0.0.2" sources."envinfo-7.8.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" @@ -86300,7 +87790,7 @@ in sources."@cspell/dict-dart-1.1.0" sources."@cspell/dict-django-2.0.0" sources."@cspell/dict-dotnet-2.0.0" - sources."@cspell/dict-elixir-2.0.0" + sources."@cspell/dict-elixir-2.0.1" sources."@cspell/dict-en-gb-1.1.33" sources."@cspell/dict-en_us-2.1.7" sources."@cspell/dict-filetypes-2.0.1" @@ -86321,10 +87811,10 @@ in sources."@cspell/dict-public-licenses-1.0.4" sources."@cspell/dict-python-2.0.6" sources."@cspell/dict-r-1.0.2" - sources."@cspell/dict-ruby-2.0.0" + sources."@cspell/dict-ruby-2.0.1" sources."@cspell/dict-rust-2.0.0" sources."@cspell/dict-scala-2.0.0" - sources."@cspell/dict-software-terms-2.1.1" + sources."@cspell/dict-software-terms-2.1.3" sources."@cspell/dict-swift-1.0.2" sources."@cspell/dict-typescript-2.0.0" sources."@cspell/dict-vue-2.0.2" @@ -86363,7 +87853,7 @@ in sources."find-up-5.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.5" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."gensequence-3.1.1" sources."get-stdin-8.0.0" @@ -86704,7 +88194,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -87121,7 +88611,7 @@ in sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" @@ -87131,7 +88621,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -87149,7 +88639,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -87220,7 +88710,7 @@ in sources."@babel/template-7.16.7" sources."@babel/traverse-7.17.3" sources."@babel/types-7.17.0" - sources."@blueprintjs/colors-4.0.0-beta.3" + sources."@blueprintjs/colors-4.0.0-rc.0" sources."@blueprintjs/core-3.53.0" sources."@blueprintjs/icons-3.32.0" sources."@deltachat/message_parser_wasm-0.1.0" @@ -87250,11 +88740,12 @@ in sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" + sources."@types/minimist-1.2.2" sources."@types/node-14.18.12" sources."@types/node-fetch-2.6.1" sources."@types/prop-types-15.7.4" - sources."@types/rc-1.2.0" - sources."@types/react-16.14.23" + sources."@types/rc-1.2.1" + sources."@types/react-16.14.24" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" sources."@types/react-window-infinite-loader-1.0.6" @@ -87296,7 +88787,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -87307,7 +88798,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -87356,7 +88847,7 @@ in sources."core-util-is-1.0.3" sources."crypto-random-string-1.0.0" sources."csscolorparser-1.0.3" - sources."csstype-3.0.10" + sources."csstype-3.0.11" sources."debounce-1.2.1" sources."debug-4.3.3" sources."decode-uri-component-0.2.0" @@ -87374,7 +88865,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.6.9" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -87471,7 +88962,7 @@ in sources."gud-1.0.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -87654,7 +89145,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.49.8" // { + (sources."sass-1.49.9" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -87767,7 +89258,7 @@ in sources."type-fest-0.3.1" sources."typed-styles-0.0.7" sources."typedarray-0.0.6" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" @@ -87787,7 +89278,7 @@ in }) sources."upath-1.2.0" sources."urix-0.1.0" - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" sources."url-parse-lax-3.0.0" sources."use-3.1.1" sources."use-debounce-3.4.3" @@ -87928,11 +89419,11 @@ in sources."dockerfile-ast-0.4.2" sources."dockerfile-language-service-0.8.1" sources."dockerfile-utils-0.9.4" - sources."vscode-jsonrpc-8.0.0-next.6" - sources."vscode-languageserver-8.0.0-next.8" - (sources."vscode-languageserver-protocol-3.17.0-next.14" // { + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.9" + (sources."vscode-languageserver-protocol-3.17.0-next.15" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.7" + sources."vscode-languageserver-types-3.17.0-next.8" ]; }) sources."vscode-languageserver-textdocument-1.0.4" @@ -87951,10 +89442,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.80.1"; + version = "6.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.80.1.tgz"; - sha512 = "s3E6aSo3DLkdrjuB4WhMDTzezvj/aLd+SBBQZMoZAX87u/2s/DnGjl9JLBJzhc+9zrhKAezYwu6d2p5lLF8WDQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.81.0.tgz"; + sha512 = "1arvWQ1t2RILTEa90GW3LAMkAEO5Vjw7i8+pFHs7tbFu16XclvTfEFoD2a9/YiB7CwZQPSGQKZy1XUEYqI21tg=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -87966,7 +89457,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.920.0" + sources."aws-sdk-2.1085.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -87979,7 +89470,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."delay-4.4.1" + sources."delay-5.0.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."eventemitter3-4.0.7" @@ -88008,7 +89499,7 @@ in sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."jmespath-0.15.0" + sources."jmespath-0.16.0" sources."jsbn-0.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" @@ -88045,7 +89536,7 @@ in ]; }) sources."request-2.88.2" - sources."requestretry-4.1.2" + sources."requestretry-7.0.2" sources."s3-stream-upload-2.0.2" sources."s3signed-0.1.0" sources."s3urls-1.5.2" @@ -88080,7 +89571,6 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" - sources."when-3.7.8" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" ]; @@ -88154,7 +89644,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" @@ -88162,12 +89652,12 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -88335,7 +89825,7 @@ in }) sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -88348,7 +89838,7 @@ in sources."universalify-0.1.2" ]; }) - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" (sources."get-package-info-1.0.0" // { @@ -88392,7 +89882,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-core-module-2.8.1" @@ -88562,7 +90052,7 @@ in sources."roarr-2.15.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -88650,7 +90140,7 @@ in sources."yallist-4.0.0" (sources."yargs-17.3.1" // { dependencies = [ - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -88724,7 +90214,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -88763,13 +90253,13 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."caller-callsite-4.1.0" sources."caller-path-3.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -88798,7 +90288,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -88924,7 +90414,7 @@ in sources."punycode-2.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.23.0" + sources."react-devtools-core-4.24.0" sources."react-is-16.13.1" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { @@ -89026,31 +90516,60 @@ in reconstructLock = true; }; "epgstation-../../applications/video/epgstation" = nodeEnv.buildNodePackage { - name = "EPGStation"; - packageName = "EPGStation"; - version = "1.7.5"; + name = "epgstation"; + packageName = "epgstation"; + version = "2.6.20"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.16.7" + sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.16.7" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) - sources."@fluentui/date-time-utilities-7.9.1" - sources."@fluentui/dom-utilities-1.1.2" - sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.183.1" - sources."@fluentui/react-focus-7.18.2" - sources."@fluentui/react-window-provider-1.0.2" - sources."@fluentui/theme-1.7.4" - sources."@gar/promisify-1.1.3" - (sources."@gulp-sourcemaps/identity-map-1.0.2" // { + (sources."@chinachu/aribts-1.3.5-mirakurun.17" // { dependencies = [ - sources."normalize-path-2.1.1" + sources."iconv-lite-0.6.3" + ]; + }) + sources."@cspotcode/source-map-consumer-0.8.0" + sources."@cspotcode/source-map-support-0.7.0" + (sources."@eslint/eslintrc-0.4.3" // { + dependencies = [ + sources."ajv-6.12.6" + sources."debug-4.3.3" + sources."ignore-4.0.6" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."ms-2.1.2" + sources."strip-json-comments-3.1.1" + ]; + }) + sources."@fluentui/date-time-utilities-8.4.0" + sources."@fluentui/dom-utilities-2.2.0" + sources."@fluentui/font-icons-mdl2-8.2.4" + sources."@fluentui/foundation-legacy-8.2.4" + sources."@fluentui/keyboard-key-0.4.0" + sources."@fluentui/merge-styles-8.5.0" + sources."@fluentui/react-8.60.3" + sources."@fluentui/react-focus-8.5.4" + sources."@fluentui/react-hooks-8.5.2" + sources."@fluentui/react-window-provider-2.2.0" + sources."@fluentui/set-version-8.2.0" + sources."@fluentui/style-utilities-8.6.4" + sources."@fluentui/theme-2.6.3" + sources."@fluentui/utilities-8.8.0" + (sources."@gulp-sourcemaps/identity-map-2.0.1" // { + dependencies = [ + sources."acorn-6.4.2" + sources."inherits-2.0.4" + sources."through2-3.0.2" ]; }) (sources."@gulp-sourcemaps/map-sources-1.0.0" // { @@ -89058,99 +90577,111 @@ in sources."normalize-path-2.1.1" ]; }) + (sources."@humanwhocodes/config-array-0.5.0" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@humanwhocodes/object-schema-1.2.1" sources."@microsoft/load-themed-styles-1.10.247" + sources."@node-rs/crc32-1.5.0" + sources."@node-rs/crc32-android-arm-eabi-1.5.0" + sources."@node-rs/crc32-android-arm64-1.5.0" + sources."@node-rs/crc32-darwin-arm64-1.5.0" + sources."@node-rs/crc32-darwin-x64-1.5.0" + sources."@node-rs/crc32-freebsd-x64-1.5.0" + sources."@node-rs/crc32-linux-arm-gnueabihf-1.5.0" + sources."@node-rs/crc32-linux-arm64-gnu-1.5.0" + sources."@node-rs/crc32-linux-arm64-musl-1.5.0" + sources."@node-rs/crc32-linux-x64-gnu-1.5.0" + sources."@node-rs/crc32-linux-x64-musl-1.5.0" + sources."@node-rs/crc32-win32-arm64-msvc-1.5.0" + sources."@node-rs/crc32-win32-ia32-msvc-1.5.0" + sources."@node-rs/crc32-win32-x64-msvc-1.5.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-1.1.1" - (sources."@npmcli/move-file-1.1.2" // { - dependencies = [ - sources."rimraf-3.0.2" - ]; - }) sources."@sindresorhus/is-0.14.0" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@sqltools/formatter-1.2.3" sources."@szmarczak/http-timer-1.1.2" - sources."@types/basic-auth-1.1.3" - sources."@types/body-parser-1.19.0" - sources."@types/caseless-0.12.2" - sources."@types/chart.js-2.9.24" + sources."@tokenizer/token-0.3.0" + sources."@tsconfig/node10-1.0.8" + sources."@tsconfig/node12-1.0.9" + sources."@tsconfig/node14-1.0.1" + sources."@tsconfig/node16-1.0.2" + sources."@types/body-parser-1.19.1" + sources."@types/component-emitter-1.2.11" sources."@types/connect-3.4.35" - sources."@types/engine.io-3.1.7" - sources."@types/express-4.17.8" + sources."@types/cookie-0.4.1" + sources."@types/cors-2.8.12" + sources."@types/express-4.17.13" sources."@types/express-serve-static-core-4.17.28" - sources."@types/fancy-log-1.3.0" - sources."@types/glob-7.2.0" - sources."@types/hls.js-0.13.1" - sources."@types/js-yaml-3.12.5" + sources."@types/file-type-10.9.1" + sources."@types/js-yaml-4.0.4" sources."@types/json-schema-7.0.9" - sources."@types/lodash-4.14.161" - sources."@types/material-design-lite-1.1.16" + sources."@types/lodash-4.14.176" sources."@types/mime-1.3.2" - sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.0" - sources."@types/mithril-2.0.3" - sources."@types/mkdirp-1.0.1" - sources."@types/multer-1.4.4" - sources."@types/mysql-2.15.15" - sources."@types/node-14.11.1" - sources."@types/pg-7.14.5" - sources."@types/pg-types-2.2.0" + sources."@types/minimist-1.2.2" + sources."@types/mkdirp-1.0.2" + sources."@types/mongodb-4.0.6" + sources."@types/multer-1.4.7" + sources."@types/node-16.11.6" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - (sources."@types/request-2.48.5" // { + sources."@types/serve-static-1.13.10" + sources."@types/socket.io-3.0.1" + sources."@types/source-map-support-0.5.4" + sources."@types/sqlite3-3.1.7" + sources."@types/url-join-4.0.1" + sources."@types/uuid-3.4.10" + sources."@types/webidl-conversions-6.1.1" + sources."@types/whatwg-url-8.2.1" + sources."@types/ws-6.0.4" + (sources."@typescript-eslint/eslint-plugin-4.33.0" // { dependencies = [ - sources."form-data-2.5.1" + sources."debug-4.3.3" + sources."ms-2.1.2" ]; }) - sources."@types/serve-static-1.13.10" - sources."@types/socket.io-2.1.11" - sources."@types/socket.io-client-1.4.33" - sources."@types/sqlite3-3.1.6" - sources."@types/tough-cookie-4.0.1" - sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.10.1" - sources."@uifabric/icons-7.6.2" - sources."@uifabric/merge-styles-7.19.2" - sources."@uifabric/react-hooks-7.14.0" - sources."@uifabric/set-version-7.0.24" - sources."@uifabric/styling-7.20.0" - sources."@uifabric/utilities-7.33.5" - 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."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" + sources."@typescript-eslint/experimental-utils-4.33.0" + (sources."@typescript-eslint/parser-4.33.0" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + (sources."@typescript-eslint/typescript-estree-4.33.0" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/visitor-keys-4.33.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-5.7.4" - sources."after-0.8.2" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.2" + sources."acorn-walk-8.2.0" sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" - sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.2" - sources."ansi-colors-1.1.0" + sources."ajv-8.10.0" + sources."ajv-formats-2.1.1" + sources."ansi-colors-4.1.1" sources."ansi-cyan-0.1.1" - sources."ansi-escapes-1.4.0" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) sources."ansi-gray-0.1.1" sources."ansi-red-0.1.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-styles-4.3.0" sources."ansi-wrap-0.1.0" + sources."any-promise-1.3.0" (sources."anymatch-2.0.0" // { dependencies = [ (sources."braces-2.3.2" // { @@ -89173,6 +90704,7 @@ in sources."to-regex-range-2.1.1" ]; }) + sources."app-root-path-3.0.0" sources."append-buffer-1.0.2" sources."append-field-1.0.0" sources."aproba-1.2.0" @@ -89184,7 +90716,10 @@ in sources."string_decoder-1.1.1" ]; }) + sources."arg-4.1.3" sources."argparse-1.0.10" + sources."arib-mpeg2ts-parser-3.0.13" + sources."arib-subtitle-timedmetadater-4.0.9" sources."aribts-2.1.12" sources."arr-diff-4.0.0" sources."arr-filter-1.1.2" @@ -89211,37 +90746,19 @@ in }) sources."array-union-2.1.0" sources."array-unique-0.3.2" - sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.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."assert-plus-1.0.0" 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-limiter-1.0.1" sources."async-settle-1.0.0" sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."b24.js-1.0.3" - sources."babel-polyfill-6.23.0" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) + sources."axios-0.24.0" sources."bach-1.2.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" @@ -89250,42 +90767,23 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-arraybuffer-0.1.4" sources."base64-js-1.5.1" sources."base64id-2.0.0" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" - sources."better-assert-1.0.2" - sources."big.js-5.2.2" + sources."big-integer-1.6.51" sources."bignumber.js-9.0.0" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."blob-0.0.5" sources."block-stream-0.0.9" - sources."bluebird-3.7.2" - sources."bn.js-5.2.0" sources."body-parser-1.19.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."inherits-2.0.4" - sources."safe-buffer-5.2.1" - ]; - }) - sources."browserify-zlib-0.2.0" + sources."bson-4.6.1" sources."buffer-5.7.1" sources."buffer-equal-1.0.0" sources."buffer-from-1.1.2" - sources."buffer-writer-2.0.0" - sources."buffer-xor-1.0.3" - sources."builtin-modules-1.1.1" - sources."builtin-status-codes-3.0.0" + sources."bufferutil-4.0.6" (sources."busboy-0.2.14" // { dependencies = [ sources."readable-stream-1.1.14" @@ -89293,17 +90791,6 @@ in ]; }) sources."bytes-3.1.0" - (sources."cacache-15.3.0" // { - dependencies = [ - sources."chownr-2.0.0" - sources."fs-minipass-2.1.0" - sources."minipass-3.1.6" - sources."minizlib-2.1.2" - sources."p-map-4.0.0" - sources."rimraf-3.0.2" - sources."tar-6.1.11" - ]; - }) sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -89312,14 +90799,11 @@ in ]; }) sources."call-bind-1.0.2" - sources."callsite-1.0.0" + sources."callsites-3.1.0" sources."camelcase-3.0.0" sources."caseless-0.12.0" - sources."chalk-1.1.3" - sources."chardet-0.4.2" - sources."chart.js-2.9.3" - sources."chartjs-color-2.4.1" - sources."chartjs-color-string-0.6.0" + sources."chalk-4.1.2" + sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { dependencies = [ sources."braces-2.3.2" @@ -89336,8 +90820,6 @@ in ]; }) sources."chownr-1.1.4" - sources."chrome-trace-event-1.0.3" - sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -89355,14 +90837,24 @@ in sources."kind-of-5.1.0" ]; }) - sources."clean-css-4.2.3" sources."clean-stack-2.2.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - (sources."cliui-3.2.0" // { + sources."cli-cursor-3.1.0" + (sources."cli-highlight-2.1.11" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."yargs-16.2.0" + ]; + }) + sources."cli-width-3.0.0" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."clone-2.1.2" @@ -89379,16 +90871,12 @@ in sources."code-point-at-1.1.0" sources."collection-map-1.0.0" sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."color-support-1.1.3" - sources."colors-1.4.0" sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."commondir-1.0.1" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."component-inherit-0.0.3" + sources."commander-7.2.0" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ @@ -89397,40 +90885,33 @@ in sources."string_decoder-1.1.1" ]; }) - sources."concat-with-sourcemaps-1.1.0" - sources."console-browserify-1.2.0" sources."console-control-strings-1.1.0" - sources."constants-browserify-1.0.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."convert-source-map-1.8.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) sources."copy-descriptor-0.1.1" (sources."copy-props-2.0.5" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."core-js-2.6.12" sources."core-util-is-1.0.3" + sources."cors-2.8.5" sources."crc-3.8.0" - (sources."create-ecdh-4.0.4" // { + sources."create-require-1.1.1" + (sources."cross-spawn-7.0.3" // { dependencies = [ - sources."bn.js-4.12.0" + sources."which-2.0.2" + ]; + }) + (sources."css-3.0.0" // { + dependencies = [ + sources."inherits-2.0.4" + sources."source-map-resolve-0.6.0" ]; }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."crypto-browserify-3.12.0" - sources."css-2.2.4" - sources."css-ripple-effect-1.0.5" - sources."cyclist-1.0.1" sources."d-1.0.1" sources."dashdash-1.14.1" sources."date-format-3.0.0" @@ -89445,6 +90926,7 @@ in sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."deep-is-0.1.4" (sources."default-compare-1.0.0" // { dependencies = [ sources."kind-of-5.1.0" @@ -89454,15 +90936,15 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" - (sources."del-5.1.0" // { + (sources."del-6.0.0" // { dependencies = [ sources."rimraf-3.0.2" ]; }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."denque-2.0.1" sources."depd-1.1.2" - sources."des.js-1.0.1" sources."destroy-1.0.4" sources."detect-file-1.0.0" sources."detect-libc-1.0.3" @@ -89474,15 +90956,10 @@ in ]; }) sources."diff-4.0.2" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."difunc-0.0.4" sources."dir-glob-3.0.1" - sources."diskusage-1.1.3" - sources."domain-browser-1.2.0" + sources."diskusage-ng-1.0.2" + sources."doctrine-3.0.0" sources."dotenv-8.6.0" sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { @@ -89495,60 +90972,73 @@ in sources."each-props-1.3.2" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - sources."inherits-2.0.4" - ]; - }) - sources."emojis-list-3.0.0" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.2" // { - dependencies = [ - sources."cookie-0.3.1" - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - }) - (sources."engine.io-client-3.4.4" // { + (sources."engine.io-6.0.1" // { dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."ws-6.1.4" + sources."cookie-0.4.2" + sources."debug-4.3.3" + sources."ms-2.1.2" + sources."ws-8.2.3" ]; }) - sources."engine.io-parser-2.2.1" - sources."enhanced-resolve-4.5.0" - sources."errno-0.1.8" + sources."engine.io-parser-5.0.3" + sources."enhanced-resolve-5.9.2" + sources."enquirer-2.3.6" sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" - sources."es6-promise-4.2.8" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.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-7.32.0" // { + dependencies = [ + sources."ajv-6.12.6" + sources."ansi-regex-5.0.1" + sources."debug-4.3.3" + sources."escape-string-regexp-4.0.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."ignore-4.0.6" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."ms-2.1.2" + sources."strip-ansi-6.0.1" + sources."strip-json-comments-3.1.1" + ]; + }) + sources."eslint-config-prettier-8.3.0" + sources."eslint-plugin-prettier-3.4.1" + sources."eslint-scope-5.1.1" + sources."eslint-utils-3.0.0" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) (sources."esrecurse-4.3.0" // { dependencies = [ sources."estraverse-5.3.0" ]; }) sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-emitter-0.3.5" sources."eventemitter3-2.0.3" - sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -89570,7 +91060,7 @@ in sources."expand-tilde-2.0.2" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-7.0.1" + sources."express-openapi-9.3.0" (sources."ext-1.6.0" // { dependencies = [ sources."type-2.6.0" @@ -89582,7 +91072,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-2.2.0" + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -89592,16 +91082,18 @@ in sources."extsprintf-1.3.0" sources."fancy-log-1.3.3" sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" - sources."figgy-pudding-3.5.2" - sources."figures-2.0.0" + sources."figlet-1.5.2" + sources."figures-3.2.0" + sources."file-entry-cache-6.0.1" + sources."file-type-16.5.3" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."find-cache-dir-3.3.2" sources."find-up-1.1.2" (sources."findup-sync-3.0.0" // { dependencies = [ @@ -89616,6 +91108,12 @@ in }) sources."fined-1.2.0" sources."flagged-respawn-1.0.1" + (sources."flat-cache-3.0.4" // { + dependencies = [ + sources."flatted-3.2.5" + sources."rimraf-3.0.2" + ]; + }) sources."flatted-2.0.2" (sources."flush-write-stream-1.1.1" // { dependencies = [ @@ -89624,6 +91122,7 @@ in sources."string_decoder-1.1.1" ]; }) + sources."follow-redirects-1.14.9" sources."for-in-1.0.2" sources."for-own-1.0.0" sources."forever-agent-0.6.1" @@ -89631,24 +91130,10 @@ in sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - (sources."from2-2.3.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."fs-extra-9.0.1" + sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs-mkdirp-stream-1.0.0" - sources."fs-routes-7.0.1" - (sources."fs-write-stream-atomic-1.0.10" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."fs-routes-9.0.3" sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" (sources."fstream-1.0.12" // { @@ -89657,13 +91142,9 @@ in ]; }) sources."function-bind-1.1.1" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) - sources."get-caller-file-1.0.3" + sources."functional-red-black-tree-1.0.1" + sources."gauge-2.7.4" + sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -89682,39 +91163,90 @@ in sources."glob-watcher-5.0.5" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" - sources."globby-10.0.2" + sources."globals-13.12.1" + sources."globby-11.1.0" sources."glogg-1.0.2" sources."got-9.6.0" sources."graceful-fs-4.2.9" sources."gulp-4.0.2" - (sources."gulp-clean-css-4.3.0" // { + (sources."gulp-cli-2.3.0" // { dependencies = [ - sources."through2-3.0.1" + sources."ansi-colors-1.1.0" + sources."cliui-3.2.0" + sources."get-caller-file-1.0.3" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.2" + sources."yargs-7.1.2" + sources."yargs-parser-5.0.1" ]; }) - sources."gulp-cli-2.3.0" - sources."gulp-concat-2.6.1" - (sources."gulp-dart-sass-1.0.2" // { + (sources."gulp-eslint-6.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ajv-6.12.6" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" + sources."astral-regex-1.0.0" sources."chalk-2.4.2" - sources."strip-ansi-4.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."debug-4.3.3" + sources."emoji-regex-7.0.3" + sources."eslint-6.8.0" + sources."eslint-utils-1.4.3" + sources."eslint-visitor-keys-1.3.0" + sources."espree-6.2.1" + sources."file-entry-cache-5.0.1" + sources."flat-cache-2.0.1" + sources."globals-12.4.0" + sources."has-flag-3.0.0" + sources."ignore-4.0.6" + sources."is-fullwidth-code-point-2.0.0" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."levn-0.3.0" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."optionator-0.8.3" + sources."path-key-2.0.1" + sources."prelude-ls-1.1.2" + sources."regexpp-2.0.1" + sources."rimraf-2.6.3" + sources."semver-6.3.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."slice-ansi-2.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" + sources."table-5.4.6" + sources."type-check-0.3.2" + sources."type-fest-0.8.1" ]; }) (sources."gulp-plumber-1.2.1" // { dependencies = [ + sources."ansi-styles-2.2.1" sources."arr-diff-1.1.0" sources."arr-union-2.1.0" sources."array-slice-0.2.3" + sources."chalk-1.1.3" sources."extend-shallow-1.1.4" sources."kind-of-1.1.0" sources."plugin-error-0.1.2" + sources."supports-color-2.0.0" + ]; + }) + (sources."gulp-sourcemaps-3.0.0" // { + dependencies = [ + sources."acorn-6.4.2" ]; }) - sources."gulp-sourcemaps-2.6.5" - sources."gulp-tslint-8.1.4" (sources."gulp-typescript-5.0.1" // { dependencies = [ sources."ansi-colors-3.2.4" @@ -89725,17 +91257,16 @@ in }) sources."gulplog-1.0.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-1.0.3" - sources."has-ansi-2.0.0" - (sources."has-binary2-1.0.3" // { + (sources."har-validator-5.1.5" // { dependencies = [ - sources."isarray-2.0.1" + sources."ajv-6.12.6" + sources."json-schema-traverse-0.4.1" ]; }) - sources."has-cors-1.1.0" - sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -89748,42 +91279,35 @@ in sources."kind-of-4.0.0" ]; }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."inherits-2.0.4" - sources."safe-buffer-5.2.1" - ]; - }) - sources."hash.js-1.1.7" - (sources."hls-b24.js-0.12.3" // { - dependencies = [ - sources."eventemitter3-3.1.0" - ]; - }) - sources."hmac-drbg-1.0.1" + 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-errors-1.7.2" sources."http-signature-1.2.0" - sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."iferr-0.1.5" sources."ignore-5.2.0" sources."ignore-walk-3.0.4" - sources."immutable-4.0.0" + sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."indexof-0.0.1" - sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.8" - sources."inquirer-3.0.6" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."interpret-1.4.0" + sources."inversify-5.1.1" sources."invert-kv-1.0.0" sources."ip-1.1.5" + sources."ip-num-1.3.4" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" @@ -89796,7 +91320,7 @@ in sources."is-dir-1.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.3" sources."is-negated-glob-1.0.0" sources."is-number-7.0.0" @@ -89805,36 +91329,32 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-relative-1.0.0" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" + sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" - (sources."jest-worker-26.6.2" // { + sources."js-tokens-4.0.0" + (sources."js-yaml-4.1.0" // { dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."argparse-2.0.1" ]; }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-1.0.1" - (sources."jsonfile-6.1.0" // { + sources."jsonfile-4.0.0" + (sources."jsonrpc2-ws-1.0.0-beta9" // { dependencies = [ - sources."universalify-2.0.0" + sources."eventemitter3-3.1.2" ]; }) sources."jsprim-1.4.2" @@ -89852,16 +91372,12 @@ in }) sources."lcid-1.0.0" sources."lead-1.0.0" + sources."levn-0.4.1" sources."liftoff-3.1.0" sources."load-json-file-1.1.0" - sources."loader-runner-2.4.0" - sources."loader-utils-1.4.0" - sources."locate-path-5.0.0" - sources."lodash-4.17.20" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" + sources."lodash-4.17.21" sources."lodash.merge-4.6.2" - sources."lodash.some-4.6.0" + sources."lodash.truncate-4.4.2" (sources."log4js-6.3.0" // { dependencies = [ sources."debug-4.3.3" @@ -89872,14 +91388,9 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."make-error-1.3.6" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" - sources."map-stream-0.0.7" sources."map-visit-1.0.0" (sources."matchdep-2.0.0" // { dependencies = [ @@ -89894,39 +91405,18 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."material-design-icons-3.0.1" - sources."material-design-lite-1.3.0" - sources."md5.js-1.3.5" sources."media-typer-0.3.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) - (sources."memory-fs-0.5.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."memoizee-0.4.15" + sources."memory-pager-1.5.0" sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" sources."micromatch-4.0.4" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."mime-1.6.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { @@ -89934,75 +91424,84 @@ in sources."yallist-3.1.1" ]; }) - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) sources."minizlib-1.3.3" - (sources."mirakurun-3.3.1" // { + (sources."mirakurun-3.9.0-beta.26" // { dependencies = [ - sources."aribts-1.3.5" + sources."ajv-6.12.6" sources."eventemitter3-4.0.7" - sources."express-openapi-6.0.0" - sources."fs-routes-2.0.0" - sources."openapi-default-setter-2.1.0" - sources."openapi-framework-0.26.0" - sources."openapi-jsonschema-parameters-1.2.0" - sources."openapi-request-coercer-2.4.0" - sources."openapi-request-validator-4.2.0" - sources."openapi-response-validator-4.0.0" - (sources."openapi-schema-validator-3.0.3" // { + (sources."express-openapi-8.0.0" // { dependencies = [ - sources."openapi-types-1.3.4" + sources."openapi-types-8.0.0" ]; }) - (sources."openapi-security-handler-2.0.4" // { + sources."fs-routes-8.0.0" + sources."json-schema-traverse-0.4.1" + (sources."openapi-default-setter-8.0.0" // { dependencies = [ - sources."openapi-types-1.3.4" + sources."openapi-types-8.0.0" ]; }) - sources."openapi-types-1.3.5" + (sources."openapi-framework-8.0.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-jsonschema-parameters-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-coercer-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-response-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-schema-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-security-handler-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + sources."openapi-types-7.2.3" + sources."swagger-ui-dist-4.6.2" ]; }) - sources."mississippi-3.0.0" - sources."mithril-2.0.4" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) sources."mkdirp-1.0.4" - sources."moment-2.29.1" + sources."mongodb-4.4.1" + sources."mongodb-connection-string-url-2.5.2" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" ]; }) - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) sources."ms-2.0.0" - (sources."multer-1.4.2" // { + (sources."multer-1.4.3" // { dependencies = [ sources."mkdirp-0.5.5" ]; }) - sources."munin-plugin-0.0.9" sources."mute-stdout-1.0.1" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" (sources."mysql-2.18.1" // { dependencies = [ sources."isarray-1.0.0" @@ -90010,8 +91509,10 @@ in sources."string_decoder-1.1.1" ]; }) + sources."mz-2.7.0" sources."nan-2.15.0" sources."nanomatch-1.2.13" + sources."natural-compare-1.4.0" (sources."needle-2.9.1" // { dependencies = [ sources."debug-3.2.7" @@ -90019,10 +91520,9 @@ in ]; }) sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."next-tick-1.0.0" - sources."node-addon-api-2.0.0" - sources."node-fetch-1.6.3" + sources."next-tick-1.1.0" + sources."nice-try-1.0.5" + sources."node-addon-api-3.2.1" (sources."node-gyp-3.8.0" // { dependencies = [ sources."mkdirp-0.5.5" @@ -90031,19 +91531,7 @@ in sources."tar-2.2.2" ]; }) - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."buffer-4.9.2" - sources."isarray-1.0.0" - sources."punycode-1.4.1" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-http-2.8.3" - ]; - }) + sources."node-gyp-build-4.3.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."mkdirp-0.5.5" @@ -90066,7 +91554,6 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-component-0.0.3" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -90087,59 +91574,53 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.183.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-2.0.1" - (sources."openapi-default-setter-7.2.3" // { + sources."onetime-5.1.2" + (sources."openapi-default-setter-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-framework-7.5.0" // { + (sources."openapi-framework-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" - ]; - }) - (sources."openapi-jsonschema-parameters-7.2.3" // { - dependencies = [ - sources."openapi-types-7.2.3" + sources."js-yaml-3.14.1" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-request-coercer-7.5.0" // { + (sources."openapi-jsonschema-parameters-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-request-validator-7.4.0" // { + (sources."openapi-request-coercer-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-response-validator-7.4.0" // { + (sources."openapi-request-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-schema-validator-7.2.3" // { + (sources."openapi-response-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-security-handler-7.2.3" // { + (sources."openapi-schema-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - sources."openapi-types-7.0.1" - (sources."opencollective-1.0.3" // { + (sources."openapi-security-handler-9.3.1" // { dependencies = [ - sources."minimist-1.2.0" + sources."openapi-types-9.3.1" ]; }) - sources."opencollective-postinstall-2.0.3" - sources."opn-4.0.2" + sources."openapi-types-9.3.0" + sources."optionator-0.9.1" (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."isarray-1.0.0" @@ -90147,96 +91628,64 @@ in sources."string_decoder-1.1.1" ]; }) - sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" - sources."p-limit-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."p-map-3.0.0" - sources."p-try-2.2.0" + sources."p-map-4.0.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."packet-reader-1.0.0" - sources."pako-1.0.11" - (sources."parallel-transform-1.2.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."parse-asn1-5.1.6" + sources."parent-module-1.0.1" + sources."parent-require-1.0.0" sources."parse-filepath-1.0.2" sources."parse-json-2.2.0" sources."parse-node-version-1.0.1" sources."parse-passwd-1.0.0" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) sources."parseurl-1.3.3" sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."pbkdf2-3.1.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - (sources."pg-8.3.3" // { - dependencies = [ - sources."semver-4.3.2" - ]; - }) - sources."pg-connection-string-2.5.0" - sources."pg-int8-1.0.1" - sources."pg-pool-3.5.1" - sources."pg-protocol-1.5.0" - sources."pg-types-2.2.0" - sources."pgpass-1.0.5" + sources."picocolors-0.2.1" sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pkg-dir-4.2.0" // { + (sources."plugin-error-1.0.1" // { dependencies = [ - sources."find-up-4.1.0" - sources."path-exists-4.0.0" + sources."ansi-colors-1.1.0" ]; }) - sources."plugin-error-1.0.1" sources."posix-character-classes-0.1.1" - sources."postgres-array-2.0.0" - sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.7" - sources."postgres-interval-1.2.0" + sources."postcss-7.0.39" + sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" + sources."prettier-2.4.1" + sources."prettier-linter-helpers-1.0.0" sources."pretty-hrtime-1.0.3" - sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."promise-inflight-1.0.1" + sources."progress-2.0.3" sources."promise-queue-2.2.5" - sources."prop-types-15.8.1" sources."proxy-addr-2.0.7" - sources."prr-1.0.1" sources."psl-1.8.0" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -90245,17 +91694,12 @@ in }) sources."punycode-2.1.1" sources."qs-6.7.0" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."queue-microtask-1.2.3" - 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-16.14.0" - sources."react-dom-16.14.0" - sources."react-is-16.13.1" + sources."react-17.0.2" + sources."react-dom-17.0.2" (sources."read-pkg-1.1.0" // { dependencies = [ sources."path-type-1.1.0" @@ -90263,6 +91707,7 @@ in }) sources."read-pkg-up-1.0.1" sources."readable-stream-3.6.0" + sources."readable-web-to-node-stream-3.0.2" (sources."readdirp-2.2.1" // { dependencies = [ sources."braces-2.3.2" @@ -90278,8 +91723,9 @@ in ]; }) sources."rechoir-0.6.2" - sources."regenerator-runtime-0.10.5" + sources."reflect-metadata-0.1.13" sources."regex-not-1.0.2" + sources."regexpp-3.2.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remove-bom-buffer-3.0.0" @@ -90295,38 +91741,32 @@ in ]; }) sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."resolve-1.22.0" sources."resolve-dir-1.0.1" + sources."resolve-from-4.0.0" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-2.7.1" - sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."run-queue-1.0.3" - sources."rx-4.1.0" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - (sources."sass-1.49.8" // { + (sources."rxjs-6.6.7" // { dependencies = [ - sources."anymatch-3.1.2" - sources."binary-extensions-2.2.0" - sources."chokidar-3.5.3" - sources."fsevents-2.3.2" - sources."is-binary-path-2.1.0" - sources."readdirp-3.6.0" + sources."tslib-1.14.1" ]; }) + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."saslprep-1.0.3" sources."sax-1.2.4" - sources."scheduler-0.19.1" - sources."schema-utils-2.7.1" + sources."scheduler-0.20.2" sources."semver-7.3.5" sources."semver-greatest-satisfied-range-1.1.0" (sources."send-0.17.1" // { @@ -90334,7 +91774,6 @@ in sources."ms-2.1.1" ]; }) - sources."serialize-javascript-5.0.1" sources."serve-static-1.14.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -90342,12 +91781,19 @@ in 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-2.0.0" + sources."shebang-regex-3.0.0" sources."sift-7.0.1" sources."signal-exit-3.0.7" sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."is-fullwidth-code-point-3.0.0" + ]; + }) + sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -90377,57 +91823,35 @@ in sources."kind-of-3.2.2" ]; }) - (sources."socket.io-2.3.0" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - }) - sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.3.0" // { + (sources."socket.io-4.3.1" // { dependencies = [ - sources."base64-arraybuffer-0.1.5" - sources."debug-4.1.1" - sources."isarray-2.0.1" - sources."ms-2.1.3" - (sources."socket.io-parser-3.3.2" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."debug-4.3.3" + sources."ms-2.1.2" ]; }) - (sources."socket.io-parser-3.4.1" // { + sources."socket.io-adapter-2.3.3" + (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."debug-4.1.1" - sources."isarray-2.0.1" - sources."ms-2.1.3" + sources."debug-4.3.3" + sources."ms-2.1.2" ]; }) - sources."source-list-map-2.0.1" + sources."socks-2.6.2" sources."source-map-0.6.1" - sources."source-map-js-1.0.2" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.21" + sources."source-map-support-0.5.20" sources."source-map-url-0.4.1" sources."sparkles-1.0.1" + sources."sparse-bitfield-3.0.3" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" - sources."split2-4.1.0" sources."sprintf-js-1.0.3" - sources."sqlite3-5.0.0" + sources."sqlite3-5.0.2" sources."sqlstring-2.3.1" sources."sshpk-1.17.0" - (sources."ssri-8.0.1" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ @@ -90447,38 +91871,17 @@ in ]; }) sources."statuses-1.5.0" - (sources."stream-browserify-2.0.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-each-1.2.3" sources."stream-exhaust-1.0.2" - (sources."stream-http-3.2.0" // { - dependencies = [ - sources."inherits-2.0.4" - ]; - }) sources."stream-shift-1.0.1" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" sources."debug-4.3.3" - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" sources."ms-2.1.2" - sources."universalify-0.1.2" ]; }) sources."streamsearch-0.1.2" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-1.0.2" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -90488,13 +91891,22 @@ in sources."strip-bom-2.0.0" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" + sources."strtok3-6.3.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."sver-compat-1.5.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.34.0" + sources."swagger-ui-dist-3.52.5" + (sources."table-6.8.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."tail-2.2.4" - sources."tapable-1.1.3" + sources."tapable-2.2.1" (sources."tar-4.4.19" // { dependencies = [ sources."mkdirp-0.5.5" @@ -90502,12 +91914,9 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.10.0" // { - dependencies = [ - sources."source-map-0.7.3" - ]; - }) - sources."terser-webpack-plugin-4.2.2" + 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" // { dependencies = [ @@ -90518,12 +91927,9 @@ in }) sources."through2-filter-3.0.0" sources."time-stamp-1.1.0" - sources."timers-browserify-2.0.12" sources."timers-ext-0.1.7" sources."tmp-0.0.33" sources."to-absolute-glob-2.0.2" - sources."to-array-0.1.4" - sources."to-arraybuffer-1.0.1" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -90534,42 +91940,47 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."toidentifier-1.0.0" + sources."token-types-4.2.0" sources."tough-cookie-2.5.0" - (sources."ts-loader-8.0.4" // { + sources."tr46-3.0.0" + sources."ts-loader-9.2.6" + sources."ts-log-2.2.4" + (sources."ts-node-10.4.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."semver-6.3.0" - sources."supports-color-5.5.0" + sources."acorn-8.7.0" ]; }) - sources."ts-log-2.2.4" - sources."tslib-1.14.1" - (sources."tslint-6.1.3" // { + sources."tslib-2.3.1" + (sources."tsutils-3.21.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."mkdirp-0.5.5" - sources."semver-5.7.1" - sources."supports-color-5.5.0" + sources."tslib-1.14.1" ]; }) - sources."tsutils-2.29.0" - sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.2.0" + sources."type-check-0.4.0" + sources."type-fest-0.20.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."typescript-4.0.3" + (sources."typeorm-0.2.38" // { + dependencies = [ + sources."buffer-6.0.3" + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."typescript-4.4.4" sources."unc-path-regex-0.1.2" - sources."undertaker-1.3.0" + (sources."undertaker-1.3.0" // { + dependencies = [ + sources."fast-levenshtein-1.1.4" + ]; + }) sources."undertaker-registry-1.0.1" sources."union-value-1.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" sources."unique-stream-2.3.1" - sources."universalify-1.0.0" + sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -90585,19 +91996,15 @@ in sources."upath-1.2.0" sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-join-4.0.1" sources."url-parse-lax-3.0.0" - sources."url-toolkit-2.2.5" sources."use-3.1.1" - sources."util-0.11.1" + sources."utf-8-validate-5.0.9" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."uws-9.148.0" + sources."v8-compile-cache-2.3.0" sources."v8flags-3.2.0" sources."validate-npm-package-license-3.0.4" sources."value-or-function-3.0.0" @@ -90620,97 +92027,2015 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."vinyl-sourcemaps-apply-0.2.1" // { + sources."webidl-conversions-7.0.0" + sources."whatwg-url-11.0.0" + sources."which-1.3.1" + sources."which-module-1.0.0" + sources."wide-align-1.1.5" + sources."word-wrap-1.2.3" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."source-map-0.5.7" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - sources."vm-browserify-1.1.2" - (sources."watchpack-1.7.5" // { + sources."wrappy-1.0.2" + (sources."write-1.0.3" // { dependencies = [ - sources."anymatch-3.1.2" - sources."binary-extensions-2.2.0" - sources."chokidar-3.5.3" - sources."fsevents-2.3.2" - sources."is-binary-path-2.1.0" - sources."readdirp-3.6.0" + sources."mkdirp-0.5.5" + ]; + }) + sources."ws-6.2.2" + 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."yargonaut-1.1.4" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."supports-color-2.0.0" ]; }) - sources."watchpack-chokidar2-2.0.1" - (sources."webpack-4.44.2" // { + (sources."yargs-17.3.1" // { dependencies = [ - sources."acorn-6.4.2" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."yargs-parser-21.0.1" + ]; + }) + sources."yargs-parser-20.2.9" + sources."yn-3.1.1" + sources."zen-observable-0.8.15" + sources."zen-observable-ts-1.2.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "DTV Software in Japan."; + homepage = "https://github.com/l3tnun/EPGStation-V2#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + "epgstation-client-../../applications/video/epgstation/client" = nodeEnv.buildNodePackage { + name = "epgstation-client"; + packageName = "epgstation-client"; + version = "2.6.20"; + src = ../../applications/video/epgstation/client; + dependencies = [ + sources."@babel/code-frame-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + sources."@babel/highlight-7.16.10" + (sources."@eslint/eslintrc-0.4.3" // { + dependencies = [ + sources."acorn-7.4.1" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.3.1" + sources."ignore-4.0.6" + ]; + }) + sources."@hapi/address-2.1.4" + sources."@hapi/bourne-1.3.2" + sources."@hapi/hoek-8.5.1" + sources."@hapi/joi-15.1.1" + sources."@hapi/topo-3.1.6" + sources."@humanwhocodes/config-array-0.5.0" + sources."@humanwhocodes/object-schema-1.2.1" + sources."@intervolga/optimize-cssnano-plugin-1.0.6" + sources."@mdi/font-6.5.95" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@socket.io/component-emitter-3.0.0" + (sources."@soda/friendly-errors-webpack-plugin-1.8.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + 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."@soda/get-current-script-1.0.2" + 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.13" + sources."@types/express-serve-static-core-4.17.28" + sources."@types/glob-7.2.0" + sources."@types/hls.js-0.13.3" + sources."@types/http-proxy-1.17.8" + sources."@types/json-schema-7.0.9" + sources."@types/json-stable-stringify-1.0.33" + sources."@types/lodash-4.14.178" + sources."@types/mime-1.3.2" + sources."@types/minimatch-3.0.5" + sources."@types/minimist-1.2.2" + sources."@types/node-17.0.21" + sources."@types/normalize-package-data-2.4.1" + sources."@types/parse-json-4.0.0" + sources."@types/q-1.5.5" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" + sources."@types/serve-static-1.13.10" + sources."@types/smoothscroll-polyfill-0.3.1" + sources."@types/socket.io-client-1.4.36" + sources."@types/source-list-map-0.1.2" + sources."@types/tapable-1.0.8" + (sources."@types/uglify-js-3.13.1" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-4.41.32" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."@types/webpack-dev-server-3.11.6" + sources."@types/webpack-env-1.16.3" + (sources."@types/webpack-sources-3.2.0" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + sources."@typescript-eslint/eslint-plugin-4.33.0" + sources."@typescript-eslint/experimental-utils-4.33.0" + sources."@typescript-eslint/parser-4.33.0" + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + sources."@typescript-eslint/typescript-estree-4.33.0" + sources."@typescript-eslint/visitor-keys-4.33.0" + sources."@vue/cli-overlay-4.5.15" + (sources."@vue/cli-plugin-eslint-4.5.12" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."dir-glob-2.2.2" + sources."fast-glob-2.2.7" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."slash-2.0.0" + sources."to-regex-range-2.1.1" + ]; + }) + sources."@vue/cli-plugin-router-4.5.15" + (sources."@vue/cli-plugin-typescript-4.5.13" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" sources."braces-2.3.2" - sources."cacache-12.0.4" + sources."dir-glob-2.2.2" sources."extend-shallow-2.0.1" + sources."fast-glob-2.2.7" sources."fill-range-4.0.0" + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."slash-2.0.0" + sources."to-regex-range-2.1.1" + ]; + }) + sources."@vue/cli-plugin-vuex-4.5.13" + (sources."@vue/cli-service-4.5.13" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."acorn-7.4.1" + sources."array-union-1.0.2" + sources."braces-2.3.2" + sources."dir-glob-2.2.2" + sources."extend-shallow-2.0.1" + sources."fast-glob-2.2.7" + sources."fill-range-4.0.0" + sources."fs-extra-7.0.1" + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."jsonfile-4.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."slash-2.0.0" + sources."ssri-8.0.1" + sources."to-regex-range-2.1.1" + sources."universalify-0.1.2" + ]; + }) + (sources."@vue/cli-shared-utils-4.5.15" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."semver-6.3.0" + sources."yallist-3.1.1" + ]; + }) + (sources."@vue/component-compiler-utils-3.3.0" // { + dependencies = [ + sources."hash-sum-1.0.2" + sources."lru-cache-4.1.5" + sources."source-map-0.6.1" + sources."yallist-2.1.2" + ]; + }) + sources."@vue/eslint-config-prettier-6.0.0" + sources."@vue/eslint-config-typescript-7.0.0" + sources."@vue/preload-webpack-plugin-1.1.2" + sources."@vue/web-component-wrapper-1.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."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."accepts-1.3.8" + sources."acorn-6.4.2" + sources."acorn-jsx-5.3.2" + sources."acorn-walk-7.2.0" + sources."address-1.1.2" + sources."ajv-6.12.6" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.2" + sources."alphanum-sort-1.0.2" + sources."ansi-colors-3.2.4" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-html-community-0.0.8" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" + sources."anymatch-3.1.2" + sources."aproba-1.2.0" + sources."arch-2.2.0" + sources."argparse-1.0.10" + sources."aribb24.js-1.8.8" + 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."asn1-0.2.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."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."astral-regex-2.0.0" + sources."async-2.6.3" + 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."autoprefixer-9.8.8" // { + dependencies = [ + sources."picocolors-0.2.1" + ]; + }) + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."axios-0.24.0" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."js-tokens-3.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."backo2-1.0.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."bcrypt-pbkdf-1.0.2" + sources."bfj-6.1.2" + sources."big.js-5.2.2" + sources."binary-extensions-2.2.0" + sources."bindings-1.5.0" + sources."bluebird-3.7.2" + sources."bn.js-5.2.0" + (sources."body-parser-1.19.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.9.7" + ]; + }) + (sources."bonjour-3.5.0" // { + dependencies = [ + sources."array-flatten-2.1.2" + ]; + }) + sources."boolbase-1.0.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.20.0" + sources."buffer-4.9.2" + sources."buffer-from-1.1.2" + sources."buffer-indexof-1.1.1" + sources."buffer-json-2.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" + sources."bytes-3.1.2" + (sources."cacache-12.0.4" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) + sources."cache-base-1.0.1" + (sources."cache-loader-4.1.0" // { + dependencies = [ + sources."find-cache-dir-3.3.2" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."make-dir-3.1.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."pkg-dir-4.2.0" + sources."schema-utils-2.7.1" + sources."semver-6.3.0" + ]; + }) + sources."call-bind-1.0.2" + sources."call-me-maybe-1.0.1" + (sources."caller-callsite-2.0.0" // { + dependencies = [ + sources."callsites-2.0.0" + ]; + }) + sources."caller-path-2.0.0" + sources."callsite-1.0.0" + sources."callsites-3.1.0" + sources."camel-case-3.0.0" + sources."camelcase-5.3.1" + sources."caniuse-api-3.0.0" + sources."caniuse-lite-1.0.30001314" + sources."case-sensitive-paths-webpack-plugin-2.4.0" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."check-types-8.0.3" + sources."chokidar-3.5.3" + sources."chownr-1.1.4" + sources."chrome-trace-event-1.0.3" + sources."ci-info-1.6.0" + 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."cli-cursor-2.1.0" + (sources."cli-highlight-2.1.11" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."cli-spinners-2.6.1" + sources."cli-width-3.0.0" + (sources."clipboardy-2.3.0" // { + dependencies = [ + sources."is-wsl-2.2.0" + ]; + }) + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" + ]; + }) + sources."clone-1.0.4" + sources."coa-2.0.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.0" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."safe-buffer-5.1.2" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."connect-history-api-fallback-1.6.0" + sources."console-browserify-1.2.0" + sources."consolidate-0.15.1" + sources."constants-browserify-1.0.0" + sources."content-disposition-0.5.4" + sources."content-type-1.0.4" + sources."cookie-0.4.2" + sources."cookie-signature-1.0.6" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + (sources."copy-webpack-plugin-5.1.2" // { + dependencies = [ + sources."array-union-1.0.2" + sources."dir-glob-2.2.2" sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."globby-7.1.1" + sources."ignore-3.3.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."pkg-dir-3.0.0" + sources."slash-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."cosmiconfig-6.0.0" + (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-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."crypto-browserify-3.12.0" + sources."css-color-names-0.0.4" + sources."css-declaration-sorter-4.0.1" + (sources."css-loader-3.6.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + sources."semver-6.3.0" + ]; + }) + sources."css-select-2.1.0" + sources."css-select-base-adapter-0.1.1" + (sources."css-tree-1.0.0-alpha.37" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."css-what-3.4.2" + sources."cssesc-3.0.0" + (sources."cssnano-4.1.11" // { + dependencies = [ + sources."cosmiconfig-5.2.1" + sources."import-fresh-2.0.0" + sources."parse-json-4.0.0" + sources."resolve-from-3.0.0" + ]; + }) + 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."dashdash-1.14.1" + sources."date-fns-2.28.0" + sources."de-indent-1.0.2" + sources."debug-4.3.3" + sources."decache-4.6.1" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-equal-1.1.1" + sources."deep-is-0.1.4" + sources."deepmerge-4.2.2" + (sources."default-gateway-5.0.5" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."execa-3.4.0" + sources."get-stream-5.2.0" + sources."is-stream-2.0.1" + sources."mimic-fn-2.1.0" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."p-finally-2.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) + sources."defaults-1.0.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + (sources."del-4.1.1" // { + dependencies = [ + sources."array-union-1.0.2" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + ]; + }) + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."des.js-1.0.1" + sources."destroy-1.0.4" + sources."detect-node-2.1.0" + sources."diff-4.0.2" + (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."doctrine-3.0.0" + sources."dom-converter-0.2.0" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domain-browser-1.2.0" + sources."domelementtype-1.3.1" + (sources."domhandler-4.3.0" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domutils-1.7.0" + sources."dot-prop-5.3.0" + sources."dotenv-8.6.0" + sources."dotenv-expand-5.1.0" + sources."duplexer-0.1.2" + sources."duplexify-3.7.1" + sources."easy-stack-1.0.1" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."ejs-2.7.4" + sources."electron-to-chromium-1.4.82" + (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" + sources."end-of-stream-1.4.4" + sources."engine.io-client-6.0.3" + sources."engine.io-parser-5.0.3" + (sources."enhanced-resolve-4.5.0" // { + dependencies = [ + sources."memory-fs-0.5.0" + ]; + }) + (sources."enquirer-2.3.6" // { + dependencies = [ + sources."ansi-colors-4.1.1" + ]; + }) + sources."entities-2.2.0" + sources."errno-0.1.8" + sources."error-ex-1.3.2" + sources."error-stack-parser-2.0.7" + sources."es-abstract-1.19.1" + sources."es-to-primitive-1.2.1" + sources."es6-promise-4.2.8" + sources."escalade-3.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + (sources."eslint-7.32.0" // { + dependencies = [ + sources."@babel/code-frame-7.12.11" + sources."acorn-7.4.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.3" + sources."escape-string-regexp-4.0.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."has-flag-4.0.0" + sources."ignore-4.0.6" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."supports-color-7.2.0" + sources."which-2.0.2" + ]; + }) + sources."eslint-config-prettier-6.15.0" + sources."eslint-loader-2.2.1" + sources."eslint-plugin-prettier-3.4.1" + (sources."eslint-plugin-vue-7.20.0" // { + dependencies = [ + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + sources."semver-6.3.0" + ]; + }) + sources."eslint-scope-5.1.1" + sources."eslint-utils-3.0.0" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-6.2.1" // { + dependencies = [ + sources."acorn-7.4.1" + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."event-pubsub-4.3.0" + sources."eventemitter2-6.4.5" + sources."eventemitter3-4.0.7" + sources."events-3.3.0" + sources."eventsource-1.1.0" + sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."express-4.17.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.9.7" + ]; + }) + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" + sources."fast-glob-3.2.11" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.13.0" + sources."faye-websocket-0.11.4" + sources."figgy-pudding-3.5.2" + sources."figures-3.2.0" + sources."file-entry-cache-6.0.1" + (sources."file-loader-4.3.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) + sources."file-uri-to-path-1.0.0" + sources."filesize-3.6.1" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-cache-dir-0.1.1" + sources."find-up-1.1.2" + (sources."flat-cache-3.0.4" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."flatted-3.2.5" + sources."flush-write-stream-1.1.1" + sources."follow-redirects-1.14.9" + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + (sources."fork-ts-checker-webpack-plugin-3.1.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."isarray-1.0.0" sources."kind-of-3.2.2" - sources."locate-path-3.0.0" - sources."lru-cache-5.1.1" - sources."make-dir-2.1.0" - sources."memory-fs-0.4.1" sources."micromatch-3.1.10" - sources."mkdirp-0.5.5" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."semver-5.7.1" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."fork-ts-checker-webpack-plugin-v5-5.2.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."schema-utils-2.7.0" + sources."supports-color-7.2.0" + ]; + }) + sources."form-data-2.3.3" + sources."forwarded-0.2.0" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."fs-extra-9.1.0" + sources."fs-monkey-1.0.3" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.1" + sources."get-stdin-6.0.0" + sources."get-stream-4.1.0" + sources."get-symbol-description-1.0.0" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-7.2.0" + sources."glob-parent-5.1.2" + sources."glob-to-regexp-0.3.0" + (sources."globals-13.12.1" // { + dependencies = [ + sources."type-fest-0.20.2" + ]; + }) + sources."globby-11.1.0" + sources."graceful-fs-4.2.9" + sources."gzip-size-5.1.1" + sources."handle-thing-2.0.1" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-bigints-1.0.1" + sources."has-cors-1.1.0" + sources."has-flag-3.0.0" + 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."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."hash-sum-2.0.0" + sources."hash.js-1.1.7" + sources."he-1.2.0" + sources."hex-color-regex-1.1.0" + sources."highlight.js-10.7.3" + sources."hls.js-1.1.2" + sources."hmac-drbg-1.0.1" + sources."hoopy-0.1.4" + sources."hosted-git-info-2.8.9" + 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-minifier-3.5.21" // { + dependencies = [ + sources."commander-2.17.1" + ]; + }) + (sources."html-webpack-plugin-3.2.0" // { + dependencies = [ + sources."big.js-3.2.0" + sources."emojis-list-2.1.0" + sources."json5-0.5.1" + sources."loader-utils-0.2.17" + sources."util.promisify-1.0.0" + ]; + }) + (sources."htmlparser2-6.1.0" // { + dependencies = [ + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.8.0" + ]; + }) + sources."http-deceiver-1.2.7" + sources."http-errors-1.8.1" + sources."http-parser-js-0.5.6" + sources."http-proxy-1.18.1" + sources."http-proxy-middleware-1.3.1" + sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" + sources."human-signals-1.1.1" + sources."iconv-lite-0.4.24" + sources."icss-utils-4.1.1" + sources."ieee754-1.2.1" + sources."iferr-0.1.5" + sources."ignore-5.2.0" + sources."import-cwd-2.1.0" + sources."import-fresh-3.3.0" + (sources."import-from-2.1.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) + (sources."import-local-2.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."pkg-dir-3.0.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."indexes-of-1.0.1" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + sources."restore-cursor-3.1.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."internal-ip-4.3.0" // { + dependencies = [ + sources."default-gateway-4.2.0" + ]; + }) + sources."internal-slot-1.0.3" + sources."interpret-1.4.0" + sources."inversify-6.0.1" + sources."ip-1.1.5" + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.1" + sources."is-absolute-url-2.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-arguments-1.1.1" + sources."is-arrayish-0.2.1" + sources."is-bigint-1.0.4" + sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.2" + sources."is-buffer-1.1.6" + sources."is-callable-1.2.4" + sources."is-ci-1.2.1" + sources."is-color-stop-1.1.0" + sources."is-core-module-2.8.1" + 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" + sources."is-negative-zero-2.0.2" + sources."is-number-7.0.0" + sources."is-number-object-1.0.6" + sources."is-obj-2.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" + sources."is-plain-obj-3.0.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.1.4" + sources."is-resolvable-1.1.0" + sources."is-shared-array-buffer-1.0.1" + sources."is-stream-1.1.0" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typedarray-1.0.0" + sources."is-weakref-1.0.2" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."javascript-stringify-2.1.0" + sources."js-message-1.0.7" + sources."js-queue-2.0.2" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" + sources."jsbn-0.1.1" + sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-0.4.0" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-1.0.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json5-1.0.1" + sources."jsonfile-6.1.0" + sources."jsonify-0.0.0" + sources."jsprim-1.4.2" + sources."killable-1.0.1" + sources."kind-of-6.0.3" + sources."klona-2.0.5" + sources."launch-editor-2.3.0" + sources."launch-editor-middleware-2.3.0" + sources."levn-0.4.1" + sources."lines-and-columns-1.2.4" + sources."loader-fs-cache-1.0.3" + sources."loader-runner-2.4.0" + sources."loader-utils-1.4.0" + (sources."locate-path-3.0.0" // { + dependencies = [ sources."path-exists-3.0.0" - sources."pify-4.0.1" + ]; + }) + sources."lodash-4.17.21" + sources."lodash.defaultsdeep-4.6.1" + sources."lodash.mapvalues-4.6.0" + sources."lodash.memoize-4.1.2" + sources."lodash.merge-4.6.2" + sources."lodash.transform-4.6.0" + sources."lodash.truncate-4.4.2" + sources."lodash.uniq-4.5.0" + sources."log-symbols-2.2.0" + sources."loglevel-1.8.0" + sources."lower-case-1.1.4" + sources."lru-cache-6.0.0" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."material-design-icons-iconfont-6.1.1" + sources."md5.js-1.3.5" + sources."mdn-data-2.0.4" + sources."media-typer-0.3.0" + sources."memfs-3.4.1" + sources."memory-fs-0.4.1" + sources."merge-descriptors-1.0.1" + (sources."merge-source-map-1.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."microevent.ts-0.1.1" + sources."micromatch-4.0.4" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."mime-2.6.0" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" + sources."mimic-fn-1.2.0" + (sources."mini-css-extract-plugin-0.9.0" // { + dependencies = [ + sources."normalize-url-1.9.1" + ]; + }) + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.1.2" + sources."minimist-1.2.5" + sources."minipass-3.1.6" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."move-concurrently-1.0.1" + sources."mpegts.js-1.6.10" + sources."ms-2.1.2" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."mute-stream-0.0.8" + sources."mz-2.7.0" + sources."nan-2.15.0" + sources."nanomatch-1.2.13" + sources."natural-compare-1.4.0" + sources."negotiator-0.6.3" + sources."neo-async-2.6.2" + sources."nice-try-1.0.5" + sources."no-case-2.3.2" + sources."node-forge-0.10.0" + sources."node-ipc-9.2.1" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."node-releases-2.0.2" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."normalize-path-3.0.0" + sources."normalize-range-0.1.2" + sources."normalize-url-3.3.0" + sources."npm-run-path-2.0.2" + sources."nth-check-1.0.2" + (sources."null-loader-4.0.1" // { + dependencies = [ + sources."json5-2.2.0" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."num2fraction-1.2.2" + sources."oauth-sign-0.9.0" + 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-hash-1.3.1" + sources."object-inspect-1.12.0" + sources."object-is-1.1.5" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.2" + sources."object.getownpropertydescriptors-2.1.3" + sources."object.pick-1.3.0" + sources."object.values-1.1.5" + 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-6.4.0" + sources."opener-1.5.2" + sources."opn-5.5.0" + sources."optionator-0.9.1" + (sources."ora-3.4.0" // { + dependencies = [ + sources."strip-ansi-5.2.0" + ]; + }) + sources."original-1.0.2" + sources."os-browserify-0.3.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-map-2.1.0" + sources."p-retry-3.0.1" + sources."p-try-2.2.0" + sources."pako-1.0.11" + sources."parallel-transform-1.2.0" + sources."param-case-2.1.1" + sources."parent-module-1.0.1" + sources."parse-asn1-5.1.6" + sources."parse-json-5.2.0" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.7" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."pbkdf2-3.1.2" + sources."performance-now-2.1.0" + 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."pkg-dir-1.0.0" + sources."pnp-webpack-plugin-1.7.0" + (sources."portfinder-1.0.28" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."posix-character-classes-0.1.1" + (sources."postcss-7.0.39" // { + dependencies = [ + sources."picocolors-0.2.1" + 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-load-config-2.1.2" // { + dependencies = [ + sources."cosmiconfig-5.2.1" + sources."import-fresh-2.0.0" + sources."parse-json-4.0.0" + sources."resolve-from-3.0.0" + ]; + }) + sources."postcss-loader-3.0.0" + (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."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-selector-parser-6.0.9" + (sources."postcss-svgo-4.0.3" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-unique-selectors-4.0.1" + sources."postcss-value-parser-4.2.0" + sources."prelude-ls-1.2.1" + sources."prepend-http-1.0.4" + sources."prettier-2.4.1" + sources."prettier-linter-helpers-1.0.0" + sources."pretty-error-2.1.2" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."promise-inflight-1.0.1" + sources."proxy-addr-2.0.7" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."psl-1.8.0" + (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.1.1" + sources."q-1.5.1" + sources."qs-6.5.3" + sources."query-string-4.3.4" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."querystringify-2.2.0" + sources."queue-microtask-1.2.3" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."range-parser-1.2.1" + sources."raw-body-2.4.3" + sources."read-pkg-5.2.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."readdirp-3.6.0" + sources."rechoir-0.6.2" + sources."reflect-metadata-0.1.13" + sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.4.1" + sources."regexpp-3.2.0" + sources."relateurl-0.2.7" + sources."remove-trailing-separator-1.1.0" + (sources."renderkid-2.0.7" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."css-select-4.2.1" + sources."css-what-5.1.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.8.0" + sources."nth-check-2.0.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."request-2.88.2" + sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" + sources."require-main-filename-2.0.0" + sources."requires-port-1.0.0" + sources."resize-observer-polyfill-1.5.1" + sources."resolve-1.22.0" + (sources."resolve-cwd-2.0.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) + sources."resolve-from-4.0.0" + sources."resolve-url-0.2.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.7.1" + sources."ripemd160-2.0.2" + sources."roboto-fontface-0.10.0" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" + sources."run-queue-1.0.3" + sources."rxjs-6.6.7" + sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sass-1.32.12" + (sources."sass-loader-10.2.0" // { + dependencies = [ + sources."json5-2.2.0" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."sax-1.2.4" + sources."schema-utils-1.0.0" + sources."select-hose-2.0.0" + sources."selfsigned-1.10.14" + sources."semver-7.3.5" + (sources."send-0.17.2" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."mime-1.6.0" + sources."ms-2.1.3" + ]; + }) + sources."serialize-javascript-4.0.0" + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."ms-2.0.0" + sources."setprototypeof-1.1.0" + ]; + }) + sources."serve-static-1.14.2" + 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.2.0" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shell-quote-1.7.3" + sources."shelljs-0.8.5" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."smoothscroll-polyfill-0.4.4" + (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."socket.io-client-4.3.2" + sources."socket.io-parser-4.1.2" + (sources."sockjs-0.3.24" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) + (sources."sockjs-client-1.6.0" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + (sources."sort-keys-1.1.2" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) + 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.5.21" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.1" + sources."spark-md5-3.0.2" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.11" + sources."spdy-4.0.2" + (sources."spdy-transport-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.17.0" + sources."ssri-6.0.2" + sources."stable-0.1.8" + sources."stackframe-1.2.1" + (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-each-1.2.3" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.1" + sources."strict-uri-encode-1.1.0" + sources."string-width-4.2.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."strip-ansi-6.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + ]; + }) + sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-2.0.0" + sources."strip-json-comments-3.1.1" + (sources."stylehacks-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + sources."supports-color-5.5.0" + sources."supports-preserve-symlinks-flag-1.0.0" + sources."svgo-1.3.2" + (sources."table-6.8.0" // { + dependencies = [ + sources."ajv-8.10.0" + sources."json-schema-traverse-1.0.0" + ]; + }) + sources."tapable-1.1.3" + (sources."terser-4.8.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-1.4.5" // { + dependencies = [ + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" sources."pkg-dir-3.0.0" - sources."readable-stream-2.3.7" - sources."schema-utils-1.0.0" + sources."source-map-0.6.1" + ]; + }) + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."thread-loader-2.1.3" + 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-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.1" + sources."toposort-1.0.7" + sources."tough-cookie-2.5.0" + sources."tryer-1.0.1" + (sources."ts-loader-6.2.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."ts-pnp-1.2.0" + sources."tslib-1.14.1" + (sources."tslint-5.20.1" // { + dependencies = [ sources."semver-5.7.1" - sources."serialize-javascript-4.0.0" - sources."ssri-6.0.2" - sources."string_decoder-1.1.1" - sources."terser-4.8.0" - sources."terser-webpack-plugin-1.4.5" - sources."to-regex-range-2.1.1" - sources."y18n-4.0.3" - sources."yallist-3.1.1" + sources."tsutils-2.29.0" + ]; + }) + sources."tsutils-3.21.0" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.4.0" + sources."type-fest-0.6.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typeface-roboto-1.1.13" + sources."typescript-4.4.4" + (sources."uglify-js-3.4.10" // { + dependencies = [ + sources."commander-2.19.0" + sources."source-map-0.6.1" + ]; + }) + sources."unbox-primitive-1.0.1" + 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."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."upath-1.2.0" + sources."upper-case-1.1.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-loader-2.3.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) + sources."url-parse-1.5.10" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.1" + sources."utila-0.4.0" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."v8-compile-cache-2.3.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."vendors-1.0.4" + sources."verror-1.10.0" + sources."vm-browserify-1.1.2" + sources."vue-2.6.14" + sources."vue-class-component-7.2.6" + sources."vue-cli-plugin-vuetify-2.4.3" + (sources."vue-eslint-parser-7.11.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + sources."semver-6.3.0" ]; }) - sources."webpack-sources-1.4.3" - (sources."webpack-stream-6.1.0" // { + sources."vue-hot-reload-api-2.3.4" + (sources."vue-loader-15.9.8" // { dependencies = [ + sources."hash-sum-1.0.2" + ]; + }) + (sources."vue-loader-v16-16.8.3" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."json5-2.2.0" + sources."loader-utils-2.0.2" sources."supports-color-7.2.0" ]; }) + sources."vue-property-decorator-9.1.2" + sources."vue-router-3.5.3" + (sources."vue-style-loader-4.1.3" // { + dependencies = [ + sources."hash-sum-1.0.2" + ]; + }) + sources."vue-template-compiler-2.6.14" + sources."vue-template-es2015-compiler-1.9.1" + sources."vuetify-2.5.10" + sources."vuetify-datetime-picker-2.1.1" + (sources."vuetify-loader-1.7.3" // { + dependencies = [ + sources."file-loader-6.2.0" + sources."json5-2.2.0" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + 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."wbuf-1.7.3" + sources."wcwidth-1.0.1" + (sources."webpack-4.46.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."eslint-scope-4.0.3" + 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."webpack-bundle-analyzer-3.9.0" // { + dependencies = [ + sources."acorn-7.4.1" + sources."ws-6.2.2" + ]; + }) + (sources."webpack-chain-6.5.1" // { + dependencies = [ + sources."deepmerge-1.5.2" + ]; + }) + sources."webpack-dev-middleware-3.7.3" + (sources."webpack-dev-server-3.11.3" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."emoji-regex-7.0.3" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."find-up-3.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + (sources."http-proxy-middleware-0.19.1" // { + dependencies = [ + sources."is-glob-4.0.3" + ]; + }) + sources."is-absolute-url-3.0.3" + sources."is-binary-path-1.0.1" + sources."is-fullwidth-code-point-2.0.0" + 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."semver-6.3.0" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."supports-color-6.1.0" + sources."to-regex-range-2.1.1" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."ws-6.2.2" + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" + ]; + }) + sources."webpack-log-2.0.0" + sources."webpack-merge-4.2.2" + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."websocket-driver-0.7.4" + sources."websocket-extensions-0.1.4" + sources."webworkify-webpack-2.1.5" sources."which-1.3.1" - sources."which-module-1.0.0" - sources."wide-align-1.1.5" + sources."which-boxed-primitive-1.0.2" + sources."which-module-2.0.0" + sources."word-wrap-1.2.3" sources."worker-farm-1.7.0" - (sources."wrap-ansi-2.1.0" // { + sources."worker-rpc-0.1.1" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.7" - sources."xmlhttprequest-ssl-1.5.5" + sources."ws-8.2.3" + sources."xmlhttprequest-ssl-2.0.0" sources."xtend-4.0.2" - sources."y18n-3.2.2" + sources."y18n-4.0.3" sources."yallist-4.0.0" - (sources."yargs-7.1.2" // { + sources."yaml-1.10.2" + (sources."yargs-16.2.0" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."cliui-7.0.4" + sources."y18n-5.0.8" ]; }) - sources."yargs-parser-5.0.1" + sources."yargs-parser-20.2.9" sources."yeast-0.1.2" - sources."yocto-queue-0.1.0" + (sources."yorkie-2.0.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.8.0" + sources."get-stream-3.0.0" + sources."lru-cache-4.1.5" + sources."normalize-path-1.0.0" + sources."yallist-2.1.2" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { - description = "DTV Software in Japan."; - homepage = "https://github.com/l3tnun/EPGStation#readme"; - license = "MIT"; }; production = true; bypassCache = true; @@ -90737,18 +94062,18 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.9.0"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.9.0.tgz"; - sha512 = "PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz"; + sha512 = "tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw=="; }; dependencies = [ - (sources."@eslint/eslintrc-1.1.0" // { + (sources."@eslint/eslintrc-1.2.0" // { dependencies = [ sources."ignore-4.0.6" ]; }) - sources."@humanwhocodes/config-array-0.9.3" + sources."@humanwhocodes/config-array-0.9.5" sources."@humanwhocodes/object-schema-1.2.1" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -91026,10 +94351,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.2.0.tgz"; - sha512 = "0zyZwv7mBmeeEMZ7ur5xHt/klu1CNiuMuTbsrbDOvQPqDxyLOKlQtvsJOn9VHCUt8sAlyN21Jmu7KI6lH7fSgQ=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.3.0.tgz"; + sha512 = "Oi5E+C3AtAHOwqBbL3GL1eQErfDnZGmIqbMjlDGp8WtELN0f+fdfWA4ZldCOSjnqsYg7hYQFgrZXjIXbjYsC9Q=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -91045,7 +94370,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" @@ -91070,15 +94395,15 @@ in sources."@babel/types-7.17.0" sources."@expo/apple-utils-0.0.0-alpha.26" sources."@expo/bunyan-4.0.0" - sources."@expo/config-6.0.18" - (sources."@expo/config-plugins-4.0.18" // { + sources."@expo/config-6.0.19" + (sources."@expo/config-plugins-4.1.0" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@expo/config-types-44.0.0" - sources."@expo/dev-server-0.1.105" - sources."@expo/dev-tools-0.13.145" + sources."@expo/dev-server-0.1.106" + sources."@expo/dev-tools-0.13.146" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -91094,7 +94419,7 @@ in ]; }) sources."@expo/json-file-8.2.34" - sources."@expo/metro-config-0.3.11" + sources."@expo/metro-config-0.3.12" sources."@expo/osascript-2.0.31" (sources."@expo/package-manager-0.0.50" // { dependencies = [ @@ -91108,12 +94433,12 @@ in sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-3.0.18" + sources."@expo/prebuild-config-3.1.0" sources."@expo/rudder-sdk-node-1.1.1" sources."@expo/schemer-1.3.33" sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.16.18" // { + (sources."@expo/webpack-config-0.16.19" // { dependencies = [ sources."is-wsl-2.2.0" ]; @@ -91159,7 +94484,7 @@ in sources."@sideway/address-4.1.3" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.2.0" @@ -91171,7 +94496,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/q-1.5.5" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.1" @@ -91193,7 +94518,7 @@ in ]; }) sources."@types/yargs-15.0.14" - sources."@types/yargs-parser-20.2.1" + sources."@types/yargs-parser-21.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -91339,7 +94664,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - (sources."browserslist-4.19.3" // { + (sources."browserslist-4.20.0" // { dependencies = [ sources."picocolors-1.0.0" ]; @@ -91373,7 +94698,7 @@ in }) sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -91631,7 +94956,7 @@ in sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -91648,7 +94973,6 @@ in }) sources."entities-2.2.0" sources."env-editor-0.4.2" - sources."envinfo-7.8.1" sources."eol-0.9.1" sources."errno-0.1.8" sources."error-ex-1.3.2" @@ -91704,7 +95028,7 @@ in sources."fs-extra-9.1.0" ]; }) - (sources."expo-pwa-0.0.113" // { + (sources."expo-pwa-0.0.114" // { dependencies = [ sources."commander-2.20.0" ]; @@ -91838,7 +95162,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -92930,7 +96254,7 @@ in }) sources."url-join-4.0.0" sources."url-loader-4.1.1" - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" @@ -93097,7 +96421,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.2.29" // { + (sources."xdl-59.2.30" // { dependencies = [ sources."bplist-parser-0.3.1" sources."chownr-1.1.4" @@ -93173,7 +96497,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -93195,7 +96519,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.11" sources."@jridgewell/trace-mapping-0.3.4" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -93214,7 +96538,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-4.1.0" @@ -93222,7 +96546,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -93246,8 +96570,8 @@ in ]; }) sources."delay-5.0.0" - sources."devtools-protocol-0.0.960912" - sources."electron-to-chromium-1.4.71" + sources."devtools-protocol-0.0.969999" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -93338,14 +96662,14 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - (sources."puppeteer-13.3.2" // { + (sources."puppeteer-13.5.1" // { dependencies = [ sources."ws-8.5.0" ]; }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.23.0" + sources."react-devtools-core-4.24.0" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -93470,7 +96794,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + sources."@oclif/parser-3.8.7" (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -93649,7 +96973,7 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.1" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."type-fest-0.21.3" @@ -93749,7 +97073,7 @@ in sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -93823,10 +97147,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "10.2.1"; + version = "10.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.2.1.tgz"; - sha512 = "MBAN5fMMiP8eUfh3pNXREOPzsjp6VpOLAWxD/h2+qLGqzmS3A1S/PQA+VCx46+ebkeo8oilNaVbNLAN/+yAbLw=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.2.2.tgz"; + sha512 = "KJ7C0HeZr01/uKSuU/pJ2ZUAm0OQvujkmdpKurkV4x/JQHh5MeZvCsPC+Zwn4uqTCaSpY1XZt3167c+jscgv7w=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -93842,7 +97166,7 @@ in sources."@google-cloud/projectify-2.1.1" sources."@google-cloud/promisify-2.0.4" sources."@google-cloud/pubsub-2.19.0" - sources."@grpc/grpc-js-1.5.5" + sources."@grpc/grpc-js-1.5.7" sources."@grpc/proto-loader-0.6.9" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/fs-1.1.1" // { @@ -93873,14 +97197,14 @@ in sources."@types/duplexify-3.6.1" sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."acorn-8.7.0" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { @@ -94085,7 +97409,7 @@ in sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -94178,7 +97502,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."gaxios-4.3.2" sources."gcp-metadata-4.3.1" sources."get-caller-file-2.0.5" @@ -94194,7 +97518,7 @@ in sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" - sources."google-auth-library-7.13.0" + sources."google-auth-library-7.14.0" sources."google-gax-2.29.6" sources."google-p12-pem-3.1.3" sources."got-9.6.0" @@ -94226,7 +97550,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.7" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."install-artifact-from-github-1.3.0" sources."ip-1.1.5" sources."ip-regex-4.3.0" @@ -94344,11 +97668,7 @@ in ]; }) sources."media-typer-0.3.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) + sources."memoizee-0.4.15" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.6.0" @@ -94383,7 +97703,7 @@ in }) sources."negotiator-0.6.3" sources."netmask-2.0.2" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-emoji-1.11.0" sources."node-fetch-2.6.7" @@ -94463,7 +97783,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.3" sources."rc-1.2.8" - sources."re2-1.17.3" + sources."re2-1.17.4" sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" sources."readdirp-3.6.0" @@ -94492,7 +97812,7 @@ in }) sources."rsvp-4.8.5" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" @@ -94648,7 +97968,7 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -94813,7 +98133,7 @@ in sources."ieee754-1.2.1" sources."indent-string-5.0.0" sources."inherits-2.0.4" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.1" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" @@ -94897,7 +98217,7 @@ in sources."redent-4.0.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -94913,7 +98233,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."strip-final-newline-2.0.0" @@ -94955,7 +98275,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -95147,7 +98467,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.7.0" + sources."web3-utils-1.7.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.0" @@ -95234,7 +98554,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caller-0.0.1" + sources."caller-1.0.1" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { dependencies = [ @@ -95284,7 +98604,6 @@ in sources."deep-equal-2.0.5" sources."define-properties-1.1.3" sources."define-property-2.0.2" - sources."defined-0.0.0" sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" @@ -95352,7 +98671,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -95404,7 +98723,6 @@ in sources."isarray-2.0.5" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."jsonify-0.0.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" sources."lazy-1.0.11" @@ -95499,7 +98817,6 @@ in sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" sources."resolve-url-0.2.1" - sources."resumer-0.0.0" sources."ret-0.1.15" sources."revalidator-0.1.8" sources."rimraf-2.7.1" @@ -95512,7 +98829,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."shush-1.0.0" + sources."shush-1.0.1" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."simple-swizzle-0.2.2" @@ -95572,12 +98889,7 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" - sources."strip-json-comments-0.1.3" - (sources."tape-2.3.3" // { - dependencies = [ - sources."deep-equal-0.1.2" - ]; - }) + sources."strip-json-comments-2.0.1" sources."text-hex-1.0.0" sources."through-2.3.8" (sources."to-object-path-0.3.0" // { @@ -95699,10 +99011,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.7.0"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.7.0.tgz"; - sha512 = "y5L+h7dtFjiKeBiiNtNw0HsgcMcTMokpfXHbXfIV7khCS1dxN9xtYx6lKvsxLX3ytxs3OsWTxeqfNhEB87wrNw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.9.1.tgz"; + sha512 = "iU5pmwAq5d1XXo98BkYe2KccH3Dy/jsj7QsvP0CpfzOO0EFtidg5KUzPPaekLaGyoqxiMwWf0uAX7S1ERzMFYw=="; }; dependencies = [ sources."@ampproject/remapping-2.1.2" @@ -95728,7 +99040,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -95753,7 +99065,7 @@ in sources."@sideway/address-4.1.3" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@turist/fetch-7.2.0" @@ -95762,7 +99074,7 @@ in sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/node-fetch-2.6.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -95782,7 +99094,7 @@ in sources."boolbase-1.0.0" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -95791,7 +99103,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -95828,7 +99140,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.8.0" - sources."create-gatsby-2.7.0" + sources."create-gatsby-2.9.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -95855,7 +99167,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -95887,11 +99199,11 @@ in sources."find-up-4.1.0" sources."form-data-3.0.1" sources."fs-exists-cached-1.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.7.0" - (sources."gatsby-telemetry-3.7.0" // { + sources."gatsby-core-utils-3.9.1" + (sources."gatsby-telemetry-3.9.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -95916,7 +99228,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.8" sources."htmlparser2-6.1.0" @@ -95925,6 +99237,7 @@ in sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" + sources."import-from-4.0.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -95957,6 +99270,7 @@ in sources."keyv-4.1.1" sources."kleur-3.0.3" sources."latest-version-5.1.0" + sources."lmdb-2.2.4" sources."locate-path-5.0.0" sources."lock-1.1.0" sources."lodash-4.17.21" @@ -95976,9 +99290,13 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."ms-2.1.2" + sources."msgpackr-1.5.4" + sources."msgpackr-extract-1.0.16" sources."mute-stream-0.0.8" + sources."nan-2.15.0" sources."nice-try-1.0.5" sources."node-fetch-2.6.7" + sources."node-gyp-build-4.3.0" sources."node-object-hash-2.3.10" sources."node-releases-2.0.2" sources."normalize-url-6.1.0" @@ -95989,6 +99307,7 @@ in sources."onetime-5.1.2" sources."open-7.4.2" sources."opentracing-0.14.7" + sources."ordered-binary-1.2.4" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" @@ -96103,7 +99422,7 @@ in sources."tmp-0.2.1" sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" - sources."token-types-4.1.1" + sources."token-types-4.2.0" sources."tr46-0.0.3" sources."tslib-1.14.1" sources."type-fest-0.20.2" @@ -96115,6 +99434,7 @@ in sources."util-deprecate-1.0.2" sources."utila-0.4.0" sources."uuid-3.4.0" + sources."weak-lru-cache-1.2.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" @@ -96160,10 +99480,10 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.7.tgz"; - sha512 = "T6i3kosKqbzgVP99cFpGyovKpNHpTmxPIZjfbNMlyCinj1oIclZ3qcHnI7jttJbXb/XHfNPqDLKQEHL+jCHTZQ=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.8.tgz"; + sha512 = "0VMjRsX2HVhDboVUJIZ2N6ig7f/KG69V1AlTGIMUcxQzeLtjAFtxSdFQ2Z+hjmsu4Wjl6RjPj6NczIu3eSZ6mQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -96414,6 +99734,7 @@ in sources."asyncmemo-1.0.0" sources."chloride-2.4.1" sources."chloride-test-1.2.4" + sources."clarify-error-1.0.0" sources."commander-2.20.3" sources."debug-4.3.3" sources."deep-extend-0.6.0" @@ -96434,7 +99755,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-canonical-base64-1.1.1" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-property-1.0.2" sources."is-valid-domain-0.0.20" @@ -96458,7 +99779,7 @@ in sources."multiserver-3.8.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-2.0.0" - sources."muxrpc-6.7.0" + sources."muxrpc-6.7.2" sources."nearley-2.20.1" sources."node-gyp-build-4.3.0" sources."node-polyglot-1.0.0" @@ -96484,11 +99805,7 @@ in sources."pull-git-packidx-parser-1.0.0" sources."pull-git-remote-helper-2.0.0" sources."pull-git-repo-1.2.1" - (sources."pull-goodbye-0.0.2" // { - dependencies = [ - sources."pull-stream-3.5.0" - ]; - }) + sources."pull-goodbye-0.0.3" sources."pull-handshake-1.1.4" sources."pull-hash-1.0.0" sources."pull-hyperscript-0.2.2" @@ -96521,7 +99838,7 @@ in sources."remove-markdown-0.1.0" sources."ret-0.1.15" sources."safe-buffer-5.2.1" - sources."secret-handshake-1.1.20" + sources."secret-handshake-1.1.21" sources."semver-5.7.1" sources."separator-escape-0.0.1" sources."sha.js-2.4.5" @@ -96624,12 +99941,12 @@ in sources."@gitbeaker/core-35.4.0" sources."@gitbeaker/node-35.4.0" sources."@gitbeaker/requester-utils-35.4.0" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -96667,7 +99984,7 @@ in sources."got-11.8.3" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" sources."ieee754-1.2.1" @@ -96679,7 +99996,7 @@ in sources."li-1.3.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."lowercase-keys-2.0.0" @@ -96694,7 +100011,7 @@ in sources."onetime-5.1.2" (sources."ora-6.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."p-cancelable-2.1.1" @@ -96821,7 +100138,7 @@ in sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."degenerator-3.0.2" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."dot-prop-6.0.1" sources."duplexer3-0.1.4" sources."emoji-regex-8.0.0" @@ -96865,7 +100182,7 @@ in sources."has-yarn-2.1.0" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."human-signals-2.1.0" @@ -96876,7 +100193,7 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" (sources."inquirer-autocomplete-prompt-1.4.0" // { dependencies = [ sources."rxjs-6.6.7" @@ -96982,7 +100299,7 @@ in sources."punycode-2.1.1" sources."pupa-2.1.1" sources."quick-lru-4.0.1" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -97013,7 +100330,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -97034,7 +100351,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -97061,7 +100378,7 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -97262,7 +100579,7 @@ in sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -97328,9 +100645,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.6.5" // { + (sources."@graphql-tools/import-6.6.6" // { dependencies = [ - sources."@graphql-tools/utils-8.6.1" + sources."@graphql-tools/utils-8.6.2" sources."tslib-2.3.1" ]; }) @@ -97355,10 +100672,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.3.1" // { + (sources."@graphql-tools/schema-8.3.2" // { dependencies = [ - sources."@graphql-tools/merge-8.2.2" - sources."@graphql-tools/utils-8.6.1" + sources."@graphql-tools/merge-8.2.3" + sources."@graphql-tools/utils-8.6.2" sources."tslib-2.3.1" ]; }) @@ -97389,7 +100706,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -97548,7 +100865,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" @@ -97843,7 +101160,7 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -97879,15 +101196,15 @@ in }) sources."@cronvel/get-pixels-3.4.0" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.3.1" - sources."@graphql-tools/delegate-8.5.0" - sources."@graphql-tools/graphql-file-loader-7.3.3" - sources."@graphql-tools/import-6.6.5" - sources."@graphql-tools/json-file-loader-7.3.3" - sources."@graphql-tools/load-7.5.1" - sources."@graphql-tools/merge-8.2.2" - sources."@graphql-tools/schema-8.3.1" - (sources."@graphql-tools/url-loader-7.7.1" // { + sources."@graphql-tools/batch-execute-8.3.2" + sources."@graphql-tools/delegate-8.5.2" + sources."@graphql-tools/graphql-file-loader-7.3.4" + sources."@graphql-tools/import-6.6.6" + sources."@graphql-tools/json-file-loader-7.3.4" + sources."@graphql-tools/load-7.5.2" + sources."@graphql-tools/merge-8.2.3" + sources."@graphql-tools/schema-8.3.2" + (sources."@graphql-tools/url-loader-7.9.1" // { dependencies = [ (sources."subscriptions-transport-ws-0.11.0" // { dependencies = [ @@ -97897,8 +101214,8 @@ in sources."ws-8.5.0" ]; }) - sources."@graphql-tools/utils-8.6.1" - sources."@graphql-tools/wrap-8.4.0" + sources."@graphql-tools/utils-8.6.2" + sources."@graphql-tools/wrap-8.4.3" sources."@iarna/toml-2.2.5" sources."@n1ru4l/graphql-live-query-0.9.0" sources."@nodelib/fs.scandir-2.1.5" @@ -97908,7 +101225,11 @@ in sources."@oclif/config-1.17.0" sources."@oclif/errors-1.3.4" sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + (sources."@oclif/parser-3.8.7" // { + dependencies = [ + sources."@oclif/errors-1.3.5" + ]; + }) (sources."@oclif/plugin-help-3.2.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -97930,10 +101251,10 @@ in }) sources."@oclif/screen-1.0.4" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.5" - sources."@types/ws-8.2.3" + sources."@types/ws-8.5.2" sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."ansi-escapes-3.2.0" @@ -97997,7 +101318,7 @@ in sources."semver-5.7.1" ]; }) - sources."cross-undici-fetch-0.1.24" + sources."cross-undici-fetch-0.1.25" sources."cwise-compiler-1.1.3" sources."dataloader-2.0.0" sources."debug-4.3.3" @@ -98056,8 +101377,8 @@ in sources."graphql-language-service-parser-1.10.4" sources."graphql-language-service-types-1.8.7" sources."graphql-language-service-utils-2.5.1" - sources."graphql-sse-1.0.6" - sources."graphql-ws-5.6.0" + sources."graphql-sse-1.1.0" + sources."graphql-ws-5.6.2" sources."has-flag-4.0.0" sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" @@ -98101,7 +101422,7 @@ in sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" - sources."meros-1.1.4" + sources."meros-1.2.0" sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.4.1" @@ -98196,13 +101517,12 @@ in sources."ts-node-9.1.1" sources."tslib-2.3.1" sources."type-is-1.6.18" - sources."undici-4.14.1" + sources."undici-4.15.1" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" - sources."valid-url-1.0.9" sources."value-or-promise-1.0.11" sources."vary-1.1.2" sources."vscode-languageserver-types-3.16.0" @@ -98328,10 +101648,10 @@ in meshcommander = nodeEnv.buildNodePackage { name = "meshcommander"; packageName = "meshcommander"; - version = "0.9.2-b"; + version = "0.9.3-b"; src = fetchurl { - url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.2-b.tgz"; - sha512 = "aTPHEnqnIDzsCcL7O7FPnMmKN0Z9Sy5rl58atknikYbLISiu3LHESWUFvFGHHodSs0NVCGM/m5OR5BIVWYxnMg=="; + url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.3-b.tgz"; + sha512 = "RNWHDlBCihL4v/BbqmcyqB3mui8qcza28Vp29FZL7j9d0y4u1UJyjtoHEwjOHw76gX6IMYKcLPksUo5cLDJcEw=="; }; dependencies = [ sources."accepts-1.3.8" @@ -98494,7 +101814,7 @@ in sources."marked-4.0.12" (sources."marked-terminal-5.1.1" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."memory-streams-0.1.3" @@ -98522,7 +101842,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.11.4" + sources."systeminformation-5.11.7" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -98663,7 +101983,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -98741,7 +102061,7 @@ in sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -98811,7 +102131,7 @@ in sources."mute-stdout-1.0.1" sources."nan-2.15.0" sources."nanomatch-1.2.13" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."now-and-later-2.0.1" @@ -99083,7 +102403,7 @@ in ]; }) sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" (sources."expand-brackets-2.1.4" // { @@ -99142,7 +102462,7 @@ in sources."graceful-fs-4.2.9" sources."gulplog-1.0.0" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -99230,7 +102550,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" (sources."object-copy-0.1.0" // { @@ -99420,7 +102740,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -99508,7 +102828,7 @@ in sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."he-1.2.0" sources."html-encoding-sniffer-3.0.0" sources."http-proxy-1.18.1" @@ -99725,7 +103045,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1077.0" + sources."aws-sdk-2.1092.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -99929,7 +103249,7 @@ in sources."jmp-2.0.0" sources."jp-kernel-2.0.0" sources."nan-2.14.2" - sources."nel-1.2.0" + sources."nel-1.3.0" sources."node-gyp-build-4.3.0" sources."uuid-3.4.0" sources."zeromq-5.2.8" @@ -100267,7 +103587,7 @@ in }; dependencies = [ sources."@jcubic/lily-0.3.0" - sources."@types/jquery-3.5.13" + sources."@types/jquery-3.5.14" sources."@types/sizzle-2.3.3" sources."ansidec-0.3.4" sources."arch-2.2.0" @@ -100296,7 +103616,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.31.1" + sources."jquery.terminal-2.32.1" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -100335,10 +103655,10 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.8.1.tgz"; - sha512 = "fbyGBN90QJX4cRkCQtxWltYp/8c/0QCPZrHCQmZJX9iGN91bq/QmggjPbh5/jdHB6johHGxB/LamJIyFFwOVxQ=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.8.2.tgz"; + sha512 = "u7n8UdvFlZcE8LpGDPpc2miBD0zOd9fBMKajeF04KkVCOX7s6Ua+qK9r+zvQBjQT53O7p9XGSEVAUvB4q98b5w=="; }; dependencies = [ sources."@bmewburn/js-beautify-1.13.0" @@ -100505,7 +103825,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."uuid-3.4.0" @@ -100515,7 +103835,7 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) - (sources."vscode-html-languageservice-4.2.1" // { + (sources."vscode-html-languageservice-4.2.2" // { dependencies = [ sources."vscode-languageserver-types-3.16.0" ]; @@ -100609,7 +103929,7 @@ in sources."deep-is-0.1.4" sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."diff-4.0.2" (sources."duplexer2-0.1.4" // { dependencies = [ @@ -100660,8 +103980,8 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" - sources."http-errors-1.8.1" + sources."has-symbols-1.0.3" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -100759,7 +104079,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.10.3" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" @@ -100789,7 +104109,7 @@ in sources."source-map-0.6.1" sources."split2-3.2.2" sources."ssh-config-1.1.6" - sources."statuses-1.5.0" + sources."statuses-2.0.1" (sources."stream-combiner2-1.1.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -100870,42 +104190,42 @@ in dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.2" - sources."@ot-builder/bin-composite-types-1.3.3" - sources."@ot-builder/bin-util-1.3.3" - sources."@ot-builder/cli-help-shower-1.3.3" - sources."@ot-builder/cli-proc-1.3.3" - sources."@ot-builder/cli-shared-1.3.3" - sources."@ot-builder/common-impl-1.3.3" - sources."@ot-builder/errors-1.3.3" - sources."@ot-builder/io-bin-cff-1.3.3" - sources."@ot-builder/io-bin-encoding-1.3.3" - sources."@ot-builder/io-bin-ext-private-1.3.3" - sources."@ot-builder/io-bin-font-1.3.3" - sources."@ot-builder/io-bin-glyph-store-1.3.3" - sources."@ot-builder/io-bin-layout-1.3.3" - sources."@ot-builder/io-bin-metadata-1.3.3" - sources."@ot-builder/io-bin-metric-1.3.3" - sources."@ot-builder/io-bin-name-1.3.3" - sources."@ot-builder/io-bin-sfnt-1.3.3" - sources."@ot-builder/io-bin-ttf-1.3.3" - sources."@ot-builder/io-bin-vtt-private-1.3.3" - sources."@ot-builder/ot-1.3.3" - sources."@ot-builder/ot-encoding-1.3.3" - sources."@ot-builder/ot-ext-private-1.3.3" - sources."@ot-builder/ot-glyphs-1.3.3" - sources."@ot-builder/ot-layout-1.3.3" - sources."@ot-builder/ot-metadata-1.3.3" - sources."@ot-builder/ot-name-1.3.3" - sources."@ot-builder/ot-sfnt-1.3.3" - sources."@ot-builder/ot-standard-glyph-namer-1.3.3" - sources."@ot-builder/ot-vtt-private-1.3.3" - sources."@ot-builder/prelude-1.3.3" - sources."@ot-builder/primitive-1.3.3" - sources."@ot-builder/rectify-1.3.3" - sources."@ot-builder/stat-glyphs-1.3.3" - sources."@ot-builder/trace-1.3.3" - sources."@ot-builder/var-store-1.3.3" - sources."@ot-builder/variance-1.3.3" + sources."@ot-builder/bin-composite-types-1.4.0" + sources."@ot-builder/bin-util-1.4.0" + sources."@ot-builder/cli-help-shower-1.4.0" + sources."@ot-builder/cli-proc-1.4.0" + sources."@ot-builder/cli-shared-1.4.0" + sources."@ot-builder/common-impl-1.4.0" + sources."@ot-builder/errors-1.4.0" + sources."@ot-builder/io-bin-cff-1.4.0" + sources."@ot-builder/io-bin-encoding-1.4.0" + sources."@ot-builder/io-bin-ext-private-1.4.0" + sources."@ot-builder/io-bin-font-1.4.0" + sources."@ot-builder/io-bin-glyph-store-1.4.0" + sources."@ot-builder/io-bin-layout-1.4.0" + sources."@ot-builder/io-bin-metadata-1.4.0" + sources."@ot-builder/io-bin-metric-1.4.0" + sources."@ot-builder/io-bin-name-1.4.0" + sources."@ot-builder/io-bin-sfnt-1.4.0" + sources."@ot-builder/io-bin-ttf-1.4.0" + sources."@ot-builder/io-bin-vtt-private-1.4.0" + sources."@ot-builder/ot-1.4.0" + sources."@ot-builder/ot-encoding-1.4.0" + sources."@ot-builder/ot-ext-private-1.4.0" + sources."@ot-builder/ot-glyphs-1.4.0" + sources."@ot-builder/ot-layout-1.4.0" + sources."@ot-builder/ot-metadata-1.4.0" + sources."@ot-builder/ot-name-1.4.0" + sources."@ot-builder/ot-sfnt-1.4.0" + sources."@ot-builder/ot-standard-glyph-namer-1.4.0" + sources."@ot-builder/ot-vtt-private-1.4.0" + sources."@ot-builder/prelude-1.4.0" + sources."@ot-builder/primitive-1.4.0" + sources."@ot-builder/rectify-1.4.0" + sources."@ot-builder/stat-glyphs-1.4.0" + sources."@ot-builder/trace-1.4.0" + sources."@ot-builder/var-store-1.4.0" + sources."@ot-builder/variance-1.4.0" sources."@unicode/unicode-14.0.0-1.2.1" sources."@xmldom/xmldom-0.7.5" sources."aglfn-1.0.2" @@ -100952,7 +104272,7 @@ in sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."get-caller-file-2.0.5" sources."graceful-fs-4.2.9" sources."has-flag-4.0.0" @@ -100967,8 +104287,8 @@ in sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.3.3" - sources."otb-ttc-bundle-1.3.3" + sources."ot-builder-1.4.0" + sources."otb-ttc-bundle-1.4.0" sources."passerror-1.1.1" sources."patel-0.37.1" sources."patrisika-0.24.0" @@ -101003,7 +104323,7 @@ in (sources."verda-1.5.0" // { dependencies = [ sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."wawoff2-2.0.1" @@ -101158,11 +104478,21 @@ in sources."tslib-1.14.1" ]; }) + (sources."@aws-crypto/crc32c-2.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@aws-crypto/ie11-detection-2.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) + (sources."@aws-crypto/sha1-browser-2.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@aws-crypto/sha256-browser-2.0.0" // { dependencies = [ sources."tslib-1.14.1" @@ -101183,85 +104513,87 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/abort-controller-3.52.0" + sources."@aws-sdk/abort-controller-3.54.0" sources."@aws-sdk/chunked-blob-reader-3.52.0" sources."@aws-sdk/chunked-blob-reader-native-3.52.0" - sources."@aws-sdk/client-s3-3.52.0" - sources."@aws-sdk/client-sso-3.52.0" - sources."@aws-sdk/client-sts-3.52.0" - sources."@aws-sdk/config-resolver-3.52.0" - sources."@aws-sdk/credential-provider-env-3.52.0" - sources."@aws-sdk/credential-provider-imds-3.52.0" - sources."@aws-sdk/credential-provider-ini-3.52.0" - sources."@aws-sdk/credential-provider-node-3.52.0" - sources."@aws-sdk/credential-provider-process-3.52.0" - sources."@aws-sdk/credential-provider-sso-3.52.0" - sources."@aws-sdk/credential-provider-web-identity-3.52.0" - sources."@aws-sdk/eventstream-marshaller-3.52.0" - sources."@aws-sdk/eventstream-serde-browser-3.52.0" - sources."@aws-sdk/eventstream-serde-config-resolver-3.52.0" - sources."@aws-sdk/eventstream-serde-node-3.52.0" - sources."@aws-sdk/eventstream-serde-universal-3.52.0" - sources."@aws-sdk/fetch-http-handler-3.52.0" - sources."@aws-sdk/hash-blob-browser-3.52.0" - sources."@aws-sdk/hash-node-3.52.0" - sources."@aws-sdk/hash-stream-node-3.52.0" - sources."@aws-sdk/invalid-dependency-3.52.0" + sources."@aws-sdk/client-s3-3.54.0" + sources."@aws-sdk/client-sso-3.54.0" + sources."@aws-sdk/client-sts-3.54.0" + sources."@aws-sdk/config-resolver-3.54.0" + sources."@aws-sdk/credential-provider-env-3.54.0" + sources."@aws-sdk/credential-provider-imds-3.54.0" + sources."@aws-sdk/credential-provider-ini-3.54.0" + sources."@aws-sdk/credential-provider-node-3.54.0" + sources."@aws-sdk/credential-provider-process-3.54.0" + sources."@aws-sdk/credential-provider-sso-3.54.0" + sources."@aws-sdk/credential-provider-web-identity-3.54.0" + sources."@aws-sdk/eventstream-marshaller-3.54.0" + sources."@aws-sdk/eventstream-serde-browser-3.54.0" + sources."@aws-sdk/eventstream-serde-config-resolver-3.54.0" + sources."@aws-sdk/eventstream-serde-node-3.54.0" + sources."@aws-sdk/eventstream-serde-universal-3.54.0" + sources."@aws-sdk/fetch-http-handler-3.54.0" + sources."@aws-sdk/hash-blob-browser-3.54.0" + sources."@aws-sdk/hash-node-3.54.0" + sources."@aws-sdk/hash-stream-node-3.54.0" + sources."@aws-sdk/invalid-dependency-3.54.0" sources."@aws-sdk/is-array-buffer-3.52.0" - sources."@aws-sdk/md5-js-3.52.0" - sources."@aws-sdk/middleware-apply-body-checksum-3.52.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.52.0" - sources."@aws-sdk/middleware-content-length-3.52.0" - sources."@aws-sdk/middleware-expect-continue-3.52.0" - sources."@aws-sdk/middleware-header-default-3.52.0" - sources."@aws-sdk/middleware-host-header-3.52.0" - sources."@aws-sdk/middleware-location-constraint-3.52.0" - sources."@aws-sdk/middleware-logger-3.52.0" - (sources."@aws-sdk/middleware-retry-3.52.0" // { + sources."@aws-sdk/md5-js-3.54.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.54.0" + sources."@aws-sdk/middleware-content-length-3.54.0" + sources."@aws-sdk/middleware-expect-continue-3.54.0" + sources."@aws-sdk/middleware-flexible-checksums-3.54.0" + sources."@aws-sdk/middleware-header-default-3.54.0" + sources."@aws-sdk/middleware-host-header-3.54.0" + sources."@aws-sdk/middleware-location-constraint-3.54.0" + sources."@aws-sdk/middleware-logger-3.54.0" + (sources."@aws-sdk/middleware-retry-3.54.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.52.0" - sources."@aws-sdk/middleware-sdk-sts-3.52.0" - sources."@aws-sdk/middleware-serde-3.52.0" - sources."@aws-sdk/middleware-signing-3.52.0" - sources."@aws-sdk/middleware-ssec-3.52.0" - sources."@aws-sdk/middleware-stack-3.52.0" - sources."@aws-sdk/middleware-user-agent-3.52.0" - sources."@aws-sdk/node-config-provider-3.52.0" - sources."@aws-sdk/node-http-handler-3.52.0" - sources."@aws-sdk/property-provider-3.52.0" - sources."@aws-sdk/protocol-http-3.52.0" - sources."@aws-sdk/querystring-builder-3.52.0" - sources."@aws-sdk/querystring-parser-3.52.0" - sources."@aws-sdk/s3-request-presigner-3.52.0" - sources."@aws-sdk/service-error-classification-3.52.0" + sources."@aws-sdk/middleware-sdk-s3-3.54.0" + sources."@aws-sdk/middleware-sdk-sts-3.54.0" + sources."@aws-sdk/middleware-serde-3.54.0" + sources."@aws-sdk/middleware-signing-3.54.0" + sources."@aws-sdk/middleware-ssec-3.54.0" + sources."@aws-sdk/middleware-stack-3.54.0" + sources."@aws-sdk/middleware-user-agent-3.54.0" + sources."@aws-sdk/node-config-provider-3.54.0" + sources."@aws-sdk/node-http-handler-3.54.0" + sources."@aws-sdk/property-provider-3.54.0" + sources."@aws-sdk/protocol-http-3.54.0" + sources."@aws-sdk/querystring-builder-3.54.0" + sources."@aws-sdk/querystring-parser-3.54.0" + sources."@aws-sdk/s3-request-presigner-3.54.0" + sources."@aws-sdk/service-error-classification-3.54.0" sources."@aws-sdk/shared-ini-file-loader-3.52.0" - sources."@aws-sdk/signature-v4-3.52.0" - sources."@aws-sdk/smithy-client-3.52.0" - sources."@aws-sdk/types-3.52.0" - sources."@aws-sdk/url-parser-3.52.0" + sources."@aws-sdk/signature-v4-3.54.0" + sources."@aws-sdk/smithy-client-3.54.0" + sources."@aws-sdk/types-3.54.0" + sources."@aws-sdk/url-parser-3.54.0" sources."@aws-sdk/util-arn-parser-3.52.0" sources."@aws-sdk/util-base64-browser-3.52.0" sources."@aws-sdk/util-base64-node-3.52.0" - sources."@aws-sdk/util-body-length-browser-3.52.0" - sources."@aws-sdk/util-body-length-node-3.52.0" + sources."@aws-sdk/util-body-length-browser-3.54.0" + sources."@aws-sdk/util-body-length-node-3.54.0" sources."@aws-sdk/util-buffer-from-3.52.0" sources."@aws-sdk/util-config-provider-3.52.0" - sources."@aws-sdk/util-create-request-3.52.0" - sources."@aws-sdk/util-credentials-3.52.0" - sources."@aws-sdk/util-defaults-mode-browser-3.52.0" - sources."@aws-sdk/util-defaults-mode-node-3.52.0" - sources."@aws-sdk/util-format-url-3.52.0" + sources."@aws-sdk/util-create-request-3.54.0" + sources."@aws-sdk/util-credentials-3.53.0" + sources."@aws-sdk/util-defaults-mode-browser-3.54.0" + sources."@aws-sdk/util-defaults-mode-node-3.54.0" + sources."@aws-sdk/util-format-url-3.54.0" sources."@aws-sdk/util-hex-encoding-3.52.0" sources."@aws-sdk/util-locate-window-3.52.0" + sources."@aws-sdk/util-stream-browser-3.54.0" + sources."@aws-sdk/util-stream-node-3.54.0" sources."@aws-sdk/util-uri-escape-3.52.0" - sources."@aws-sdk/util-user-agent-browser-3.52.0" - sources."@aws-sdk/util-user-agent-node-3.52.0" + sources."@aws-sdk/util-user-agent-browser-3.54.0" + sources."@aws-sdk/util-user-agent-node-3.54.0" sources."@aws-sdk/util-utf8-browser-3.52.0" sources."@aws-sdk/util-utf8-node-3.52.0" - sources."@aws-sdk/util-waiter-3.52.0" + sources."@aws-sdk/util-waiter-3.54.0" sources."@aws-sdk/xml-builder-3.52.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" @@ -101269,7 +104601,7 @@ in sources."@joplin/fork-sax-1.2.43" (sources."@joplin/htmlpack-2.6.1" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" ]; }) sources."@joplin/lib-2.6.3" @@ -101322,7 +104654,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1092.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -101976,7 +105308,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -102197,17 +105529,17 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "0.7.1"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.1.tgz"; - sha512 = "/LxjcgeDIZwFB1HHTShKAYs2NaxAgwUQjXKvrFLDvw3KqvbffFmy5ZeeamxoSLgQG89tRs9+CFKiR3lJAPPhDw=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.3.tgz"; + sha512 = "VBvNBt3cIrCBHa3gYbVsCFUEReqWZPf+Biq1ZtFdIiQ6rytRLDp3qvtrGv7z/iZDd1D4vXWpW7Nx1nP8muLzkg=="; }; dependencies = [ sources."cli-color-2.0.1" sources."d-1.0.1" sources."difflib-0.2.4" sources."dreamopt-0.8.0" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -102220,12 +105552,8 @@ in sources."heap-0.2.7" sources."is-promise-2.2.2" sources."lru-queue-0.1.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) - sources."next-tick-1.0.0" + sources."memoizee-0.4.15" + sources."next-tick-1.1.0" sources."timers-ext-0.1.7" sources."type-1.2.0" sources."wordwrap-1.0.0" @@ -102267,7 +105595,7 @@ in sources."get-intrinsic-1.1.1" sources."graphlib-2.1.8" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" @@ -102521,7 +105849,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -103156,7 +106484,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + sources."@oclif/parser-3.8.7" (sources."@oclif/plugin-help-3.3.1" // { dependencies = [ sources."@oclif/config-1.18.2" @@ -103164,7 +106492,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.27.3" // { + (sources."@putdotio/api-client-8.30.0" // { dependencies = [ sources."axios-0.21.4" ]; @@ -103224,7 +106552,7 @@ in sources."dotenv-8.6.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."escape-string-regexp-4.0.0" @@ -103254,7 +106582,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ignore-5.2.0" @@ -103292,7 +106620,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-orderby-2.0.3" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-downloader-helper-1.0.19" sources."object-inspect-1.12.0" @@ -103346,7 +106674,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" sources."uri-js-4.4.1" - sources."urijs-1.19.8" + sources."urijs-1.19.10" sources."uuid-8.3.2" sources."which-1.3.1" sources."widest-line-3.1.0" @@ -103388,17 +106716,18 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.3.16"; + version = "6.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz"; - sha512 = "nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ=="; + url = "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz"; + sha512 = "2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g=="; }; dependencies = [ + sources."@colors/colors-1.5.0" sources."@socket.io/base64-arraybuffer-1.0.2" sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -103414,7 +106743,6 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colors-1.4.0" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."connect-3.7.0" @@ -103422,7 +106750,7 @@ in sources."cookie-0.4.2" sources."cors-2.8.5" sources."custom-event-1.0.1" - sources."date-format-4.0.3" + sources."date-format-4.0.4" sources."debug-2.6.9" sources."depd-1.1.2" sources."di-0.0.1" @@ -103430,7 +106758,7 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-6.1.2" // { + (sources."engine.io-6.1.3" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -103446,7 +106774,7 @@ in sources."finalhandler-1.1.2" sources."flatted-3.2.5" sources."follow-redirects-1.14.9" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" @@ -103466,7 +106794,7 @@ in sources."isbinaryfile-4.0.8" sources."jsonfile-6.1.0" sources."lodash-4.17.21" - (sources."log4js-6.4.1" // { + (sources."log4js-6.4.2" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -103514,7 +106842,7 @@ in }) sources."source-map-0.6.1" sources."statuses-1.5.0" - (sources."streamroller-3.0.2" // { + (sources."streamroller-3.0.4" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -103559,7 +106887,7 @@ in }; dependencies = [ sources."@ampproject/remapping-2.1.2" - sources."@babel/cli-7.17.3" + sources."@babel/cli-7.17.6" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.0" (sources."@babel/core-7.17.5" // { @@ -103579,7 +106907,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -103658,12 +106986,12 @@ in sources."brace-expansion-1.1.11" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-from-1.1.2" sources."bytes-3.1.2" sources."bytesish-0.4.4" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-1.4.0" @@ -103718,7 +107046,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -103771,7 +107099,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -104012,7 +107340,7 @@ in sources."glob-stream-6.1.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" @@ -104734,7 +108062,7 @@ in sources."abbrev-1.1.1" sources."add-stream-1.0.0" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -104927,7 +108255,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-4.1.0" @@ -104955,7 +108283,7 @@ in (sources."init-package-json-2.0.5" // { dependencies = [ sources."normalize-package-data-3.0.3" - sources."read-package-json-4.1.1" + sources."read-package-json-4.1.2" ]; }) sources."inquirer-7.3.3" @@ -105271,7 +108599,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -105529,7 +108857,7 @@ in sources."depd-1.1.2" ]; }) - sources."http-parser-js-0.5.5" + sources."http-parser-js-0.5.6" sources."inherits-2.0.4" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" @@ -106262,7 +109590,7 @@ in sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" @@ -106272,7 +109600,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -106295,7 +109623,7 @@ in sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -106387,11 +109715,11 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" - sources."@types/yargs-parser-20.2.1" + sources."@types/yargs-parser-21.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -106544,7 +109872,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -106560,7 +109888,7 @@ in sources."cached-path-relative-1.1.0" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -106683,7 +110011,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106814,7 +110142,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -106924,7 +110252,7 @@ in sources."lodash.debounce-4.0.8" sources."lodash.memoize-3.0.4" sources."lru-cache-5.1.1" - sources."magic-string-0.25.7" + sources."magic-string-0.25.9" sources."make-dir-3.1.0" sources."makeerror-1.0.12" sources."map-cache-0.2.2" @@ -107421,7 +110749,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -107994,7 +111322,7 @@ in }) sources."ecc-jsbn-0.1.2" sources."entities-1.1.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -108074,7 +111402,7 @@ in sources."interpret-1.4.0" sources."is-core-module-2.8.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-property-1.0.2" sources."is-resolvable-1.1.0" @@ -108120,7 +111448,7 @@ in sources."multipipe-0.1.2" sources."mute-stream-0.0.5" sources."natural-compare-1.4.0" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."node-addon-api-1.7.2" sources."node-fetch-2.6.1" sources."number-is-nan-1.0.1" @@ -108288,7 +111616,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -108381,7 +111709,7 @@ in }) sources."debug-4.3.3" sources."delaunator-5.0.0" - sources."devtools-protocol-0.0.960912" + sources."devtools-protocol-0.0.969999" sources."dompurify-2.3.5" sources."end-of-stream-1.4.4" sources."extract-zip-2.0.1" @@ -108419,7 +111747,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-13.3.2" + sources."puppeteer-13.5.1" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."robust-predicates-3.0.1" @@ -108454,10 +111782,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz"; - sha512 = "T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz"; + sha512 = "L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -108498,7 +111826,11 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-7.2.0" + (sources."glob-7.2.0" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) sources."glob-parent-5.1.2" sources."growl-1.10.5" sources."has-flag-4.0.0" @@ -108516,9 +111848,9 @@ in sources."js-yaml-4.1.0" sources."locate-path-6.0.0" sources."log-symbols-4.1.0" - sources."minimatch-3.0.4" + sources."minimatch-4.2.1" sources."ms-2.1.3" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."p-limit-3.1.0" @@ -108583,7 +111915,7 @@ in sources."get-intrinsic-1.1.1" sources."graphlib-2.1.8" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" @@ -108763,10 +112095,10 @@ in 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/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" - sources."@types/yargs-parser-20.2.1" + sources."@types/yargs-parser-21.0.0" sources."agent-base-6.0.2" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -108929,7 +112261,7 @@ in sources."ncp-2.0.0" sources."near-api-js-0.44.2" sources."near-hd-key-1.2.1" - sources."near-ledger-js-0.2.0" + sources."near-ledger-js-0.2.1" sources."near-seed-phrase-0.2.0" (sources."node-abi-2.30.1" // { dependencies = [ @@ -109146,26 +112478,30 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "8.4.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz"; - sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz"; + sha512 = "Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw=="; }; dependencies = [ sources."@gar/promisify-1.1.3" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" sources."aproba-2.0.0" sources."are-we-there-yet-3.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."cacache-15.3.0" + (sources."cacache-15.3.0" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."color-support-1.1.3" @@ -109180,12 +112516,12 @@ in sources."err-code-2.0.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" @@ -109198,12 +112534,12 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" + sources."lru-cache-7.4.4" + sources."make-fetch-happen-10.0.5" sources."minimatch-3.1.2" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" + sources."minipass-fetch-2.0.3" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -109223,7 +112559,11 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.5" + (sources."semver-7.3.5" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" @@ -109696,12 +113036,12 @@ in sources."@node-red/registry-2.2.2" sources."@node-red/runtime-2.2.2" sources."@node-red/util-2.2.2" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -109948,7 +113288,7 @@ in sources."normalize-url-6.1.0" sources."npmlog-5.0.1" sources."nth-check-2.0.1" - (sources."number-allocator-1.0.9" // { + (sources."number-allocator-1.0.10" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -110454,7 +113794,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -110764,7 +114104,7 @@ in sources."os-tmpdir-1.0.2" (sources."ow-0.21.0" // { dependencies = [ - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."type-fest-0.20.2" ]; }) @@ -110948,10 +114288,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "8.5.1"; + version = "8.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-8.5.1.tgz"; - sha512 = "zHrOHAatEPJ59o2JIPlhgc9LX9mb8xFrqu4kiiul4w1IGMTtKn2lqRiGIRKU0or69NSLXNmqbCP9bNJIr/wB6Q=="; + url = "https://registry.npmjs.org/npm/-/npm-8.5.4.tgz"; + sha512 = "VnGLT4t88cUE78lLw5kxBwtLn2/Sx6O7Uw9dYwmq6AnF/taWHyMYQgDzUEsLhaXAVH7prG+sjG+MvxlHdIasgg=="; }; buildInputs = globalBuildInputs; meta = { @@ -110966,10 +114306,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "12.4.0"; + version = "12.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.4.0.tgz"; - sha512 = "X14H74M8SVFkStmP1NDOMh0OjLB3mU2dwUeM71zyITJHkm08MASwwTcydW6YuGcNW1RUlVq1cQY2yWijv4zKUQ=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.3.tgz"; + sha512 = "siFg/+Un+j4tLA6GJCnk6hz2YU4Yc5bftDnOoiSRLKL6NeAS3FScB32mtKNBtITMJf2nsoZSr8vH+wdUGeP19g=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -110979,20 +114319,20 @@ in sources."@npmcli/fs-1.1.1" (sources."@npmcli/git-3.0.0" // { dependencies = [ - sources."lru-cache-7.3.1" + sources."lru-cache-7.4.4" ]; }) sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" + sources."@npmcli/run-script-3.0.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -111057,7 +114397,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."get-stdin-8.0.0" sources."get-stream-4.1.0" (sources."glob-7.2.0" // { @@ -111081,7 +114421,7 @@ in sources."has-yarn-2.1.0" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" @@ -111143,15 +114483,19 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.1.0" + (sources."make-fetch-happen-10.0.5" // { + dependencies = [ + sources."lru-cache-7.4.4" + ]; + }) sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mimic-response-1.0.1" - sources."minimatch-5.0.0" + sources."minimatch-5.0.1" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" + sources."minipass-fetch-2.0.3" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -111160,7 +114504,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."negotiator-0.6.3" - sources."node-gyp-8.4.1" + sources."node-gyp-9.0.0" sources."nopt-5.0.0" sources."normalize-package-data-3.0.3" sources."normalize-url-4.5.1" @@ -111170,14 +114514,7 @@ in sources."npm-package-arg-9.0.0" sources."npm-packlist-3.0.0" sources."npm-pick-manifest-7.0.0" - (sources."npm-registry-fetch-13.0.0" // { - dependencies = [ - sources."@tootallnate/once-2.0.0" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.3.1" - sources."make-fetch-happen-10.0.3" - ]; - }) + sources."npm-registry-fetch-13.0.1" sources."npmlog-6.0.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" @@ -111190,7 +114527,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-13.0.2" + sources."pacote-13.0.3" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -111207,7 +114544,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."rc-config-loader-4.0.0" - sources."read-package-json-4.1.1" + sources."read-package-json-4.1.2" sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" sources."registry-auth-token-4.2.1" @@ -111365,7 +114702,7 @@ in sources."mkdirp-0.5.5" ]; }) - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."getpass-0.1.7" sources."glob-7.2.0" sources."graceful-fs-2.0.3" @@ -111611,7 +114948,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ @@ -111625,7 +114962,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -111643,7 +114980,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -111823,7 +115160,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -111840,7 +115177,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -111977,7 +115314,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -112061,7 +115398,7 @@ in }) sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -112084,10 +115421,11 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.9" // { dependencies = [ + sources."acorn-8.7.0" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."source-map-0.7.3" - sources."terser-5.10.0" + sources."terser-5.12.0" ]; }) (sources."htmlparser2-6.1.0" // { @@ -112614,6 +115952,243 @@ in bypassCache = true; reconstructLock = true; }; + parcel = nodeEnv.buildNodePackage { + name = "parcel"; + packageName = "parcel"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parcel/-/parcel-2.3.2.tgz"; + sha512 = "4jhgoBcQaiGKmnmBvNyKyOvZrxCgzgUzdEoVup/fRCOP99hNmvYIN5IErIIJxsU9ObcG/RGCFF8wa4kVRsWfIg=="; + }; + dependencies = [ + sources."@babel/code-frame-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + (sources."@babel/highlight-7.16.10" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@parcel/bundler-default-2.3.2" + sources."@parcel/cache-2.3.2" + sources."@parcel/codeframe-2.3.2" + sources."@parcel/compressor-raw-2.3.2" + sources."@parcel/config-default-2.3.2" + sources."@parcel/core-2.3.2" + sources."@parcel/diagnostic-2.3.2" + sources."@parcel/events-2.3.2" + sources."@parcel/fs-2.3.2" + sources."@parcel/fs-search-2.3.2" + sources."@parcel/graph-2.3.2" + sources."@parcel/hash-2.3.2" + sources."@parcel/logger-2.3.2" + sources."@parcel/markdown-ansi-2.3.2" + sources."@parcel/namer-default-2.3.2" + sources."@parcel/node-resolver-core-2.3.2" + sources."@parcel/optimizer-cssnano-2.3.2" + sources."@parcel/optimizer-htmlnano-2.3.2" + sources."@parcel/optimizer-image-2.3.2" + sources."@parcel/optimizer-svgo-2.3.2" + sources."@parcel/optimizer-terser-2.3.2" + sources."@parcel/package-manager-2.3.2" + sources."@parcel/packager-css-2.3.2" + sources."@parcel/packager-html-2.3.2" + sources."@parcel/packager-js-2.3.2" + sources."@parcel/packager-raw-2.3.2" + sources."@parcel/packager-svg-2.3.2" + sources."@parcel/plugin-2.3.2" + sources."@parcel/reporter-cli-2.3.2" + sources."@parcel/reporter-dev-server-2.3.2" + sources."@parcel/resolver-default-2.3.2" + sources."@parcel/runtime-browser-hmr-2.3.2" + sources."@parcel/runtime-js-2.3.2" + sources."@parcel/runtime-react-refresh-2.3.2" + sources."@parcel/runtime-service-worker-2.3.2" + sources."@parcel/source-map-2.0.2" + sources."@parcel/transformer-babel-2.3.2" + sources."@parcel/transformer-css-2.3.2" + (sources."@parcel/transformer-html-2.3.2" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/transformer-image-2.3.2" + sources."@parcel/transformer-js-2.3.2" + sources."@parcel/transformer-json-2.3.2" + sources."@parcel/transformer-postcss-2.3.2" + (sources."@parcel/transformer-posthtml-2.3.2" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/transformer-raw-2.3.2" + sources."@parcel/transformer-react-refresh-wrap-2.3.2" + (sources."@parcel/transformer-svg-2.3.2" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/types-2.3.2" + sources."@parcel/utils-2.3.2" + sources."@parcel/watcher-2.0.5" + sources."@parcel/workers-2.3.2" + sources."@swc/helpers-0.2.14" + sources."@trysound/sax-0.2.0" + sources."@types/parse-json-4.0.0" + sources."abortcontroller-polyfill-1.7.3" + sources."acorn-8.7.0" + sources."ansi-styles-3.2.1" + sources."base-x-3.0.9" + sources."boolbase-1.0.0" + sources."browserslist-4.20.0" + sources."buffer-from-1.1.2" + sources."callsites-3.1.0" + sources."caniuse-api-3.0.0" + sources."caniuse-lite-1.0.30001314" + (sources."chalk-4.1.2" // { + dependencies = [ + sources."ansi-styles-4.3.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."chrome-trace-event-1.0.3" + sources."clone-2.1.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colord-2.9.2" + sources."commander-7.2.0" + sources."cosmiconfig-7.0.1" + sources."css-declaration-sorter-6.1.4" + sources."css-select-4.2.1" + sources."css-tree-1.1.3" + sources."css-what-5.1.0" + sources."cssesc-3.0.0" + sources."cssnano-5.1.3" + sources."cssnano-preset-default-5.2.3" + sources."cssnano-utils-3.1.0" + sources."csso-4.2.0" + sources."detect-libc-1.0.3" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domhandler-4.3.0" + sources."domutils-2.8.0" + sources."dotenv-7.0.0" + sources."dotenv-expand-5.1.0" + sources."electron-to-chromium-1.4.82" + sources."entities-2.2.0" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."get-port-4.2.0" + sources."globals-13.12.1" + sources."has-flag-3.0.0" + sources."htmlnano-2.0.0" + (sources."htmlparser2-7.2.0" // { + dependencies = [ + sources."entities-3.0.1" + ]; + }) + sources."import-fresh-3.3.0" + sources."is-arrayish-0.2.1" + sources."is-json-2.0.1" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."json-source-map-0.6.1" + sources."json5-2.2.0" + sources."lilconfig-2.0.4" + sources."lines-and-columns-1.2.4" + sources."lmdb-2.2.4" + sources."lodash.memoize-4.1.2" + sources."lodash.uniq-4.5.0" + sources."mdn-data-2.0.14" + sources."minimist-1.2.5" + sources."msgpackr-1.5.4" + sources."msgpackr-extract-1.0.16" + sources."nan-2.15.0" + sources."nanoid-3.3.1" + sources."node-addon-api-3.2.1" + sources."node-gyp-build-4.3.0" + sources."node-releases-2.0.2" + sources."normalize-url-6.1.0" + sources."nth-check-2.0.1" + sources."nullthrows-1.1.1" + sources."ordered-binary-1.2.4" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."path-type-4.0.0" + sources."picocolors-1.0.0" + sources."postcss-8.4.8" + sources."postcss-calc-8.2.4" + sources."postcss-colormin-5.3.0" + sources."postcss-convert-values-5.1.0" + sources."postcss-discard-comments-5.1.1" + 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.1" + sources."postcss-merge-rules-5.1.0" + sources."postcss-minify-font-values-5.1.0" + sources."postcss-minify-gradients-5.1.0" + sources."postcss-minify-params-5.1.1" + sources."postcss-minify-selectors-5.2.0" + sources."postcss-normalize-charset-5.1.0" + sources."postcss-normalize-display-values-5.1.0" + sources."postcss-normalize-positions-5.1.0" + sources."postcss-normalize-repeat-style-5.1.0" + sources."postcss-normalize-string-5.1.0" + sources."postcss-normalize-timing-functions-5.1.0" + sources."postcss-normalize-unicode-5.1.0" + sources."postcss-normalize-url-5.1.0" + sources."postcss-normalize-whitespace-5.1.1" + sources."postcss-ordered-values-5.1.0" + sources."postcss-reduce-initial-5.1.0" + sources."postcss-reduce-transforms-5.1.0" + sources."postcss-selector-parser-6.0.9" + sources."postcss-svgo-5.1.0" + sources."postcss-unique-selectors-5.1.1" + sources."postcss-value-parser-4.2.0" + sources."posthtml-0.16.6" + sources."posthtml-parser-0.11.0" + sources."posthtml-render-3.0.0" + sources."react-refresh-0.9.0" + sources."regenerator-runtime-0.13.9" + sources."resolve-from-4.0.0" + sources."safe-buffer-5.2.1" + sources."semver-5.7.1" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" + sources."stable-0.1.8" + sources."stylehacks-5.1.0" + sources."supports-color-5.5.0" + sources."svgo-2.8.0" + (sources."terser-5.12.0" // { + dependencies = [ + sources."commander-2.20.3" + sources."source-map-0.7.3" + ]; + }) + sources."timsort-0.3.0" + sources."type-fest-0.20.2" + sources."util-deprecate-1.0.2" + sources."utility-types-3.10.0" + sources."v8-compile-cache-2.3.0" + sources."weak-lru-cache-1.2.2" + sources."xxhash-wasm-0.4.2" + sources."yaml-1.10.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Blazing fast, zero configuration web application bundler"; + homepage = "https://github.com/parcel-bundler/parcel#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; @@ -112733,7 +116308,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."heapdump-0.3.15" @@ -112864,7 +116439,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -113079,7 +116654,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."hosted-git-info-2.8.9" @@ -113937,7 +117512,7 @@ in sources."debug-4.3.3" sources."deep-is-0.1.4" sources."degenerator-3.0.2" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."emitter-listener-1.1.2" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" @@ -113965,7 +117540,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -114026,7 +117601,7 @@ in sources."promptly-2.2.0" sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."read-1.0.7" sources."readable-stream-1.1.14" sources."readdirp-3.6.0" @@ -114051,11 +117626,11 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."sprintf-js-1.1.2" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.11.4" + sources."systeminformation-5.11.8" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-2.3.1" @@ -114070,7 +117645,7 @@ in sources."async-2.6.3" ]; }) - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -114091,10 +117666,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.31.0"; + version = "6.32.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.31.0.tgz"; - sha512 = "YUCyLI2J2wQsHWgcRYR8wUrTWsE0E8GX46XKtdXcUiE0GJJYi5saRy2Y8BMfLtlDHshHLs2U/KO1e5gsftJTFA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.3.tgz"; + sha512 = "lMQgROSwiUA+kt+suAPinjNwqevS1Iz0rppWNZ3jHhzeP07RFRQ+Ksai2OlAnM+YjlbHT9niQ4ICBVSqcdQ04w=="; }; buildInputs = globalBuildInputs; meta = { @@ -114137,10 +117712,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.6"; + version = "8.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz"; - sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz"; + sha512 = "2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ=="; }; dependencies = [ sources."nanoid-3.3.1" @@ -114186,7 +117761,7 @@ in sources."fast-glob-3.2.11" sources."fastq-1.13.0" sources."fill-range-7.0.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."get-stdin-9.0.0" @@ -114227,7 +117802,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -114341,6 +117916,39 @@ in bypassCache = true; reconstructLock = true; }; + prettier_d_slim = nodeEnv.buildNodePackage { + name = "prettier_d_slim"; + packageName = "prettier_d_slim"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier_d_slim/-/prettier_d_slim-1.2.0.tgz"; + sha512 = "Wq/Qida9MweJX7dKjlNeJ9Ppfeu4YPWY2947x1xev2RXjimvv2QOBRQJhGAir/QZ+WJnrU82e9O67Uqu8JgbZw=="; + }; + dependencies = [ + sources."camelize-1.0.0" + sources."core_d-3.2.0" + sources."function-bind-1.1.1" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."is-core-module-2.8.1" + sources."minimist-1.2.5" + sources."nanolru-1.0.0" + sources."path-parse-1.0.7" + sources."prettier-2.5.1" + sources."resolve-1.22.0" + sources."supports-color-8.1.1" + sources."supports-preserve-symlinks-flag-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Makes prettier fast"; + homepage = "https://github.com/mikew/prettier_d_slim"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; prettier-plugin-toml = nodeEnv.buildNodePackage { name = "prettier-plugin-toml"; packageName = "prettier-plugin-toml"; @@ -114368,13 +117976,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.9.2"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.9.2.tgz"; - sha512 = "i9eK6cexV74OgeWaH3+e6S07kvC9jEZTl6BqtBH398nlCU0tck7mE9dicY6YQd+euvMjjCtY89q4NgmaPnUsSg=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.10.0.tgz"; + sha512 = "dAld12vtwdz9Rz01nOjmnXe+vHana5PSog8t0XGgLemKsUVsaupYpr74AHaS3s78SaTS5s2HOghnJF+jn91ZrA=="; }; dependencies = [ - sources."@prisma/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" + sources."@prisma/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" ]; buildInputs = globalBuildInputs; meta = { @@ -114389,13 +117997,13 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "3.9.2"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.9.2.tgz"; - sha512 = "lAe5mPD18PPpVlVmHQqj2ky11N9n6nGI32vuu2RbLHK4mRgkA/sLn8kBg81zs3WIdBLzCX+dYSpM8UFviZrlgA=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.10.0.tgz"; + sha512 = "PDapBurrv72Mn28rWg5cWZrt6cFLftWadNfdbVNmsjdR4G3eX9OrflSsOVEuSOANLrP/yi129zT0hS+XC6P3Wg=="; }; dependencies = [ - sources."@prisma/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" + sources."@prisma/prisma-fmt-wasm-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" sources."@types/js-levenshtein-1.1.1" sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -114474,10 +118082,10 @@ in pulp = nodeEnv.buildNodePackage { name = "pulp"; packageName = "pulp"; - version = "15.0.0"; + version = "16.0.0-0"; src = fetchurl { - url = "https://registry.npmjs.org/pulp/-/pulp-15.0.0.tgz"; - sha512 = "JPzDiSjxwySAFOFnpevZO7YzzDgGdJP/SQap1UJbK0rsrfUVQC+zOHDkm7A8T3gR/0el4ft6KwB6fcDl2bTzVw=="; + url = "https://registry.npmjs.org/pulp/-/pulp-16.0.0-0.tgz"; + sha512 = "6nG6qg/p5IGa0k4w9EkBVBX3+7Ra1mjbOCYwbn85kjUC6x1jkyP+hAP7xAwBxTPgxSD8x5IZtoX9sbrNeKecnQ=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -114753,11 +118361,11 @@ in sources."isexe-2.0.0" sources."shell-quote-1.7.3" sources."uuid-3.4.0" - sources."vscode-jsonrpc-8.0.0-next.6" - sources."vscode-languageserver-8.0.0-next.8" - sources."vscode-languageserver-protocol-3.17.0-next.14" + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.9" + sources."vscode-languageserver-protocol-3.17.0-next.15" sources."vscode-languageserver-textdocument-1.0.4" - sources."vscode-languageserver-types-3.17.0-next.7" + sources."vscode-languageserver-types-3.17.0-next.8" sources."vscode-uri-2.1.2" sources."which-2.0.2" ]; @@ -114841,14 +118449,14 @@ in sources."duplexer3-0.1.4" sources."end-of-stream-1.4.4" sources."follow-redirects-1.14.9" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."https-proxy-agent-5.0.0" sources."ini-1.3.8" @@ -114915,10 +118523,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.223"; + version = "1.1.228"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.223.tgz"; - sha512 = "EGLKMQRmSkKNe/eDy6MEkqq5lF91C5MCMYxvmCgKGUjZHIa+HByJIiRY2cOTm7g2CAv0eE7Ift701VxLM5Q0iQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.228.tgz"; + sha512 = "Q/LnDoZK6bxc7u60kFjFwi9X3s79kLaGd/g23T0c6T1CUdrRxDyRTvNRLjLPSLaX8EuPIdcXuPXAzXgSjBz/Mw=="; }; buildInputs = globalBuildInputs; meta = { @@ -115123,7 +118731,7 @@ in sources."pako-0.2.9" ]; }) - sources."urijs-1.19.8" + sources."urijs-1.19.10" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vlq-0.2.3" @@ -115195,7 +118803,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."i-0.3.7" sources."inflight-1.0.6" @@ -115276,7 +118884,7 @@ in }; dependencies = [ sources."@ampproject/remapping-2.1.2" - sources."@babel/cli-7.17.3" + sources."@babel/cli-7.17.6" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.0" (sources."@babel/core-7.17.5" // { @@ -115292,7 +118900,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ @@ -115306,7 +118914,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -115324,7 +118932,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-default-from-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" @@ -115416,7 +119024,7 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -115574,7 +119182,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -115608,7 +119216,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -115836,7 +119444,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116020,7 +119628,7 @@ in sources."has-cors-1.1.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -116073,7 +119681,7 @@ in sources."http-cache-semantics-3.8.1" sources."http-deceiver-1.2.7" sources."http-errors-1.8.1" - sources."http-parser-js-0.5.5" + sources."http-parser-js-0.5.6" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.19.1" sources."https-browserify-1.0.0" @@ -116175,7 +119783,6 @@ in sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" - sources."json3-3.3.3" sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."keyv-3.0.0" @@ -116235,8 +119842,12 @@ in ]; }) sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.34" // { + dependencies = [ + sources."mime-db-1.51.0" + ]; + }) sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -116726,7 +120337,7 @@ in ]; }) sources."sockjs-0.3.24" - (sources."sockjs-client-1.5.2" // { + (sources."sockjs-client-1.6.0" // { dependencies = [ sources."debug-3.2.7" ]; @@ -116898,7 +120509,7 @@ in ]; }) sources."url-loader-2.3.0" - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -117181,7 +120792,7 @@ in sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -117196,10 +120807,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.13.7"; + version = "0.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.7.tgz"; - sha512 = "MkRGhBJfEESAhNnH+duJIkcS+PO5CRPzfJuHjd8tJEfdSXeCu+6UfBVyX4zrstbNGPtZkLn+ZV+bBl5obIcMIA=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.8.tgz"; + sha512 = "P0gh4cIP9KRMMISwVoU0EZKQS6U841UCZ26Lsoh3LANhgPGhKr5IrJzxVX7unxKLGzEjzZWXF778Vye9JXVDEg=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -117228,7 +120839,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.4" - sources."@redocly/openapi-core-1.0.0-beta.82" + sources."@redocly/openapi-core-1.0.0-beta.87" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" sources."@types/node-14.18.12" @@ -117246,7 +120857,7 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-2.0.3" + sources."babel-plugin-styled-components-2.0.6" sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -117377,7 +120988,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.4.1" + sources."mobx-6.4.2" sources."mobx-react-7.3.0" sources."mobx-react-lite-3.3.0" sources."ms-2.1.2" @@ -117393,7 +121004,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."object-assign-4.1.1" - sources."openapi-sampler-1.2.0" + sources."openapi-sampler-1.2.1" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" @@ -117431,7 +121042,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.63" // { + (sources."redoc-2.0.0-rc.64" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -117471,7 +121082,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -117505,7 +121116,7 @@ in sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -117661,10 +121272,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.2.1.tgz"; - sha512 = "OXH4qT5Gs9di6lZPDmRuanIvdiVzltCe8W9ELz6Q3EhoWS+RjRp5HBwFHr+k1fbbP82/Z83sQiK+/ZYFBwrrsQ=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.3.0.tgz"; + sha512 = "KzZxJjj1gmxVNyplY6g9MiGwtDvZJiYkMvG1Qmaita7vWT/8eoTEK+RuIPLvxDeyxOtTz56u2wrOETVO79qL4A=="; }; buildInputs = globalBuildInputs; meta = { @@ -118002,10 +121613,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.67.3"; + version = "2.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.67.3.tgz"; - sha512 = "G/x1vUwbGtP6O5ZM8/sWr8+p7YfZhI18pPqMRtMYMWSbHjKZ/ajHGiM+GWNTlWyOR0EHIdT8LHU+Z4ciIZ1oBw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.70.0.tgz"; + sha512 = "iEzYw+syFxQ0X9RefVwhr8BA2TNJsTaX8L8dhyeyMECDbmiba+8UQzcu+xZdji0+JQ+s7kouQnw+9Oz5M19XKA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -118055,7 +121666,7 @@ in sources."@types/mocha-8.2.3" sources."@types/node-14.17.34" sources."@types/node-fetch-2.6.1" - sources."@types/vscode-1.64.0" + sources."@types/vscode-1.65.0" sources."@typescript-eslint/eslint-plugin-4.33.0" sources."@typescript-eslint/experimental-utils-4.33.0" sources."@typescript-eslint/parser-4.33.0" @@ -118277,7 +121888,7 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."he-1.2.0" sources."hosted-git-info-4.1.0" @@ -118333,12 +121944,12 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" - (sources."mocha-9.2.1" // { + (sources."mocha-9.2.2" // { dependencies = [ sources."argparse-2.0.1" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" - sources."minimatch-3.0.4" + sources."minimatch-4.2.1" sources."ms-2.1.3" sources."supports-color-8.1.1" sources."yargs-16.2.0" @@ -118347,7 +121958,7 @@ in }) sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" sources."node-abi-3.8.0" @@ -118465,7 +122076,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.6" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.2" @@ -118503,7 +122114,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yargs-unparser-2.0.0" sources."yauzl-2.10.0" sources."yazl-2.5.1" @@ -118532,7 +122143,7 @@ in sources."p-locate-5.0.0" sources."path-exists-4.0.0" sources."picocolors-1.0.0" - sources."postcss-8.4.6" + sources."postcss-8.4.8" sources."source-map-js-1.0.2" sources."strip-json-comments-3.1.1" sources."yocto-queue-0.1.0" @@ -118598,7 +122209,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-auth-2.0.7" sources."inherits-2.0.4" sources."isarray-0.0.1" @@ -118646,10 +122257,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.49.8"; + version = "1.49.9"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.49.8.tgz"; - sha512 = "NoGOjvDDOU9og9oAxhRnap71QaTjjlzrvLnKecUJ3GxhaQBrV6e7gPuSPF28u1OcVAArVojPAe4ZhOXwwC4tGw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz"; + sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -118826,10 +122437,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.2.1"; + version = "3.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.2.1.tgz"; - sha512 = "ocCfLKt+C8rZaalzkbdnxenPZBjS78wnZxJYqDdXx3EYr4e9KND2WyTKUhB8g/f3FPSWjGW35R9e3/Mfd/ceTw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.7.4.tgz"; + sha512 = "TsrSGfzKO9N0/rp2dROVUrKgku3b3JHP1wBEPrCgLLmfBTBLRi6YoTK9HAWgehNa+uSHdE4x02s+nttXU6qhtQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -118838,26 +122449,27 @@ 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.1.0" + sources."@serverless/aws-lambda-otel-extension-dist-0.1.10" + sources."@serverless/dashboard-plugin-6.1.5" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.3.1" // { + (sources."@serverless/platform-client-4.3.2" // { dependencies = [ sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/utils-6.0.2" // { + (sources."@serverless/utils-6.0.3" // { dependencies = [ sources."jwt-decode-3.1.2" ]; }) - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/lodash-4.14.178" - sources."@types/node-17.0.19" + sources."@types/lodash-4.14.179" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.9" sources."agent-base-6.0.2" @@ -118883,7 +122495,7 @@ in sources."async-3.2.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1092.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -118974,7 +122586,7 @@ in sources."type-1.2.0" ]; }) - sources."dayjs-1.10.7" + sources."dayjs-1.10.8" sources."debug-4.3.3" (sources."decompress-4.2.1" // { dependencies = [ @@ -119023,11 +122635,7 @@ in sources."duration-0.2.2" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - (sources."es5-ext-0.10.53" // { - dependencies = [ - sources."next-tick-1.0.0" - ]; - }) + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" (sources."es6-set-0.1.5" // { dependencies = [ @@ -119082,7 +122690,7 @@ in sources."graphlib-2.1.8" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.0" @@ -119093,7 +122701,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -119153,8 +122761,12 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.34" // { + dependencies = [ + sources."mime-db-1.51.0" + ]; + }) sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" @@ -119221,7 +122833,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -119272,7 +122884,7 @@ in sources."tmp-0.0.33" sources."to-buffer-1.1.1" sources."to-regex-range-5.0.1" - sources."token-types-4.1.1" + sources."token-types-4.2.0" sources."tr46-0.0.3" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" @@ -119950,10 +123562,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.855.0"; + version = "1.868.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.855.0.tgz"; - sha512 = "LZ8tXVleYHPW2GL3UWfaswKatNY1rTQ7aUNOD1rboD4cWydJsHCnSHzoMQcXq+06XBLw//LxL0G2YhdZhPz2mA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.868.0.tgz"; + sha512 = "iIzTIgQELgCmqvi3XBdKf+6ButRQ/SKCvR91DJM2SKdnIrRAQykNU2NAzBY5IfM/RHcPqCxlCgeJxTumiswv9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -119977,14 +123589,14 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."component-emitter-1.3.0" sources."cookie-0.4.2" sources."cors-2.8.5" sources."debug-4.3.3" - sources."engine.io-6.1.2" + sources."engine.io-6.1.3" sources."engine.io-parser-5.0.3" sources."mime-db-1.51.0" sources."mime-types-2.1.34" @@ -120085,7 +123697,7 @@ in sources."locate-path-6.0.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."log-update-5.0.0" @@ -120100,7 +123712,7 @@ in sources."onetime-5.1.2" (sources."ora-6.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."p-limit-3.1.0" @@ -120137,7 +123749,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."strip-indent-4.0.0" @@ -120276,6 +123888,7 @@ in sources."chloride-2.4.1" sources."chloride-test-1.2.4" sources."chokidar-1.7.0" + sources."clarify-error-1.0.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -120437,7 +124050,7 @@ in sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" sources."has-network-0.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."has-value-1.0.0" // { dependencies = [ @@ -120564,7 +124177,7 @@ in ]; }) sources."levelup-4.4.0" - sources."libnested-1.5.1" + sources."libnested-1.5.2" sources."libsodium-0.7.9" sources."libsodium-wrappers-0.7.9" sources."lodash.debounce-4.0.8" @@ -120595,14 +124208,20 @@ in sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" sources."ms-2.1.2" - sources."multiblob-1.13.7" - sources."multiblob-http-1.2.0" + (sources."multiblob-1.13.8" // { + dependencies = [ + sources."glob-7.2.0" + sources."mkdirp-1.0.4" + sources."rimraf-3.0.2" + ]; + }) + sources."multiblob-http-1.2.1" sources."multicb-1.2.2" sources."multiserver-3.8.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-2.0.0" sources."mutexify-1.4.0" - sources."muxrpc-6.7.0" + sources."muxrpc-6.7.2" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" sources."muxrpcli-3.1.2" @@ -120692,7 +124311,7 @@ in sources."promisify-4loc-1.0.0" sources."promisize-1.1.2" sources."prr-1.0.1" - sources."pull-abortable-4.0.0" + sources."pull-abortable-4.1.1" sources."pull-async-1.0.0" sources."pull-awaitable-1.0.0" sources."pull-box-stream-1.0.13" @@ -120710,14 +124329,10 @@ in ]; }) sources."pull-glob-1.0.7" - (sources."pull-goodbye-0.0.2" // { - dependencies = [ - sources."pull-stream-3.5.0" - ]; - }) + sources."pull-goodbye-0.0.3" sources."pull-handshake-1.1.4" sources."pull-hash-1.0.0" - sources."pull-inactivity-2.1.3" + sources."pull-inactivity-2.1.4" sources."pull-level-2.0.4" sources."pull-live-1.0.1" sources."pull-looper-1.0.0" @@ -120757,7 +124372,6 @@ in sources."push-stream-11.0.1" ]; }) - sources."querystringify-2.2.0" sources."queue-tick-1.0.0" sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" @@ -120854,7 +124468,6 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."requires-port-1.0.0" sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" @@ -120871,8 +124484,8 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."sanitize-filename-1.6.3" - sources."secret-handshake-1.1.20" - sources."secret-stack-6.4.0" + sources."secret-handshake-1.1.21" + sources."secret-stack-6.4.1" sources."semver-5.7.1" sources."separator-escape-0.0.1" (sources."set-value-2.0.1" // { @@ -120928,13 +124541,13 @@ in sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - (sources."ssb-bendy-butt-0.12.4" // { + (sources."ssb-bendy-butt-0.12.5" // { dependencies = [ sources."ssb-keys-8.2.0" ]; }) - sources."ssb-bfe-3.1.1" - sources."ssb-bfe-spec-0.3.0" + sources."ssb-bfe-3.1.3" + sources."ssb-bfe-spec-0.4.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" @@ -120944,7 +124557,7 @@ in ]; }) sources."ssb-db-19.2.0" - (sources."ssb-db2-2.8.9" // { + (sources."ssb-db2-2.8.11" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -121000,7 +124613,7 @@ in sources."ssb-replicate-1.3.3" sources."ssb-typescript-2.6.0" sources."ssb-unix-socket-1.0.0" - sources."ssb-uri2-1.7.0" + sources."ssb-uri2-1.7.2" (sources."ssb-validate-4.1.4" // { dependencies = [ sources."ssb-keys-8.2.0" @@ -121094,7 +124707,6 @@ in }) sources."untildify-2.1.0" sources."urix-0.1.0" - sources."url-parse-1.5.9" sources."use-3.1.1" sources."user-home-2.0.0" sources."utf8-byte-length-1.0.4" @@ -121213,7 +124825,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1092.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -121442,7 +125054,7 @@ in ]; }) sources."has-cors-1.1.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hawk-3.1.3" sources."highlight.js-8.2.0" @@ -121478,7 +125090,7 @@ in ]; }) sources."is-fullwidth-code-point-1.0.0" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-promise-2.2.2" sources."is-property-1.0.2" @@ -121991,10 +125603,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "14.5.1"; + version = "14.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-14.5.1.tgz"; - sha512 = "8Hf4HtnhxlWlf7iXF9zFfhSc3X0teRnVzl6PqPs2JEFx+dy/mhMhghZfiTDW4QG0ihDw9+WP7GZw5Nzx7cQF5A=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-14.5.3.tgz"; + sha512 = "omHETL+kGHR+fCXFK1SkZD/A+emCP9esggAdWEl8GPjTNeyRYj+H6uetRDcU+7E451zwWiUYGVAX+lApsAZgsQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -122122,7 +125734,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.6" + sources."postcss-8.4.8" sources."postcss-media-query-parser-0.2.3" sources."postcss-resolve-nested-selector-0.1.1" sources."postcss-safe-parser-6.0.0" @@ -122354,7 +125966,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122383,7 +125995,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."magic-string-0.25.7" + sources."magic-string-0.25.9" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."min-indent-1.0.1" @@ -122409,9 +126021,9 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" - sources."svelte-preprocess-4.10.3" + sources."svelte-preprocess-4.10.4" sources."to-regex-range-5.0.1" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -122439,7 +126051,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122472,7 +126084,7 @@ in sources."jsonc-parser-2.3.1" sources."lodash-4.17.21" sources."lower-case-2.0.2" - sources."magic-string-0.25.7" + sources."magic-string-0.25.9" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."min-indent-1.0.1" @@ -122498,11 +126110,11 @@ in sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" sources."svelte-3.46.4" - sources."svelte-preprocess-4.10.3" + sources."svelte-preprocess-4.10.4" sources."svelte2tsx-0.5.5" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."vscode-css-languageservice-5.1.13" (sources."vscode-emmet-helper-2.6.4" // { dependencies = [ @@ -122799,7 +126411,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -123159,7 +126771,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."undefsafe-2.0.5" (sources."union-value-1.0.1" // { dependencies = [ @@ -123302,7 +126914,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.6" + sources."postcss-8.4.8" sources."postcss-js-4.0.0" sources."postcss-load-config-3.1.3" sources."postcss-nested-5.0.6" @@ -123535,12 +127147,13 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.10.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; - sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz"; + sha512 = "R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A=="; }; dependencies = [ + sources."acorn-8.7.0" sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.7.3" @@ -123563,34 +127176,34 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.1.0.tgz"; - sha512 = "VZ0iVepE0jUchMfIW0uKGdEdv3l0ajOFvUBcpB1xGOLAz3gVwpdWvlagVlFXuwjc2N+9mcjTM0PCIXNwIs2vQA=="; + url = "https://registry.npmjs.org/textlint/-/textlint-12.1.1.tgz"; + sha512 = "AoE/pPL+6e/7hHOxwxL5oBTYIsG6gjrMP77VQZVYxXYfTDduwRlqhQUUrVd32DaLQTm7z3/lCnY46uFkmK06fA=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-12.1.0" - sources."@textlint/ast-tester-12.1.0" - sources."@textlint/ast-traverse-12.1.0" - sources."@textlint/feature-flag-12.1.0" - sources."@textlint/fixer-formatter-12.1.0" - sources."@textlint/kernel-12.1.0" - sources."@textlint/linter-formatter-12.1.0" - sources."@textlint/markdown-to-ast-12.1.0" - sources."@textlint/module-interop-12.1.0" - sources."@textlint/source-code-fixer-12.1.0" - sources."@textlint/text-to-ast-12.1.0" - sources."@textlint/textlint-plugin-markdown-12.1.0" - sources."@textlint/textlint-plugin-text-12.1.0" - sources."@textlint/types-12.1.0" - sources."@textlint/utils-12.1.0" + sources."@textlint/ast-node-types-12.1.1" + sources."@textlint/ast-tester-12.1.1" + sources."@textlint/ast-traverse-12.1.1" + sources."@textlint/feature-flag-12.1.1" + sources."@textlint/fixer-formatter-12.1.1" + sources."@textlint/kernel-12.1.1" + sources."@textlint/linter-formatter-12.1.1" + sources."@textlint/markdown-to-ast-12.1.1" + sources."@textlint/module-interop-12.1.1" + sources."@textlint/source-code-fixer-12.1.1" + sources."@textlint/text-to-ast-12.1.1" + sources."@textlint/textlint-plugin-markdown-12.1.1" + sources."@textlint/textlint-plugin-text-12.1.1" + sources."@textlint/types-12.1.1" + sources."@textlint/utils-12.1.1" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" sources."ajv-8.10.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."astral-regex-2.0.0" sources."bail-1.0.5" @@ -123599,16 +127212,11 @@ in sources."brace-expansion-1.1.11" sources."call-bind-1.0.2" sources."ccount-1.1.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) + sources."chalk-4.1.2" sources."character-entities-1.2.4" sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."charenc-0.0.2" - sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" @@ -123620,7 +127228,7 @@ in sources."diff-4.0.2" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" @@ -123638,8 +127246,8 @@ in sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-ansi-2.0.0" - sources."has-symbols-1.0.2" + sources."has-flag-4.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" @@ -123653,7 +127261,7 @@ in sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-1.0.0" - sources."is-fullwidth-code-point-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" @@ -123666,7 +127274,6 @@ in sources."load-json-file-1.1.0" sources."locate-path-2.0.0" sources."lodash.truncate-4.4.2" - sources."log-symbols-1.0.2" sources."longest-streak-2.0.4" sources."markdown-table-2.0.0" (sources."md5-2.3.0" // { @@ -123674,11 +127281,7 @@ in sources."is-buffer-1.1.6" ]; }) - (sources."mdast-util-find-and-replace-1.1.1" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) + sources."mdast-util-find-and-replace-1.1.1" sources."mdast-util-footnote-0.1.7" sources."mdast-util-from-markdown-0.8.5" sources."mdast-util-frontmatter-0.2.0" @@ -123703,7 +127306,6 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."normalize-package-data-2.5.0" - sources."number-is-nan-1.0.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."once-1.4.0" @@ -123746,37 +127348,19 @@ in sources."resolve-1.22.0" sources."rimraf-2.6.3" sources."semver-5.7.1" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."is-fullwidth-code-point-3.0.0" - ]; - }) + sources."slice-ansi-4.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.0.3" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) - (sources."strip-ansi-6.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - }) + 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."supports-color-2.0.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."table-6.8.0" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) + sources."table-6.8.0" sources."text-table-0.2.0" sources."traverse-0.6.6" sources."trough-1.0.5" @@ -123843,7 +127427,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."match-index-1.0.3" sources."object-keys-1.1.1" sources."regexp.prototype.flags-1.4.1" @@ -124458,7 +128042,7 @@ in sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-bigint-1.0.4" @@ -124568,7 +128152,7 @@ in sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-bigint-1.0.4" @@ -124646,7 +128230,7 @@ in sha512 = "dkVdH21q9vipV7UU10qQQprPuP8rG+IDJSHUtmOC0WDYvwYTiUC9IYLIpkyWdgfwFYegDTnnR4duHNZynqOXTA=="; }; dependencies = [ - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -124655,7 +128239,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -124804,7 +128388,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" @@ -125119,7 +128703,7 @@ in sha512 = "o24rZwvzeMbbvuara2bGaX6eHw925aQw1BZhl7VHtY6xlWrJ9Sy7P29/Q2GQNIP4Otzcf09TX29zTBbRjKbrSA=="; }; dependencies = [ - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -125128,7 +128712,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -125277,7 +128861,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" @@ -125769,7 +129353,7 @@ in sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.1.0" @@ -126270,7 +129854,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -126735,7 +130319,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -127584,10 +131168,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.137.5"; + version = "0.138.3"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.137.5.tgz"; - sha512 = "rTyr+HDFxjnN8+N/guZjDgfVxgHptZQpf6xfL/Mo7a5JYIFwK6tAq3bzxYYB4Ae0RosDZlDuP+X5aXDXz+XnHQ=="; + url = "https://registry.npmjs.org/three/-/three-0.138.3.tgz"; + sha512 = "4t1cKC8gimNyJChJbaklg8W/qj3PpsLJUIFm5LIuAy/hVxxNm1ru2FGTSfbTSsuHmC/7ipsyuGKqrSAKLNtkzg=="; }; buildInputs = globalBuildInputs; meta = { @@ -128031,10 +131615,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.5.5"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; - sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz"; + sha512 = "HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="; }; buildInputs = globalBuildInputs; meta = { @@ -128049,10 +131633,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.9.6.tgz"; - sha512 = "nLB9qvCFq/jRj21tC6SPZgde8JkNbCQZVjoeBHYsCZvzBgSyNh1A1k5puAM9g/kWlEvAlN/G4J8tETbnJySVpg=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.9.7.tgz"; + sha512 = "xjw6C9PctpLSwKEqaavSKfeH1CRmx1sD/DWXjig4xA/e9Y9/Mr70ViOinq5grFzexzDcdqdb7VDdkf7Ke+eZFg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -128073,7 +131657,7 @@ in sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."find-up-3.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."glob-7.2.0" sources."glob-parent-5.1.2" @@ -128141,10 +131725,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.15.1"; + version = "3.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz"; - sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz"; + sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; }; buildInputs = globalBuildInputs; meta = { @@ -128186,7 +131770,7 @@ in sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@primer/octicons-16.3.1" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@socket.io/base64-arraybuffer-1.0.2" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" @@ -128195,7 +131779,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.25" + sources."@types/node-16.11.26" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -128253,7 +131837,7 @@ in sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-6.1.2" // { + (sources."engine.io-6.1.3" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -128439,7 +132023,7 @@ in sources."y18n-5.0.8" sources."yallist-2.1.2" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; @@ -128469,7 +132053,7 @@ in sources."@types/is-empty-1.2.1" sources."@types/js-yaml-4.0.5" sources."@types/ms-0.7.31" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."ansi-regex-6.0.1" @@ -128525,7 +132109,7 @@ in sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."supports-color-5.5.0" @@ -128534,10 +132118,10 @@ in sources."typedarray-0.0.6" sources."unified-engine-9.0.5" sources."unist-util-inspect-7.0.0" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.2" sources."util-deprecate-1.0.2" - sources."vfile-5.3.0" - sources."vfile-message-3.1.0" + sources."vfile-5.3.2" + sources."vfile-message-3.1.2" (sources."vfile-reporter-7.0.3" // { dependencies = [ sources."supports-color-9.2.1" @@ -128709,7 +132293,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -128779,7 +132363,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@vercel/build-utils-2.14.0" sources."@vercel/go-1.3.0" sources."@vercel/node-1.13.0" @@ -128889,10 +132473,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.5.tgz"; - sha512 = "893GcGS5oFjBK2Dakdl4I0x8rtkgI+TOi44M9PmFU6YV+kwoLIRAxIcoF55rGiHFESCq98C+yjWn1OXznWgm7A=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.6.tgz"; + sha512 = "mgX18AzHsg2sDqh4aVVjk23iXf2s93lN7SZnZq2JE74/uGeXfrBckix3YdKtxgZe1vb1tiwDz9JRqoRV9SyGng=="; }; buildInputs = globalBuildInputs; meta = { @@ -129005,7 +132589,7 @@ in sources."globals-13.12.1" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -129085,7 +132669,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" (sources."vue-eslint-parser-7.11.0" // { @@ -129270,25 +132854,25 @@ in vscode-langservers-extracted = nodeEnv.buildNodePackage { name = "vscode-langservers-extracted"; packageName = "vscode-langservers-extracted"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.0.0.tgz"; - sha512 = "DTFhpzUhP3M5WA62WT/SVSxtq47R5rbIEznA7svxWD19/+D1iGBrrzAa8LrDCkLUMxyG3gbya99LczV4F9m6Yg=="; + url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.1.0.tgz"; + sha512 = "HZfrlqpVu8N0UkSyjldPsGFpVFByYaDRDMmBvmKwKai2rAsd2vtde2CFnX9rOpmg3pN2vET8j3qtqZvZLzmkjQ=="; }; dependencies = [ sources."core-js-3.21.1" sources."jsonc-parser-3.0.0" sources."regenerator-runtime-0.13.9" sources."request-light-0.5.7" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."vscode-css-languageservice-5.1.13" - sources."vscode-html-languageservice-4.2.1" + sources."vscode-html-languageservice-4.2.2" sources."vscode-json-languageservice-4.2.0" - sources."vscode-jsonrpc-8.0.0-next.6" - sources."vscode-languageserver-8.0.0-next.8" - (sources."vscode-languageserver-protocol-3.17.0-next.14" // { + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.9" + (sources."vscode-languageserver-protocol-3.17.0-next.15" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.7" + sources."vscode-languageserver-types-3.17.0-next.8" ]; }) sources."vscode-languageserver-textdocument-1.0.4" @@ -129313,14 +132897,14 @@ in version = "1.6.8"; src = ../../applications/editors/vscode/extensions/vscode-lldb/build-deps; dependencies = [ - sources."@discoveryjs/json-ext-0.5.6" + sources."@discoveryjs/json-ext-0.5.7" sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.9" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.64.0" + sources."@types/vscode-1.65.0" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -129360,12 +132944,12 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -129405,10 +132989,10 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.3.0" sources."domutils-2.8.0" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."enhanced-resolve-5.9.0" + sources."enhanced-resolve-5.9.2" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."errno-0.1.8" @@ -129444,7 +133028,7 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."he-1.2.0" sources."htmlparser2-6.1.0" sources."human-signals-2.1.0" @@ -129572,7 +133156,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.10.0" // { + (sources."terser-5.12.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.7.3" @@ -129595,7 +133179,7 @@ in sources."tslib-2.3.1" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.6" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."uc.micro-1.0.6" sources."underscore-1.13.2" sources."uri-js-4.4.1" @@ -129615,7 +133199,7 @@ in sources."vscode-debugadapter-testsupport-1.51.0" sources."vscode-debugprotocol-1.51.0" sources."watchpack-2.3.1" - sources."webpack-5.69.1" + sources."webpack-5.70.0" (sources."webpack-cli-4.9.2" // { dependencies = [ sources."commander-7.2.0" @@ -129918,7 +133502,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -129981,7 +133565,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -130791,7 +134375,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.0" + sources."unist-util-stringify-position-3.0.2" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { dependencies = [ @@ -130823,7 +134407,7 @@ in sources."vfile-message-2.0.4" ]; }) - sources."vfile-message-3.1.0" + sources."vfile-message-3.1.2" (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -130976,7 +134560,7 @@ in sources."esutils-2.0.3" sources."fast-levenshtein-2.0.6" sources."form-data-3.0.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."gauge-3.0.2" @@ -131085,7 +134669,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -131123,16 +134707,15 @@ in sources."@devicefarmer/adbkit-2.11.3" sources."@devicefarmer/adbkit-logcat-1.1.0" sources."@devicefarmer/adbkit-monkey-1.0.1" - (sources."@eslint/eslintrc-1.1.0" // { + (sources."@eslint/eslintrc-1.2.1" // { dependencies = [ sources."debug-4.3.3" sources."eslint-visitor-keys-3.3.0" sources."espree-9.3.1" - sources."ignore-4.0.6" sources."ms-2.1.2" ]; }) - (sources."@humanwhocodes/config-array-0.9.3" // { + (sources."@humanwhocodes/config-array-0.9.5" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -131143,7 +134726,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/yauzl-2.9.2" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -131289,7 +134872,7 @@ in }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" (sources."firefox-profile-4.2.2" // { @@ -131339,7 +134922,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-yarn-2.1.0" sources."htmlparser2-6.1.0" @@ -131588,7 +135171,7 @@ in sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-readable-stream-1.0.0" @@ -131637,7 +135220,7 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" (sources."zip-dir-2.0.0" // { dependencies = [ @@ -131658,17 +135241,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.69.1"; + version = "5.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.69.1.tgz"; - sha512 = "+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz"; + sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw=="; }; dependencies = [ sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -131690,13 +135273,13 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.71" - sources."enhanced-resolve-5.9.0" + sources."electron-to-chromium-1.4.82" + sources."enhanced-resolve-5.9.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -131731,7 +135314,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - (sources."terser-5.10.0" // { + (sources."terser-5.12.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -131760,7 +135343,7 @@ in sha512 = "m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ=="; }; dependencies = [ - sources."@discoveryjs/json-ext-0.5.6" + sources."@discoveryjs/json-ext-0.5.7" sources."@webpack-cli/configtest-1.1.1" sources."@webpack-cli/info-1.4.1" sources."@webpack-cli/serve-1.6.1" @@ -131841,14 +135424,14 @@ in sources."@types/http-proxy-1.17.8" sources."@types/json-schema-7.0.9" sources."@types/mime-1.3.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.1" sources."@types/serve-index-1.9.1" sources."@types/serve-static-1.13.10" sources."@types/sockjs-0.3.33" - sources."@types/ws-8.2.3" + sources."@types/ws-8.5.2" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ajv-8.10.0" @@ -131936,7 +135519,7 @@ in sources."graceful-fs-4.2.9" sources."handle-thing-2.0.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hpack.js-2.1.6" // { dependencies = [ @@ -131947,7 +135530,7 @@ in sources."html-entities-2.3.2" sources."http-deceiver-1.2.7" sources."http-errors-1.8.1" - sources."http-parser-js-0.5.5" + sources."http-parser-js-0.5.6" sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.3" sources."human-signals-2.1.0" @@ -132180,10 +135763,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.3.tgz"; - sha512 = "UuAv33TkzZGpGYgWH8rLWkvebd91UWid6tueQhUj6eGxfLUpAEl6uFyRMLAEmg2/kskKQzI2YPl8+tgex3TWxg=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.4.tgz"; + sha512 = "uamNZvqmpk1NpK+Vk/L8hppxq/7n8qtD+pQKia9pkXIAGqOGDA65ql9hx6g8rA2tM7cKDNkJhtxxF9ibJsyveQ=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.3" @@ -132198,7 +135781,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -132230,7 +135813,7 @@ in sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.18.3" // { + (sources."bittorrent-tracker-9.18.4" // { dependencies = [ sources."debug-4.3.3" sources."decompress-response-6.0.0" @@ -132286,7 +135869,7 @@ in }) sources."core-util-is-1.0.3" sources."cpus-1.0.3" - sources."create-torrent-5.0.1" + sources."create-torrent-5.0.2" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."define-lazy-prop-2.0.0" @@ -132388,7 +135971,7 @@ in sources."node-gyp-build-4.3.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-8.4.0" sources."package-json-versionify-1.0.4" @@ -132460,7 +136043,7 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.12.2" + sources."streamx-2.12.4" sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.3.0" @@ -132471,7 +136054,7 @@ in sources."thunky-0.1.0" sources."timeout-refresh-1.0.3" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.4.7" // { + (sources."torrent-discovery-9.4.9" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -132493,12 +136076,12 @@ in ]; }) sources."ut_pex-3.0.2" - sources."utf-8-validate-5.0.8" + sources."utf-8-validate-5.0.9" sources."util-deprecate-1.0.2" sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.8.2" // { + (sources."webtorrent-1.8.6" // { dependencies = [ sources."debug-4.3.3" sources."decompress-response-6.0.0" @@ -132516,7 +136099,7 @@ in sources."xmldom-0.1.31" sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -132576,10 +136159,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.4.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.4.0.tgz"; - sha512 = "NgUzbSbRQvIH++P303a6Y20qLRqM8qhPESoJ/n26NBXA+GITozV1/JRl2FLEt9oPSR9WkQ1a9J3EsToHfKGQWA=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.5.1.tgz"; + sha512 = "rTrsKFF2G6vY9oInUoMWHuRjdQi/AAeWkt2H4N9TYKMiQPzEWnz91MufNkNwlXCA26JCDFStwqNjaYPUdI6SDw=="; }; dependencies = [ sources."jsonc-parser-3.0.0" @@ -132716,10 +136299,10 @@ in ]; }) sources."@npmcli/installed-package-contents-1.0.7" - (sources."@npmcli/map-workspaces-2.0.1" // { + (sources."@npmcli/map-workspaces-2.0.2" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.0.0" + sources."minimatch-5.0.1" ]; }) (sources."@npmcli/metavuln-calculator-2.0.0" // { @@ -132750,7 +136333,7 @@ in sources."ms-2.1.2" ]; }) - (sources."agentkeepalive-4.2.0" // { + (sources."agentkeepalive-4.2.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -133141,7 +136724,7 @@ in sources."ansi-regex-5.0.1" sources."are-we-there-yet-3.0.0" sources."env-paths-2.2.1" - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."is-fullwidth-code-point-3.0.0" sources."npmlog-6.0.1" sources."readable-stream-3.6.0" @@ -133191,8 +136774,12 @@ in sources."debug-4.3.3" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.3.1" - sources."make-fetch-happen-10.0.3" + sources."lru-cache-7.4.4" + (sources."make-fetch-happen-10.0.5" // { + dependencies = [ + sources."minipass-fetch-2.0.3" + ]; + }) sources."ms-2.1.2" ]; }) @@ -133585,7 +137172,7 @@ in sources."gauge-3.0.2" sources."get-stream-6.0.1" sources."has-flag-4.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.1" sources."locate-path-6.0.0" @@ -133601,7 +137188,7 @@ in sources."path-key-3.1.1" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -133640,10 +137227,10 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-5.1.0.tgz"; - sha512 = "J62b/7sFwqt4zbmPbeKJGwZlvW2X3ynyfWHZPr+xLAGF80h4aY4SgXaadMjljpvIbWGOwRmK38vwEdi5XgUpcQ=="; + url = "https://registry.npmjs.org/zx/-/zx-5.2.0.tgz"; + sha512 = "EzaYf8TGosgEGli8CpcDHnvZck/FRv3vEjIzYnhZLib8H+jKc3p4CG2epTayDqCOYQ2v0xsv2DoQ1Hn2OZ0o/g=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -133651,9 +137238,9 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."braces-3.0.2" - sources."chalk-5.0.0" + sources."chalk-5.0.1" sources."data-uri-to-buffer-4.0.0" sources."dir-glob-3.0.1" sources."duplexer-0.1.2" @@ -133664,7 +137251,7 @@ in sources."fill-range-7.0.1" sources."formdata-polyfill-4.0.10" sources."from-0.1.7" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."glob-parent-5.1.2" sources."globby-13.1.1" sources."graceful-fs-4.2.9" @@ -133679,7 +137266,7 @@ in sources."micromatch-4.0.4" sources."minimist-1.2.5" sources."node-domexception-1.0.0" - sources."node-fetch-3.2.0" + sources."node-fetch-3.2.3" sources."path-type-4.0.0" sources."pause-stream-0.0.11" sources."picomatch-2.3.1" diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 9a072482d32..bfef3d5b6c6 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp mpfr ppl camlidl ]; propagatedBuildInputs = [ mlgmpidl ]; - strictDeps = true; + strictDeps = false; outputs = [ "out" "bin" "dev" ]; diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index a75f05b33f2..e5fe6702131 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, cppo }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo }: buildDunePackage rec { pname = "camomile"; @@ -23,6 +23,10 @@ buildDunePackage rec { runHook postConfigure ''; + postInstall = '' + echo "version = \"${version}\"" >> $out/lib/ocaml/${ocaml.version}/site-lib/camomile/META + ''; + meta = { inherit (src.meta) homepage; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix index 8834de53a8f..df228603e9f 100644 --- a/pkgs/development/ocaml-modules/facile/default.nix +++ b/pkgs/development/ocaml-modules/facile/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "facile"; version = "1.1.4"; + useDune2 = false; + src = fetchurl { url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz"; sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp"; diff --git a/pkgs/development/ocaml-modules/fdkaac/default.nix b/pkgs/development/ocaml-modules/fdkaac/default.nix index d3915b65935..d794e4acce7 100644 --- a/pkgs/development/ocaml-modules/fdkaac/default.nix +++ b/pkgs/development/ocaml-modules/fdkaac/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { description = "OCaml binding for the fdk-aac library"; inherit (src.meta) homepage; license = lib.licenses.gpl2Only; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl lib.maintainers.dandellion ]; }; } diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix new file mode 100644 index 00000000000..77a6ef01ac9 --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -0,0 +1,21 @@ +{ lib, fetchFromGitHub }: + +rec { + version = "1.1.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-ffmpeg"; + rev = "v${version}"; + sha256 = "13rc3d0n963a28my5ahv78r82rh450hvbsc74mb6ld0r9v210r0p"; + }; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-ffmpeg"; + description = "Bindings for the ffmpeg libraries"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix new file mode 100644 index 00000000000..7f0a5da34dd --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -0,0 +1,36 @@ +{ lib, buildDunePackage, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil +, ffmpeg-avcodec +, ffmpeg-avfilter +, ffmpeg-swscale +, ffmpeg-swresample +, ffmpeg-av +, ffmpeg-avdevice +}: + +buildDunePackage { + pname = "ffmpeg"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + propagatedBuildInputs = [ + ffmpeg-avutil + ffmpeg-avcodec + ffmpeg-avfilter + ffmpeg-swscale + ffmpeg-swresample + ffmpeg-av + ffmpeg-avdevice + ]; + + # The tests fail + doCheck = false; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg libraries"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix new file mode 100644 index 00000000000..e8d71aa321e --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg }: + +buildDunePackage { + pname = "ffmpeg-av"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg libraries -- top-level helpers"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix new file mode 100644 index 00000000000..8ee5428c473 --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avcodec"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avcodec library"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix new file mode 100644 index 00000000000..e6641a6ca03 --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-av, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avdevice"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avdevice library"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix new file mode 100644 index 00000000000..6479bbe55bf --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avfilter"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avfilter library"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix new file mode 100644 index 00000000000..121fb115146 --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avutil"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avutil libraries"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix new file mode 100644 index 00000000000..92011e48eab --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-swresample"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg swresample library"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix new file mode 100644 index 00000000000..9d97b722551 --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-swscale"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg swscale library"; + }; +} diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix new file mode 100644 index 00000000000..e08841ac32f --- /dev/null +++ b/pkgs/development/ocaml-modules/flac/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, flac }: + +buildDunePackage rec { + pname = "flac"; + version = "0.3.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-flac"; + rev = "v${version}"; + sha256 = "06gfbrp30sdxigzkix83y1b610ljzik6rrxmbl3ppmpx4dqlwnxa"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg flac.dev ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-flac"; + description = "Bindings for flac"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/genspio/default.nix b/pkgs/development/ocaml-modules/genspio/default.nix index db3c42bca36..963cd1dab13 100644 --- a/pkgs/development/ocaml-modules/genspio/default.nix +++ b/pkgs/development/ocaml-modules/genspio/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "genspio"; version = "0.0.2"; + useDune2 = false; + src = fetchFromGitHub { owner = "hammerlab"; repo = pname; @@ -13,7 +15,7 @@ buildDunePackage rec { sha256 = "0cp6p1f713sfv4p2r03bzvjvakzn4ili7hf3a952b3w1k39hv37x"; }; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; propagatedBuildInputs = [ nonstd sosa ]; diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index 34b2ee668ea..3dc4a9856f9 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -6,11 +6,11 @@ buildDunePackage rec { pname = "index"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "1q1lv960dk1br8nz8gkibdywl2wv64ywib7b9jn33f6mpb81qc9f"; + sha256 = "sha256:150mcsh8vj2hapfnxbjmacanjy4avrv8yk1lyaxmqj3fpmn1y32y"; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix index ec2f793caf9..c3b4b0c6d70 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.12.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix @@ -24,7 +24,7 @@ with self; hash = "0gl89zpgsf3n30nb6v5cns27g2bfg4rf3s2427gqvwbkr5gcf7ri"; meta.description = "Full standard library replacement for OCaml"; propagatedBuildInputs = [ sexplib0 ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune_1 ]; }; stdio = janePackage { @@ -208,7 +208,7 @@ with self; pname = "jst-config"; hash = "0yxcz13vda1mdh9ah7qqxwfxpcqang5sgdssd8721rszbwqqaw93"; meta.description = "Compile-time configuration for Jane Street libraries"; - buildInputs = [ ppx_assert ]; + buildInputs = [ dune_1 ppx_assert ]; }; ppx_optcomp = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 7d1c8544709..2f9aeea1d62 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -666,6 +666,7 @@ with self; pname = "pythonlib"; hash = "0qr0mh9jiv1ham5zlz9i4im23a1vh6x1yp6dp2db2s4icmfph639"; meta.description = "A library to help writing wrappers around ocaml code for python"; + meta.broken = lib.versionAtLeast ocaml.version "4.13"; propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ]; }; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index 63c4a900fce..da268757601 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -5,7 +5,9 @@ buildDunePackage (args // { inherit version buildInputs; - minimumOCamlVersion = "4.04"; + useDune2 = false; + + minimalOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "janestreet"; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix index ebde7b240ef..5b918683570 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.12.0" }: -{ pname, version ? defaultVersion, hash, buildInputs ? [], ...}@args: +{ pname, version ? defaultVersion, hash, ...}@args: buildDunePackage (args // { - inherit version buildInputs; + inherit version; - minimumOCamlVersion = "4.07"; + useDune2 = false; - useDune2 = true; + minimalOCamlVersion = "4.07"; src = fetchFromGitHub { owner = "janestreet"; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 0d5babad042..b7ed4f24b1d 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,8 +1,18 @@ -{ lib, fetchFromGitHub, buildDunePackage, zed, lwt_log, lwt_react, mew_vi }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, zed, lwt_log, lwt_react, mew_vi }: + +let params = + if lib.versionAtLeast ocaml.version "4.08" then { + version = "3.2.0"; + sha256 = "sha256:048k26644wq5wlwk0j179dxrxyz9nxqqq4vvhyh6pqpgxdajd44i"; + } else { + version = "3.1.0"; + sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; + } +; in buildDunePackage rec { pname = "lambda-term"; - version = "3.1.0"; + inherit (params) version; useDune2 = true; @@ -10,7 +20,7 @@ buildDunePackage rec { owner = "ocaml-community"; repo = pname; rev = version; - sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; + inherit (params) sha256; }; propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]; diff --git a/pkgs/development/ocaml-modules/lwt/camlp4.nix b/pkgs/development/ocaml-modules/lwt/camlp4.nix index 88bb3d6759a..e48d7cfa185 100644 --- a/pkgs/development/ocaml-modules/lwt/camlp4.nix +++ b/pkgs/development/ocaml-modules/lwt/camlp4.nix @@ -11,7 +11,9 @@ buildDunePackage rec { sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9"; }; - minimumOCamlVersion = "4.02"; + useDune2 = false; + + minimalOCamlVersion = "4.02"; propagatedBuildInputs = [ camlp4 ]; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index c9d5200d876..96e3abc2674 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -21,9 +21,9 @@ buildDunePackage rec { strictDeps = true; - nativeBuildInputs = [ pkg-config cppo ]; + nativeBuildInputs = [ pkg-config cppo ] + ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims; buildInputs = [ dune-configurator ] - ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix index 9de535154ee..82b1feed540 100644 --- a/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -4,7 +4,9 @@ buildDunePackage rec { pname = "nonstd"; version = "0.0.3"; - minimumOCamlVersion = "4.02"; + useDune2 = false; + + minimalOCamlVersion = "4.02"; src = fetchzip { url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 26deb2f0597..4f192fe20ec 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -12,8 +12,8 @@ let params = if lib.versionAtLeast ocaml.version "4.13" then { - version = "1.9.1"; - sha256 = "sha256:1vnwdpjppihprc8q2i5zcqq7vp67255jclg90ldfvwafgljxn76g"; + version = "1.10.3"; + sha256 = "sha256-o6wQc7Byi5T0vbARF3LAq69/9wMkOZRQ6rcVa/rBUfE="; } else if lib.versionAtLeast ocaml.version "4.12" then { version = "1.9.0"; diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index 5d8d967bf4f..009d95992fb 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -1,5 +1,9 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml, result, ppx_derivers }: +if lib.versionOlder "4.13" ocaml.version +then throw "ocaml-migrate-parsetree-1.8 is not available for OCaml ${ocaml.version}" +else + buildDunePackage rec { pname = "ocaml-migrate-parsetree"; version = "1.8.0"; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 4dcaca42788..13ac62f6451 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,14 +1,14 @@ { lib, buildDunePackage, fetchFromGitHub, camlidl, fuse, dune-configurator }: -buildDunePackage { +buildDunePackage rec { pname = "ocamlfuse"; - version = "2.7.1_cvs6_e35e76b"; + version = "2.7.1_cvs7"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; - rev = "e35e76bee3b06806256b5bfca108b7697267cd5c"; - sha256 = "1v9g0wh7rnjkrjrnw50145g6ry38plyjs8fq8w0nlzwizhf3qhff"; + rev = "v${version}"; + sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo="; }; # This currently fails with dune diff --git a/pkgs/development/ocaml-modules/ogg/default.nix b/pkgs/development/ocaml-modules/ogg/default.nix new file mode 100644 index 00000000000..e1e1df6c2a0 --- /dev/null +++ b/pkgs/development/ocaml-modules/ogg/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libogg }: + +buildDunePackage rec { + pname = "ogg"; + version = "0.7.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-ogg"; + rev = "v${version}"; + sha256 = "0z3z0816rxq8wdjw51plzn8lmilic621ilk4x9wpnr0axmnl3wqb"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ libogg ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-ogg"; + description = "Bindings to libogg"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/opus/default.nix b/pkgs/development/ocaml-modules/opus/default.nix new file mode 100644 index 00000000000..30e461b9f9a --- /dev/null +++ b/pkgs/development/ocaml-modules/opus/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, libopus }: + +buildDunePackage rec { + pname = "opus"; + version = "0.2.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-opus"; + rev = "v${version}"; + sha256 = "09mgnprhhs1adqm25c0qjhknswbh6va3jknq06fnp1jszszcjf4s"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg libopus.dev ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-opus"; + description = "Bindings to libopus"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix index 9eb81003d47..7b15437a7ed 100644 --- a/pkgs/development/ocaml-modules/owee/default.nix +++ b/pkgs/development/ocaml-modules/owee/default.nix @@ -1,20 +1,19 @@ -{ lib, buildDunePackage, fetchFromGitHub }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; + useDune2 = true; pname = "owee"; - version = "0.3"; + version = "0.4"; - src = fetchFromGitHub { - owner = "let-def"; - repo = "owee"; - rev = "v${version}"; - sha256 = "0jp8ca57488d7sj2nqy4yxcdpda6sxx51yyi8k6888hbinhyqp0j"; + src = fetchurl { + url = "https://github.com/let-def/owee/releases/download/v${version}/owee-${version}.tbz"; + sha256 = "sha256:055bi0yfdki1pqagbhrwmfvigyawjgsmqw04zhpp6hds8513qzvb"; }; meta = { description = "An experimental OCaml library to work with DWARF format"; - inherit (src.meta) homepage; + homepage = "https://github.com/let-def/owee/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 090c8113ce4..fbe484dea04 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -5,6 +5,7 @@ , ppxlib , ppx_derivers , result +, ounit , ounit2 , ocaml-migrate-parsetree , ocaml-migrate-parsetree-2 @@ -51,7 +52,9 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ ounit2 ]; + checkInputs = [ + (if lib.versionAtLeast version "5.2" then ounit2 else ounit) + ]; meta = with lib; { description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 59b7c29730a..9ec1c24dbe3 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }: let param = - let v6_4 = { - version = "6.4"; - sha256 = "15v7yfv6gyp8lzlgwi9garz10wpg34dk4072jdv19n6v20zfg7n1"; + let v6_5 = { + version = "6.5"; + sha256 = "sha256:0fwibah2hgllrnbdrmfqil5gr5raf6pb5h2zx6zs1h3d4ykvy8k8"; useDune2 = true; nativeBuildInputs = [cppo]; buildInputs = [cppo]; @@ -28,12 +28,13 @@ let param = "4.07" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; - "4.08" = v6_4; - "4.09" = v6_4; - "4.10" = v6_4; - "4.11" = v6_4; - "4.12" = v6_4; - "4.13" = v6_4; + "4.08" = v6_5; + "4.09" = v6_5; + "4.10" = v6_5; + "4.11" = v6_5; + "4.12" = v6_5; + "4.13" = v6_5; + "4.14" = v6_5; }.${ocaml.meta.branch}; in diff --git a/pkgs/development/ocaml-modules/prof_spacetime/default.nix b/pkgs/development/ocaml-modules/prof_spacetime/default.nix index 91e30e155db..bfbd466bad6 100644 --- a/pkgs/development/ocaml-modules/prof_spacetime/default.nix +++ b/pkgs/development/ocaml-modules/prof_spacetime/default.nix @@ -7,7 +7,7 @@ , cohttp , ocaml_lwt , cohttp-lwt-unix -, lambdaTerm +, lambda-term , stdlib-shims }: @@ -30,7 +30,7 @@ buildDunePackage rec { cohttp ocaml_lwt cohttp-lwt-unix - lambdaTerm + lambda-term stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/shine/default.nix b/pkgs/development/ocaml-modules/shine/default.nix new file mode 100644 index 00000000000..3aa8cce7980 --- /dev/null +++ b/pkgs/development/ocaml-modules/shine/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, shine }: + +buildDunePackage rec { + pname = "shine"; + version = "0.2.2"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-shine"; + rev = "2e1de686ea031f1056df389161ea2b721bfdb39e"; + sha256 = "0v6i4ym5zijki6ffkp2qkp00lk4fysjhmg690xscj23gwz4zx8ir"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ shine ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-shine"; + description = "Bindings to the fixed-point mp3 encoding library shine"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix index 009b2ce3261..442d06e4f69 100644 --- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix +++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchFromGitHub, buildDunePackage, owee }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, owee }: + +lib.throwIfNot (lib.versionAtLeast "4.12" ocaml.version) + "spacetime_lib is not available for OCaml ${ocaml.version}" buildDunePackage rec { pname = "spacetime_lib"; diff --git a/pkgs/development/ocaml-modules/speex/default.nix b/pkgs/development/ocaml-modules/speex/default.nix new file mode 100644 index 00000000000..1bf5f308ecf --- /dev/null +++ b/pkgs/development/ocaml-modules/speex/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, speex }: + +buildDunePackage rec { + pname = "speex"; + version = "0.4.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-speex"; + rev = "v${version}"; + sha256 = "0p4ip37kihlz9qy604llak2kzd00g45ix1yiihnrri2nm01scfab"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg speex.dev ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-speex"; + description = "Bindings to libspeex"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 1f4fd7b8580..04f181d7598 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -24,6 +24,7 @@ buildDunePackage rec { maintainers = [ lib.maintainers.maggesi lib.maintainers.anmonteiro + lib.maintainers.dandellion ]; }; } diff --git a/pkgs/development/ocaml-modules/theora/default.nix b/pkgs/development/ocaml-modules/theora/default.nix new file mode 100644 index 00000000000..0f7b4aca1c7 --- /dev/null +++ b/pkgs/development/ocaml-modules/theora/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, libtheora }: + +buildDunePackage rec { + pname = "theora"; + version = "0.4.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-theora"; + rev = "v${version}"; + sha256 = "1sggjmlrx4idkih1ddfk98cgpasq60haj4ykyqbfs22cmii5gpal"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg libtheora ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-theora"; + description = "Bindings to libtheora"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/vorbis/default.nix b/pkgs/development/ocaml-modules/vorbis/default.nix new file mode 100644 index 00000000000..f33182e5fc1 --- /dev/null +++ b/pkgs/development/ocaml-modules/vorbis/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, libvorbis }: + +buildDunePackage rec { + pname = "vorbis"; + version = "0.8.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-vorbis"; + rev = "v${version}"; + sha256 = "1acy7yvf2y5dggzxw4vmrpdipakr98si3pw5kxw0mh7livn08al8"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg libvorbis ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-vorbis"; + description = "Bindings to libvorbis"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index bf7fcb66fe5..6b000891290 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if !lib.versionAtLeast ocaml.version "4.02" +|| lib.versionOlder "4.13" ocaml.version then throw "wasm is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index b19b275019d..bc0f4ac636c 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/box/box.phar makeWrapper ${php}/bin/php $out/bin/box \ --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/deployer/default.nix b/pkgs/development/php-packages/deployer/default.nix index 7679fb5ea51..661a6310958 100644 --- a/pkgs/development/php-packages/deployer/default.nix +++ b/pkgs/development/php-packages/deployer/default.nix @@ -14,6 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/deployer/deployer.phar makeWrapper ${php}/bin/php $out/bin/dep --add-flags "$out/libexec/deployer/deployer.phar" @@ -22,6 +23,7 @@ mkDerivation rec { installShellCompletion --cmd dep \ --bash <($out/bin/dep autocomplete --install) \ --zsh <($out/bin/dep autocomplete --install) + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix new file mode 100644 index 00000000000..e9b88d8155e --- /dev/null +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: +mkDerivation rec { + pname = "grumphp"; + version = "1.8.1"; + + src = fetchurl { + url = "https://github.com/phpro/${pname}/releases/download/v${version}/${pname}.phar"; + sha256 = "sha256-3XPMyH2F3ZfRr8DmvlBY3Z6uolhaRraQxwKIskIwPq8="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/${pname}/grumphp.phar + makeWrapper ${php}/bin/php $out/bin/grumphp \ + --add-flags "$out/libexec/${pname}/grumphp.phar" + runHook postInstall + ''; + + meta = with lib; { + broken = versionOlder php.version "8.0"; + description = "A PHP code-quality tool"; + homepage = "https://github.com/phpro/grumphp"; + license = licenses.mit; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix index 0b2e5ff8c58..6c5af7d5d27 100644 --- a/pkgs/development/php-packages/phing/default.nix +++ b/pkgs/development/php-packages/phing/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phing"; - version = "2.17.1"; + version = "2.17.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://www.phing.info/get/phing-${version}.phar"; - sha256 = "sha256-Sf2fdy9b1wmXEDA3S4CRksH/DhAIirIy6oekWE1TNjE="; + sha256 = "sha256-KDqJdHIqgtar6ofNG4ENRlpRg9XYFeL5YS7Rclh1+PQ="; }; dontUnpack = true; @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phing/phing.phar makeWrapper ${php}/bin/php $out/bin/phing \ --add-flags "$out/libexec/phing/phing.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix new file mode 100644 index 00000000000..f564cb53692 --- /dev/null +++ b/pkgs/development/php-packages/phive/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: + +mkDerivation rec { + pname = "phive"; + version = "0.15.0"; + + src = fetchurl { + url = "https://github.com/phar-io/phive/releases/download/${version}/phive-${version}.phar"; + sha256 = "sha256-crMr8d5nsVt7+zQ5xPeph/JXmTEn6jJFVtp3mOgylB4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/phive/phive.phar + makeWrapper ${php}/bin/php $out/bin/phive \ + --add-flags "$out/libexec/phive/phive.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "The Phar Installation and Verification Environment (PHIVE)"; + homepage = "https://github.com/phar-io/phive"; + license = licenses.bsd3; + maintainers = with maintainers; teams.php.members; + }; +} diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index bf1c806dfc3..90bd1af0078 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "php-cs-fixer"; - version = "3.6.0"; + version = "3.7.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-sbz8uq6nJ6dEL6FHJ01VTrovaJa8bwQ9Ic+dLr7yPnA="; + sha256 = "sha256-a7mKM++0iQm9hQFCDfyR6Jdb9h98YNHmbdQso8BU3WE="; }; dontUnpack = true; @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \ --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix index 50fd23540ee..d0335142490 100644 --- a/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -20,15 +20,19 @@ mkDerivation { ]; buildPhase = '' + runHook preBuild composer dump-autoload box build + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \ --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpcbf/default.nix b/pkgs/development/php-packages/phpcbf/default.nix index cef7c2986e8..1cc6f46bd09 100644 --- a/pkgs/development/php-packages/phpcbf/default.nix +++ b/pkgs/development/php-packages/phpcbf/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpcbf/phpcbf.phar makeWrapper ${php}/bin/php $out/bin/phpcbf \ --add-flags "$out/libexec/phpcbf/phpcbf.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpcs/default.nix b/pkgs/development/php-packages/phpcs/default.nix index baad111cec5..877f587717d 100644 --- a/pkgs/development/php-packages/phpcs/default.nix +++ b/pkgs/development/php-packages/phpcs/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpcs/phpcs.phar makeWrapper ${php}/bin/php $out/bin/phpcs \ --add-flags "$out/libexec/phpcs/phpcs.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index 763fd857c35..228fd25ea55 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpmd/phpmd.phar makeWrapper ${php}/bin/php $out/bin/phpmd \ --add-flags "$out/libexec/phpmd/phpmd.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index b00da4972f6..6351a076fde 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "1.4.6"; + version = "1.4.9"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-h19rFEs7VrdlxGS1qeYJnO5aQaKzpFZTdsN2h3Hmm0w="; + sha256 = "sha256-N2oYhhcU6uCGUzJbL8/vMUlypJa/Z86d4Xddvj6k1fc="; }; dontUnpack = true; @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpstan/phpstan.phar makeWrapper ${php}/bin/php $out/bin/phpstan \ --add-flags "$out/libexec/phpstan/phpstan.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index a772ae441a5..01f79c36397 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/psalm/psalm.phar makeWrapper ${php}/bin/php $out/bin/psalm \ --add-flags "$out/libexec/psalm/psalm.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index a9a5a007d94..f1105dea911 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psysh"; - version = "0.11.1"; + version = "0.11.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "sha256-OiEXI7AVcC5udISfJ41285OBL82mSd1Xb5qhVtG4p9I="; + sha256 = "sha256-u7VTlZw9k7VDWKGK/8fzFw0bjNu6DMGsoQnDedHgCWg="; }; dontUnpack = true; @@ -16,16 +16,18 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin tar -xzf $src -C $out/bin chmod +x $out/bin/psysh wrapProgram $out/bin/psysh --prefix PATH : "${lib.makeBinPath [ php ]}" + runHook postInstall ''; meta = with lib; { description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; - maintainers = with maintainers; [ caugner ] ++ teams.php.members; + maintainers = teams.php.members; }; } diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index 99b2b53f7ee..3cbd55221e1 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "swoole"; - version = "4.8.6"; - sha256 = "sha256-4ot8LXpWcjMmD3e/EzrYNMxqUPPupQQkv2ibLkZoWxs="; + version = "4.8.7"; + sha256 = "sha256-yoiMuIbIgwkuvoeIJT1gC8UsOE504nEQ+XsE7Oprb9o="; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 9ba564fcaac..b6f79b6c5fc 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "apscheduler"; - version = "3.9.0.post1"; + version = "3.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "APScheduler"; inherit version; - hash = "sha256-I22/ckQgD/x5xsC5/30u0Q5+mF839I1KI/QUL0ln3LU="; + hash = "sha256-ZeZXS2OVSY03HQRfKop+T31Qxq0h73MT0VscfPIN8eM="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix new file mode 100644 index 00000000000..88bdff440c4 --- /dev/null +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, paho-mqtt +, pytestCheckHook +, pythonOlder +, requests +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "adafruit-io"; + version = "2.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "adafruit"; + repo = "Adafruit_IO_Python"; + rev = version; + hash = "sha256-tjm+HvUuLK3IxXwuxPidJaBetj+n0BzKOuLj75bM7a8="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + paho-mqtt + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "Adafruit_IO" + ]; + + disabledTestPaths = [ + # Tests requires valid credentials + "tests/test_client.py" + "tests/test_errors.py" + "tests/test_mqtt_client.py" + ]; + + meta = with lib; { + description = "Module for interacting with Adafruit IO"; + homepage = "https://github.com/adafruit/Adafruit_IO_Python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index da4ac528d1a..787122157a4 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.20.0"; + version = "3.21.1"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-bbzEI/Ig7yQn4/fRmX8tIe6UL+J8iV1TbrCXBU+oLms="; + sha256 = "sha256-gVJUjxsl1rxvboL53186r63yp0k4FtTSgKJuqPzE2Q0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index f00a75961b9..b0629483d01 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.16"; + version = "0.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "v${version}"; - hash = "sha256-u3SwrSxeBJrBTHfqKY/mAb2p1jqW2AvRsHomKsI81gM="; + hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 4e2b0c5897f..dbc684281fb 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.7"; + version = "1.4.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NtiShZpPFl+elYNPLaKAg6uV8pDJv0pyR+NTUiFoMm0="; + sha256 = "sha256-ts3PnL1ePWJHHaLuC0eQKqBOt+HeEeAayeVBAIhnUWs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index a2c3d182be1..b1938c88aa9 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.6.11"; + version = "0.7.16"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "1rrdzzb2gcl3lc8l5vb99hy2lmdj5723fds2q78n4sf83y93czw7"; + sha256 = "sha256-dakxPhnI1m6KiOj6oQkfQ0UVA7NEBTHFGYnF6L6c8Ck="; }; nativeBuildInputs = [ @@ -34,6 +34,8 @@ buildPythonPackage rec { zeroconf ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index f96fa882038..f6d9b5d97ec 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -92,7 +92,10 @@ buildPythonPackage rec { # Probably because we run `python -m pytest` instead of `pytest` in the hook. preCheck = '' cd tests - ''; + '' + lib.optionalString stdenv.isDarwin '' + # Work around "OSError: AF_UNIX path too long" + export TMPDIR="/tmp" + ''; meta = with lib; { description = "Asynchronous HTTP Client/Server for Python and asyncio"; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index ece6d6140b3..5862a7e65a6 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.2.1"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bcSCYNJt9xYBMmuZYM6s+PWV0TAUFOn3ibHE0KRX+iw="; + hash = "sha256-PslmDeG/o9WAOc0FhidUNaISrlXa3rba3UEuvPVN/+A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 100405c1abe..2cc04130c67 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9FwTYcaXwGMMnhp+MXe1Iu8Og5aHL6qo9SVKWHFtc7o="; + sha256 = "sha256-ktXnAgrxfDELfMQATcWHn/u6C4bKQii+mbT4mA54coo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 54e23789844..032bf995a7d 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { pytestCheckHook ]; + 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" "" diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 66bcc5f0ea4..d6f2c128908 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "1.0.10"; + version = "1.0.11"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-YHdHh7uC9QF+dj+SI2Y4rEkBq+gGalNBmuWFVgq7XOM="; + hash = "sha256-N+8vmB41AUu4aTUTBYX6SPVsW1PARaq5mCOdhg9h0/g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index 1fd619a846a..9d815dfac05 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.2.0"; # re-enable tests after 1.2.0 + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -23,8 +23,6 @@ buildPythonPackage rec { frozenlist ]; - # not compatible w ith latest asyncio - doCheck = false; checkInputs = [ pytest-asyncio pytestCheckHook @@ -32,6 +30,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ + --replace "filterwarnings = error" "" \ --replace "--cov=aiosignal" "" ''; diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix new file mode 100644 index 00000000000..e7cd81d5b5d --- /dev/null +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, behave +, allure-python-commons +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "allure-behave"; + version = "2.9.45"; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-aK0SgQIXpuUoSTz8jg5IPKQM2Xvk2EfkSGigsy/GFNo="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + pythonImportsCheck = [ "allure_behave" ]; + + propagatedBuildInputs = [ + allure-python-commons + behave + ]; + + meta = with lib; { + description = "Allure behave integration."; + homepage = "https://github.com/allure-framework/allure-python"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index 697b9bba00f..dcdf918344a 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.9.4"; + version = "1.9.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "sha256-smwPKZLevolNvpkLxoFR3NGL9YFPlBk3WYQqJXBaS7s="; + sha256 = "sha256-An7MnGtZsmEZU/y6E0sivdexFD6HJRTB1juXqHfbDzE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index d09daa273b8..80f726bdc18 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.64"; + version = "0.0.65"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-CJJ+mWAX9XG1/E2PljUZ8oz/la3hYXF1tMfuKt0Zvjw="; + hash = "sha256-bhXmPplRT9gzeD/GdD2HxN+Z4vvaiaxBwkqSml9SJUs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index d8a369d6da0..e84e3eb301b 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,17 +12,20 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.2a2"; + version = "0.2"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-pcVoYGBhp9jyuWBJ/Rpi8cjwDgPjhJ1PrPblj5DQTpk="; + hash = "sha256-xvr/NDAjCjhpImzNlCOcI4x5dIAefJ1TnUgoBhgdhPA="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ numpy @@ -35,7 +38,9 @@ buildPythonPackage rec { # tests require a physical FPGA doCheck = false; - pythonImportsCheck = [ "apycula" ]; + pythonImportsCheck = [ + "apycula" + ]; meta = with lib; { description = "Open Source tools for Gowin FPGAs"; diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix index c8b1b78b78f..b46152f3a09 100644 --- a/pkgs/development/python-modules/asn1/default.nix +++ b/pkgs/development/python-modules/asn1/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asn1"; - version = "2.4.2"; + version = "2.5.0"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrivet"; repo = "python-asn1"; rev = "v${version}"; - sha256 = "sha256-fx/kWOnh5Gk1DjeX0xiCJYnd5teD18RvKyOnawcfWWA="; + sha256 = "sha256-5Fnk94aUkV9lHnd64wuHzGcPqW7AC0O0dEwXMBL+tuo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix index fb7dec6d6ed..6f6da10a87f 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy35, pytest, pytest-asyncio }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "async-generator"; @@ -12,17 +18,17 @@ buildPythonPackage rec { sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"; }; - # no longer compatible with pytest-asyncio - doCheck = false; - checkInputs = [ pytest pytest-asyncio ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; - checkPhase = '' - pytest -W error -ra -v --pyargs async_generator - ''; + pythonImportsCheck = [ "async_generator" ]; meta = with lib; { description = "Async generators and context managers for Python 3.5+"; homepage = "https://github.com/python-trio/async_generator"; license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix new file mode 100644 index 00000000000..53bd099fce5 --- /dev/null +++ b/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asyncsleepiq"; + version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ZpxiFV9Ch46vIDxNDYm0BBD5EY8+j8AzOu6lKsQpGrY="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "asyncsleepiq" + ]; + + meta = with lib; { + description = "Async interface to SleepIQ API"; + homepage = "https://github.com/kbickar/asyncsleepiq"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index f1152da2d1d..2b3b1e4ce8c 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "e4e642dfe496d2acb245c90e37dc18028e25d5e936421e7371ea6ba0fde6435a"; + sha256 = "sha256-ZlX6ItGx0dy5zO4NUCNQq5DFNGehC1QLdiRCK1lNLnI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 6bc4c63aefb..fa00971ff25 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.3"; + version = "0.13.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1GaKDpOGX/YbM4rByTw0nYgwHYFvOLHZ0GRvanX3vAU="; + hash = "sha256-dUNljMKsbl6eByhEYivWgRJczTBw3N1RVl8r3e898mg="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 70161d3fd6a..fc188ae683c 100644 --- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "AWSIoTPythonSDK"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-iot-device-sdk-python"; rev = "v${version}"; - sha256 = "0bmvwv471mvlwj2rfz08j9qvzsp4vyjz67cbzkvsy6kmihx3wfqh"; + sha256 = "sha256-UpfgoCVbweOpWbgaqNebAAkWmhjkZu3txVoTZ/qhl3g="; }; # Module has no tests diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 2013bc64545..ea0696e294a 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7f22cd0c7a9b92ed297dd67ae79d9bb9a866e404061c02cec709ad10c4c88e19"; + sha256 = "sha256-Ag/w5HFXhS5KrIo62waEGCcUfyepTL50qQRCXY5i2Tw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 3038f8720e7..3dbb8f5a87a 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "26.0.0"; + version = "26.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-nGot8UIeL0DNuw5+v7XmLjrNiJMfpsk1z2K2Tdo4Q+s="; + sha256 = "sha256-K63nT8sx2PCIFhc+1eCAs/ItESbv9xA+8GDn2hZCJHU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 8afcde62019..fae7318cd48 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "9.0.0"; + version = "9.1.0"; pname = "azure-mgmt-containerregistry"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9f6c5894d32ba696527ecf0ff155bb43c325dff6a11a6de60cd22ea3f5fb180d"; + sha256 = "sha256-jkzGLDqrJgwCnz27lGzFk4d2q+j0P+PU8uUVGQg7MkA="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 9c6e9e2d80f..eed367c2206 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-/YmFlK5xl3HjaKGAhQu0JUVeujzPkAb8gNik4Lzp470="; + sha256 = "sha256-pjBjFPkKhKd8XI6wmzX/rAssHINMzDAZa+XRqG/pLYo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index fae47547cc7..66818ce5b05 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , msrest , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "3.0.0"; + version = "3.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "91ddb7333bf2b9541a53864cc8d2501e3694a03a9c0e41cbfae3348558675ce6"; + hash = "sha256-ROcUAm0KgIjO2A2XBpS00IeEPgd8x4cjoMfn6X9C+Gw="; }; propagatedBuildInputs = [ @@ -24,13 +26,13 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; - pythonNamespaces = [ "azure.mgmt" ]; + pythonNamespaces = [ + "azure.mgmt" + ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index edf8057e503..8c2ec661f8c 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , azure-common , azure-mgmt-core , msrest @@ -6,13 +9,14 @@ }: buildPythonPackage rec { - version = "6.0.1"; pname = "azure-mgmt-netapp"; - disabled = isPy27; + version = "7.0.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6ce683587be1638d8d77620b7af118060b8b7dfc4fd23d46a623a66edcb388e1"; + hash = "sha256-ziaddG+6MoPG18OYZyQ9HRx8nfGsz2UbWPC1pWacKto="; extension = "zip"; }; @@ -26,7 +30,10 @@ buildPythonPackage rec { # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.netapp" ]; + pythonImportsCheck = [ + "azure.common" + "azure.mgmt.netapp" + ]; meta = with lib; { description = "Microsoft Azure NetApp Files Management Client Library for Python"; diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 626a60d7c99..68cf99fa0d4 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "10.0.0"; + version = "10.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a"; + sha256 = "sha256-qH1AHIdshHNM3UiIr1UeShRhtLMo2YFq9gy4rFl58DU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 8d3bb5aca3e..669ab37e4db 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.9.0"; + version = "12.10.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cff66a115c73c90e496c8c8b3026898a3ce64100840276e9245434e28a864225"; + sha256 = "sha256-PH3CyT5/8qcxrNZqNqHwpiZgcrQVTeukiU2riRKF6jo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 421b46a9948..c7c59fd2b9f 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.6.0"; + version = "12.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7eb0cde00fbbb6b780da8bdd81312ab79de706c4a2601e4eded1bc430da680a8"; + sha256 = "sha256-kYNugiWNlXEgryKLwrzytca/W+2481RqqUCbdJWrqDI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index b24417b325a..5a83385b754 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "79eb973280ea89c0e6e2872d8f3f175b172b7438c2e2b9b4e655ae206be705fa"; + sha256 = "sha256-IfQWsITuThzh+TRgv99JTtcDFY3gMq5PjALkN4mJEZo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 0fcf5966d68..cf1bbd9c54a 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.3"; + version = "1.7.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-WHcsqVG/ESndqKKA01FUfegycgv3tcKfrDEDknmAuKY="; + sha256 = "sha256-LWOoxXNBe64ziWLUubBvvGCA907NlVoJKEnh5lxxe9I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 42203a43da4..78529e288ca 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -1,33 +1,21 @@ { lib , buildPythonPackage , fetchPypi +, lark , nose , pythonOlder }: -let - lark-parser = buildPythonPackage rec { - pname = "lark-parser"; - version = "0.10.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "15jr4c1falvgkq664xdgamykk6waklh1psy8v3wlrg0v59hngws2"; - }; - - doCheck = true; - }; -in buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.30"; + version = "0.3.33"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-wfcTIPKbMPa7xpXzkFtxnxG2ZRFzTw35EP7f4zwHxcs="; + hash = "sha256-tdsw9gf64VGH9tRWgYZZq3FNa5B5JNhN3k6wUHrU5zY="; }; # Nose is required during build process, so can not use `checkInputs`. @@ -36,7 +24,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - lark-parser + lark ]; # This fork of python-hcl2 doesn't ship tests diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 112f12e5f25..a63df0d7d39 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -21,7 +21,7 @@ , visualizationSupport ? false }: buildPythonPackage rec { - pname = "binwalk"; + pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; version = "2.3.3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index ea2c20df205..be7f69fbd8d 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.7"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TaeQqxk+mTEH8/8K68T41q1RlqGQcfuvrRawKJikT9c="; + sha256 = "sha256-8SA+kC1R3zGRfXfuupw/540DKHOirXjHN+JkIPAIDlg="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index dcb83d1ca2a..c96c2e8707b 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -4,16 +4,19 @@ , nose , parts , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "bitlist"; - version = "0.6.2"; + version = "0.7.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "69cf632ca61b5fb5d2fd7587ddf023bcab8f327302f15070ec9079b68df9082a"; + sha256 = "sha256-p3Gws48u1/AzltbtPyWvSX4O0u4MgSXiVq4GstpPCCg="; }; propagatedBuildInputs = [ @@ -29,6 +32,11 @@ buildPythonPackage rec { "bitlist" ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=bitlist --cov-report term-missing" "" + ''; + meta = with lib; { description = "Python library for working with little-endian list representation of bit strings"; homepage = "https://github.com/lapets/bitlist"; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 13f05fa6136..064fe8187ed 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -1,8 +1,12 @@ -{ stdenv, lib -, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, pytestCheckHook +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +, pytestCheckHook , aiohttp , aiohttp-cors -, attrs , click , colorama , dataclasses @@ -19,13 +23,13 @@ buildPythonPackage rec { pname = "black"; - version = "21.12b0"; + version = "22.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-d7gPaTpWni5SeVhFljTxjfmwuiYluk4MLV2lvkLm8rM="; + hash = "sha256-p8AZLTVjX2/BF0vldct5FekuXdYp7nn9rw3PpBqAr7U="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -61,17 +65,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp aiohttp-cors - attrs click colorama mypy-extensions pathspec platformdirs tomli - typed-ast # required for tests and python2 extra uvloop - ] ++ lib.optional (pythonOlder "3.7") dataclasses - ++ lib.optional (pythonOlder "3.8") typing-extensions; + ] ++ lib.optional (pythonOlder "3.8") typed-ast + ++ lib.optional (pythonOlder "3.10") typing-extensions; meta = with lib; { description = "The uncompromising Python code formatter"; diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 572dbad932b..27b7ba03d45 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -5,11 +5,16 @@ , python-slugify , requests , pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "blinkpy"; version = "0.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fronzbot"; @@ -38,6 +43,12 @@ buildPythonPackage rec { "blinkpy.sync_module" ]; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + "test_download_video_exit" + "test_parse_camera_not_in_list" + "test_parse_downloaded_items" + ]; + meta = with lib; { description = "Python library for the Blink Camera system"; homepage = "https://github.com/fronzbot/blinkpy"; diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index 1c491cb5de0..aac2c2b9739 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "blspy"; - version = "1.0.8"; + version = "1.0.9"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yKLirwWWeUTs5BFXZfqfuNJUXtQW40EiNPxuP+FeHso="; + hash = "sha256-6keimQqwh37G9xc1Xyxlr+0n9Qgv87Np2D7Gzj6ik5Y="; }; patches = [ diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 29a5dd569ae..518a2d8b69e 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.29"; + version = "0.2.30"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-x+TXHG7xJWd5t6pKQ/6X48lOuIQWUnEwsySFRh5GJnE="; + sha256 = "sha256-qq01hnNiJ6BUGhi5owYvxM+Kj7/KYp0vBpILmwPuZaw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix index cbc75ef2843..5ee2ff0522a 100644 --- a/pkgs/development/python-modules/bsdiff4/default.nix +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -1,24 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "bsdiff4"; - version = "1.2.1"; + version = "1.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "87cffc7522effdda03fd1564b212ad2279c0af50d16c3e65776f80acb6705d4b"; + hash = "sha256-GICsP1KmxGrmvMbbEX5Ps1+bDM1a91/U/uaQfQDWmDw="; }; + pythonImportsCheck = [ + "bsdiff4" + ]; + checkPhase = '' mv bsdiff4 _bsdiff4 python -c 'import bsdiff4; bsdiff4.test()' ''; meta = with lib; { - description = "binary diff and patch using the BSDIFF4-format"; + description = "Binary diff and patch using the BSDIFF4-format"; homepage = "https://github.com/ilanschnell/bsdiff4"; license = licenses.bsdProtection; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 49acee691cf..d900beca38a 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -6,15 +6,20 @@ , transaction , zope_testrunner , python +, pythonOlder }: buildPythonPackage rec { - pname = "BTrees"; - version = "4.9.2"; + pname = "btrees"; + version = "4.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "d33323655924192c4ac998d9ee3002e787915d19c1e17a6baf47c9a63d9556e3"; + pname = "BTrees"; + inherit version; + hash = "sha256-1qsONBDQdNcVQkXW3GSTrobxtQvWCA0TEOuz7N6l3rY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 6e0637d2a6b..d1926c9631a 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -1,24 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, six}: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, six +}: buildPythonPackage rec { pname = "bumps"; - version = "0.8.1"; + version = "0.9.0"; + format = "setuptools"; - propagatedBuildInputs = [six]; - - # Bumps does not provide its own tests.py, so the test - # always fails - doCheck = false; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f4f2ee712a1e468a2ce5c0a32f67739a83331f0cb7b9c50b9e7510daefc12169"; + hash = "sha256-BY9kg0ksKfrpQgsl1aDDJJ+zKJmURqwTtKxlITxse+o="; }; + propagatedBuildInputs = [ + six + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "bumps" + ]; + meta = with lib; { - homepage = "https://www.reflectometry.org/danse/software.html"; description = "Data fitting with bayesian uncertainty analysis"; - maintainers = with maintainers; [ rprospero ]; + homepage = "https://bumps.readthedocs.io/"; license = licenses.publicDomain; + maintainers = with maintainers; [ rprospero ]; }; } diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index b5679978c2c..8743c01ba2a 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -9,13 +9,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.5.0"; + version = "1.6.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Xr3c10xbBm7mjsylZGUzjpsTgEZ+CpBvR5dpfJ+zgeI="; + hash = "sha256-hznV/ZGspygdQlZgrmWvdmOAjIF3d4ll9n6QsWorJCc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix index e1c27d9e4fb..587d0d1f6c1 100644 --- a/pkgs/development/python-modules/cchardet/default.nix +++ b/pkgs/development/python-modules/cchardet/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , python @@ -20,9 +21,14 @@ buildPythonPackage rec { checkInputs = [ 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 = '' cp -R src/tests $TMPDIR pushd $TMPDIR + '' + lib.optionalString (stdenv.hostPlatform.system != "x86_64-linux") '' + rm $TMPDIR/tests/testdata/th/tis-620.txt # identified as iso-8859-11, which is fine for all practical purposes + rm $TMPDIR/tests/testdata/ga/iso-8859-1.txt # identified as windows-1252, which is fine for all practical purposes + rm $TMPDIR/tests/testdata/fi/iso-8859-1.txt # identified as windows-1252, which is fine for all practical purposes ''; checkPhase = '' diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 4a00155a4ec..754d7ca0f2a 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.1.2"; + version = "2.1.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "0qxqd5ip98d6q1d48vcprpr38sa47ky3cr6lprd01nzibdmf2r2d"; + sha256 = "sha256-Zv3ViOrdQby+7UQrHy6174W2qh1vx21R0yOA7ecr0lU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 7686b919272..be597277b6b 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "03kj15cf1pbd11mxsik96m5w1m6p0fbdc4ia5ihzmq8rz28razpq"; }; + propagatedBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 354f90f12b6..1c5b96ea48c 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.56.4"; + version = "0.58.2"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "0li8zkdvmgfxqzqs1rvd48mwim0bhjwmxlywqxjix0a43kvkvh77"; + sha256 = "sha256-ArpvP4tbRf1fK8BPokRXqS3YyaFiOLBrR8uQHko5iKo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 3991dc6bf68..6479933293f 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.5.2"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "375d37d9ab8bf501c048e44efce2276296e3d67bb276e891e0e93b0a8bbb988a"; + sha256 = "sha256-ExA+ZlC+6mVSMWvVgl1qo7fpj1uBFQJt9IJnmN/590E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index c7383e98219..803104d8547 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "channels-redis"; - version = "3.3.1"; + version = "3.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "channels_redis"; - sha256 = "899dc6433f5416cf8ad74505baaf2acb5461efac3cad40751a41119e3f68421b"; + sha256 = "sha256-Xf/UzBYXQSW9QEP8j+dGLKdAPPgB1Zqfp0EO0QH6alc="; }; buildInputs = [ redis hiredis ]; diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index ba7dd1db3b9..d406ea15fbd 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "2.0.10"; + version = "2.0.12"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; rev = version; - hash = "sha256-QsUqrC2oycvyCbOzGmHahgNi40YZ0sujb3Cj8EnsGS8="; + hash = "sha256-d5vWnZtFR669l1Meg4ZSsYIyBlJZya7SpXJMx2AP8NU="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 28e777e8fdd..30a620b5ad6 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.5.0"; + version = "5.6.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "04hsh1z2ngfslmvi8fdzfccssg6i0ziksil84j129f049m96wd51"; + sha256 = "sha256-mf4QASdvO7doV5pKAAEzaKJP66w29osBlbLrJuopUvA="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 608f3a0cac6..d55f5155b45 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -8,22 +8,21 @@ , pep517 , pytestCheckHook , toml +, pythonOlder }: buildPythonPackage rec { pname = "check-manifest"; version = "0.47"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "56dadd260a9c7d550b159796d2894b6d0bcc176a94cbc426d9bb93e5e48d12ce"; + hash = "sha256-VtrdJgqcfVULFZeW0olLbQvMF2qUy8Qm2buT5eSNEs4="; }; - # Test requires filesystem access - postPatch = '' - substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist" - ''; - propagatedBuildInputs = [ build pep517 @@ -37,11 +36,18 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "check_manifest" ]; + disabledTests = [ + # Test wants to setup a venv + "test_build_sdist_pep517_isolated" + ]; + + pythonImportsCheck = [ + "check_manifest" + ]; meta = with lib; { - homepage = "https://github.com/mgedmin/check-manifest"; description = "Check MANIFEST.in in a Python source package for completeness"; + homepage = "https://github.com/mgedmin/check-manifest"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; }; diff --git a/pkgs/development/python-modules/chromaprint/default.nix b/pkgs/development/python-modules/chromaprint/default.nix new file mode 100644 index 00000000000..2a07a4eb6dc --- /dev/null +++ b/pkgs/development/python-modules/chromaprint/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, m2r +}: + +buildPythonPackage rec { + pname = "chromaprint"; + version = "0.5"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-d4M+ieNQpIXcnEH1WyIWnTYZe3P+Y58W0uz1uYPwLQE="; + }; + + buildInputs = [ m2r ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "chromaprint" ]; + + meta = with lib; { + description = "Facilitate effortless color terminal output"; + homepage = "https://pypi.org/project/${pname}/"; + license = licenses.mit; + maintainers = with maintainers; [ dschrempf peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index 409164cf830..670e4a3c923 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "65f0313f9915b36068f6dfcab08e04671621e6227650443bc12e81997081ae7f"; + sha256 = "sha256-UVLKJHDPxi9ivY3JyIySmce0NUhxIIlIxVTdPoXMaKM="; }; propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix index cd11aa03f86..6f693f369cd 100644 --- a/pkgs/development/python-modules/cloudscraper/default.nix +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy3k +, pythonOlder , fetchPypi , requests , requests-toolbelt @@ -9,12 +9,14 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.58"; - disabled = !isPy3k; + version = "1.2.60"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1wnzv2k8cm8q1x18r4zg8pcnpm4gsdp82hywwjimp2v2qll918nx"; + hash = "sha256-DTQTsv/59895UTsMmqxYtSfFosUWPRx8wMT4zKHQ9Oc="; }; propagatedBuildInputs = [ @@ -27,10 +29,12 @@ buildPythonPackage rec { # nixpkgs yet, and also aren't included in the PyPI bundle. TODO. doCheck = false; - pythonImportsCheck = [ "cloudscraper" ]; + pythonImportsCheck = [ + "cloudscraper" + ]; meta = with lib; { - description = "A Python module to bypass Cloudflare's anti-bot page"; + description = "Python module to bypass Cloudflare's anti-bot page"; homepage = "https://github.com/venomous/cloudscraper"; license = licenses.mit; maintainers = with maintainers; [ kini ]; diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 517f3b99bef..92e5a71ee80 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.30.0"; + version = "1.33.7"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-IKxeNAMJTMCpP/jz7lHuetHCpddypgYdCKQcI/9pIj8="; + sha256 = "sha256-KNm2O2kZg+YzjtebsBoL7BOHCuffDELXm2k8vIFtKdk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch b/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch deleted file mode 100644 index 9939e6fb43a..00000000000 --- a/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -80,7 +80,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "clvm_rs" --version = "0.1.14" -+version = "0.1.15" - dependencies = [ - "bls12_381", - "hex", diff --git a/pkgs/development/python-modules/clvm-rs/default.nix b/pkgs/development/python-modules/clvm-rs/default.nix index ec078970bc1..7b5a5a96a8c 100644 --- a/pkgs/development/python-modules/clvm-rs/default.nix +++ b/pkgs/development/python-modules/clvm-rs/default.nix @@ -5,35 +5,59 @@ , pythonOlder , openssl , perl +, pkgs }: +let + # clvm-rs does not work with maturin 0.12 + # https://github.com/Chia-Network/clvm_rs/commit/32fba40178a5440a1306623f47d8b0684ae2339a#diff-50c86b7ed8ac2cf95bd48334961bf0530cdc77b5a56f852c5c61b89d735fd711 + maturin_0_11 = with pkgs; rustPlatform.buildRustPackage rec { + pname = "maturin"; + version = "0.11.5"; + src = fetchFromGitHub { + owner = "PyO3"; + repo = "maturin"; + rev = "v${version}"; + hash = "sha256-hwc6WObcJa6EXf+9PRByUtiupMMYuXThA8i/K4rl0MA="; + }; + cargoHash = "sha256-qGCEfKpQwAC57LKonFnUEgLW4Cc7HFJgSyUOzHkKN9c="; + + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = lib.optionals stdenv.isLinux [ dbus ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; + + # Requires network access, fails in sandbox. + doCheck = false; + }; +in + buildPythonPackage rec { pname = "clvm_rs"; - version = "0.1.15"; + version = "0.1.19"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - sha256 = "sha256-4QFreQlRjKqGhPvuXU/pZpxMfF8LkIf6X7C3K2q77MI="; + sha256 = "sha256-mCKY/PqNOUTaRsFDxQBvbTD6wC4qzP0uv5FldYkwl6c="; }; - patches = [ - # upstream forgot to refresh the lock file - ./bump-cargo-lock.patch - ]; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; + inherit src; name = "${pname}-${version}"; - sha256 = "sha256-jPNU+P6JgxTPL1GYUBE4VPU3p6cgL8u/+AIELr7r5Mk="; + sha256 = "sha256-TmrR8EeySsGWXohMdo3dCX4oT3l9uLVv5TUeRxCBQeE="; }; format = "pyproject"; + buildAndTestSubdir = "wheel"; + nativeBuildInputs = [ perl # used by openssl-sys to configure + maturin_0_11 ] ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index c0863a5b394..d609508822e 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-plwVL52ov4JxTxnCh/4JaO6Of4mejZRQPXPQ/lcinBk="; + sha256 = "sha256-/oWbDpjSIrS0WAIgB9qsJ1fpcPBnHUXlXQGTHBtLs8s="; }; propagatedNativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix new file mode 100644 index 00000000000..5ff53b8eb75 --- /dev/null +++ b/pkgs/development/python-modules/coqui-trainer/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, coqpit +, fsspec +, pytorch-bin + +, pytestCheckHook +, soundfile +, tensorboardx +, torchvision +}: + +let + pname = "coqui-trainer"; + version = "0.0.4"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "coqui-ai"; + repo = "Trainer"; + # https://github.com/coqui-ai/Trainer/issues/4 + rev = "776eba829231543d3207927fc69b321d121e527c"; + hash = "sha256-ICveftJjBNsCgegTmd/ewd/Y6XGMg7YOvchx640RFPI="; + }; + + propagatedBuildInputs = [ + coqpit + fsspec + pytorch-bin + soundfile + tensorboardx + ]; + + # tests are failing; tests require the clearml library + # https://github.com/coqui-ai/Trainer/issues/5 + doCheck = false; + + checkInputs = [ + pytestCheckHook + torchvision + ]; + + pythonImportsCheck = [ + "trainer" + ]; + + meta = with lib; { + description = "A general purpose model trainer, as flexible as it gets"; + homepage = "https://github.com/coqui-ai/Trainer"; + license = licenses.asl20; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 79ed1ebac5f..73609966ba8 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.18"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W67+Hy7Wk3dJspNYbGzk9C7TDniQIj92Ycyyu333C+8="; + sha256 = "sha256-QURm/ehJovqr/ZRE7ILKLnvxQsAdcjdSTPlzCt60IBw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 004d42a81df..dc0813acefa 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ul3j1BJd3lKzGCEhPFYxZG0CcAqAZqmOEDi8vGPFItw="; + sha256 = "sha256-iH56c2PO1G/NlLmYC+6sdAMZ+kXvUkpkqxfnl9EmDsQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/decopatch/default.nix b/pkgs/development/python-modules/decopatch/default.nix index 92c2c27de2f..71e302a8b53 100644 --- a/pkgs/development/python-modules/decopatch/default.nix +++ b/pkgs/development/python-modules/decopatch/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "decopatch"; - version = "1.4.9"; + version = "1.4.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tYgsjPDVsB0hi04E9nYtB7ModCDqUJcG9Zlxw9b+xW8="; + hash = "sha256-lX9JyT9BUBgsI/j7UdE7syE+DxenngnIzKcFdZi1VyA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index 0f67b2ae352..a4f71774c4d 100644 --- a/pkgs/development/python-modules/deep-translator/default.nix +++ b/pkgs/development/python-modules/deep-translator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.7.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-k4RhUZN/aC9D1NKkmCGZGZNU9In577RobBnDagMYHbo="; + sha256 = "sha256-Oi5dzrC19PnlExCOgu+bT5n3/XwgJkDirzl8ra8w7Nw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/deezer-py/default.nix b/pkgs/development/python-modules/deezer-py/default.nix index a05c7335214..f36a73fc27d 100644 --- a/pkgs/development/python-modules/deezer-py/default.nix +++ b/pkgs/development/python-modules/deezer-py/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "deezer-py"; - version = "1.3.6"; + version = "1.3.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a3ef151f7971d69769e7393f71373eaf896bccd22167213872ae46e04e14a2d7"; + sha256 = "sha256-saMy+IeAy6H9SgS8XHnZ9klFerGyr+vQqhuCtimgbEo="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 4710de2c7ec..b1dab2e73c9 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, django, pytest, pytest-django }: +{ lib, buildPythonPackage, fetchFromGitHub, django, pytest, pytest-django, python }: buildPythonPackage rec { pname = "django-picklefield"; version = "3.0.1"; + format = "setuptools"; # The PyPi source doesn't contain tests src = fetchFromGitHub { @@ -14,17 +15,20 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - checkInputs = [ pytest pytest-django ]; + # Tests are failing with Django 3.2 + # https://github.com/gintas/django-picklefield/issues/58 + doCheck = false; checkPhase = '' - PYTHONPATH="$(pwd):$PYTHONPATH" \ - DJANGO_SETTINGS_MODULE=tests.settings \ - pytest tests/tests.py + runHook preCheck + ${python.interpreter} -m django test --settings=tests.settings + runHook postCheck ''; - meta = { + meta = with lib; { description = "A pickled object field for Django"; homepage = "https://github.com/gintas/django-picklefield"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index c4df27beaaa..727bf304fdb 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -5,13 +5,14 @@ }: buildPythonPackage rec { - pname = "Django"; + pname = "django"; version = "2.2.27"; disabled = !isPy3k; src = fetchPypi { - inherit pname version; + pname = "Django"; + inherit version; sha256 = "sha256-HuNwRrC/K2HoOzoB0GcyNRbsO28rF81JsTJt1LqdyRM="; }; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 3ed7024c349..1538b8a82b4 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -12,13 +12,14 @@ }: buildPythonPackage rec { - pname = "Django"; + pname = "django"; version = "3.2.12"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "Django"; + inherit version; sha256 = "sha256-l3Lmk1cD5Z6ZOWCDLWamFM8CM6HFEjvGIk7MataeQeI="; }; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index eb24edb4bff..57c752725d5 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -39,14 +39,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.0.2"; + version = "4.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-EQ+1j7Euylngcq1Z/ELXcc1kLdei8kFlgqqdp6jvlUo="; + hash = "sha256-d/8ucFDjMkybZ+KbZwd1RWb1hRQRKprHMxD2DNUmGTA="; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 4c616bdeb27..d84a542d0bb 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "djangorestframework-simplejwt"; - version = "5.0.0"; + version = "5.1.0"; src = fetchPypi { pname = "djangorestframework_simplejwt"; inherit version; - sha256 = "30b10e7732395c44d21980f773214d2b9bdeadf2a6c6809cd1a7c9abe272873c"; + sha256 = "sha256-dTI1KKe5EIQ7h5GUdG8OvDSBxK2fNU3i3RYhYGYvuVo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/docx2txt/default.nix b/pkgs/development/python-modules/docx2txt/default.nix new file mode 100644 index 00000000000..6b3c2777d78 --- /dev/null +++ b/pkgs/development/python-modules/docx2txt/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "docx2txt"; + version = "0.8"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LAbZjXz+LTlH5XYKV9kk4/8HdFs3nIc3cjki5wCSNuU="; + }; + + pythonImportsCheck = [ + "docx2txt" + ]; + + meta = with lib; { + description = "A pure python-based utility to extract text and images from docx files"; + homepage = "https://github.com/ankushshah89/python-docx2txt"; + license = licenses.mit; + maintainers = with maintainers; [ ilkecan ]; + }; +} diff --git a/pkgs/development/python-modules/downloader-cli/default.nix b/pkgs/development/python-modules/downloader-cli/default.nix index 9d99709c916..40cfd888a5d 100644 --- a/pkgs/development/python-modules/downloader-cli/default.nix +++ b/pkgs/development/python-modules/downloader-cli/default.nix @@ -1,25 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, urllib3 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, urllib3 +, pythonOlder +}: buildPythonPackage rec { pname = "downloader-cli"; - version = "0.3.2"; + version = "0.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "0hjwy3qa6al6p35pv01sdl3szh7asf6vlmhwjbkpppn4zi239k0y"; + hash = "sha256-Dl5XIvdZInz+edL9uQv7V6Kc6FB+7hFAGe/nybnqvQU="; }; - propagatedBuildInputs = [ urllib3 ]; + propagatedBuildInputs = [ + urllib3 + ]; # Disable checks due to networking (Errno 101) doCheck = false; - pythonImportsCheck = [ "downloader_cli" ]; + pythonImportsCheck = [ + "downloader_cli" + ]; meta = with lib; { - description = "A simple downloader written in Python with an awesome customizable progressbar. "; + description = "Downloader with an awesome customizable progressbar"; homepage = "https://github.com/deepjyoti30/downloader-cli"; license = licenses.mit; maintainers = with maintainers; [ j0hax ]; diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 8f53ff4ebbf..2e2490568e9 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.27.0"; + version = "11.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "sha256-atIrrK4BgTfu0UaHTqJ66AxEeSJLanrmYx8myrOCOfo="; + sha256 = "sha256-xNenBmeCRIYxQqAkV8IDpPpIHyVAYJs1jAFr8w1tz2Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index bf78fec5e5d..f273b1a6428 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.7.2"; + version = "6.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "v${version}"; - sha256 = "sha256-NyoFJ3HVxE3AdCCZCZrEk4dDiTIv9cGZYPHVre/PMO4="; + sha256 = "sha256-5G+ALFDEClItXvSQFGari0QdhW+RGV8FukxUoxqphFg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 05625f92839..6e30203ad0f 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.0.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - sha256 = "04xidix6l5d9rqfwp6cmj6wvais04nlvz5ynp0zwgyjp9sh2nhp6"; + hash = "sha256-+rFW7qFpay/ebUz9EEB8nn0kuqVtVmG5ZHOWG2bMPts="; }; nativeBuildInputs = [ @@ -36,15 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/gwww/elkm1/pull/45 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/gwww/elkm1/commit/807a17268498298908bf82af4933b158b37c8f32.patch"; - sha256 = "1539g8wsxppqj6dm6w81ps05frb8vrfaxahxn2cqs76zdhvly3p9"; - }) - ]; - pythonImportsCheck = [ "elkm1_lib" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 76579e4dd89..84a709ac539 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0QOtsHGhqbjaEDpSbUXdE8+u6xzWbrTexx+BAeYwKa8="; + sha256 = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 32b3098ffc7..18047eb719a 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.20"; + version = "0.5.21"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "sha256-gYl5+rtOzci3nhgP74VM37tNk9pPWgcNBfcSSG1fSJs="; + sha256 = "sha256-jildWpYWll5j7siYhNECMBjz9bF41xFA6NyydWNdgQE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 7c8f520647e..096279b3453 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -57,6 +57,8 @@ buildPythonPackage rec { "test_hosts_no_network" "test_leakage_from_tracebacks" "test_patcher_existing_locks_locked" + # broken with pyopenssl 22.0.0 + "test_sendall_timeout" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 7f4a0adc495..6f0a39a7b2d 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.74.1"; + version = "0.75.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = version; - sha256 = "sha256-aYSJ30nAS3cG1fVSXuX2m3bxUSnpbWWUxFQy7dzuiTA="; + sha256 = "sha256-LCdScvQUdwOM8Don/5n/49bKrivT+bkhqWcBNku4fso="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 935eefa5182..fcd65f1f317 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.4.9"; + version = "1.4.10"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0af6d67s6mi9ylqla8nga6cj4y0y4gp3l2q68br2mrdyivkml0g0"; + sha256 = "sha256-JTNRm/nCQckAZrVTgcJVP3bLE53QPtccdoDcGLbP6BE="; }; preBuild = '' diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 05afcff5627..216a84b9ec6 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -6,16 +6,19 @@ , parts , nose , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "fe25519"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-3WFpbt4bA7zPlK+mp5DJXdgk44MBimCbpIMhRjZ5p0o="; + hash = "sha256-Hzdt8932WonJAaQPtL346JFPqxFXkNW4XQvbQlSoJJE="; }; propagatedBuildInputs = [ @@ -29,6 +32,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=fe25519 --cov-report term-missing" "" + ''; + pythonImportsCheck = [ "fe25519" ]; diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index 1f8c6983cbd..f514cf32537 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -1,25 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub -, substituteAll -, pytestCheckHook , ffmpeg , future -, pytest-runner , pytest-mock +, pytestCheckHook +, pythonAtLeast +, pythonOlder +, substituteAll }: buildPythonPackage rec { pname = "ffmpeg-python"; version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kkroening"; repo = "ffmpeg-python"; rev = version; - sha256 = "0mmydmfz3yiclbgi4lqrv9fh2nalafg4bkm92y2qi50mwqgffk8f"; + hash = "sha256-Dk3nHuYVlIiFF6nORZ5TVFkBXdoZUxLfoiz68V1tvlY="; }; + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + ]; + patches = [ (substituteAll { src = ./ffmpeg-location.patch; @@ -27,14 +40,23 @@ buildPythonPackage rec { }) ]; - buildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ future ]; - checkInputs = [ pytestCheckHook pytest-mock ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + pythonImportsCheck = [ + "ffmpeg" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + "test__output__video_size" + ]; meta = with lib; { description = "Python bindings for FFmpeg - with complex filtering support"; homepage = "https://github.com/kkroening/ffmpeg-python"; license = licenses.asl20; - maintainers = [ maintainers.AluisioASG ]; + maintainers = with maintainers; [ AluisioASG ]; }; } diff --git a/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch b/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch new file mode 100644 index 00000000000..234bf0cb379 --- /dev/null +++ b/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch @@ -0,0 +1,48 @@ +From 716fcfa3203bc881b543916bdb9a17460951cd26 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" <d.ol.rod@protonmail.com> +Date: Fri, 26 Nov 2021 07:13:32 -0600 +Subject: [PATCH] Fixing paths on tests + +--- + tests/maintest.py | 7 ++++++- + tests/speedtest.py | 7 ++++++- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/tests/maintest.py b/tests/maintest.py +index 0e24ca4..3484437 100644 +--- a/tests/maintest.py ++++ b/tests/maintest.py +@@ -1,6 +1,11 @@ + import fleep ++import os + +-with open("testfile", "rb") as file: ++current_dir = os.path.realpath(os.path.join(os.getcwd(), ++ os.path.dirname(__file__))) ++ ++with open(os.path.join(current_dir, "./testfile"), ++ "rb") as file: + info = fleep.get(file.read(128)) + + assert info.type == ["raster-image"] +diff --git a/tests/speedtest.py b/tests/speedtest.py +index 89338ab..829d563 100644 +--- a/tests/speedtest.py ++++ b/tests/speedtest.py +@@ -1,7 +1,12 @@ + import time + import fleep ++import os + +-with open("testfile", "rb") as file: ++current_dir = os.path.realpath(os.path.join(os.getcwd(), ++ os.path.dirname(__file__))) ++ ++with open(os.path.join(current_dir, "./testfile"), ++ "rb") as file: + stream = file.read(128) + + times = [] +-- +2.33.1 + diff --git a/pkgs/development/python-modules/fleep/default.nix b/pkgs/development/python-modules/fleep/default.nix new file mode 100644 index 00000000000..04b60732513 --- /dev/null +++ b/pkgs/development/python-modules/fleep/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "fleep"; + version = "1.0.1"; + + # Pypi version does not have tests + src = fetchFromGitHub { + owner = "floyernick"; + repo = "fleep-py"; + rev = "994bc2c274482d80ab13d89d8f7343eb316d3e44"; + sha256 = "sha256-TaU7njx98nxkhZawGMFqWj4g+yCtIX9aPWQHoamzfMY="; + }; + + patches = [ + ./0001-Fixing-paths-on-tests.patch + ]; + + checkPhase = '' + ${python.interpreter} tests/maintest.py + ${python.interpreter} tests/speedtest.py + ''; + + pythonImportsCheck = [ "fleep" ]; + + meta = with lib; { + description = "File format determination library"; + homepage = "https://github.com/floyernick/fleep-py"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix index 418c7cf42fe..1a53b46c446 100644 --- a/pkgs/development/python-modules/flipr-api/default.nix +++ b/pkgs/development/python-modules/flipr-api/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , requests-mock , pythonOlder @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "flipr-api"; - version = "1.4.1"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "cnico"; repo = pname; rev = version; - sha256 = "00qkzr2g38fpa7ndnbfx9m4d50lmz0j74nkxif3amnkbl4m6l5vn"; + sha256 = "sha256-/G92WkWUr3T5T7VVzMERFVmLDfLz6m9rlZLQZCBQbCI="; }; nativeBuildInputs = [ @@ -40,17 +39,10 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/cnico/flipr-api/pull/4 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/cnico/flipr-api/commit/f14be1dfd4f46d4d43d9ea47e51cafca3cc18e86.patch"; - sha256 = "1fdi19cq21zcjx4g132k480yhi5y0x5qj2l0h8k5zky5cdxs58r6"; - }) + pythonImportsCheck = [ + "flipr_api" ]; - pythonImportsCheck = [ "flipr_api" ]; - meta = with lib; { description = "Python client for Flipr API"; homepage = "https://github.com/cnico/flipr-api"; diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index b869d583fc8..e62eedf0468 100644 --- a/pkgs/development/python-modules/fountains/default.nix +++ b/pkgs/development/python-modules/fountains/default.nix @@ -2,16 +2,19 @@ , buildPythonPackage , fetchPypi , bitlist +, pythonOlder }: buildPythonPackage rec { pname = "fountains"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "6de6bc117c376f40a26e111111d638159a2e8a25cfe32f946db0d779decbb70a"; + sha256 = "sha256-c6nw22UtAREYZp0XCEZE6p7GpRvSLukq5y0c9KvVf9w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 34660645b59..1bc295fbe33 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.2.0"; - disabled = pythonOlder "3.6"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rTbekdceC5QK0aiySi/4QUwaEoDfTlLrx2t6Kb9bH7U="; + hash = "sha256-cHKqkvsBUN7If+8swbd6aafFrSgnop3YlweBLPOHzyU="; }; nativeBuildInputs = [ @@ -35,7 +37,9 @@ buildPythonPackage rec { cython frozenlist/_frozenlist.pyx ''; - pythonImportsCheck = [ "frozenlist" ]; + pythonImportsCheck = [ + "frozenlist" + ]; meta = with lib; { description = "Python module for list-like structure"; diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index ab196d23c2d..615bf3ebe9c 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.2.23"; + version = "2022.3.4"; format = "wheel"; disable = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-v+1OagURq3uvIRsxlbhRkUvxGnLlkH4HOx3pKW3jkfY="; + sha256 = "sha256-bHGCk+v4d1XwufFIseaXyeOqvXr5VWRNS8ruXOddt4E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ge25519/default.nix b/pkgs/development/python-modules/ge25519/default.nix index 5c9369e005b..22c96920be6 100644 --- a/pkgs/development/python-modules/ge25519/default.nix +++ b/pkgs/development/python-modules/ge25519/default.nix @@ -7,16 +7,19 @@ , nose , parts , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "ge25519"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-0M9RF8tlEoLyduvY3RvltGAnsus3HF6FEy22b6w6aUs="; + hash = "sha256-8GsNY62SusUmQcaqlhKOPHbd0jvZulCaxMxeob37JJM="; }; propagatedBuildInputs = [ @@ -31,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=ge25519 --cov-report term-missing" "" + ''; + + pythonImportsCheck = [ "ge25519" ]; diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index b091d2583b6..fe25277e8cd 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "glcontext"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; rev = version; - sha256 = "1m2zkl696vqmgrd5k1c5kl0krk6qgjgsz88qhahwva0l40bswvhp"; + sha256 = "sha256-wvoIfwd0UBooqbJGshADjf96Xqx2k9G1nN3Dy6v3GIY="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 52fdf6745c9..30d4db0d261 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "glean_parser"; - version = "5.0.1"; + version = "5.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MJ827VXy8e2CRyq4sY4d0B7etxBgRk4/hZybYOOLh9Q="; + sha256 = "sha256-8oMbaGsW5Lkw9OluNsXXe2IBNbjeoIb9vDjVOt+uHR0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 98339c851cd..ef809dcf700 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.4.2"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = version; - hash = "sha256-QdeEaOP+gPWMqtUofTwrHRqLBtjG8Kta0LfZtccTjCQ="; + hash = "sha256-doyKTGPm4tpmLrXQgsDOGklG54HSN8VFCAXa4Q73Uos="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 05963856edc..5861c66ca58 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.9"; + version = "0.1.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "249a1c1a858bb182b73749784457baacfcab8e7c13da5f3421109d5b8dace5b8"; + sha256 = "sha256-/qQxNUVAHKZ5Go4GYpJ9ATi/EeseJPMyK5HsQCjtL0o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 67296f667ab..c6f17c8d8b0 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -7,15 +7,19 @@ , proto-plus , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.0"; + version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "91fe9b0833f6e1a46293dcc0e483716372c9ff4a95ebe51276c5f0092cb9defd"; + hash = "sha256-NhRQ7X17/Y79DvJT4haArrb23zzwV+XoJT9YUfjLvKc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 4e25662b579..d28cdbf0844 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.7.1"; + version = "3.8.1"; src = fetchPypi { inherit pname version; - sha256 = "848b3028d87358666c50b36253404c15d0a83686700c4586475997b1478d71d5"; + sha256 = "sha256-DvbHQV71hTsWtjN/D1+bHGLSss+UidCZRi3J0zTa07U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 43e5b196109..be13251d2f4 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -10,15 +10,19 @@ , proto-plus , pytest-asyncio , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.7.0"; + version = "2.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hUaxA9QZ0M9klmTAN71OvY4xsRdZuic7V8TeZWzcdMc="; + hash = "sha256-CUsLMX0zRONChgzejZnBztth5ORMZyb6rj6mok2pMMU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 35c082e0563..2717af605ef 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -8,19 +8,33 @@ , pytest-asyncio , pytz , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.6.0"; + version = "3.6.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-1syubhGCY8sYgV2mdneAV/8YOdplf5YZNEeZ0RAJC6E="; + hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + pytz + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.bigquery_datatransfer" diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 32988e35dea..c26d7582c23 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "3cdbf4f82199d2ee0d07fa2c75527661fe034130e27e5c05fd070ed615cd7e23"; + sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 1d5d1b9a689..a7ee6a72913 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.34.0"; + version = "2.34.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-K3XhnlPIWSRBIBgMcqGqmehJFW48BBMHGkv7rgt0xTA="; + sha256 = "sha256-DriC3zCgD1oe89M5ojpnAjCACyqySUWVkafmharWcU8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index d9c91dc8111..9ffa885ab4a 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.5.2"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2ot8e34FbJ51dByIp+3Tq0OggpKbjqZAjwNxUZtnf0I="; + hash = "sha256-TUgC/6IZ9kNE5iDtbhKPHJqo3sv9W+nl7KcxuXfrbyM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index c99d5d0a8bf..b66ff08cff8 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.5"; + version = "2.10.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-doxO6Q8SaRqXNNMQow8kPp2BawpiTtSm2yuzyaOl7RY="; + sha256 = "sha256-dBt2Vs9J0+l534YtKS70MuUEUegwVoU66zghmcz7fGk="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index bf9e8552aec..c3e748810ee 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -1,19 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, libcst, google-api-core, grpc-google-iam-v1, proto-plus, pytest-asyncio, pytestCheckHook, mock }: +{ lib +, buildPythonPackage +, fetchPypi +, libcst +, google-api-core +, grpc-google-iam-v1 +, proto-plus +, pytest-asyncio +, pytestCheckHook +, mock +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.6.2"; + version = "3.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9oixM+4HxHn0G3j8Hpg1iB5gM+7xyD5GBbWpEzzjdrE="; + hash = "sha256-99hJvY195iUjXOZEOwFQftDkfgtD5V8hSg5ZLWKyWZU="; }; - propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + grpc-google-iam-v1 + proto-plus + ]; - checkInputs = [ pytest-asyncio pytestCheckHook mock ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + mock + ]; - pythonImportsCheck = [ "google.cloud.datacatalog" ]; + pythonImportsCheck = [ + "google.cloud.datacatalog" + ]; meta = with lib; { description = "Google Cloud Data Catalog API API client library"; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index f0d7cfcfc08..d8451ec097c 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "3.3.0"; + version = "4.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KQVlwyTWNC9EaFVdohle/i4xc/Fc+B6Q4iR8Tw2oAro="; + sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 0ea9c3e5e33..d2afea058d0 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.4.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "4a6f04112f2685a0a5cd8c7cb7946572bb7e0f6ca7cbe0088514006fca8594ca"; + sha256 = "sha256-1fpWovsg60uyAGps9QKXTdqV4WqZOOyeDFxX8YfgAMc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index d2e3abef82d..1961789e3b5 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -9,20 +9,34 @@ , pytest-asyncio , pytz , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.6.0"; + version = "3.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "20abce8d8d3939db243cbc0da62a73ff1a4e3b3b341f7ced0cfeb5e2c4a66621"; + hash = "sha256-MMTeoyC30MW9NdrXLAqelIeeIdsdNi7u5zwVhLeeTyk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + pytz + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 06c4d9e2369..9c5af01714c 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qvhZU7T2fHA2uRyXJjRxqeEAFwShH+TpGwICczgX7Sk="; + sha256 = "sha256-7gFpvFxtYneABxW2mOwW1V2E7kobmj0yzV0pxaRhs8c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 50a08e66f36..bc22afe4614 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.3.4"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cU4bwfxRAp14qmSTO+8u/APa7clWXqeeyRuEOwUgFuw="; + sha256 = "sha256-9+esejwSitfYEkD03KsPiTIKxmYhRxTrgfy3QKqIIO4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 47ca59ab2a2..017634fd527 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -7,15 +7,19 @@ , proto-plus , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.0"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4ac688593279c48d7863f0a90457202ff9b235e3ee8862498e8a5b8f867cc137"; + hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 3a4402beed6..26c89af2add 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.5.1"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b26294d02b14b40586eceb099a0e3a74265ae10a3f46fd49890cac55ad5f861f"; + sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 063ba066602..24afcea7a73 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5AOurJ/XIggFo3QZOQKiRNpbcHwdrIuMBbHeYDA001M="; + sha256 = "sha256-AjGoEAAI8aTACtcZp7zT5n9y6WCMc4GOfgUusUVXAVk="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 1efbcf02de4..6317d621a0b 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.11.0"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8JOa8HzYGJq1lrPXCWRvspXpopEK+qf5av7kmKbFIrQ="; + sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index b817c50ad5a..c4caa9474e4 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.3.2"; + version = "2.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "90af7858911f52350191575bb729305114c3c80d1f585d0f6cea39ab1ab3e409"; + sha256 = "sha256-BhQQ4QZ7GbacjpLLg5LXm1g5IhIMk3tJdDrHZLquuTk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.language" diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 4872f7ac448..32572b0115e 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -9,20 +9,34 @@ , pytestCheckHook , pytest-asyncio , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.8.0"; + version = "2.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2a25f7535f21cdeabfccb07fe4a75eae5a47bb36b82025537755b37d3376da46"; + hash = "sha256-FoB6SGDrVDHG60WeWmGwfVbSwt6xdq9da2QwSikpIlU="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pandas pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pandas + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index f30c3f35aa3..2e698db4aef 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IbQP2/XMdwzmY3UgINiUvdd1Y1ABJkhh7x7x3kiR4Is="; + sha256 = "sha256-r9qz2/HjDYHXu9jY03rt0QC1BofzQ/HrKVjGCtvXzsU="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 893eda8e096..6f6223f1be9 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.10.0"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ng1XmHQ4h32cyz68PjHSzfSmCB2vrwkGkzCtz4vZmcM="; + sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 67a8daf6f99..5f9fdb2833d 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.9.0"; + version = "2.11.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "2b3d9336afab0e5df67201234976519a28da3ccb7c9a0e463be28e2827a9fdaa"; + sha256 = "sha256-btPJ2X+I0f8C3YDB9bZwPv7HWnqsq9koWsT+CyK1AgM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 25ff1dd984d..ab432454bba 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.6.0"; + version = "2.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CaD/pMQeEdQtcQKBCW1/e42oof9KTpA0IFvCsOaD5zU="; + hash = "sha256-7L3SjViQmzTp//5LWWG9VG+TQuPay70KZdUuzhy7HS0="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.redis" diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 98c9f316320..da5d110225e 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -7,20 +7,32 @@ , grpc-google-iam-v1 , proto-plus , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.3.3"; + version = "1.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b13e0a614b4865287a4b5fc43f4810d3d48fef7e24d9bcf54cb4bd93bfbb2bf2"; + hash = "sha256-NUqFkvIwfaqz3MZEUoLqO7hFCVwV5124+lA8LGzccl0="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + grpc-google-iam-v1 + proto-plus + ]; - checkInputs = [ mock pytestCheckHook ]; + checkInputs = [ + mock + pytestCheckHook + ]; # prevent google directory from shadowing google imports preCheck = '' diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index b66091c15b2..f7c79521b63 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.8.0"; + version = "2.9.2"; src = fetchPypi { inherit pname version; - sha256 = "e8a3fb7c2a1595f59923661c568667d1ba40fcaaa4dd55fe8b1f5e54871e9460"; + sha256 = "sha256-W93SDJR8bUPQX9KzoZ6YvV9kU+Twd9huH09Smap481g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index e982aefae5a..056c57ecd54 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -8,20 +8,33 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.8.0"; + version = "1.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c77a765415d5e5465a3d74fefee9ce8f9a914ff228f1b10dda70841400ce1320"; + hash = "sha256-VaU6DRkq1pOESSOSynRRjaljp68C1X2H8anjHeHorbI="; }; - propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + grpc-google-iam-v1 + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.securitycenter" diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 5f2737912e2..e461b4cdcb5 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -7,25 +7,37 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.12.0"; + version = "2.13.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "acbf9948ce3870c72b45089356985de9df3cd881830d1127a10cb80ada9786c7"; + hash = "sha256-JxhIC4OMsXjdJYNDomEhmHPUCzveFS0oeDWsX/wd5zA="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; - pytestFlagsArray = [ - # requrire credentials - "--ignore=tests/system/gapic/v1/test_system_speech_v1.py" - "--ignore=tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py" + disabledTestPaths = [ + # Requrire credentials + "tests/system/gapic/v1/test_system_speech_v1.py" + "tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index f77c718ed8b..629c323506b 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -9,15 +9,19 @@ , google-cloud-testutils , google-resumable-media , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.1.0"; + version = "2.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0a5e7ab1a38d2c24be8e566e50b8b0daa8af8fd49d4ab312b1fda5c147429893"; + hash = "sha256-AkT0YScQy17ERfxndDh1ZOI/mCM2P7QIsock4hAkAbc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 341990868ee..881f00ead54 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.8.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/iEexbBw/lBhD+7BawaYHQpDB98jxqJB4hkmUaFHJN8="; + sha256 = "sha256-VfRDZRgwq1pOwjzmq6mdbVqcT6wQdD6qOMivQn4Ua10="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index c2ab6afafaa..a7c49f0cabe 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.10.0"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-j2MSeQLw7udQrEqj9LtMqvaGSgTLiItdpN8dUTedYdI="; + sha256 = "sha256-UJSP3a9G6k1arMpoh4/rWrnR4gYtPW6d6LGwWuk5WGg="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 6c17d6cb99a..bb9eb5f477a 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MXbuSWVezxsXGrRgGqhLWFF5iByiYRKA1/qbqYawPRQ="; + sha256 = "sha256-JkKW9vJAAkw3sHYDapRvu5jjunV8oWSg/ykDmd1wpyA="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 824a3b3a40d..c36bd09ba7c 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.7.0"; + version = "3.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dJ+i8D2p5yz3jh1BwedE4/EZfsH2B3AHokuyedWK6Jc="; + hash = "sha256-icZG33G/noii9V0rsHTG/Qe8cKDVDfASRKy2XRYM5Yg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 629220fe37a..58368693523 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-blkNMdh9ehRM9sidgGajIkrHgrJCT96hzG3nVU0DBo4="; + sha256 = "sha256-p1HXFxURs0axONrqHahl/SPvWN2mhAhvJePFOwzRR4c="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index c67f910321a..61c383dca6e 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.6.3"; + version = "2.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "54b7f63c746ab95a504bd6b9b1d806192483976a3452a1a59a7faa0eaaa03491"; + hash = "sha256-Ty80C73K3/TebsdSHinmp2y8TKgOftqT5PIDafq1GgM="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.vision" diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index c7730e5138b..2ea8de6f139 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FBTJlr4mN5qW3BvA1l/glRaqdcJGFFjqPea3KQjwUqQ="; + sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index ac40e446530..acf2e734f8c 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.7.1"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-c/Btc2CiYGb9ZGzNYDd1xJoGID6amTyv/Emdh1M6e/U="; + sha256 = "sha256-oaUR/2G8dcQ5A4YZeLTSzyMNLI8a29pSoEtTdWvTVKE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index ff545339da8..6aca35ae9e0 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.3.0"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Gn3OV5CwRRjtwCws4zllVWZg1klXEG1mqUUIbitkJXI="; + sha256 = "sha256-BpJOix558VjwIC590VGtdbDqnVm5l8hQ9WvdSlo2FRM="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 3df5f4c8458..679d0fbdb7c 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "gql"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "v${version}"; - hash = "sha256-c2OVBOIwQlwyqET8Q22O65VtWduVzQjYOhkE8GpD6LQ="; + hash = "sha256-ZtrT+zeoP9KXdaCDKOUrjEwe7dN0+IwA20FDe5ja7l8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix index 6ae0dce79ce..660a6f51688 100644 --- a/pkgs/development/python-modules/graphql-subscription-manager/default.nix +++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "graphql-subscription-manager"; - version = "0.4.3"; + version = "0.5.4"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; rev = version; - sha256 = "sha256-+LP+MDeHo0svoN/o0in6xtIqrfxs+UCBQRtBe4lZt+4="; + sha256 = "sha256-J3us0xZN1jOFRcvUQg8PQP6AVHa/swGjKU8IivmfjQE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 6fbefe827b4..531ead0f194 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.0.3"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "v${version}"; - hash = "sha256-z8X/AZx5Vam7nqYTjhhyXz7E23Crf5vLlNhWXLGSMcs="; + hash = "sha256-KVrm99aP2Nq15pDa8zaYIvTTcl6JEYU+7IkcMayHRQw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gridnet/default.nix b/pkgs/development/python-modules/gridnet/default.nix new file mode 100644 index 00000000000..1288471c6b2 --- /dev/null +++ b/pkgs/development/python-modules/gridnet/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gridnet"; + version = "4.0.0"; + + disabled = pythonOlder "3.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-gridnet"; + rev = "v${version}"; + hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "gridnet" ]; + + meta = with lib; { + description = "Asynchronous Python client for NET2GRID devices"; + homepage = "https://github.com/klaasnicolaas/python-gridnet"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index c1baa8a3ca3..515d6ed8d95 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.36.0"; + version = "0.36.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-yBkWBIT+FsOk9g3NgBTI3q4hN/dL6gI5UkoZnRcS3Jw="; + sha256 = "sha256-S5KWyW7aeR2qdBzXQ4ka2nuxGPt69LHyq2CUdRPG9ig="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 2e3be091cef..e7732e1f6a4 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.52.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-mTbNuER26BPQIjcmlpkdFNeBcNF1vTldaNpoEla0XbM="; + sha256 = "sha256-UL7HPmii65p+WO22y0qv8zq3yICKarRORqE+FK1u7OE="; }; postPatch = '' @@ -41,6 +41,8 @@ buildPythonPackage rec { warrant ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ asynctest pytest-aiohttp diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index ef7e5b8755c..71aad2650f3 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.5.6"; + version = "3.5.7"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "abdullahselek"; repo = "HerePy"; rev = version; - sha256 = "sha256-I5u5PKB29jQNFdsx+y5ZJOE837D7Hpcsf3pwlCvmEqU="; + hash = "sha256-iPFFEFGH3csqzDtBtLkVkUezObwiMHNbiD/mTgIrdpo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index ecefce19aed..dd97b470075 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.12"; + version = "0.13"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d99f2b6ddc5bfab7b7f8bbed457a82104f8980122a04b982bfc0e4f8820a1d46"; + sha256 = "sha256-xvfDq4ralIBnAtqTHZTTfNYbz6kstNOdNRtqnFIQZ1w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index 98aab26ffac..b6fca4201ad 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "homeconnect"; - version = "0.6.3"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0n4h4mi23zw3v6fbkz17fa6kkl5v9bfmj0p57jvfzcfww511y9mn"; + sha256 = "sha256-/h0dEVmP0R9tVt56mvu72Ksrvnuox1FA7BgrZMOhV6Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 3ce0f068fec..ee8b897154b 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -9,10 +9,15 @@ buildPythonPackage rec { sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; }; + postPatch = '' + substituteInPlace setup.py --replace "lark-parser" "lark" + ''; + propagatedBuildInputs = [ hypothesis lark libcst ]; checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ]; + pytestFlagsArray = [ "-v" ]; # tests are fairly slow, prevents timeout due to no stdout printing pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/icnsutil/default.nix b/pkgs/development/python-modules/icnsutil/default.nix new file mode 100644 index 00000000000..05c24ec7c37 --- /dev/null +++ b/pkgs/development/python-modules/icnsutil/default.nix @@ -0,0 +1,31 @@ +{ lib +, python +, fetchFromGitHub +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "icnsutil"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "relikd"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-TfQvAbP7iCpRQg2G+ejl245NCYo9DpYwMgiwY2BuJnY="; + }; + + doCheck = true; + + checkPhase = '' + ${python.interpreter} tests/test_icnsutil.py + ${python.interpreter} tests/test_cli.py + ''; + + meta = { + homepage = "https://github.com/relikd/icnsutil"; + description = "Create and extract .icns files."; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.reckenrode ]; + }; +} diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 4fe56c61614..d351f1ca7d4 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ + --replace "cachetools>=4.1,<5" "cachetools>=4.1" \ --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \ --replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \ --replace "WTForms>=2.3.1,<2.4" "WTForms" @@ -106,7 +107,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportChecks = [ "ihatemoney" ]; + pythonImportsCheck = [ "ihatemoney" ]; disabledTests = [ "test_notifications" # requires running service. diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 866721b09f5..9d017b24223 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,15 +7,17 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.51.1"; + version = "0.52.0"; disabled = isPy27; + format = "setuptools"; + src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-ppxQtFK7U006z7qonm3B5gN99CHB9mEX3l0XjrhZQo8="; + hash = "sha256-la2+cpTnHZQn/FXtySp+3zDCBTONiLC16Tm+hDiIERc="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 13b26e337ac..3917742a55a 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.10.1"; - format = "setuptools"; + version = "4.11.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-lR8NiltyYOnbXkHUKShbX0UekoR58Z2AgYh4Un026V4="; + hash = "sha256-nl5VO7uhhDy0oAgjAUuQdha+Ru5QPSuboAHSFKjaIY8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index 90761f76f9d..a8a4a611fee 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "iniconfig"; @@ -9,12 +9,14 @@ buildPythonPackage rec { sha256 = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"; }; + nativeBuildInputs = [ setuptools-scm ]; + doCheck = false; # avoid circular import with pytest pythonImportsCheck = [ "iniconfig" ]; meta = with lib; { description = "brain-dead simple parsing of ini files"; - homepage = "https://github.com/RonnyPfannschmidt/iniconfig"; + homepage = "https://github.com/pytest-dev/iniconfig"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 5418b237d1b..39fcec9af12 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -1,4 +1,5 @@ { lib +, aenum , aiohttp , buildPythonPackage , fetchFromGitHub @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "0.9.9"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,10 +20,11 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-oI4iGnfitou8/Jhe7K4rnSPnmddfO+6FLZzqgNmaPV8="; + hash = "sha256-hKe9sDn5t2qQ0THqFQypAGgr7cJXaZs8562NpPR/iJU="; }; propagatedBuildInputs = [ + aenum aiohttp pydantic requests diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix new file mode 100644 index 00000000000..b81d7981a28 --- /dev/null +++ b/pkgs/development/python-modules/iodata/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, lib, fetchFromGitHub, numpy, scipy, attrs, cython, nose }: + +buildPythonPackage rec { + pname = "iodata"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "theochem"; + repo = pname; + rev = version; + hash = "sha256-Qn2xWFxdS12K92DhdHVzYrBjPRV+vYo7Cs27vkeCaxM="; + }; + + leaveDotGit = true; + + nativeBuildInputs = [ cython nose ]; + propagatedBuildInputs = [ numpy scipy attrs ]; + + pythonImportsCheck = [ "iodata" "iodata.overlap_accel" ]; + doCheck = false; # Requires roberto or nose and a lenghtly setup to find the cython modules + + meta = with lib; { + description = "Python library for reading, writing, and converting computational chemistry file formats and generating input files"; + homepage = "https://github.com/theochem/iodata"; + license = licenses.lgpl3Only; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 6bd707a3f6a..aa7cc22b7a8 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "8.1.0"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "63f7e136e88f890e9802522fa5475dd81e7614ba06a8cfe4f80cc3056fdb7d73"; + sha256 = "sha256-D9n2SlEgmAqJtkKZgGwSu434zuoVXlIAtwUwHrJAHhk="; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 432f83e75cc..c1c0b049dc8 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -26,7 +26,7 @@ , testpath }: -buildPythonPackage (rec { +buildPythonPackage rec { pname = "ipython"; version = "8.0.1"; format = "pyproject"; @@ -76,14 +76,15 @@ buildPythonPackage (rec { testpath ]; + disabledTests = lib.optionals (stdenv.isDarwin) [ + # FileNotFoundError: [Errno 2] No such file or directory: 'pbpaste' + "test_clipboard_get" + ]; + meta = with lib; { description = "IPython: Productive Interactive Computing"; homepage = "http://ipython.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor fridh ]; }; -} // lib.optionalAttrs stdenv.isDarwin { - disabledTests = [ - "test_clipboard_get" # uses pbpaste - ]; -}) +} diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index e43db60fb11..50e171feb6a 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.9"; + version = "3.10.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P4GH6462+gJ9Jv8HdfKr1CDinOMyeUv1Uqhqa9ukcLg="; + sha256 = "c9e6c1dcaa9dff195429373cf2beb3117f30b3fca43d7db5aec5a2d1f6f59784"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 3504c6bf320..7e6b00429df 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -24,50 +24,73 @@ , flatbuffers , isPy39 , lib +, python , scipy , stdenv # Options: , cudaSupport ? config.cudaSupport or false }: -# Note that these values are tied to the specific version of the GPU wheel that -# we fetch. When updating, try to go for the latest possible versions that are -# still compatible with the cudatoolkit and cudnn versions available in nixpkgs. +# There are no jaxlib wheels targeting cudnn <8.0.5, and although there are +# wheels for cudatoolkit <11.1, we don't support them. assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1"; assert cudaSupport -> lib.versionAtLeast cudnn.version "8.0.5"; let - device = if cudaSupport then "gpu" else "cpu"; -in -buildPythonPackage rec { - pname = "jaxlib"; version = "0.3.0"; - format = "wheel"; - # At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting - # all of them is a pain, so we focus on 3.9, the current nixpkgs python3 - # version. - disabled = !isPy39; + pythonVersion = python.pythonVersion; - # Find new releases at https://storage.googleapis.com/jax-releases. - src = { - cpu = fetchurl { + # Find new releases at https://storage.googleapis.com/jax-releases. When + # upgrading, you can get these hashes from prefetch.sh. + cpuSrcs = { + "3.9" = fetchurl { url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl"; - sha256 = "151p4vqli8x0iqgrzrr8piqk7d76a2xq2krf23jlb142iam5bw01"; + hash = "sha256-AfBVqoqChEXlEC5PgbtQ5rQzcbwo558fjqCjSPEmN5Q="; }; - gpu = fetchurl { - # Note that there's also a release targeting cuDNN 8.2, but unfortunately - # we don't yet have that packaged at the time of writing (02/03/2022). - # Check pkgs/development/libraries/science/math/cudnn/default.nix for more - # details. - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl"; - sha256 = "0z15rdw3a8sq51rpjmfc41ix1q095aasl79rvlib85ir6f3wh2h8"; + "3.10" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl"; + hash = "sha256-9uBkFOO8LlRpO6AP+S8XK9/d2yRdyHxQGlbAjShqHRQ="; + }; + }; - # This is what the cuDNN 8.2 download looks like for future reference: - # url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl"; - # sha256 = "000mnm2masm3sx3haddcmgw43j4gxa3m4fcm14p9nb8dnncjkgpb"; + gpuSrcs = { + "3.9-805" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl"; + hash = "sha256-CArIhzM5FrQi3TkdqpUqCeDQYyDMVXlzKFgjNXjLJXw="; + }; + "3.9-82" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl"; + hash = "sha256-Q0plVnA9pUNQ+gCHSXiLNs4i24xCg8gBGfgfYe3bot4="; }; - }.${device}; + "3.10-805" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl"; + hash = "sha256-JopevCEAs0hgDngIId6NqbLam5YfcS8Lr9cEffBKp1U="; + }; + "3.10-82" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl"; + hash = "sha256-2f5TwbdP7EfQNRM3ZcJXCAkS2VXBwNYH6gwT9pdu3Go="; + }; + }; +in +buildPythonPackage rec { + pname = "jaxlib"; + inherit version; + format = "wheel"; + + # At the time of writing (2022-03-03), there are releases for <=3.10. + # Supporting all of them is a pain, so we focus on 3.9, the current nixpkgs + # python3 version, and 3.10. + disabled = !(pythonVersion == "3.9" || pythonVersion == "3.10"); + + src = + if !cudaSupport then cpuSrcs."${pythonVersion}" else + let + # jaxlib wheels are currently provided for cudnn versions at least 8.0.5 and + # 8.2. Try to use 8.2 whenever possible. + cudnnVersion = if (lib.versionAtLeast cudnn.version "8.2") then "82" else "805"; + in + gpuSrcs."${pythonVersion}-${cudnnVersion}"; # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. diff --git a/pkgs/development/python-modules/jaxlib/prefetch.sh b/pkgs/development/python-modules/jaxlib/prefetch.sh new file mode 100755 index 00000000000..31db6530639 --- /dev/null +++ b/pkgs/development/python-modules/jaxlib/prefetch.sh @@ -0,0 +1,7 @@ +version="$1" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl)" diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index ba70918cde1..9722497c75a 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.18.3"; + version = "1.18.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OMFW2xR6X/6H8ouHAe5qX8ltuwkNG9esjdosac+MiNw="; + sha256 = "sha256-rsD8euVGf1nbIHnDyxbyW7LJWtUSsc4Uf3c5OmgYpMY="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index d9884ab3d9f..f271920706f 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -3,9 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, colorama , django -, docopt , pytestCheckHook , parso }: @@ -26,9 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ parso ]; checkInputs = [ - colorama django - docopt pytestCheckHook ]; @@ -50,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors"; - license = licenses.lgpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jschema-to-python/default.nix b/pkgs/development/python-modules/jschema-to-python/default.nix index a9100e061d7..5b25b5c18a4 100644 --- a/pkgs/development/python-modules/jschema-to-python/default.nix +++ b/pkgs/development/python-modules/jschema-to-python/default.nix @@ -15,13 +15,10 @@ buildPythonPackage rec { sha256 = "76ff14fe5d304708ccad1284e4b11f96a658949a31ee7faed9e0995279549b91"; }; - nativeBuildInputs = [ - pbr - ]; - propagatedBuildInputs = [ attrs jsonpickle + pbr ]; checkInputs =[ diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix new file mode 100644 index 00000000000..ffcde4a5b21 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, jupyter_server +}: + +buildPythonPackage rec { + pname = "jupyter-lsp"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-dRq9NUE76ZpDMfNZewk0Gtx1VYntMgkawvaG2z1hJn4="; + }; + + propagatedBuildInputs = [ + jupyter_server + ]; + # tests require network + doCheck = false; + pythonImportsCheck = [ "jupyter_lsp" ]; + + meta = with lib; { + description = "Multi-Language Server WebSocket proxy for your Jupyter notebook or lab server"; + homepage = "https://pypi.org/project/jupyter-lsp"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ doronbehar ]; + }; +} + diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix new file mode 100644 index 00000000000..ad6286f4de4 --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, jupyterlab +, jupyter-lsp +}: + +buildPythonPackage rec { + pname = "jupyterlab-lsp"; + version = "3.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-8/ZGTIwpFuPiYVGZZLF+1Gc8aJcWc3BirtXdahYKwt8="; + }; + + propagatedBuildInputs = [ + jupyterlab + jupyter-lsp + ]; + # No tests + doCheck = false; + pythonImportsCheck = [ "jupyterlab_lsp" ]; + + meta = with lib; { + description = "Language Server Protocol integration for Jupyter(Lab)"; + homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 21158ebb539..fbea0935ff3 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.2.9"; + version = "3.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Zd3DTl2hp2RgbjjE9wz51KwcBRgoE88Kst/qMSxwESQ="; + sha256 = "sha256-PHFr9VkssoxcVcYVxuW9PvxxiY9pV9E3GbVkeLu7WHo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch b/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch index 4ebe5472b44..597907c14be 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch +++ b/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 66e6d49..78f7b42 100644 +index 17c7032..12ed398 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,23 +1,6 @@ +@@ -1,87 +1,12 @@ cmake_minimum_required(VERSION 3.13.0) project(kaldi_binaries) @@ -24,9 +24,8 @@ index 66e6d49..78f7b42 100644 -endif() - set(BINARIES - tools/openfst/bin/fstarcsort${CMAKE_EXECUTABLE_SUFFIX} - tools/openfst/bin/fstcompile${CMAKE_EXECUTABLE_SUFFIX} -@@ -29,63 +12,6 @@ set(LIBRARIES + ) + set(LIBRARIES src/lib/libkaldi-dragonfly${CMAKE_SHARED_LIBRARY_SUFFIX} ) @@ -87,30 +86,33 @@ index 66e6d49..78f7b42 100644 - message(FATAL_ERROR "KALDI_BRANCH not set! Use 'origin/master'?") - # set(KALDI_BRANCH "origin/master") -endif() - +- message("MAKE_EXE = ${MAKE_EXE}") message("PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}") -@@ -99,63 +25,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") + message("PYTHON_INCLUDE_DIR = ${PYTHON_INCLUDE_DIR}") +@@ -94,65 +19,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") # CXXFLAGS are set and exported in kaldi-configure-wrapper.sh -if(NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") - set(STRIP_LIBS_COMMAND find src/lib tools/openfst/lib -name *${CMAKE_SHARED_LIBRARY_SUFFIX} | xargs strip) -- set(STRIP_DST_COMMAND find ${DST} | xargs strip) +- # set(STRIP_DST_COMMAND find ${DST} [[[other specifiers]]] | xargs strip) - if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") - list(APPEND STRIP_LIBS_COMMAND -x) -- list(APPEND STRIP_DST_COMMAND -x) +- # list(APPEND STRIP_DST_COMMAND -x) - endif() +- # set(STRIP_LIBS_COMMAND true) +- set(STRIP_DST_COMMAND true) - ExternalProject_Add(kaldi - GIT_CONFIG advice.detachedHead=false - GIT_REPOSITORY https://github.com/daanzu/kaldi-fork-active-grammar.git - GIT_TAG ${KALDI_BRANCH} - GIT_SHALLOW TRUE -- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/ +- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && sed -i.bak -e "s/openfst_add_CXXFLAGS = -g -O2/openfst_add_CXXFLAGS = -g0 -O3/g" tools/Makefile && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/ - BUILD_IN_SOURCE TRUE -- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly dragonflybin bin fstbin lmbin +- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly - LIST_SEPARATOR " " -- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST} +- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST} && ${STRIP_DST_COMMAND} - ) -endif() - diff --git a/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch b/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch index 60f50d707db..3a45ea7e104 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch +++ b/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch @@ -1,5 +1,5 @@ diff --git a/kaldi_active_grammar/utils.py b/kaldi_active_grammar/utils.py -index 0b70c7f..21e1d62 100644 +index 823f997..3850336 100644 --- a/kaldi_active_grammar/utils.py +++ b/kaldi_active_grammar/utils.py @@ -79,7 +79,7 @@ elif sys.platform.startswith('linux'): platform = 'linux' @@ -8,10 +8,10 @@ index 0b70c7f..21e1d62 100644 -exec_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'exec', platform) +exec_dir = '/' - library_extension = dict(windows='.dll', linux='.so', macos='.dylib')[platform] - subprocess_seperator = '^&' if platform == 'windows' else ';' -@@ -89,13 +89,13 @@ class ExternalProcess(object): + import ush + +@@ -87,13 +87,13 @@ class ExternalProcess(object): shell = ush.Shell(raise_on_error=True) diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index d5a906dd733..46fc619b4cb 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -50,6 +50,8 @@ buildPythonPackage rec { nativeBuildInputs = [ scikit-build cmake ]; propagatedBuildInputs = [ ush requests numpy cffi ]; + doCheck = false; # no tests exist + meta = with lib; { description = "Python Kaldi speech recognition"; homepage = "https://github.com/daanzu/kaldi-active-grammar"; diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix new file mode 100644 index 00000000000..0ceced85cac --- /dev/null +++ b/pkgs/development/python-modules/kiss-headers/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, pytestCheckHook }: + +buildPythonPackage rec { + pname = "kiss-headers"; + version = "2.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Ousret"; + repo = pname; + rev = version; + sha256 = "sha256-/eTRyxFyAKQMzE/JjdoEN3w0lRiaIJcsJHTWV8M0CYQ="; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytestCheckHook ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=kiss_headers --doctest-modules --cov-report=term-missing -rxXs" "--doctest-modules -rxXs" + ''; + + disabledTestPaths = [ + # Tests require internet access + "kiss_headers/__init__.py" + "tests/test_serializer.py" + "tests/test_with_http_request.py" + ]; + + pythonImportsCheck = [ "kiss_headers" ]; + + meta = with lib; { + description = "Python package for HTTP/1.1 style headers"; + homepage = "https://github.com/Ousret/kiss-headers"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index bb39b29c0d5..be4f4aad566 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.2.3"; + version = "5.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gakMHel+CNPbN9vxY+qvZnRF4QaMmL/YnwUaQOn2270="; + hash = "sha256-N87j7nJflOqLsXPqq3wXYCA+pTu+uuImMoYA+dJ5lhA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index 6c29a662524..8fc32539d69 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -3,17 +3,18 @@ , fetchFromGitHub , python , regex +, pytestCheckHook }: buildPythonPackage rec { pname = "lark"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "0pfvjh4ydc49gs6m8b3ip85c8nd4da2bhz9714fwcyl3hdp33q7n"; + sha256 = "sha256-Y1bDSiFnqAKTlIcd8aAgtc+I3TLnWF8hhQK2ez96TQs="; }; # Optional import, but fixes some re known bugs & allows advanced regex features @@ -26,15 +27,11 @@ buildPythonPackage rec { "lark.grammars" ]; - checkPhase = '' - runHook preCheck + checkInputs = [ pytestCheckHook ]; - # Official way to run the tests. Runs unittest internally. - # pytest produces issues with some test resource paths (relies on __main__) - ${python.interpreter} -m tests - - runHook postCheck - ''; + disabledTestPaths = [ + "tests/test_nearley/test_nearley.py" # requires unpackaged Js2Py library + ]; meta = with lib; { description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 77aa9e2927a..d46e86ca106 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.4.1"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iPGNoM8/rAr3I+dD+3QdnRviUYge2reloNFimVW1ARs="; + sha256 = "sha256-Bz8QSSl2+qODoisTuCwkmCfP6QoIPHFiDoMW6BWm2zs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index a8e21a698f7..d69885fcb0f 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "7.10.0"; + version = "8.1.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-I1FNjNwWRyDAUSq2Co9EnjAbzKQtS0Rx8vHgPsFzSYw="; + sha256 = "sha256-/uGxjptiqm5B823z4mcjredj9ZLZC2WTTqhQrQPVfDU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 83ff792a62a..6dac34a9f7a 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.15.2"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-JmLQ3Hj9WnL/XfMxDiVAizGFASWMwF36ohp8asErUMM="; + sha256 = "sha256-1beURMpQ2klwupcd4wJZud6MnAKzwXPvVlobk/eSvXo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index 681ef649d8f..b2099e162d2 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lupa"; - version = "1.10"; + version = "1.13"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4lEbJ/OB9v22bvQNzFGCFQOBl0MbJBk1Z438PVEXgjE="; + sha256 = "sha256-4dlKwqYw0nECfawsIdFCh3HZ6p1NiPFfIKd4E0DwKk4="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/mat2/bubblewrap-path.patch b/pkgs/development/python-modules/mat2/bubblewrap-path.patch new file mode 100644 index 00000000000..2c71930b6df --- /dev/null +++ b/pkgs/development/python-modules/mat2/bubblewrap-path.patch @@ -0,0 +1,35 @@ +diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py +index 970d5dd..5d3c0b7 100644 +--- a/libmat2/bubblewrap.py ++++ b/libmat2/bubblewrap.py +@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError + + + def _get_bwrap_path() -> str: +- which_path = shutil.which('bwrap') +- if which_path: +- return which_path +- +- raise RuntimeError("Unable to find bwrap") # pragma: no cover ++ return '@bwrap@' + + + def _get_bwrap_args(tempdir: str, +@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, + + # XXX: use --ro-bind-try once all supported platforms + # have a bubblewrap recent enough to support it. +- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] ++ ro_bind_dirs = ['/nix/store', cwd] + for bind_dir in ro_bind_dirs: + if os.path.isdir(bind_dir): # pragma: no cover + ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) + +- ro_bind_files = ['/etc/ld.so.cache'] +- for bind_file in ro_bind_files: +- if os.path.isfile(bind_file): # pragma: no cover +- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) +- + args = ro_bind_args + \ + ['--dev', '/dev', + '--proc', '/proc', diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 97b52855f6b..1d5a76b7b80 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , python , pythonOlder @@ -37,7 +38,6 @@ buildPythonPackage rec { # hardcode paths to some binaries (substituteAll ({ src = ./paths.patch; - bwrap = "${bubblewrap}/bin/bwrap"; exiftool = "${exiftool}/bin/exiftool"; ffmpeg = "${ffmpeg}/bin/ffmpeg"; } // lib.optionalAttrs dolphinIntegration { @@ -52,6 +52,11 @@ buildPythonPackage rec { src = ./fix_poppler.patch; poppler_path = "${poppler_gi}/lib/girepository-1.0"; }) + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ + (substituteAll { + src = ./bubblewrap-path.patch; + bwrap = "${bubblewrap}/bin/bwrap"; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch index 50b0c9aaa78..784e04cda38 100644 --- a/pkgs/development/python-modules/mat2/paths.patch +++ b/pkgs/development/python-modules/mat2/paths.patch @@ -12,41 +12,6 @@ index 41c8de4..11df258 100644 +Icon=@mat2svg@ +Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U +Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U -diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py -index 970d5dd..5d3c0b7 100644 ---- a/libmat2/bubblewrap.py -+++ b/libmat2/bubblewrap.py -@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError - - - def _get_bwrap_path() -> str: -- which_path = shutil.which('bwrap') -- if which_path: -- return which_path -- -- raise RuntimeError("Unable to find bwrap") # pragma: no cover -+ return '@bwrap@' - - - def _get_bwrap_args(tempdir: str, -@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, - - # XXX: use --ro-bind-try once all supported platforms - # have a bubblewrap recent enough to support it. -- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] -+ ro_bind_dirs = ['/nix/store', cwd] - for bind_dir in ro_bind_dirs: - if os.path.isdir(bind_dir): # pragma: no cover - ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) - -- ro_bind_files = ['/etc/ld.so.cache'] -- for bind_file in ro_bind_files: -- if os.path.isfile(bind_file): # pragma: no cover -- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) -- - args = ro_bind_args + \ - ['--dev', '/dev', - '--proc', '/proc', diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py index eb65b2a..51a0fa1 100644 --- a/libmat2/exiftool.py diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix index 517d74563ae..be1df56206d 100644 --- a/pkgs/development/python-modules/mathlibtools/default.nix +++ b/pkgs/development/python-modules/mathlibtools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "mathlibtools"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "789f070f35424e89e4f2e2c007382250133cc48877627e37c5c463bcf4a1b58a"; + sha256 = "sha256-0iW7SWIxb+Ek4T26hru5EgBgXfqRh6zOR73GAgLFNyE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 1ab425ade55..23bef4bda40 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.13"; + version = "0.7.14"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "sha256-9ssDe7Wjuwuq2j7xwRyLqKouqeIt6NCUbEXjPdu2VZ8="; + sha256 = "sha256-bImBW6r8g/4MQ9yNrBBhk7AGqKRXFyAew6HHEmqelxw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 51d62c884dc..1972ae0ff5d 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.87"; + version = "1.2.92"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-W56nTTbRcSRkT15xn24ywkIVNHRUavV5Z8EST3BFkjk="; + sha256 = "sha256-tK711Lewr5Zc6dy/cDe9UEnq9zOEvuJg4mZyO3zBLR0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index f242ac69c25..4b75006bea4 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.17"; + version = "0.2.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yoPUTwpsk8wimN9DXFFz6ZJi1tI0uAVcfAi5BiwsfJM="; + sha256 = "sha256-5bmuCbX4a69sP9SnHkB4OQrOHmFufUTlchHkgu6iBYk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 32a6e05a42c..8bed74a4d52 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = version; - sha256 = "sha256-0Vkx5Hnoa09ZgavReQ72iWqmOG42ATG5w+ptCs7geoA="; + sha256 = "sha256-31ofLiBQjSMDtptgYF5rqS1bB5UDUbsbo25Nrk4WvIY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index a998e7b74b4..1d9d0774379 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -264,6 +264,8 @@ buildPythonPackage rec { "test_state_machine_creation_fails_with_invalid_names" # needs graphql "test_get_schema_creation_status" + # only appears in aarch64 currently, but best to be safe + "test_state_machine_list_executions_with_filter" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 4bb37145637..b224d40ee0b 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.1.2"; + version = "7.3.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - hash = "sha256-p81Dk6Kv0MzHvexhM8Su5/yIpB+ZGBFqOtm0D18l26s="; + hash = "sha256-X/dPO2p6GmnyJwcVPOmyo9zYda2uYfBAkuKTeX0Bt0Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index b9e19439251..3e159dfe7ce 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -9,6 +9,7 @@ , tls-parser , cacert , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -50,9 +51,11 @@ let "enable-tls1_3" "no-async" ]; - patches = builtins.filter ( - p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch" - ) oldAttrs.patches; + patches = builtins.filter + ( + p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch" + ) + oldAttrs.patches; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ]; meta = oldAttrs.meta // { knownVulnerabilities = [ @@ -76,9 +79,11 @@ let sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"; }; configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon; - patches = builtins.filter ( - p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch" - ) oldAttrs.patches; + patches = builtins.filter + ( + p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch" + ) + oldAttrs.patches; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ]; # openssl_1_0_2 needs `withDocs = false` outputs = lib.remove "doc" oldAttrs.outputs; @@ -87,42 +92,54 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "4.0.1"; + version = "4.0.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-QzO7ABh2weBO6NVFIj7kZpS8ashbDGompuvdKteJeUc="; + hash = "sha256-lLyHXLmBVvT+LgsKBU8DcUXd0qaLSrwvXxFnIB9CHcU="; }; - postPatch = let - legacyOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslLegacyStatic.version; - modernOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslStatic.version; - zlibVersion = zlibStatic.version; - in '' - mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ - cp ${opensslLegacyStatic.out}/lib/libssl.a \ - ${opensslLegacyStatic.out}/lib/libcrypto.a \ - deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ - ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include - ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps + postPatch = + let + legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version; + modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version; + zlibVersion = zlibStatic.version; + in + '' + mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ + cp ${opensslLegacyStatic.out}/lib/libssl.a \ + ${opensslLegacyStatic.out}/lib/libcrypto.a \ + deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ + ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include + ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps - mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ - cp ${opensslStatic.out}/lib/libssl.a \ - ${opensslStatic.out}/lib/libcrypto.a \ - deps/openssl-OpenSSL_${modernOpenSSLVersion}/ - ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include - ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps + mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ + cp ${opensslStatic.out}/lib/libssl.a \ + ${opensslStatic.out}/lib/libcrypto.a \ + deps/openssl-OpenSSL_${modernOpenSSLVersion}/ + ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include + ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps - mkdir -p deps/zlib-${zlibVersion}/ - cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/ - ''; + mkdir -p deps/zlib-${zlibVersion}/ + cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/ + ''; - propagatedBuildInputs = [ tls-parser ]; + nativeBuildInputs = [ + invoke + ]; + + propagatedBuildInputs = [ + tls-parser + ]; - nativeBuildInputs = [ invoke ]; + checkInputs = [ + pytestCheckHook + ]; buildPhase = '' invoke build.nassl @@ -131,19 +148,23 @@ buildPythonPackage rec { doCheck = true; - pythonImportsCheck = [ "nassl" ]; - - checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "nassl" + ]; disabledTests = [ "Online" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_write_bad" + "test_client_authentication_no_certificate_supplied" + "test_client_authentication_succeeds" ]; meta = with lib; { + description = "Low-level OpenSSL wrapper for Python"; homepage = "https://github.com/nabla-c0d3/nassl"; - description = "Low-level OpenSSL wrapper for Python 3.7+"; - platforms = with platforms; linux ++ darwin; license = licenses.agpl3Only; maintainers = with maintainers; [ veehaitch ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index 27da5b71b68..d6be449eb1b 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -9,25 +9,36 @@ buildPythonPackage rec { pname = "neo"; - version = "0.10.0"; - disabled = pythonOlder "3.6"; + version = "0.10.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0lw3r9p1ky1cswhrs9radc0vq1qfzbrk7qd00f34g96g30zab4g5"; + sha256 = "sha256-LUIYsIJtruqIDhVSJwYAKew4oAI4zrXwlxONlGfGOZs="; }; - propagatedBuildInputs = [ numpy quantities ]; + propagatedBuildInputs = [ + numpy + quantities + ]; - checkInputs = [ nose ]; + checkInputs = [ + nose + ]; checkPhase = '' nosetests --exclude=iotest ''; + pythonImportsCheck = [ + "neo" + ]; + meta = with lib; { + description = "Package for representing electrophysiology data"; homepage = "https://neuralensemble.org/neo/"; - description = "Package for representing electrophysiology data in Python"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/neo4j-driver/default.nix b/pkgs/development/python-modules/neo4j-driver/default.nix index 6b81af0c294..63a2efafbd6 100644 --- a/pkgs/development/python-modules/neo4j-driver/default.nix +++ b/pkgs/development/python-modules/neo4j-driver/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "neo4j-driver"; - version = "4.4.1"; + version = "4.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = version; - sha256 = "sha256-aGOqD6mmd3dulQ/SdaDPDZhkCwXdYCucHw+CrkJf1M0="; + sha256 = "sha256-rYedmxQvT+RjVdbDckLv00J4YuEQtMuIc8Q5FGWr3Rw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix new file mode 100644 index 00000000000..ab814061b58 --- /dev/null +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, substituteAll +, ffmpeg +, libopus +, aiohttp +, aiodns +, brotli +, cchardet +, orjson +, pynacl +}: + +buildPythonPackage rec { + pname = "nextcord"; + version = "2.0.0a9"; + + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nextcord"; + repo = "nextcord"; + rev = version; + hash = "sha256-9UJLfSYud/pIkIkJ75jE3pxsYm5bKNNRCwjDerDHp9c="; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + ffmpeg = "${ffmpeg}/bin/ffmpeg"; + libopus = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + propagatedBuildInputs = [ + aiodns + aiohttp + brotli + cchardet + orjson + pynacl + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "nextcord" + "nextcord.ext.commands" + "nextcord.ext.tasks" + ]; + + meta = with lib; { + description = "Python wrapper for the Discord API forked from discord.py"; + homepage = "https://github.com/nextcord/nextcord"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/nextcord/paths.patch b/pkgs/development/python-modules/nextcord/paths.patch new file mode 100644 index 00000000000..389637a1887 --- /dev/null +++ b/pkgs/development/python-modules/nextcord/paths.patch @@ -0,0 +1,26 @@ +diff --git a/nextcord/opus.py b/nextcord/opus.py +index 97d437a3..755e1a5c 100644 +--- a/nextcord/opus.py ++++ b/nextcord/opus.py +@@ -213,7 +213,7 @@ def _load_default() -> bool: + _filename = os.path.join(_basedir, 'bin', f'libopus-0.{_target}.dll') + _lib = libopus_loader(_filename) + else: +- _lib = libopus_loader(ctypes.util.find_library('opus')) ++ _lib = libopus_loader('@libopus@') + except Exception: + _lib = None + +diff --git a/nextcord/player.py b/nextcord/player.py +index bedefc5a..34de0459 100644 +--- a/nextcord/player.py ++++ b/nextcord/player.py +@@ -140,7 +140,7 @@ class FFmpegAudio(AudioSource): + .. versionadded:: 1.3 + """ + +- def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = 'ffmpeg', args: Any, **subprocess_kwargs: Any): ++ def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = '@ffmpeg@', args: Any, **subprocess_kwargs: Any): + piping = subprocess_kwargs.get('stdin') == subprocess.PIPE + if piping and isinstance(source, str): + raise TypeError("parameter conflict: 'source' parameter cannot be a string when piping to stdin") diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 79fd93d3212..695c674e0dc 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "nitransforms"; - version = "21.0.0"; + version = "22.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "njJqHqXVxldyGfmdM8GmgKdgIT4kMYLzcM5+ayR2EDo="; + sha256 = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c="; }; buildInputs = [ setuptools-scm toml ]; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 8da783dbdb2..8fd06ae3b40 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.56.0"; + version = "2.60.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-olrWv4c2DoZ7ddm58Wpb5jZntw8WEKJ6IzAND11tdjk="; + hash = "sha256-fXeea4MftVSJWzanHeAuERRiQLBp8l1l1Cw2lG3uz24="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 3c557eabb9d..bbe9d4a01ca 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.14.0"; + version = "0.15.0"; disabled = pythonOlder "3.7.1"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-AFfbMeYxdZaIABhf4XpszhLvFuMJebhl07sv9kuiknA="; + sha256 = "sha256-HOMBVrAz3cP8r4w8CKXKy6epxf00myYJiKv1PQ1iqhQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch b/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch new file mode 100644 index 00000000000..27b87c0b2d0 --- /dev/null +++ b/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch @@ -0,0 +1,57 @@ +From 79577371be21df40f1f6d4a4fe3453be6df9e93c Mon Sep 17 00:00:00 2001 +From: Someone Serge <sergei.kozlukov@aalto.fi> +Date: Fri, 31 Dec 2021 10:03:25 +0200 +Subject: [PATCH 2/4] cmake: find system-distributed gtest + +--- + opensfm/src/CMakeLists.txt | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt +index c85aa6fb..640d47a6 100644 +--- a/opensfm/src/CMakeLists.txt ++++ b/opensfm/src/CMakeLists.txt +@@ -52,12 +52,14 @@ if (OPENMP_FOUND) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + endif() + ++find_package(gflags REQUIRED) ++ + find_package(LAPACK) + find_package(SuiteSparse) + find_package(Eigen3 REQUIRED) + find_package(Ceres) +-find_package(Gflags REQUIRED) +-find_package(Glog REQUIRED) ++find_package(glog REQUIRED) ++find_package(GTest REQUIRED) + + # Ceres2 exposes Ceres::ceres target. + # Ceres1 exposes just ceres. +@@ -100,20 +102,13 @@ option(OPENSFM_BUILD_TESTS "Build OpenSfM unit tests." on) + + if (OPENSFM_BUILD_TESTS) + enable_testing() +- include_directories(third_party/gtest) +- add_definitions(-DCERES_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) +- +- add_library(gtest +- third_party/gtest/gmock_gtest_all.cc +- third_party/gtest/gmock_main.cc) +- target_include_directories(gtest PRIVATE ${GFLAGS_INCLUDE_DIR}) + + set(TEST_MAIN test_main) + add_library(${TEST_MAIN} testing_main.cc) + target_link_libraries(${TEST_MAIN} +- ${GFLAGS_LIBRARY} +- ${GLOG_LIBRARY} +- gtest) ++ gflags ++ glog::glog ++ GTest::gtest) + endif() + + ####### OpenSfM libraries ####### +-- +2.33.1 + diff --git a/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch b/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch new file mode 100644 index 00000000000..2815886e7e1 --- /dev/null +++ b/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch @@ -0,0 +1,161 @@ +From 36820fbab1abeeebd99f14e368093e0e3f934ca7 Mon Sep 17 00:00:00 2001 +From: Someone Serge <sergei.kozlukov@aalto.fi> +Date: Sat, 19 Feb 2022 02:37:54 +0200 +Subject: [PATCH 3/4] cmake: use system pybind11 + +--- + opensfm/src/CMakeLists.txt | 3 ++- + opensfm/src/bundle/CMakeLists.txt | 2 +- + opensfm/src/dense/CMakeLists.txt | 2 +- + opensfm/src/features/CMakeLists.txt | 1 - + opensfm/src/foundation/CMakeLists.txt | 1 - + opensfm/src/geo/CMakeLists.txt | 1 - + opensfm/src/geometry/CMakeLists.txt | 1 - + opensfm/src/map/CMakeLists.txt | 3 +-- + opensfm/src/robust/CMakeLists.txt | 1 - + opensfm/src/sfm/CMakeLists.txt | 1 - + 10 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt +index 640d47a6..6e391ffa 100644 +--- a/opensfm/src/CMakeLists.txt ++++ b/opensfm/src/CMakeLists.txt +@@ -54,6 +54,8 @@ endif() + + find_package(gflags REQUIRED) + ++find_package(pybind11 REQUIRED) ++ + find_package(LAPACK) + find_package(SuiteSparse) + find_package(Eigen3 REQUIRED) +@@ -82,7 +84,6 @@ else() + endif() + + ####### Third party libraries ####### +-add_subdirectory(third_party/pybind11) + add_subdirectory(third_party/akaze) + add_subdirectory(third_party/vlfeat) + +diff --git a/opensfm/src/bundle/CMakeLists.txt b/opensfm/src/bundle/CMakeLists.txt +index 7cd9cf74..307e963a 100644 +--- a/opensfm/src/bundle/CMakeLists.txt ++++ b/opensfm/src/bundle/CMakeLists.txt +@@ -52,7 +52,7 @@ target_link_libraries(pybundle PRIVATE + bundle + geometry + foundation +- pybind11) ++) + set_target_properties(pybundle PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." + ) +diff --git a/opensfm/src/dense/CMakeLists.txt b/opensfm/src/dense/CMakeLists.txt +index cbebb5ea..2728749d 100644 +--- a/opensfm/src/dense/CMakeLists.txt ++++ b/opensfm/src/dense/CMakeLists.txt +@@ -23,7 +23,7 @@ endif() + + pybind11_add_module(pydense python/pybind.cc) + target_include_directories(pydense PRIVATE ${GLOG_INCLUDE_DIR}) +-target_link_libraries(pydense PRIVATE dense foundation pybind11) ++target_link_libraries(pydense PRIVATE dense foundation) + set_target_properties(pydense PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." + ) +diff --git a/opensfm/src/features/CMakeLists.txt b/opensfm/src/features/CMakeLists.txt +index b131d30a..6db5b3f1 100644 +--- a/opensfm/src/features/CMakeLists.txt ++++ b/opensfm/src/features/CMakeLists.txt +@@ -22,7 +22,6 @@ target_link_libraries(pyfeatures + PRIVATE + features + foundation +- pybind11 + akaze + ) + set_target_properties(pyfeatures PROPERTIES +diff --git a/opensfm/src/foundation/CMakeLists.txt b/opensfm/src/foundation/CMakeLists.txt +index 40185227..9e0e45e7 100644 +--- a/opensfm/src/foundation/CMakeLists.txt ++++ b/opensfm/src/foundation/CMakeLists.txt +@@ -12,7 +12,6 @@ set(FOUNDATION_FILES + add_library(foundation ${FOUNDATION_FILES}) + target_link_libraries(foundation + PUBLIC +- pybind11 + ${OpenCV_LIBS} + ${OpenMP_libomp_LIBRARY} + Eigen3::Eigen +diff --git a/opensfm/src/geo/CMakeLists.txt b/opensfm/src/geo/CMakeLists.txt +index a9cbae02..75620d06 100644 +--- a/opensfm/src/geo/CMakeLists.txt ++++ b/opensfm/src/geo/CMakeLists.txt +@@ -29,7 +29,6 @@ target_link_libraries(pygeo + PRIVATE + geo + foundation +- pybind11 + ) + set_target_properties(pygeo PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/geometry/CMakeLists.txt b/opensfm/src/geometry/CMakeLists.txt +index e6dda2c2..51bfd6c5 100644 +--- a/opensfm/src/geometry/CMakeLists.txt ++++ b/opensfm/src/geometry/CMakeLists.txt +@@ -48,7 +48,6 @@ target_link_libraries(pygeometry + PRIVATE + geometry + foundation +- pybind11 + ) + set_target_properties(pygeometry PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/map/CMakeLists.txt b/opensfm/src/map/CMakeLists.txt +index b6f67bcd..f869aa4c 100644 +--- a/opensfm/src/map/CMakeLists.txt ++++ b/opensfm/src/map/CMakeLists.txt +@@ -20,7 +20,7 @@ set(MAP_FILES + add_library(map ${MAP_FILES}) + target_link_libraries(map + PUBLIC +- pybind11 ++ pybind11::module + Eigen3::Eigen + PRIVATE + geo +@@ -39,7 +39,6 @@ target_link_libraries(pymap + map + geometry + bundle +- pybind11 + ) + + if (OPENSFM_BUILD_TESTS) +diff --git a/opensfm/src/robust/CMakeLists.txt b/opensfm/src/robust/CMakeLists.txt +index ce70749f..40bdf7a4 100644 +--- a/opensfm/src/robust/CMakeLists.txt ++++ b/opensfm/src/robust/CMakeLists.txt +@@ -29,7 +29,6 @@ target_link_libraries(pyrobust + PRIVATE + robust + foundation +- pybind11 + ) + set_target_properties(pyrobust PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/sfm/CMakeLists.txt b/opensfm/src/sfm/CMakeLists.txt +index 98c28f41..7f56b791 100644 +--- a/opensfm/src/sfm/CMakeLists.txt ++++ b/opensfm/src/sfm/CMakeLists.txt +@@ -35,7 +35,6 @@ target_include_directories(pysfm PRIVATE ${GLOG_INCLUDE_DIR}) + target_link_libraries(pysfm + PRIVATE + foundation +- pybind11 + sfm + ) + set_target_properties(pysfm PROPERTIES +-- +2.33.1 + diff --git a/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch b/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch new file mode 100644 index 00000000000..f3cb2db00ec --- /dev/null +++ b/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch @@ -0,0 +1,86 @@ +From c35b110a83286e7413d7309eb218eb43b52f7d48 Mon Sep 17 00:00:00 2001 +From: Someone Serge <sergei.kozlukov@aalto.fi> +Date: Sat, 19 Feb 2022 14:36:12 +0200 +Subject: [PATCH 4/4] pybind_utils.h: conflicts with nixpkgs' pybind + +--- + opensfm/src/map/pybind_utils.h | 45 +++------------------------------- + 1 file changed, 3 insertions(+), 42 deletions(-) + +diff --git a/opensfm/src/map/pybind_utils.h b/opensfm/src/map/pybind_utils.h +index 817d1a16..3f98a2ab 100644 +--- a/opensfm/src/map/pybind_utils.h ++++ b/opensfm/src/map/pybind_utils.h +@@ -52,38 +52,6 @@ struct sfm_iterator_state { + }; + PYBIND11_NAMESPACE_END_(detail) + +-/// Makes an python iterator over the keys (`.first`) of a iterator over pairs +-/// from a first and past-the-end InputIterator. +-template <return_value_policy Policy = return_value_policy::reference_internal, +- typename Iterator, typename Sentinel, +- typename KeyType = decltype((*std::declval<Iterator>()).second), +- typename... Extra> +-iterator make_value_iterator(Iterator first, Sentinel last, Extra &&... extra) { +- typedef detail::sfm_iterator_state<Iterator, Sentinel, detail::RefIterator, +- Policy> +- state; +- +- if (!detail::get_type_info(typeid(state), false)) { +- class_<state>(handle(), "iterator", pybind11::module_local()) +- .def("__iter__", [](state &s) -> state & { return s; }) +- .def("__next__", +- [](state &s) -> KeyType { +- if (!s.first_or_done) +- ++s.it; +- else +- s.first_or_done = false; +- if (s.it == s.end) { +- s.first_or_done = true; +- throw stop_iteration(); +- } +- return (*s.it).second; +- }, +- std::forward<Extra>(extra)..., Policy); +- } +- +- return cast(state{first, last, true}); +-} +- + template <return_value_policy Policy = return_value_policy::reference_internal, + typename Iterator, typename Sentinel, + typename KeyType = decltype(&((*std::declval<Iterator>()).second)), +@@ -148,12 +116,13 @@ iterator make_ref_iterator(Iterator first, Sentinel last, Extra &&... extra) { + } + + /// Makes a python iterator from a first and past-the-end C++ InputIterator. +-template <return_value_policy Policy = return_value_policy::reference_internal, ++template <typename Access, ++ return_value_policy Policy = return_value_policy::reference_internal, + typename Iterator, typename Sentinel, + typename ValueType = decltype(std::declval<Iterator>()), + typename... Extra> + iterator make_ptr_iterator(Iterator first, Sentinel last, Extra &&... extra) { +- typedef detail::iterator_state<Iterator, Sentinel, false, Policy> state; ++ typedef detail::iterator_state<Access, Policy, Iterator, Sentinel, ValueType, Extra...> state; + + if (!detail::get_type_info(typeid(state), false)) { + class_<state>(handle(), "iterator", pybind11::module_local()) +@@ -176,14 +145,6 @@ iterator make_ptr_iterator(Iterator first, Sentinel last, Extra &&... extra) { + return cast(state{first, last, true}); + } + +-/// Makes an iterator over the keys (`.first`) of a stl map-like container +-/// supporting `std::begin()`/`std::end()` +-template <return_value_policy Policy = return_value_policy::reference_internal, +- typename Type, typename... Extra> +-iterator make_value_iterator(Type &value, Extra &&... extra) { +- return make_value_iterator<Policy>(std::begin(value), std::end(value), +- extra...); +-} + template <return_value_policy Policy = return_value_policy::reference_internal, + typename Type, typename... Extra> + iterator make_unique_ptr_value_iterator(Type &value, Extra &&... extra) { +-- +2.33.1 + diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix new file mode 100644 index 00000000000..dec998f451c --- /dev/null +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -0,0 +1,127 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, cmake +, opencv4 +, ceres-solver +, suitesparse +, metis +, eigen +, pkg-config +, pybind11 +, numpy +, pyyaml +, lapack +, gtest +, gflags +, glog +, pytestCheckHook +, networkx +, pillow +, exifread +, gpxpy +, pyproj +, python-dateutil +, joblib +, repoze_lru +, xmltodict +, cloudpickle +, scipy +, sphinx +, matplotlib +, fpdf +, +}: + +let + ceresSplit = (builtins.length ceres-solver.outputs) > 1; + ceres' = + if ceresSplit + then ceres-solver.dev + else ceres-solver; +in +buildPythonPackage rec { + pname = "OpenSfM"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "mapillary"; + repo = pname; + rev = "79aa4bdd8bd08dc0cd9e3086d170cedb29ac9760"; + sha256 = "sha256-dHBrkYwLA1OUxUSoe7DysyeEm9Yy70tIJvAsXivdjrM="; + }; + patches = [ + (fetchpatch { + url = "https://github.com/mapillary/OpenSfM/pull/872/commits/a76671db11038f3f4dfe5b8f17582fb447ad7dd5.patch"; + sha256 = "sha256-4nizQiZIjucdydOLrETvs1xdV3qiYqAQ7x1HECKvlHs="; + }) + ./0002-cmake-find-system-distributed-gtest.patch + ./0003-cmake-use-system-pybind11.patch + ./0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch + ./fix-scripts.patch + ]; + postPatch = '' + rm opensfm/src/cmake/FindGlog.cmake + rm opensfm/src/cmake/FindGflags.cmake + + # HAHOG is the default descriptor. + # We'll test both HAHOG and SIFT because this is + # where segfaults might be introduced in future + echo 'feature_type: SIFT' >> data/berlin/config.yaml + echo 'feature_type: HAHOG' >> data/lund/config.yaml + ''; + + nativeBuildInputs = [ cmake pkg-config sphinx ]; + buildInputs = [ + ceres' + suitesparse + metis + eigen + lapack + gflags + gtest + glog + pybind11 + ]; + propagatedBuildInputs = [ + numpy + scipy + pyyaml + opencv4 + networkx + pillow + matplotlib + fpdf + exifread + gpxpy + pyproj + python-dateutil + joblib + repoze_lru + xmltodict + cloudpickle + ]; + checkInputs = [ pytestCheckHook ]; + + dontUseCmakeBuildDir = true; + cmakeFlags = [ + "-Bcmake_build" + "-Sopensfm/src" + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + "test_reconstruction_incremental" + "test_reconstruction_triangulation" + ]; + + pythonImportsCheck = [ "opensfm" ]; + + meta = { + maintainers = [ lib.maintainers.SomeoneSerge ]; + license = lib.licenses.bsd2; + description = "Open source Structure-from-Motion pipeline from Mapillary"; + homepage = "https://opensfm.org/"; + }; +} diff --git a/pkgs/development/python-modules/opensfm/fix-scripts.patch b/pkgs/development/python-modules/opensfm/fix-scripts.patch new file mode 100644 index 00000000000..634820a3275 --- /dev/null +++ b/pkgs/development/python-modules/opensfm/fix-scripts.patch @@ -0,0 +1,41 @@ +diff --git a/bin/opensfm b/bin/opensfm +index b5ee4b15..f05c0d1c 100755 +--- a/bin/opensfm ++++ b/bin/opensfm +@@ -1,12 +1,6 @@ +-#!/bin/bash ++#!/usr/bin/env bash + set -e + + DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) + +-if [ -x "$(command -v python3)" ]; then +- PYTHON=python3 +-else +- PYTHON=python +-fi +- +-"$PYTHON" "$DIR"/opensfm_main.py "$@" ++exec "$DIR"/opensfm_main.py "$@" +diff --git a/bin/opensfm_main.py b/bin/opensfm_main.py +index 31249e12..cc71560c 100755 +--- a/bin/opensfm_main.py ++++ b/bin/opensfm_main.py +@@ -1,3 +1,5 @@ ++#!/usr/bin/env python ++ + import sys + from os.path import abspath, join, dirname + +diff --git a/setup.py b/setup.py +index 1120717f..438a16db 100644 +--- a/setup.py ++++ b/setup.py +@@ -71,6 +71,7 @@ setuptools.setup( + scripts=[ + "bin/opensfm_run_all", + "bin/opensfm", ++ "bin/opensfm_main.py", + ], + package_data={ + "opensfm": [ diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix index db9c265ef3e..9910aefe1cb 100644 --- a/pkgs/development/python-modules/orderedset/default.nix +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -14,5 +14,8 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/orderedset"; license = licenses.bsd3; maintainers = [ maintainers.jtojnar ]; + # No support for Python 3.9/3.10 + # https://github.com/simonpercivall/orderedset/issues/36 + broken = true; }; } diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index 4c798f43c25..65ebd1bf3a1 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -1,16 +1,19 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "parts"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "6463d5c49142d14029196a6a781b57bc98ba5b3d93244f4ed637f534d08129c1"; + sha256 = "sha256-NrhNpWyzqwn1bNnuqmcyKcUED0A4v7VJE4ZlTHFafJY="; }; # Project has no tests diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 8775faa53c2..7a03226b4dd 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.8.0"; + version = "5.8.1"; src = fetchPypi { inherit pname version; - sha256 = "672d8ebee84921862110f23fcec2acea191ef58543d34dfe9ef3d9f13c31cddf"; + sha256 = "sha256-ZrxaNJEvQIuzklvyEjHLb1kgYme39j81A++GXBopLiU="; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index b31334589f5..aacb726d6a1 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -1,8 +1,8 @@ { buildPythonPackage +, build , git , gnupg , pbr -, mock , sphinx , stestr , testresources @@ -27,9 +27,9 @@ buildPythonPackage rec { checkInputs = [ pbr + build git gnupg - mock sphinx stestr testresources diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index f8ba8d3cf24..5b5462cf475 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,25 +1,43 @@ { lib , buildPythonPackage +, cffi , fetchPypi -, zope_interface, cffi -, sphinx, manuel +, zope_interface +, sphinx +, manuel +, pythonOlder }: buildPythonPackage rec { pname = "persistent"; - version = "4.7.0"; + version = "4.9.0"; + format = "setuptools"; - nativeBuildInputs = [ sphinx manuel ]; - propagatedBuildInputs = [ zope_interface cffi ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0ef7c05a6dca0104dc224fe7ff31feb30a63d970421c9462104a4752148ac333"; + hash = "sha256-RwGzHYHBBCJlclrzkEUOnZFq10ucF4twEAU4U1keDGo="; }; - meta = { + nativeBuildInputs = [ + sphinx + manuel + ]; + + propagatedBuildInputs = [ + zope_interface + cffi + ]; + + pythonImportsCheck = [ + "persistent" + ]; + + meta = with lib; { description = "Automatic persistence for Python objects"; - homepage = "http://www.zodb.org/"; - license = lib.licenses.zpl21; + homepage = "https://github.com/zopefoundation/persistent/"; + license = licenses.zpl21; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 5e47b69ac77..4a03d60f1ee 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.67"; + version = "2.1.71"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rtxHRuZ30S81pdWUvQnSImcEX6/vCY/pvKFNY7sJaBw="; + sha256 = "sha256-jJ7J4upDL1X1Eut1kUWdJu3Ih2mheNFt0wI+QTZMKow="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 57c9f77f1fe..8653c28c878 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.24.0"; + version = "1.24.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BsawsGjQfONm97ztrfdqC12mph+GMCyMr/aQt/xd/ts="; + sha256 = "sha256-KRIixd39ZqP8DTIXAM9ZHIsPkw0vyEh3fWz8/1VEPOY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 57b085a5405..8aa1ad1f4c4 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,17 +1,23 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +# for passthru.tests +, imageio, matplotlib, pilkit, pydicom, reportlab }@args: import ./generic.nix (rec { pname = "Pillow"; - version = "9.0.0"; + version = "9.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf"; + sha256 = "bIvII4p9/a96dfXsWmY/QXP4w2flo5+H5yBJXh7tdfo="; + }; + + passthru.tests = { + inherit imageio matplotlib pilkit pydicom reportlab; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 3e33f1a8aa0..97c67fd5fa4 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -3,13 +3,14 @@ , disabled , src , meta +, passthru ? {} , ... }@args: with args; buildPythonPackage rec { - inherit pname version src meta; + inherit pname version src meta passthru; # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 387853ad28c..d36ba25ba47 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -4,15 +4,19 @@ , nulltype , python-dateutil , urllib3 +, pythonOlder }: buildPythonPackage rec { pname = "plaid-python"; - version = "8.10.0"; + version = "9.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8930949bd43e3126289f50e927d1acacf53c57ec3227c764e0c1feb72bbb61a3"; + hash = "sha256-vHJ35MvMw3G1k/A2gifaE97GayoVEOQ9lR6yG6ZkzS4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index f2e86599148..2be8928f630 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.4.1"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Ce1dwE2g/7o91NPkmlM0uv0eMB7WzFCExV/8ZCAn22Y="; + sha256 = "sha256-fppwtY8VX8IQ96H930xItO7mS8LlxxHgBcKlwIL5P2E="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix index 10e50804ef5..53d14229970 100644 --- a/pkgs/development/python-modules/poolsense/default.nix +++ b/pkgs/development/python-modules/poolsense/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; + hash = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index 125984554a0..33b233bd609 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proxmoxer"; - version = "1.2.0"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-ElHocXrazwK+b5vdjYSJAYB4ajs2n+V8koj4QKkdDMQ="; + sha256 = "sha256-3EpId20WVVjXA/wxwy1peyHPcXdiT3fprABkcNBpZtE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 94cfaaa78c5..4e05dd51b05 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { pname = "psygnal"; - version = "0.3.0"; + version = "0.3.3"; src = fetchFromGitHub { owner = "tlambert03"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vrGym/V0cSGIjBWMWpDrPBijEOFayK1vdR02gsWzRvo="; + sha256 = "sha256-BQmcA1gD2i4sxROH+a7gStcNK1mXYVerIZ2y6gn8vI8="; }; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index c36554122de..0c87391aba0 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.0.1"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "v${version}"; - hash = "sha256-TXxnFKDq1eWShimtNKaUMEQrs1nRQ8NqAQSI8Hutcp8="; + hash = "sha256-rAeZxCaSY9tgoMk7l+mlqqiZfD2yIGoywITC0Y2z7oI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 0ae60b381c6..406d81e15bb 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , dataclasses -, isPy3k , fetchPypi , jedi , pygments @@ -14,14 +13,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2022.1"; + version = "2022.1.1"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e827a4b489dcad561189535db6677becbf32164b2b44df00786eb2d5e00c587e"; + hash = "sha256-2zvdZkI8nSkHTBwsSfyyJL0Nbwgxn+0bTn6taDkUCD8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index a5de75f70f8..c56fc990f2c 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.41"; + version = "3.42"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2G+5lKkLtgZ/2ghU0xVTDqIXbTNykYIKRiwZiagusoc="; + sha256 = "sha256-2/YT36X4UvmmhiaxyJBtCKA3QuibYtReTS6MQ3YGV+c="; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index c24bcefec16..fe9d3276e1b 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.4.1"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyAthena"; inherit version; - sha256 = "9d42b4e2cdbd8c48f8157692b50681b08569aa3cac3a9694e671ec9aa40f969b"; + sha256 = "sha256-GTcDiDtZGgTpdl6YBgPuztv7heEPZ/ymhup/4JwfELA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix index 63edd6e60f8..9788860cdd6 100644 --- a/pkgs/development/python-modules/pyaussiebb/default.nix +++ b/pkgs/development/python-modules/pyaussiebb/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , loguru +, pydantic , poetry-core , pythonOlder , requests @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pyaussiebb"; - version = "0.0.11"; + version = "0.0.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "yaleman"; repo = "aussiebb"; rev = "v${version}"; - hash = "sha256-aL+n2ut7n6UUyymMEHoFMhRvK9iFRRunYE9ZirKFXhc="; + hash = "sha256-4B+eq863G+iVl8UnxDumPVpkj9W8kX5LK0wo4QIYo4w="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { aiohttp requests loguru + pydantic ]; postPatch = '' diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix new file mode 100644 index 00000000000..d76f72630a6 --- /dev/null +++ b/pkgs/development/python-modules/pycep-parser/default.nix @@ -0,0 +1,58 @@ +{ lib +, assertpy +, buildPythonPackage +, fetchFromGitHub +, lark +, poetry-core +, pytestCheckHook +, pythonOlder +, regex +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pycep-parser"; + version = "0.3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gruebel"; + repo = "pycep"; + rev = version; + hash = "sha256-ud26xJQWdu7wtv75/K16HSSw0MvaSr3H1hDZBPjSzYE="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + lark + regex + typing-extensions + ]; + + checkInputs = [ + assertpy + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.3.2-alpha.4"' 'version = "${version}"' \ + --replace 'regex = "^2022.3.2"' 'regex = "*"' + ''; + + pythonImportsCheck = [ + "pycep" + ]; + + meta = with lib; { + description = "Python based Bicep parser"; + homepage = "https://github.com/gruebel/pycep"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index 1385b415613..a6a2446da07 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.16.3"; + version = "0.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-/0JSnJy/OUbYX26wTZ3RloVy74bU2D4Z6NOLq6IkI7o="; + hash = "sha256-Rw0sZ2k+tXo04mvlL83hUgdHIND5NIsVH/CzrfmbKlE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index f5921d0dfd2..37ef4da7daf 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "10.2.3"; + version = "10.3.0"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "ddb86c5acdc13e8bdadd2b7f5738fda36b32c1750548f7b629ca8d178f05e0da"; + sha256 = "sha256-TrEHRG/b7YdvSMgyArYhKyIShhaKVcFrPrjt9CAPEKE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 44e7ed0ad4a..e3e4e6c3a03 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -6,13 +6,12 @@ buildPythonPackage rec { pname = "pycryptodome"; - version = "3.12.0"; + version = "3.14.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Esc0OuxaOz31xHJlKBsSthHybsk2e2EpGZ1n2lS3aME="; - extension = "zip"; + hash = "sha256-4E5Ap/jBZpGVU2o3l53YfaLDLb3HPW/jXwB3sMF8gDs="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index c9f622d6c69..934c021ed90 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -6,13 +6,12 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.12.0"; + version = "3.14.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ki6drAFm5GF+XHmA0s/2kSputctcE+fs4iJDhlC9f2Y="; - extension = "zip"; + hash = "sha256-LOdu0Agf1qyMdO3HW50U7KIGQXOveYQ8JPpiVzJjwfI="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyctr/default.nix b/pkgs/development/python-modules/pyctr/default.nix new file mode 100644 index 00000000000..3817342be3e --- /dev/null +++ b/pkgs/development/python-modules/pyctr/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, pycryptodomex }: + +buildPythonPackage rec { + pname = "pyctr"; + version = "0.6.0"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-05lMcsIeJIHI3LwHQTjr4M+bn1FG+GQscuGq34XxjK8="; + }; + + propagatedBuildInputs = [ pycryptodomex ]; + + pythonImportsCheck = [ "pyctr" ]; + + meta = with lib; { + description = "Python library to interact with Nintendo 3DS files"; + license = licenses.mit; + maintainers = with maintainers; [ rileyinman ]; + homepage = "https://github.com/ihaveamac/pyctr"; + }; +} diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 5494360e51f..0b87aba8165 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.44.1"; + version = "7.45.0"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8"; + sha256 = "sha256-UDbFPG9BBukWDQU6S6o0M6AhX7M4YHPiESc8VqOpXz0="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index fe418be71ad..8d37521f326 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "86"; + version = "87"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-NqNXbF5rGMCbugzZY+AQPPHYmQx/RrSwqtnoF1shSSU="; + sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydroid-ipcam/default.nix b/pkgs/development/python-modules/pydroid-ipcam/default.nix index 3d9b4188172..50e04ef2018 100644 --- a/pkgs/development/python-modules/pydroid-ipcam/default.nix +++ b/pkgs/development/python-modules/pydroid-ipcam/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "pydroid-ipcam"; - version = "unstable-2021-06-01"; + version = "1.3.1"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = "3ca14ff178f3506a6a91d8736deea8f06e9ad1c1"; - sha256 = "0w81pl5fya17hg5xgba2vgxnylfd8jc70il575wdz2pw6z6ihj3s"; + hash = "sha256-ekgYzTf8it94OYVGcJhEzVFv+9tCrdfLgyco7wq9AXE="; }; propagatedBuildInputs = [ @@ -25,7 +27,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pydroid_ipcam" ]; + + pythonImportsCheck = [ + "pydroid_ipcam" + ]; meta = with lib; { description = "Python library for Android IP Webcam"; diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix index 20f3fb9f417..28fb058c52a 100644 --- a/pkgs/development/python-modules/pyefergy/default.nix +++ b/pkgs/development/python-modules/pyefergy/default.nix @@ -1,15 +1,18 @@ { lib , aiohttp +, aresponses , buildPythonPackage , fetchFromGitHub , iso4217 +, pytest-asyncio +, pytestCheckHook , pythonOlder , pytz }: buildPythonPackage rec { pname = "pyefergy"; - version = "0.1.5"; + version = "22.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +21,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - sha256 = "sha256-8xcKgsZ6buaQdrKD8Qn7jB5IlQ0NkR0nZGuFk+Dd8Q8="; + sha256 = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps="; }; propagatedBuildInputs = [ @@ -27,10 +30,15 @@ buildPythonPackage rec { pytz ]; - # Project has no tests - doCheck = false; + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; - pythonImportsCheck = [ "pyefergy" ]; + pythonImportsCheck = [ + "pyefergy" + ]; meta = with lib; { description = "Python API library for Efergy energy meters"; diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index a1fd4215faf..baf57da4160 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,22 +8,29 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.53.3"; - disabled = pythonOlder "3.5"; + version = "0.54.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t4rFsuhcpYdgmQeog+DRFxHk0wpMc+aukQi981vH/44="; + hash = "sha256-vL8jSgTtDvaHuCvaCYmFixILQFasTl82yINL5yRtOwU="; }; - propagatedBuildInputs = [ pyusb pyserial ]; + propagatedBuildInputs = [ + pyserial + pyusb + ]; - # tests requires access to the serial port + # Tests require access to the serial port doCheck = false; - pythonImportsCheck = [ "pyftdi" ]; + pythonImportsCheck = [ + "pyftdi" + ]; meta = with lib; { description = "User-space driver for modern FTDI devices"; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 7addcf53142..fbf5ccf9ede 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.21"; + version = "1.5.22"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5aaaddb06dc4b6f9ba08254d8d806a2bd2406925a9caf3a51fdffbd5d09728e2"; + sha256 = "sha256-VjDcNuoA/cEa06g5TGdkF+w2WyX92a9XoQfhmtxBGw8="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index d846cc4f18c..b06cb543006 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -1,52 +1,63 @@ { lib -, buildPythonPackage +, stdenv +, toPythonModule +, fetchFromGitHub +, cmake +, boost , eigen -, nlopt , ipopt -, boost +, nlopt , pagmo2 -, numpy +, python , cloudpickle , ipyparallel , numba -, python +, numpy +, pybind11 }: -let - propagatedBuildInputs = [ numpy cloudpickle ipyparallel numba ]; - - pagmo2WithPython = pagmo2.overrideAttrs (oldAttrs: { - cmakeFlags = oldAttrs.cmakeFlags ++ [ - "-DPAGMO_BUILD_PYGMO=yes" - "-DPAGMO_BUILD_PAGMO=no" - "-DPagmo_DIR=${pagmo2}" - ]; - buildInputs = [ eigen nlopt ipopt boost pagmo2 ] ++ propagatedBuildInputs; - postInstall = '' - mv wheel $out - ''; - }); - -in buildPythonPackage { +toPythonModule (stdenv.mkDerivation rec { pname = "pygmo"; - version = pagmo2WithPython.version; - - inherit propagatedBuildInputs; + version = "2.18.0"; - src = pagmo2WithPython; - - preBuild = '' - mv ${python.sitePackages}/pygmo wheel - cd wheel - ''; + src = fetchFromGitHub { + owner = "esa"; + repo = "pygmo2"; + rev = "v${version}"; + sha256 = "sha256-he7gxRRJd6bBrD0Z0i+CQTr5JH4P3Im/beNGO+HfmNM="; + }; - # dont do tests - doCheck = false; + cmakeFlags = [ + "-DPYGMO_INSTALL_PATH=${placeholder "out"}/lib/${python.libPrefix}/site-packages" + ]; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + cloudpickle + ipyparallel + numba + numpy + python + ]; + + buildInputs = [ + boost + eigen + ipopt + nlopt + pagmo2 + pybind11 + ]; + + doCheck = true; meta = with lib; { description = "Parallel optimisation for Python"; - homepage = "https://esa.github.io/pagmo2/"; + homepage = "https://github.com/esa/pygmo2"; license = licenses.gpl3Plus; maintainers = [ maintainers.costrouc ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix new file mode 100644 index 00000000000..ce489127946 --- /dev/null +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, gevent +, click +, colorama +, configparser +, distro +, jinja2 +, paramiko +, python-dateutil +, pywinrm +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "pyinfra"; + version = "1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-r+7ka3WKE6uHP//p1N71hgTGit7Eo3x9INpbKPYbFMI="; + }; + + propagatedBuildInputs = [ + click + colorama + configparser + distro + gevent + jinja2 + paramiko + python-dateutil + pywinrm + setuptools + six + ]; + + doCheck = false; + + pythonImportsCheck = [ + "pyinfra" + ]; + + meta = with lib; { + description = "Python-based infrastructure automation"; + longDescription = '' + pyinfra automates/provisions/manages/deploys infrastructure. It can be used for + ad-hoc command execution, service deployment, configuration management and more. + ''; + homepage = "https://github.com/Fizzadar/pyinfra"; + maintainers = with maintainers; [ totoroot ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index 67a3892cdc0..5daadce41f4 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.3"; + version = "3.0.5"; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; rev = "v${version}"; - hash = "sha256-zQ0IBfbWEGv5t+b3EKF+6tEpmwfAWFMndPqSNSQZ5b4="; + hash = "sha256-lVutG/xJvVP0qS0UnEyS/9KwwqdRX6ownTKek8/VXbU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix index 41efa9a54d2..a064390b1ce 100644 --- a/pkgs/development/python-modules/pykrakenapi/default.nix +++ b/pkgs/development/python-modules/pykrakenapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pykrakenapi"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dominiktraxl"; repo = "pykrakenapi"; rev = "v${version}"; - hash = "sha256-i2r6t+JcL6INI8Y26gvVvNjv6XxMj4G+pF9Xf/hsx1A="; + hash = "sha256-ZhP4TEWFEGIqI/nk2It1IVFKrX4HKP+dWxu+gLJNIeg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix index 8ca565834d4..a83f2fd3ad1 100644 --- a/pkgs/development/python-modules/pylru/default.nix +++ b/pkgs/development/python-modules/pylru/default.nix @@ -1,18 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pylru"; - version = "1.2.0"; + version = "1.2.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "492f934bb98dc6c8b2370c02c95c65516ddc08c8f64d27f70087eb038621d297"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jlhutch"; + repo = pname; + rev = "v${version}"; + hash = "sha256-dTYiD+/zt0ZSP+sefYyeD87To1nRXyoFodlBg8pm1YE="; }; + # Check with the next release if tests are ready + doCheck = false; + + pythonImportsCheck = [ + "pylru" + ]; + meta = with lib; { - homepage = "https://github.com/jlhutch/pylru"; description = "A least recently used (LRU) cache implementation"; - license = licenses.gpl2; + homepage = "https://github.com/jlhutch/pylru"; + license = licenses.gpl2Only; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 6f846481b03..8bf43a44543 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.20"; + version = "2.4.27"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QdYlmlDZzVH8tErGdgAz6FjT/L7jexduvrffKVEqMfY="; + sha256 = "sha256-DzW1jB7L7sD9WAhk/3/0UD8PW7Nw/bHTI527NmMV6CY="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 5cf2615ed03..7c1e46647e3 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -2,10 +2,11 @@ , fetchPypi , buildPythonPackage , pythonOlder -, Theano +, theano-pymc , pandas , patsy , joblib +, cachetools , tqdm , six , h5py @@ -16,6 +17,8 @@ , parameterized , fastprogress , typing-extensions +, dill +, semver }: buildPythonPackage rec { @@ -34,7 +37,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - Theano pandas patsy joblib @@ -45,12 +47,10 @@ buildPythonPackage rec { packaging fastprogress typing-extensions - ]; - - checkInputs = [ - pytest - nose - parameterized + dill + theano-pymc + cachetools + semver ]; # The test suite is computationally intensive and test failures are not @@ -67,9 +67,6 @@ buildPythonPackage rec { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; homepage = "https://github.com/pymc-devs/pymc3"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ilya-kolpakov ]; - # several dependencies are not declared and in the end it requires theano-pymc3 - # instead of Theano. The former is currently not packaged. - broken = true; + maintainers = with lib.maintainers; [ nidabdella ]; }; } diff --git a/pkgs/development/python-modules/pymediaroom/default.nix b/pkgs/development/python-modules/pymediaroom/default.nix index e977cb23d75..364063f7862 100644 --- a/pkgs/development/python-modules/pymediaroom/default.nix +++ b/pkgs/development/python-modules/pymediaroom/default.nix @@ -1,21 +1,19 @@ { lib , async-timeout , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder , xmltodict }: buildPythonPackage rec { pname = "pymediaroom"; - version = "0.6.4.1"; + version = "0.6.5.4"; disabled = pythonOlder "3.5"; - src = fetchFromGitHub { - owner = "dgomes"; - repo = pname; - rev = version; - sha256 = "1klf2dxd8rlq3n4b9m03lzwcsasn9vi6m3hzrjqhqnprhrnp0xmy"; + src = fetchPypi { + inherit pname version; + hash = "sha256-CZh2knpLT7xt5s6+kTQ4Mq9LcpKgWvgdFCkPtMucJTM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index ad862feaf52..24c214fcba3 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.19.5"; + version = "1.19.6"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "sha256-OTybnLJmmoaRoBew/bmuDs86Smbypc6jfQqqGikKVaU="; + sha256 = "sha256-7z0T4n8Vhdd29qJZfxE6q9KNNrZIuYOnKFCyHFOZqwg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix index 5eaf015e9bb..8227e01edc2 100644 --- a/pkgs/development/python-modules/pynina/default.nix +++ b/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.1.4"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - sha256 = "1q382b70ydzzbqb9sa5y5w7039rp6q0wyffarrsdw916kbc4zyqd"; + sha256 = "sha256-7sceYmzOmXJMKaIdGmXMuCAum0aJeVTxx1w/jZy5Eig="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyobihai/default.nix b/pkgs/development/python-modules/pyobihai/default.nix index 79d8363372b..0cc62311f32 100644 --- a/pkgs/development/python-modules/pyobihai/default.nix +++ b/pkgs/development/python-modules/pyobihai/default.nix @@ -7,13 +7,15 @@ buildPythonPackage rec { pname = "pyobihai"; - version = "1.3.1"; - disabled = pythonOlder "3.6"; + version = "1.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; # GitHub release, https://github.com/dshokouhi/pyobihai/issues/10 src = fetchPypi { inherit pname version; - sha256 = "1vvf5if57dfd091a7fb5rvx63hvf0isrx28j72nj2aav1as460qp"; + hash = "sha256-zhsnJyhXlugK0nJ7FJZZcrq2VDQt1a9uCgsJAIABZ28="; }; propagatedBuildInputs = [ @@ -23,7 +25,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pyobihai" ]; + pythonImportsCheck = [ + "pyobihai" + ]; meta = with lib; { description = "Python package to interact with Obihai devices"; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 16bfddc8340..e4655082af9 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -6,17 +6,50 @@ , cryptography , pyasn1 , idna -, pytest +, pytestCheckHook , pretend , flaky , glibcLocales , six }: -let - # https://github.com/pyca/pyopenssl/issues/791 - # These tests, we disable in the case that libressl is passed in as openssl. - failingLibresslTests = [ +buildPythonPackage rec { + pname = "pyopenssl"; + version = "22.0.0"; + + src = fetchPypi { + pname = "pyOpenSSL"; + inherit version; + sha256 = "sha256-ZgsbFCWqxKG+odlBaKhdmfCzFEyGndQ5DSdinQCH8b8="; + }; + + outputs = [ "out" "dev" ]; + + # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 + # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. + doCheck = !stdenv.isDarwin; + + nativeBuildInputs = [ openssl ]; + propagatedBuildInputs = [ cryptography pyasn1 idna six ]; + + checkInputs = [ pytestCheckHook pretend flaky glibcLocales ]; + + preCheck = '' + export LANG="en_US.UTF-8" + ''; + + disabledTests = [ + # https://github.com/pyca/pyopenssl/issues/692 + # These tests, we disable always. + "test_set_default_verify_paths" + "test_fallback_default_verify_paths" + # https://github.com/pyca/pyopenssl/issues/768 + "test_wantWriteError" + # https://github.com/pyca/pyopenssl/issues/1043 + "test_alpn_call_failure" + ] ++ lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) [ + # https://github.com/pyca/pyopenssl/issues/791 + # These tests, we disable in the case that libressl is passed in as openssl. "test_op_no_compression" "test_npn_advertise_error" "test_npn_select_error" @@ -29,66 +62,21 @@ let "test_verify_with_revoked" "test_set_notAfter" "test_set_notBefore" - ]; - - # these tests are extremely tightly wed to the exact output of the openssl cli tool, - # including exact punctuation. - failingOpenSSL_1_1Tests = [ + ] ++ lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") [ + # these tests are extremely tightly wed to the exact output of the openssl cli tool, including exact punctuation. "test_dump_certificate" "test_dump_privatekey_text" "test_dump_certificate_request" "test_export_text" - ]; - - disabledTests = [ - # https://github.com/pyca/pyopenssl/issues/692 - # These tests, we disable always. - "test_set_default_verify_paths" - "test_fallback_default_verify_paths" - # https://github.com/pyca/pyopenssl/issues/768 - "test_wantWriteError" - # https://github.com/pyca/pyopenssl/issues/1043 - "test_alpn_call_failure" - ] ++ ( - lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) failingLibresslTests - ) ++ ( - lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests - ) ++ ( + ] ++ lib.optionals stdenv.is32bit [ # https://github.com/pyca/pyopenssl/issues/974 - lib.optionals stdenv.is32bit [ "test_verify_with_time" ] - ); - - # Compose the final string expression, including the "-k" and the single quotes. - testExpression = lib.optionalString (disabledTests != []) - "-k 'not ${lib.concatStringsSep " and not " disabledTests}'"; - -in - -buildPythonPackage rec { - pname = "pyopenssl"; - version = "21.0.0"; + "test_verify_with_time" + ]; - src = fetchPypi { - pname = "pyOpenSSL"; - inherit version; - sha256 = "5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3"; + meta = with lib; { + description = "Python wrapper around the OpenSSL library"; + homepage = "https://github.com/pyca/pyopenssl"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; - - outputs = [ "out" "dev" ]; - - checkPhase = '' - runHook preCheck - export LANG="en_US.UTF-8" - py.test tests ${testExpression} - runHook postCheck - ''; - - # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 - # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. - doCheck = !stdenv.isDarwin; - - nativeBuildInputs = [ openssl ]; - propagatedBuildInputs = [ cryptography pyasn1 idna six ]; - - checkInputs = [ pytest pretend flaky glibcLocales ]; } diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index b602b6db0d0..60d09f35a46 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.3.9"; + version = "1.3.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "v${version}"; - hash = "sha256-3jL9qu4kKpjLoNboMRSp8w/8K2jf+7z8BZsvzYVUjPc="; + hash = "sha256-XvQDCCxqqY902cpn7Ee48XOvbjBhs0UsJH/b4skjazE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index ee34f91b57e..1c054defbef 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyparted"; - version = "3.11.7"; + version = "3.12.0"; disabled = isPyPy; src = fetchFromGitHub { repo = pname; owner = "dcantrell"; rev = "v${version}"; - sha256 = "01193fmkss9icjvqpw85szpk8ld1pnha7p9kqm7mpwk6rc6gi2m3"; + sha256 = "sha256-LfBLR0A/wnfBtXISAAY6Nl4vnk1rtY03F+PT8UIMrEs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix new file mode 100644 index 00000000000..7c278d6e1be --- /dev/null +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, precice, numpy, mpi4py, cython }: + +buildPythonPackage rec { + pname = "pyprecice"; + version = "2.3.0.1"; + + src = fetchFromGitHub { + owner = "precice"; + repo = "python-bindings"; + rev = "v${version}"; + sha256 = "1yz96pif63ms797bzxbfrjba4mgz7cz5dqrqghn5sg0g1b9qxnn5"; + }; + + nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ numpy mpi4py precice ]; + + doCheck = false; # Disable Test because everything depends on open mpi which requires network. + # Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface + + meta = with lib; { + description = "Python language bindings for preCICE"; + homepage = "https://github.com/precice/python-bindings"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix index 96570fce884..2d23256ff84 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyramid_exclog"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "d05ced5c12407507154de6750036bc83861b85c11be70b3ec3098c929652c14b"; + sha256 = "sha256-Tl2rYH/GifNfB9w4nG9UIqAQz0O6kujCED/4iZnPKDw="; }; propagatedBuildInputs = [ pyramid ]; diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 7e1fb8876cb..30dd52e3eea 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = version; - hash = "sha256-JBU/ApBumdW87fQqMAopzv+UV0f6VsHMiyNqG7BRLgo="; + hash = "sha256-Ty+yIA8amKyV3z++7n1m/YRH0gEoVIVTdX8xiZYp/eM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index b89b0dc0264..dfc10c638e0 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "1.4.7"; + version = "1.4.8"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Pyrogram"; inherit version; - hash = "sha256-2kBlTaP2tkUgP4TiP+9zv5pgCap9VnyB8BEHI6SY+uc="; + hash = "sha256-mUJEV8DLYhXNvYiuiVDCfgMmZRDCNZuydngj9C9FvQU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index d8820e6d9d0..758c848c7ec 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.core"; inherit version; - hash = "sha256-N74cQcWx57lYIPiQTL+/Ec5Kf1rgdMrRkkYIdyaLjN4="; + hash = "sha256-gkvr1FgFWI1eurjbuUYhYj0D4eZTIBsDMRXSWrKiCP4="; }; # pyroute2 sub-modules have no tests diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index fe4eac24870..4838b669042 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - hash = "sha256-jwPg7xcmQU3F4cVrs2GVUxBXV6waMkrnmyZkHo2kLR0="; + hash = "sha256-+/B+YQOluzyGYmnwAZonsjgZeiZPYl8LhJ9OjnvV/64="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index cb40f0b4eff..4704d95279f 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - hash = "sha256-uMEPUleEBIaIV4bCejTmeHYhKeaN9SNcUMzBAODNBEU="; + hash = "sha256-sjlJ1eBoMQaJzEF/4Qk9ZwZB0s/yvR5wUUDP3UWBA50="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 300b1d21fa1..1889b5ead88 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - hash = "sha256-roNLNXmnW27a+TgxtMi8HO5hF4agxdjQ0DMsYW6O44c="; + hash = "sha256-j2vEQyfuuMH0QRtXw6acX9AMureQwgeS+Ap7m2uP9OY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 2564e460119..86bbde3e52a 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - hash = "sha256-o/rmbOwfRUPw/g1Cc/5otqKvGe3Br3y4iSXad/PfTPw="; + hash = "sha256-90DAbXCkoIFUbWZotKYkCSGsQvb7LrEpf6xGCviP40w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index 6b0b4bc35c9..4a3d58c896c 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.7"; + version = "0.6.8"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-d9LdXxBQGa40MmGuK2cFOOEI7X4Y1pPv0ObW9n7ZUjo="; + sha256 = "sha256-SNebxs0mCFEI4bejuLMeU3wrO8KZZT1frnfQw8Gko6E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 0050c4aa795..0f47e7228d3 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - hash = "sha256-p+U3Y5vKCxuvMl/yNKlay57tlU4GKttCJrAwctKa5TY="; + hash = "sha256-bTGzXouEdVUFaT5mxGfonFu3aOMxZKRTDMaHFciofec="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index 39308e162e2..84c9813b5ea 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - hash = "sha256-GdququbQcU+exzxifb8UGamkSUMhR94j+auF8I6e7/Q="; + hash = "sha256-l07CEwZzDxym+QAnKFFEpX690RStOA+rAwMXiEd7FOs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 1fda8265428..a2ae4d3c385 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qBv9jshyg0S9IThdrXHTFcb2neQPDmURmtSbqYCKlWo="; + hash = "sha256-WhqjvCwKrUUBLKvjpva7pc94UIZvTf7j705Bt2DHyKQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix new file mode 100644 index 00000000000..97d5bd84f66 --- /dev/null +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-backend-splunk"; + version = "0.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-backend-splunk"; + rev = "v${version}"; + hash = "sha256-jKvGBUO55DtF6bpgEL82XB5Ba+kmqJsCqUdzftcpSJ0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.backends.splunk" + ]; + + meta = with lib; { + description = "Library to support Splunk for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-backend-splunk"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix new file mode 100644 index 00000000000..2d2aadb9eae --- /dev/null +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-crowdstrike"; + version = "0.1.4"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-crowdstrike"; + rev = "v${version}"; + hash = "sha256-Riu2u1IouS1BMtXauXrNMIl06TU11pHdC0jjlOiR71s="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.crowdstrike" + ]; + + meta = with lib; { + description = "Library to support CrowdStrike pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix new file mode 100644 index 00000000000..02a12f93f7b --- /dev/null +++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-sysmon"; + version = "0.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-sysmon"; + rev = "v${version}"; + hash = "sha256-Y9X9/ynrfs4gVTLl7pOvK3TH2Eh2vNF1S6Cnt3tByJM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.sysmon" + ]; + + meta = with lib; { + description = "Library to support Sysmon pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-sysmon"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix new file mode 100644 index 00000000000..89bea0d0dc9 --- /dev/null +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pyparsing +, pytestCheckHook +, pythonOlder +, pyyaml +}: + +buildPythonPackage rec { + pname = "pysigma"; + version = "0.4.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma"; + rev = "v${version}"; + hash = "sha256-egyzeniid2PZZQ6hsd44W+YURI8uGaXvDMuhNIXUqO0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyparsing + pyyaml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pyparsing = "^3.0.7"' 'pyparsing = "*"' \ + ''; + + pythonImportsCheck = [ + "sigma" + ]; + + meta = with lib; { + description = "Library to parse and convert Sigma rules into queries"; + homepage = "https://github.com/SigmaHQ/pySigma"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index a971751c9ea..e72e38b30cb 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pycountry , pythonOlder , requests , websocket-client @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.2"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,11 +18,10 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = version; - sha256 = "sha256-R/HmkVbVKbO54lDSw1tLYs2mXi/XqZX9GGXozv+96iI="; + sha256 = "sha256-/BhNoU1dnZj07ZvG126srSb6eW00n8htFuDttq006QE="; }; propagatedBuildInputs = [ - pycountry requests websocket-client xmltodict diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index e4417139bfa..843f140ce75 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.3"; + version = "1.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = version; - hash = "sha256-p9d3wZkOMhNQWJN6tCNUlW15A3irU8QN/nm7PLGTE/M="; + hash = "sha256-qp+e40z24RIOV5RfSw/nI/y1Z3972nCLN8DgQyLbDOc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 4e45477c8ca..794bbce74e0 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -1,20 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, aiohttp }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, setuptools-scm +, aiohttp +, pytest +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-aiohttp"; - version = "0.3.0"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; + hash = "sha256-DI/rSNyOuAhw4rFTrK9iu7zCB5d+vLdDZf/P4WrcnxU="; }; - buildInputs = [ pytest ]; + patches = [ + # https://github.com/aio-libs/pytest-aiohttp/pull/26 + (fetchpatch { + name = "fix-tests-with-pytest-asyncio-0.18.0.patch"; + url = "https://github.com/aio-libs/pytest-aiohttp/commit/97152c2dfdd368f799ec6bcb5fc315736a726f53.patch"; + hash = "sha256-g7MTyCKUHnufOfrbhVV58WtfbGt1uXx8F7U9U+EaXfg="; + }) + ]; - propagatedBuildInputs = [ aiohttp ]; + nativeBuildInputs = [ + setuptools-scm + ]; - # There are no tests - doCheck = false; + propagatedBuildInputs = [ + aiohttp + pytest + pytest-asyncio + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 6401e1ce2c9..b8d3dffa3b0 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.17.2"; + version = "0.18.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4wDXvO6pDK0dQLnyfJTTa+GXf9Qtsi6ywYDUIdhkgGo="; + hash = "sha256-PE66ogjfzj6cW3+UD5nZHSt6zg7b+j6Q4ACznE4j0j8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -36,6 +36,7 @@ buildPythonPackage rec { checkInputs = [ flaky hypothesis + flaky pytestCheckHook ]; @@ -44,9 +45,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "library for testing asyncio code with pytest"; + description = "Library for testing asyncio code with pytest"; homepage = "https://github.com/pytest-dev/pytest-asyncio"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index 766e0754387..5d4d8d1798f 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.9"; + version = "3.6.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bf9favhlHcGj8nf1JxTkMjpo8hMyfBHgMCilOcIL2Sk="; + sha256 = "sha256-W8Syxgl/lPqDX2zdzvpk3Q/0aNBWM8JeUOXGDBYyamM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-json-report/default.nix b/pkgs/development/python-modules/pytest-json-report/default.nix index 2b89fe71592..95a0bcb325f 100644 --- a/pkgs/development/python-modules/pytest-json-report/default.nix +++ b/pkgs/development/python-modules/pytest-json-report/default.nix @@ -5,17 +5,21 @@ , pytest-metadata , pytest-xdist , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pytest-json-report"; - version = "1.4.1"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "numirias"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OS9ASUp9iJ12Ovr931RQU/DHEAXqbgcRMCBP4h+GAhk="; + hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 7f07ed2b6dd..94db409be91 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pytest , pytest-asyncio , pytestCheckHook , setuptools-scm @@ -8,15 +9,19 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.6.1"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "40217a058c52a63f1042f0784f62009e976ba824c418cced42e88d5f40ab0e62"; + hash = "sha256-URK9ksyfGG7pbhqS78hJaepJSTnDrq05xQ9CHEzGlTQ="; }; nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ + pytest + ]; + checkInputs = [ pytest-asyncio pytestCheckHook @@ -34,6 +39,6 @@ buildPythonPackage rec { description = "Thin-wrapper around the mock package for easier use with pytest"; homepage = "https://github.com/pytest-dev/pytest-mock"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 9cf5ffc63ab..bf386d6d62d 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -2,16 +2,15 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, pythonOlder - +, ftfy , mailchecker , phonenumbers +, pytestCheckHook , python-dateutil , python-fsutil +, pythonOlder , python-slugify , pyyaml -, ftfy , requests , six , toml @@ -20,7 +19,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.24.3"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = version; - hash = "sha256-06n8MNoGQRSrBK2XeEBBoQ2NIXWf0qXPVBeP9ERMEj0="; + hash = "sha256-G7pTbxNcESMUiKpQxjiF0gwN5mBhmuwIDlzauN5JCB4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 0edf2b69580..52e17faa5cc 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "python-box"; - version = "5.4.1"; + version = "6.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; rev = version; - sha256 = "sha256-SkteajcWG7rBFMm6Xp6QCfkZfwthRituGL/RtICbtYk="; + hash = "sha256-YOYcI+OAuTumNtTylUc6dSY9shOE6eTr8M3rVbcy5hs="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "box" ]; + pythonImportsCheck = [ + "box" + ]; meta = with lib; { description = "Python dictionaries with advanced dot notation access"; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 293d9771280..c5557b3fa6d 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -4,6 +4,7 @@ , pkg-config , python , dbus-python +, packaging , enlightenment }: @@ -11,18 +12,18 @@ buildPythonPackage rec { pname = "python-efl"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"; + sha256 = "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ dbus-python ]; + propagatedBuildInputs = [ dbus-python packaging ]; preConfigure = '' NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" @@ -39,8 +40,8 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Python bindings for EFL and Elementary"; - homepage = "https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"; + description = "Python bindings for Enlightenment Foundation Libraries"; + homepage = "https://github.com/DaveMDS/python-efl"; platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 6704cb8ad00..e15a7548421 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.1.1"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ytEzjB/xp5GnuueZXcYh4mx3378iW63kVqzsdRJ4KCU="; + sha256 = "sha256-j27oEQn+wjH8K3TixANbt94FSOr4LdEZ/ilN8sSlJL4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix index aa2c4d020e5..78a3b018c7e 100644 --- a/pkgs/development/python-modules/python-http-client/default.nix +++ b/pkgs/development/python-modules/python-http-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python_http_client"; - version = "3.3.6"; + version = "3.3.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sendgrid"; repo = "python-http-client"; rev = version; - sha256 = "sha256-Xchf/jVkQ7SYOzI9f81iS/G72k//6wkl2bMvHprOP9Y="; + sha256 = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/python-juicenet/default.nix b/pkgs/development/python-modules/python-juicenet/default.nix index 1547c891461..ad27a913257 100644 --- a/pkgs/development/python-modules/python-juicenet/default.nix +++ b/pkgs/development/python-modules/python-juicenet/default.nix @@ -1,18 +1,22 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "python-juicenet"; - version = "1.0.2"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jesserockz"; repo = "python-juicenet"; rev = "v${version}"; - sha256 = "04547pj51ds31yhyc7ng47v9giz16h2s3wgb6szc8ivhb5rclqz2"; + hash = "sha256-5RKnVwOfEHzFZCiC8OUpS8exKrENK+I3Ok45HlKEvtU="; }; propagatedBuildInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "pyjuicenet" ]; + pythonImportsCheck = [ + "pyjuicenet" + ]; meta = with lib; { description = "Read and control Juicenet/Juicepoint/Juicebox based EVSE devices"; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 4095ff9285c..c1391995dda 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.10"; + version = "0.5.11"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6iV+uIdVi0Z3FeM9xnp1Ss3VzFVEOm7wykxjSTXUIGM="; + sha256 = "sha256-1hC7yE/hGLx9g3NXqU45yC/6dcW6/0oZwgYW5bj/37c="; }; nativeBuildInputs = [ @@ -70,10 +70,6 @@ buildPythonPackage rec { "miio" ]; - disabledTestPaths = [ - "miio/tests/test_vacuums.py" - ]; - meta = with lib; { description = "Python library for interfacing with Xiaomi smart appliances"; homepage = "https://github.com/rytilahti/python-miio"; diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 05efc97b644..8c76861bcb8 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "5.7.0"; + version = "5.8.0"; src = fetchPypi { inherit pname version; - sha256 = "c65e3d51018f193cce2daf3d0fd69daa36003bdb2b85df6b07b973e4c39e2f92"; + sha256 = "sha256-M0hS34iXuV8FgewS7ih96MepKJogihjwqLOHdwGf2YY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 5b7af8ad736..16c4dc0f230 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -9,12 +9,14 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "5.0.2"; + version = "6.1.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8TODoLn8vmSaGJK5yOtPjqsdbYS4S7emJDF6+pgVnKs="; + hash = "sha256-7/GQ5N+sl9L4wYkO5oJwns0jZQdCNhaH24LZXh5eJfU="; }; propagatedBuildInputs = [ @@ -26,9 +28,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + pytestFlagsArray = [ + "test.py" + ]; - pythonImportsCheck = [ "slugify" ]; + pythonImportsCheck = [ + "slugify" + ]; meta = with lib; { description = "Python Slugify application that handles Unicode"; diff --git a/pkgs/development/python-modules/python-songpal/default.nix b/pkgs/development/python-modules/python-songpal/default.nix index 715bf164a4b..7215bd73281 100644 --- a/pkgs/development/python-modules/python-songpal/default.nix +++ b/pkgs/development/python-modules/python-songpal/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.14"; + version = "0.14.1"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "rytilahti"; repo = "python-songpal"; rev = version; - hash = "sha256-yuCtz1B5bj3mWz4eP2GXzoaHuIQ47tIWn19jkZN54lw="; + hash = "sha256-lLRAXoz95hSt1JcWbQ1g5xmvDOeUmeXPa9pCuJktaeY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-trovo/default.nix b/pkgs/development/python-modules/python-trovo/default.nix new file mode 100644 index 00000000000..d7fa18cfba3 --- /dev/null +++ b/pkgs/development/python-modules/python-trovo/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "python-trovo"; + version = "0.1.5"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-JUJax9nk4NqpMMrbDmQhcy22GIqPha+K4tudQ98PvlE="; + }; + + propagatedBuildInputs = [ requests ]; + + # No tests found + doCheck = false; + + pythonImportsCheck = [ "trovoApi" ]; + + meta = with lib; { + description = "A Python wrapper for the Trovo API"; + homepage = "https://codeberg.org/wolfangaukang/python-trovo"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index 2690f8ea7eb..de14a4010b6 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -4,15 +4,19 @@ , setuptools , libvlc , substituteAll +, pythonOlder }: buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.12118"; + version = "3.0.16120"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Vm8vfDA/aACFHKzAFt8cbu7AlK1j4KSdh9udaYCU8fs="; + hash = "sha256-kvmP7giPcr1tBjs7MxLQvSmzfnrWXd6zpzAzIDAMKAc="; }; patches = [ @@ -27,9 +31,12 @@ buildPythonPackage rec { setuptools ]; - doCheck = false; # no tests + # Module has no tests + doCheck = false; - pythonImportsCheck = [ "vlc" ]; + pythonImportsCheck = [ + "vlc" + ]; meta = with lib; { description = "Python bindings for VLC, the cross-platform multimedia player and framework"; diff --git a/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix new file mode 100644 index 00000000000..04e89b664c4 --- /dev/null +++ b/pkgs/development/python-modules/python-zbar/default.nix @@ -0,0 +1,42 @@ +{ lib , buildPythonPackage , fetchFromGitHub , pillow , zbar , pytestCheckHook }: + +buildPythonPackage rec { + pname = "python-zbar"; + version = "0.23.90"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mchehab"; + repo = "zbar"; + rev = version; + sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; + }; + + propagatedBuildInputs = [ pillow ]; + + buildInputs = [ zbar ]; + + checkInputs = [ pytestCheckHook ]; + + preBuild = '' + cd python + ''; + + disabledTests = [ + #AssertionError: b'Y800' != 'Y800' + "test_format" + "test_new" + #Requires loading a recording device + #zbar.SystemError: <zbar.Processor object at 0x7ffff615a680> + "test_processing" + ]; + + pythonImportsCheck = [ "zbar" ]; + + meta = with lib; { + description = "Python bindings for zbar"; + homepage = "https://github.com/mchehab/zbar"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index 6fb7d5d4728..64b3d11e95a 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.6.5"; + version = "1.6.6"; format = "setuptools"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - hash = "sha256-l3eeD/WGiqVQ2E92WBV8eTRPVdtUnP7wP4brE8PPTkw="; + hash = "sha256-gN0VNISogw2rTr58DuHLQ8VyOg6VE3X9T/j6fw0EdXw="; }; patches = [ diff --git a/pkgs/development/python-modules/pytwitchapi/default.nix b/pkgs/development/python-modules/pytwitchapi/default.nix deleted file mode 100644 index 9777f333130..00000000000 --- a/pkgs/development/python-modules/pytwitchapi/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, aiohttp -, python-dateutil -, requests -, websockets -}: - -buildPythonPackage rec { - pname = "pytwitchapi"; - version = "2.5.2"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "Teekeks"; - repo = "pyTwitchAPI"; - rev = "v${version}"; - hash = "sha256-i+oAx23bMu+jaXHPWElD5GJH6vSytW/9N1amsmma4Lc="; - }; - - propagatedBuildInputs = [ - aiohttp - python-dateutil - requests - websockets - ]; - - # Project has no tests. - doCheck = false; - - pythonImportsCheck = [ - "twitchAPI" - ]; - - meta = with lib; { - description = "Python implementation of the Twitch Helix API, its Webhook and PubSub"; - homepage = "https://github.com/Teekeks/pyTwitchAPI"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - }; -} diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 8d815ee1ce9..09c2c1ca7a6 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.31.0"; + version = "2.31.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nuYWJ4nilbXa/1KOuGhc6rB7uXDE4+lcESNud4Ug+3Y="; + sha256 = "sha256-l4wF/I3wsA9nowIdLjNPUxCaTPBu5v5oPQ3oNbLh+/o="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 2c0e893b9c5..10f78ab5e14 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - pname = "PyYAML"; + pname = "pyyaml"; version = "6.0"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index ea5325ea660..795b8460b5d 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.22.0"; + version = "0.23.0"; checkInputs = [ pytestCheckHook ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "685a08247b561ed1c7a7b42e68293f90b412e83556626304a3f826a15be51308"; + sha256 = "sha256-gDn0Nu6ALTr3KyZnYDSA6RE3S5JQj562FP2RI9U3Gxs="; }; doCheck = true; diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix new file mode 100644 index 00000000000..c5b4413540c --- /dev/null +++ b/pkgs/development/python-modules/radios/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiodns +, aiohttp +, awesomeversion +, backoff +, cachetools +, pycountry +, pydantic +, yarl +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "radios"; + version = "0.1.1"; + + disabled = pythonOlder "3.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-radios"; + rev = "v${version}"; + hash = "sha256-NCBch9MCWVD6ez0sIUph8rwOOzEMZtwC4atXJe53xZM="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiodns + aiohttp + awesomeversion + backoff + cachetools + pycountry + pydantic + yarl + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "radios" ]; + + meta = with lib; { + description = "Asynchronous Python client for the Radio Browser API"; + homepage = "https://github.com/frenck/python-radios"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 65ab0cb2682..122c4fdf665 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "readme-renderer"; - version = "32.0"; + version = "34.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "readme_renderer"; inherit version; - sha256 = "sha256-tRK+r6Z5gmDH1a8+Gx8Jfli/zZpXXafE3dXgN0kKW4U="; + sha256 = "sha256-37TRfyFwbRRfdHPgthyiRbpY6BDPmyIJpII5Z3+C5bA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index b96c7ca8995..86e591eaf14 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -2,25 +2,28 @@ , buildPythonPackage , fetchPypi , python -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "regex"; - version = "2021.11.10"; + version = "2022.1.18"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-80HuLfCZm/33qV5EgHXv/g2yEqWTh94acGkOSssD1MY="; + hash = "sha256-l/MtwDqAVKTEpatddh7Uhh6CiywgD+vU5GhXBppIORY="; }; - # Sources for different Python releases are located in same folder checkPhase = '' - rm -r ${if !isPy27 then "regex_2" else "regex_3"} ${python.interpreter} -m unittest ''; - pythonImportsCheck = [ "regex" ]; + pythonImportsCheck = [ + "regex" + ]; meta = with lib; { description = "Alternative regular expression module, to replace re"; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index a742c422ee9..464bbd78515 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,17 +1,18 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , cython }: -buildPythonPackage { +buildPythonPackage rec { pname = "rencode"; - version = "git20150810"; + version = "1.0.6"; - src = fetchgit { - url = "https://github.com/aresch/rencode"; - rev = "b45e04abdca0dea36e383a8199783269f186c99e"; - sha256 = "b4bd82852d4220e8a9493d3cfaecbc57b1325708a2d48c0f8acf262edb10dc40"; + src = fetchFromGitHub { + owner = "aresch"; + repo = "rencode"; + rev = "v${version}"; + sha256 = "sha256-PGjjrZuoGYSPMNqXG1KXoZnOoWIe4g6s056jFhqrJ60="; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 69a1b11fea4..0b5d7835819 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0053"; + version = "0.60"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "v${version}"; - sha256 = "0qjp7n2qa9n9fdhfcgfgw89hy19z5144cxhkhmhv1xnfdiz175qd"; + sha256 = "sha256-4yk05obra0icWHPXaJ+Wj+xxDRkVYg/VsrXTQUdHJIc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 86e37419c72..95861bda181 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -5,25 +5,23 @@ , pytestCheckHook , pythonOlder , requests -, six , urllib3 }: buildPythonPackage rec { pname = "responses"; - version = "0.17.0"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7GdeCA0Gv40fteWmih5c0N9GsJx4IwMV9lCvXkA2vsc="; + hash = "sha256-OAytTBwdyULl6KjqrgtNTt9wj08BDbi3vPr60fzSVP8="; }; propagatedBuildInputs = [ requests - six urllib3 ]; diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix new file mode 100644 index 00000000000..4c543febb81 --- /dev/null +++ b/pkgs/development/python-modules/rich-rst/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, docutils +, rich +}: + +buildPythonPackage rec { + pname = "rich-rst"; + version = "1.1.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "wasi-master"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-s48hdJo1LIRXTf+PeSBa6y/AH1NLmnyAafFydJ+exDk="; + }; + + propagatedBuildInputs = [ docutils rich ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "rich_rst" ]; + + meta = with lib; { + description = "A beautiful reStructuredText renderer for rich"; + homepage = "https://github.com/wasi-master/rich-rst"; + license = licenses.mit; + maintainers = with maintainers; [ jyooru ]; + }; +} diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 32c5d552ff3..358c2ed600e 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.14.1"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - hash = "sha256-K9R//xbyXaJ+AHmt42Fv40j43UkvKVyAFiXAq+P4mh8="; + hash = "sha256-yNmnCoHIBlpQCLd+YcsKCKd1wWh8WZNpILWmChZGWH4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index aaf31f06a1c..4d0a4aa94f1 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , capstone +, pythonOlder }: buildPythonPackage rec { pname = "ropgadget"; - version = "6.6"; + version = "6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "v${version}"; - sha256 = "1i0gx0cwhxk6d8byvck17hh83szz3k6ndd118ha3q0r0msap0lz1"; + hash = "sha256-zOTbncsOvmLQMZGpcRLviSZP/d1cQTQHXCLUKyEgVBk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index 79f21ba6aab..31d76d78ac7 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.17.20"; + version = "0.17.21"; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - sha256 = "sha256-S4ozwe+ytEOpP8qvz6TS5EX46MKcUo2fXNr7fMnkAEw="; + sha256 = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; }; # Tests use relative paths diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix index aab3201047d..d2dbb2e4058 100644 --- a/pkgs/development/python-modules/sabyenc3/default.nix +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -1,22 +1,32 @@ -{ lib, fetchPypi, python3Packages }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "sabyenc3"; - version = "4.0.2"; + version = "5.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "dfaa0bdd01752a9cfde0d349a8f4e178b04b1cf9c1bc018b287961192cd2bb90"; + hash = "sha256-muqJCn5FcSp5KNZqfW433NCOxfj1DvFvlZPClmNkPR0="; }; - # tests are not included in pypi distribution + # Tests are not included in pypi distribution doCheck = false; - meta = { + pythonImportsCheck = [ + "sabyenc3" + ]; + + meta = with lib; { description = "yEnc Decoding for Python 3"; homepage = "https://github.com/sabnzbd/sabyenc/"; - license = lib.licenses.lgpl3; - maintainers = [ lib.maintainers.lovek323 ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ lovek323 ]; }; - } diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index f906802c212..bed661ce200 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "samsungtvws"; - version = "2.0.0"; + version = "2.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-F9Q5gEKS9aYz/FYj1x1EIP2rfjCcxfqqacYV16rJCgs="; + sha256 = "sha256-LbNHaSbNCwoffox6B8kEUzxjkSJotB+P1bw3wbU7DZk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 660ca5de80b..63c24e9936f 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -13,6 +13,7 @@ , pytest-sugar , pytestCheckHook , pythonOlder +, pythonAtLeast , sanic-routing , sanic-testing , ujson @@ -26,7 +27,8 @@ buildPythonPackage rec { version = "21.12.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7" || + pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88 src = fetchFromGitHub { owner = "sanic-org"; diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 69b9bf05467..fcf16503462 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "ba49325f6a31e8bdccfb88337aa85218d209e88a6a704e9c41ef13bf749e0f46"; + sha256 = "sha256-Sx+reZKBbahjkVgo8hC8EP5vMsRhnprwGjKumQqH83k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index e939142fd82..d3ca4459619 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -1,20 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { - pname = "semantic_version"; - version = "2.8.5"; + pname = "semantic-version"; + version = "2.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; + pname = "semantic_version"; + inherit version; + sha256 = "sha256-q/VIc1U+Xgem/U1fZTt4H1rkEpekk2ZrWdzyFABqErI="; }; - # ModuleNotFoundError: No module named 'tests' - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "semantic_version" + ]; meta = with lib; { description = "A library implementing the 'SemVer' scheme"; - license = licenses.bsdOriginal; + homepage = "https://github.com/rbarrois/python-semanticversion/"; + license = licenses.bsd2; maintainers = with maintainers; [ layus makefu ]; }; } diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index c9b6d7c9680..aab6ab049da 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.9.6"; + version = "6.9.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-6MkAtkbKVoa8UatG92RzbCdAM+WsQN2WnOIh4pRoUVk="; + sha256 = "sha256-Lx84jmgJz/J5MJtJyqDTVIbN6H63gD2rkJrdNeojd08="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix index 331f84252ce..68e9638c350 100644 --- a/pkgs/development/python-modules/simber/default.nix +++ b/pkgs/development/python-modules/simber/default.nix @@ -1,20 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub, colorama, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, colorama +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "simber"; - version = "0.2.3"; + version = "0.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "04dp9b4s7zb166vlacsaypc6iw1p75azqas1wf0flp570qqf3rkx"; + hash = "sha256-P4bhxu9Di4E2Zkd0vIkyDi1S6Y0V/EQSMF4ftWoiXKE="; }; - propagatedBuildInputs = [ colorama ]; + propagatedBuildInputs = [ + colorama + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "simber" ]; + pythonImportsCheck = [ + "simber" + ]; meta = with lib; { description = "Simple, minimal and powerful logger for Python"; diff --git a/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch b/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch new file mode 100644 index 00000000000..4c6f869c0c2 --- /dev/null +++ b/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch @@ -0,0 +1,21 @@ +From d949b37151cd538d4c6a15e1ba6c1343f8bff76d Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" <d.ol.rod@protonmail.com> +Date: Mon, 6 Dec 2021 15:26:19 -0600 +Subject: [PATCH] set poetry-core + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index d3fdc52..bd7ddc2 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -27,4 +27,4 @@ black = "^19.10b0" + + [build-system] + requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++build-backend = "poetry.core.masonry.api" +-- +2.33.1 diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix new file mode 100644 index 00000000000..39cd92f5f67 --- /dev/null +++ b/pkgs/development/python-modules/single-version/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub, poetry-core, pytestCheckHook }: + +buildPythonPackage rec { + pname = "single-version"; + version = "1.5.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hongquan"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-I8ATQzPRH9FVjqPoqrNjYMBU5azpmkLjRmHcz943C10="; + }; + + patches = [ + ./0001-set-poetry-core.patch + ]; + + nativeBuildInputs = [ poetry-core ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "single_version" ]; + + meta = with lib; { + description = "Utility to let you have a single source of version in your code base"; + homepage = "https://github.com/hongquan/single-version"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 7b94067aeee..09682a2a3d0 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.15.1"; + version = "3.15.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-N8JvNK1ddlCabzCmEv9TItqXDT7A4Dt8dhMLBICWXHA="; + sha256 = "sha256-lhdh4Eo7yIsukXoKI6Ss793fYmAu91O1UElmxV9xAc4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 293b8069b58..1b7bd7341eb 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "NabuCasa"; repo = pname; rev = version; - sha256 = "sha256-IjdgxX6ed9IWMFaMXIXQWZWoODrZBzXtMAcMOIhPFVQ="; + hash = "sha256-Ehafb35H462Ffn6omGh/MDJKQX5qJJZeiIBO3n0IGlA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 0922f8c10d2..50a134df2d2 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.26.3"; + version = "0.27.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - hash = "sha256-tMW5SCsO1XMQdbasMw3qIMwj+Y6wTQHAmTZ+9r8Mffs="; + hash = "sha256-8U7wfxqen+hgK8j9ooPHCAKvd9kSZicToTyP7XzQFrg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index e332d0defd7..a03052c7e42 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "v${version}"; - sha256 = "0ywdh1pfk0pgm64p97i9cwz0h9wggbp4shxp5l7kkqs2n2v5c6qg"; + sha256 = "sha256-M0WtONhsqmmK0PBB+Df4YrFpT+vfVidDkt80eBHOo04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index 9a1d614062b..c1b68e61088 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, fetchpatch +, pytestCheckHook , numpy , libsndfile , cffi @@ -12,6 +13,8 @@ buildPythonPackage rec { pname = "soundfile"; version = "0.10.3.post1"; + # https://github.com/bastibe/python-soundfile/issues/157 + disabled = isPyPy || stdenv.isi686; src = fetchPypi { pname = "SoundFile"; @@ -19,22 +22,30 @@ buildPythonPackage rec { sha256 = "0yqhrfz7xkvqrwdxdx2ydy4h467sk7z3gf984y1x2cq7cm1gy329"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy libsndfile cffi ]; - propagatedNativeBuildInputs = [ cffi ]; + patches = [ + # Fix build on macOS arm64, https://github.com/bastibe/python-soundfile/pull/332 + (fetchpatch { + url = "https://github.com/bastibe/python-soundfile/commit/e554e9ce8bed96207d587e6aa661e4b08f1c6a79.patch"; + sha256 = "sha256-vu/7s5q4I3yBnoNHmmFmcXvOLFcPwY9ri9ri6cKLDwU="; + }) + ]; - meta = { - description = "An audio library based on libsndfile, CFFI and NumPy"; - license = lib.licenses.bsd3; - homepage = "https://github.com/bastibe/PySoundFile"; - maintainers = with lib.maintainers; [ fridh ]; - }; + postPatch = '' + substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; - postPatch = '' - substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; + checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ numpy libsndfile cffi ]; + propagatedNativeBuildInputs = [ cffi ]; - # https://github.com/bastibe/PySoundFile/issues/157 - disabled = isPyPy || stdenv.isi686; + # Test fails on aarch64-darwin with `MemoryError`, 53 failed, 31 errors, see + # https://github.com/bastibe/python-soundfile/issues/331 + doCheck = stdenv.system != "aarch64-darwin"; + meta = { + description = "An audio library based on libsndfile, CFFI and NumPy"; + license = lib.licenses.bsd3; + homepage = "https://github.com/bastibe/python-soundfile"; + maintainers = with lib.maintainers; [ fridh ]; + }; } diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index e8b46e99cc1..5e3bc6aac8b 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.2.2"; + version = "3.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-s9mjYeHjwcGtD38kTyaH+s5CD+LWQtkpic01eUSn1w8="; + sha256 = "sha256-JdAz/Ae4+/yb3Te3cLilhtxBTb1gMShEmvMldqOJFnM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index b82d1afe476..df05cd27364 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.22"; + version = "0.23"; src = fetchPypi { inherit pname version; - sha256 = "a42c7a13ab1ae9ed18e8e8b0f76b8d35dc476fdebe6e634354fe6fd0f261f686"; + sha256 = "sha256-HVVRjwqG7NbJa6j/jIhK3KBbrD5Y52ppKjzRmqf0Ks8="; }; # No tests included. diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index f77ee113bb0..8b68eea2566 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-kaKOKeztP89SLF4yrUFW1TTAEyAaCTm2XCcOH0b+Dzc="; + sha256 = "sha256-3bZFFtGW6j/3m/3F4+tapZujzpMZnrIcYTngDCNGylI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 439f1554912..5d96f8e1505 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.24"; + version = "3.25.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0bkvh1L+HqyH5/GKaw4J+OPJ/yR882JgWI4vBH6v0lM="; + sha256 = "sha256-32lfUJoTbkflztLU/BDhbHbuOkW66OGpHLuiyAKFy8k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 18dac082f06..a435b363a0f 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X8FpGnrF0aHuf3yIzRrxoNAu77UASTL36CQpcuxESV8="; + sha256 = "sha256-W/UdJPLcFOEHHz7VYeQ3CcXysNju5DuxqvYA+xMkb20="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index f76ba96a5b8..bc3e2c238c9 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sslyze"; - version = "5.0.2"; + version = "5.0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-8xtnE5oFxH3wo2Smt65/xGDHxivexN6ggUpyUg42Cjk="; + hash = "sha256-d465WJIDsgNAPe8KW5v2KDSgzMH7OPLSiFfFH9n+jiA="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index cbbd3a878d7..eb9879a4bf0 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -1,5 +1,6 @@ { asttokens , buildPythonPackage +, cython , executing , fetchFromGitHub , git @@ -15,13 +16,13 @@ buildPythonPackage rec { pname = "stack-data"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "alexmojaki"; repo = "stack_data"; rev = "v${version}"; - sha256 = "sha256-dRIRDMq0tc1QuBHvppPwJA5PVGHyVRhoBlX5BsdDzec="; + sha256 = "sha256-brXFrk1UU5hxCVeRvGK7wzRA0Hoj9fgqoxTIwInPrEc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -39,6 +40,7 @@ buildPythonPackage rec { ]; checkInputs = [ + cython littleutils pygments pytestCheckHook diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 5b1ff139ff9..e9811262838 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.66.0"; + version = "2.67.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d8YDIjD3cUsaG0WQdPCMYNYMIpucO+rDcnGQY+PRQJw="; + hash = "sha256-cYuT1qGBBSQ7zgybSOUY9y8fCD0n8H4HuL2zpUH+ODU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index 4757cd32318..f627f0e7231 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -7,19 +7,21 @@ , pytest , pytest-cov , hypothesis -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "stups-pierone"; - version = "1.1.49"; - disabled = !isPy3k; + version = "1.1.50"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zalando-stups"; repo = "pierone-cli"; rev = version; - sha256 = "1kb1lpnxbcq821mx75vzapndvxfvsdrplyhsqjq4vdhyqrx2dn3q"; + hash = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw="; }; propagatedBuildInputs = [ @@ -28,9 +30,9 @@ buildPythonPackage rec { stups-zign ]; - preCheck = " + preCheck = '' export HOME=$TEMPDIR - "; + ''; checkInputs = [ pytest @@ -38,10 +40,14 @@ buildPythonPackage rec { hypothesis ]; + pythonImportsCheck = [ + "pierone" + ]; + meta = with lib; { description = "Convenient command line client for STUPS' Pier One Docker registry"; homepage = "https://github.com/zalando-stups/pierone-cli"; license = licenses.asl20; - maintainers = [ maintainers.mschuwalow ]; + maintainers = with maintainers; [ mschuwalow ]; }; } diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 55cea70924e..41baf697fff 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -7,14 +7,14 @@ buildPythonApplication rec { pname = "sybil"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dpLtZueT5eea5qcM8s+GGRftSOr/DYrfgl5k2Fgg8lE="; + hash = "sha256-bwLcIgSvflohIDeSTZdPcngfbcGP08RMx85GOhIPUw0="; }; checkInputs = [ @@ -22,7 +22,7 @@ buildPythonApplication rec { ]; disabledTests = [ - # sensitive to output of other commands + # Sensitive to output of other commands "test_namespace" "test_unittest" ]; diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index c2c22358661..db0f01ae51f 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "sha256-kz4M4ghR9Mi8Ig5K+pZC4zHt8XxoP3vU4ATImejqbgg="; + sha256 = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; }; postConfigure = '' diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 18ab606afdd..b2a719a020b 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.7.3"; + version = "5.8.0"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "v${version}"; - sha256 = "1d6rnlybj971b5j5glvq288hd4r204nkmssqb0k8rm6cqcwhz292"; + sha256 = "sha256-spTIHiyspjrIV8DKR7YNpNTNO9SlcLOROuABhmu3ckA="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 93fc92bd632..91f91a3d7b1 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.18.3"; + version = "6.18.5"; format = "setuptools"; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,12 +25,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JgAQCulv/QgjNLN441VVD++LSlKab6TDT0cTCQXHQm0="; + hash = "sha256-Atrog/Vn9bcP0608nu+5WRLniskL5sdES14vRr9XLIQ="; }; - # no longer compatible with sybil - # https://github.com/simplistix/testfixtures/issues/169 - doCheck = false; checkInputs = [ mock pytestCheckHook @@ -44,19 +41,6 @@ buildPythonPackage rec { "testfixtures/tests/test_django" ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/simplistix/testfixtures/issues/168 - "test_invalid_communicate_call" - "test_invalid_kill" - "test_invalid_parameters" - "test_invalid_poll" - "test_invalid_send_signal" - "test_invalid_terminate" - "test_invalid_wait_call" - "test_replace_delattr_cant_remove" - "test_replace_delattr_cant_remove_not_strict" - ]; - pytestFlagsArray = [ "testfixtures/tests" ]; diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix new file mode 100644 index 00000000000..e14c64730a2 --- /dev/null +++ b/pkgs/development/python-modules/textual/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, rich +, typing-extensions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "textual"; + version = "0.1.15"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Textualize"; + repo = pname; + rev = "v${version}"; + sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6"; + }; + + patches = [ + (fetchpatch { + # v0.1.15 git tag has 0.1.14 in pyproject.toml + name = "version.patch"; + url = "https://github.com/Textualize/textual/commit/1b8d7d184e10889002425641222702afba508aea.patch"; + sha256 = "1nfqp5f8ba3fg0ar3lghrlqypbjbsaywxaz3iiff8fy8j2wgsppp"; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + rich + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "textual" ]; + + meta = with lib; { + description = "TUI framework for Python inspired by modern web development"; + homepage = "https://github.com/Textualize/textual"; + license = licenses.mit; + maintainers = with maintainers; [ jyooru ]; + }; +} diff --git a/pkgs/development/python-modules/theano-pymc/default.nix b/pkgs/development/python-modules/theano-pymc/default.nix new file mode 100644 index 00000000000..ad0b93fe094 --- /dev/null +++ b/pkgs/development/python-modules/theano-pymc/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, pandas +, numpy +, scipy +, filelock +, pytest +, nose +, parameterized +}: + +buildPythonPackage rec { + pname = "theano-pymc"; + version = "1.1.2"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "Theano-PyMC"; + inherit version; + sha256 = "5da6c2242ea72a991c8446d7fe7d35189ea346ef7d024c890397011114bf10fc"; + }; + + # No need for coverage stats in Nix builds + postPatch = '' + substituteInPlace setup.py --replace ", 'pytest-cov'" "" + ''; + + propagatedBuildInputs = [ + pandas + numpy + scipy + filelock + ]; + + # The test suite is computationally intensive and test failures are not + # indicative for package usability hence tests are disabled by default. + doCheck = false; + pythonImportsCheck = [ "theano" ]; + + meta = { + description = "PyMC theano fork"; + homepage = "https://github.com/majidaldo/Theano-PyMC"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nidabdella ]; + }; +} diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 55bf72aec76..417cd8e056c 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.13"; + version = "8.0.14"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R2YqOuM9RFp3tup7dyREgFx7uomR8SLjUNr3Le3IFxo="; + sha256 = "sha256-3MC8ao6BTiDyaCXj/X+DNCTpMYcTWVJFSl0X+sCc5J0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tifffile/python2-regex-compat.patch b/pkgs/development/python-modules/tifffile/python2-regex-compat.patch deleted file mode 100644 index 7f4ec5764bb..00000000000 --- a/pkgs/development/python-modules/tifffile/python2-regex-compat.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/setup.py 2019-02-20 18:52:12.000000000 +0100 -+++ b/setup.py 2019-03-02 13:55:39.014019260 +0100 -@@ -20,12 +20,6 @@ - - description = re.search(r'"""(.*)\.(?:\r\n|\r|\n)', code).groups()[0] - --readme = re.search(r'(?:\r\n|\r|\n){2}"""(.*)"""(?:\r\n|\r|\n){2}from', code, -- re.MULTILINE | re.DOTALL).groups()[0] -- --readme = '\n'.join([description, '=' * len(description)] -- + readme.splitlines()[1:]) -- - license = re.search(r'(# Copyright.*?(?:\r\n|\r|\n))(?:\r\n|\r|\n)+""', code, - re.MULTILINE | re.DOTALL).groups()[0] - -@@ -41,7 +35,6 @@ - name='tifffile', - version=version, - description=description, -- long_description=readme, - author='Christoph Gohlke', - author_email='cgohlke@uci.edu', - url='https://www.lfd.uci.edu/~gohlke/', diff --git a/pkgs/development/python-modules/tikzplotlib/default.nix b/pkgs/development/python-modules/tikzplotlib/default.nix new file mode 100644 index 00000000000..ebf58dd12e9 --- /dev/null +++ b/pkgs/development/python-modules/tikzplotlib/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +, numpy +, pillow +, webcolors +, flit-core +, pytestCheckHook +, pandas +}: + +buildPythonPackage rec { + pname = "tikzplotlib"; + version = "0.10.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "nschloe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PLExHhEnxkEiXsE0rqvpNWwVZ+YoaDa2BTx8LktdHl0="; + }; + + propagatedBuildInputs = [ + matplotlib + numpy + pillow + webcolors + flit-core + ]; + + checkInputs = [ + pytestCheckHook + pandas + ]; + + meta = with lib; { + description = "Save matplotlib figures as TikZ/PGFplots for smooth integration into LaTeX"; + homepage = "https://github.com/nschloe/tikzplotlib"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix index ad35fe50128..a886e116e45 100644 --- a/pkgs/development/python-modules/tls-parser/default.nix +++ b/pkgs/development/python-modules/tls-parser/default.nix @@ -7,23 +7,29 @@ buildPythonPackage rec { pname = "tls-parser"; - version = "1.2.2"; + version = "2.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = "tls_parser"; rev = version; - sha256 = "12qj3vg02r5a51w6gbgb1gcxicqc10lbbsdi57jkkfvbqiindbd0"; + hash = "sha256-A1lYRe1sHDoOFdF20DP+xRMcPBWzokIXFphIpaBmwBc="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "tls_parser" ]; + pythonImportsCheck = [ + "tls_parser" + ]; meta = with lib; { - homepage = "https://github.com/nabla-c0d3/tls_parser"; description = "Small library to parse TLS records"; + homepage = "https://github.com/nabla-c0d3/tls_parser"; platforms = with platforms; linux ++ darwin; license = licenses.mit; maintainers = with maintainers; [ veehaitch ]; diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix new file mode 100644 index 00000000000..fc53c5ba823 --- /dev/null +++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -0,0 +1,48 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pandas +, pytestCheckHook +, pytorch +, tensorflow-tensorboard +, torchvision +}: + +let + version = "0.3.1"; + repo = fetchFromGitHub { + owner = "pytorch"; + repo = "kineto"; + rev = "v${version}"; + hash = "sha256-Yg001XzOPDmz9wEP2b7Ggz/uU6x5PFzaaBeUBwWKFS0="; + }; +in +buildPythonPackage rec { + pname = "torch_tb_profiler"; + inherit version; + format = "setuptools"; + + # See https://discourse.nixos.org/t/extracting-sub-directory-from-fetchgit-or-fetchurl-or-any-derivation/8830. + src = "${repo}/tb_plugin"; + + propagatedBuildInputs = [ pandas tensorflow-tensorboard ]; + + checkInputs = [ pytestCheckHook pytorch torchvision ]; + + disabledTests = [ + # Tests that attempt to access the filesystem in naughty ways. + "test_profiler_api_without_gpu" + "test_tensorboard_end2end" + "test_tensorboard_with_path_prefix" + "test_tensorboard_with_symlinks" + ]; + + pythonImportsCheck = [ "torch_tb_profiler" ]; + + meta = with lib; { + description = "PyTorch Profiler TensorBoard Plugin"; + homepage = "https://github.com/pytorch/kineto"; + license = licenses.bsd3; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 774a42fc13a..dc42ba0972f 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -1,24 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage -, traits, pyface, six +{ lib +, fetchPypi +, buildPythonPackage +, traits +, pyface +, pythonOlder }: buildPythonPackage rec { pname = "traitsui"; - version = "7.2.1"; + version = "7.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "dfc39015faf0591f9927e3d4d22bd95a16d49c85db30e60acd4ba7b85c7c5d5b"; + hash = "sha256-lHStZ/NF2Wsya0AemgFAXICCyS+kO/R8CwOYGOWHrGk="; }; - propagatedBuildInputs = [ traits pyface six ]; + propagatedBuildInputs = [ + traits + pyface + ]; + + # Needs X server + doCheck = false; - doCheck = false; # Needs X server + pythonImportsCheck = [ + "traitsui" + ]; meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/traitsui"; - maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; + maintainers = with maintainers; [ knedlsepp ]; }; } diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index 425b7eddfe9..382e90e14c8 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "twentemilieu"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-twentemilieu"; rev = "v${version}"; - sha256 = "sha256-7HQ0+h8oiyY+TacQdX84K0r994rH0AMZAvZz8PUvQl0="; + sha256 = "sha256-UE7fhbSThXmMns1XfUUQqw0wn5/w/x+UncansIBiank="; }; postPatch = '' diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix new file mode 100644 index 00000000000..ce4ae1a8874 --- /dev/null +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, python-dateutil +, requests +, typing-extensions +, websockets +}: + +buildPythonPackage rec { + pname = "twitchapi"; + version = "2.5.3"; + + format = "setuptools"; + + src = fetchPypi { + pname = "twitchAPI"; + inherit version; + sha256 = "e7987dd8c3d1a3d25fe85ff0c0b0bad492f916c920f618dca8efd6baad3ac704"; + }; + + propagatedBuildInputs = [ + aiohttp + python-dateutil + requests + typing-extensions + websockets + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "twitchAPI.eventsub" + "twitchAPI.oauth" + "twitchAPI.pubsub" + "twitchAPI.twitch" + "twitchAPI.types" + ]; + + meta = with lib; { + description = "Python implementation of the Twitch Helix API, its Webhook, PubSub and EventSub"; + homepage = "https://github.com/Teekeks/pyTwitchAPI"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index c4977ab0829..87116017063 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "typed-ast"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "python"; repo = "typed_ast"; rev = version; - hash = "sha256-qfXMT+rSf/WcWHpkg4VZXZMYj/5IKQWAKRsxQ0TRzPU="; + hash = "sha256-Ul1FIS1a1f8l3tX+m8Bj/LsLQW1sXJv6XzEZ9zh8rfI="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/types-cryptography/default.nix b/pkgs/development/python-modules/types-cryptography/default.nix new file mode 100644 index 00000000000..dd68bfddef7 --- /dev/null +++ b/pkgs/development/python-modules/types-cryptography/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, types-enum34 +, types-ipaddress +}: + +buildPythonPackage rec { + pname = "types-cryptography"; + version = "3.3.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-RI/q+a4xImFJvGvOHPj/9U2mYe8Eg398DDFoKYhcNig="; + }; + + pythonImportsCheck = [ + "cryptography-stubs" + ]; + + propagatedBuildInputs = [ types-enum34 types-ipaddress ]; + + meta = with lib; { + description = "Typing stubs for cryptography"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/types-enum34/default.nix b/pkgs/development/python-modules/types-enum34/default.nix new file mode 100644 index 00000000000..6c186f2d875 --- /dev/null +++ b/pkgs/development/python-modules/types-enum34/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-enum34"; + version = "1.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0421lr89vv3fpg77kkj5nmzd7z3nmhw4vh8ibsjp6vfh86b7d73g"; + }; + + pythonImportsCheck = [ + "enum-python2-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for enum34"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/types-ipaddress/default.nix b/pkgs/development/python-modules/types-ipaddress/default.nix new file mode 100644 index 00000000000..19e048d1a9f --- /dev/null +++ b/pkgs/development/python-modules/types-ipaddress/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-ipaddress"; + version = "1.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h9q9pjvw1ap5k70ygp750d096jkzymxlhx87yh0pr9mb6zg6gd0"; + }; + + pythonImportsCheck = [ + "ipaddress-python2-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for ipaddress"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/types-paramiko/default.nix b/pkgs/development/python-modules/types-paramiko/default.nix new file mode 100644 index 00000000000..f43fc5ed507 --- /dev/null +++ b/pkgs/development/python-modules/types-paramiko/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, types-cryptography +}: + +buildPythonPackage rec { + pname = "types-paramiko"; + version = "2.8.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-HWkCWoa5509G2OHyPFijb5RVORAvE1tQEgL7myxP0SI="; + }; + + pythonImportsCheck = [ + "paramiko-stubs" + ]; + + propagatedBuildInputs = [ types-cryptography ]; + + meta = with lib; { + description = "Typing stubs for paramiko"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 165c65f3a9e..c62190ff5da 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.11"; + version = "2.27.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-an7SSyF4CvSlteJMMQss2IX7YS31/ZVYTQPYfl8qGVo="; + sha256 = "sha256-/ROC+i4o6shI+u2wMyhAIE8G8MtRcAjjx7goLKU+VtI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 24ee2ce5b29..46fe7da5d1c 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.9"; + version = "57.4.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U273R0T44eS+T8cZiH+IbnTkzzx5K0oGmEMgvk30ULU="; + sha256 = "sha256-mhNRNnnGQPZhbi2atQ1DHJnKiumEipckP4h8gP1c8pQ="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 3e6eac4427a..235535ce971 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.9"; + version = "1.26.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-q9LUhXg3SCsYNLSBfwWHZ43MUx28mr5M3k2ijO8/Uiw="; + hash = "sha256-JNZORBFohR6wXx0CLeGK4xVY9WScjxEX44TC6F4xMVs="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 7dfd5c9d276..4c776070ae6 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.7.0"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447"; + sha256 = "sha256-1fLlOpoA2zIkqMNjSbU4Dg4i0a7GxpSxT7lIPuk8YgU="; }; pythonImportsCheck = [ "unidiff" ]; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 868ad5fed96..cbc03ea0d04 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -6,19 +6,23 @@ buildPythonPackage rec { pname = "versioneer"; - version = "0.21"; - disabled = pythonOlder "3.6"; + version = "0.22"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "64f2dbcbbed15f9a6da2b85f643997db729cf496cafdb97670fb2fa73a7d8e20"; + hash = "sha256-nw6aLLXvUhy/0QTUOiCN2RJN+0rM+nLWlODQQwoBQrw="; }; # Couldn't get tests to work because, for instance, they used virtualenv and # pip. doCheck = false; - pythonImportsCheck = [ "versioneer" ]; + pythonImportsCheck = [ + "versioneer" + ]; meta = with lib; { description = "Version-string management for VCS-controlled trees"; diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 9fe43d16f92..247a192588d 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -5,7 +5,6 @@ , setuptools , geopy , docopt -, pyyaml , certifi , amqtt , websockets @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.9.2"; + version = "0.10.0"; disabled = pythonOlder "3.8"; @@ -27,24 +26,30 @@ buildPythonPackage rec { owner = "molobrakos"; repo = "volvooncall"; rev = "v${version}"; - hash = "sha256-OTs282z7qzILl/xxM3whaxiQr8FZOfgceO2EY3NJKbA="; + hash = "sha256-HLSanXJs1yPSgYo4oX0zJtrV5sKkxV2yLPhc2dVRHY8="; }; propagatedBuildInputs = [ - geopy - docopt - pyyaml - certifi - amqtt - websockets aiohttp ]; + passthru.extras-require = { + console = [ + certifi + docopt + geopy + ]; + mqtt = [ + amqtt + certifi + ]; + }; + checkInputs = [ - pytestCheckHook asynctest pytest-asyncio - ]; + pytestCheckHook + ] ++ passthru.extras-require.mqtt; pythonImportsCheck = [ "volvooncall" ]; diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 2d0988473dd..8228047d9ce 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.13.1"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-85ohhynXHWjuwKB18DciB48tNGZcHzafobMDaGoTkoc="; + sha256 = "sha256-901VW56vr6ysMlzspgVbPMLnDIpJRgSEOEQ8ohHp+mc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 6b10b30a193..ef8e6cfd247 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -28,6 +28,7 @@ , requests , scikit-learn , sentry-sdk +, setproctitle , setuptools , shortuuid , stdenv @@ -37,13 +38,13 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.10"; + version = "0.12.11"; src = fetchFromGitHub { owner = pname; repo = "client"; rev = "v${version}"; - sha256 = "198c6zx7xih74cw0dwfqw7s7b7whik7wv4nfq6x6xw0kw86r6hby"; + sha256 = "0av4vv4llan40678bw0vlah0gn6hjg5pdqwq0c5cv15lqrdb8g32"; }; # The wandb requirements.txt does not distinguish python2/3 dependencies. We @@ -70,6 +71,7 @@ buildPythonPackage rec { pyyaml requests sentry-sdk + setproctitle setuptools shortuuid yaspin @@ -99,11 +101,11 @@ buildPythonPackage rec { "tests/test_telemetry_full.py" "tests/wandb_agent_test.py" "tests/wandb_artifacts_test.py" - "tests/wandb_history_test.py" "tests/wandb_integration_test.py" "tests/wandb_run_test.py" "tests/wandb_settings_test.py" "tests/wandb_sweep_test.py" + "tests/wandb_verify_test.py" # Fails and borks the pytest runner as well. "tests/wandb_test.py" diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 27c7521cef8..3d752596dec 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "54.1"; + version = "54.2"; disabled = !isPy3k; format = "pyproject"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - sha256 = "sha256-+lfbhi4GvQHF59gtrTmbO5lSo5gnAjwXvumxwGH/G70="; + sha256 = "sha256-1eiqguPiokd6RUPwZG2fsUCAybo0oIWXUesjdXzABGY="; }; patches = [ diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 3b88afa7e65..3bd0d5b55b9 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.13.0"; + version = "0.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "sha256-n+TIzlnyPeSywTQr7wlGNezsbQ2+S/WYt1H95+Id2Rw="; + sha256 = "sha256-QQPrAfk+BX8mjqn9ISim9hLEZR2nbgxbkwCv+91yeRY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 790aaec3ce3..13cc5b89c2a 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , coverage -, nose +, pytestCheckHook }: buildPythonPackage rec { @@ -14,11 +14,13 @@ buildPythonPackage rec { sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21"; }; - checkInputs = [ coverage nose ]; + checkInputs = [ coverage pytestCheckHook ]; - checkPhase = '' - nosetests - ''; + disabledTests = [ + # incompatibilities with security fixes: https://github.com/martinblech/xmltodict/issues/289 + "test_namespace_collapse" + "test_namespace_support" + ]; meta = { description = "Makes working with XML feel like you are working with JSON"; diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index f0203d58dff..7243b3891f4 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "0.8.0"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "lyz-code"; repo = pname; rev = version; - sha256 = "sha256-Gkq80YMeiPy7xxLauA/nloW4znMV2tfE+e24HyZgUaQ="; + sha256 = "sha256-YCC4xK1fB5Gyv32JhbSuejtzLNMRnH7iyUpzccVijS0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index e29ff3b12de..8d5892979e1 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -2,18 +2,22 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder , yara }: buildPythonPackage rec { pname = "yara-python"; - version = "4.1.3"; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - sha256 = "sha256-lOP+OVnMgpP8S+Q3jGRNEAFXAohXgX5Nvl+l4EK5ebs="; + hash = "sha256-jNxYuIddMzANZoQ0p7BbRrX6ISpaCA7T6j+iS+FOocg="; }; buildInputs = [ @@ -28,9 +32,13 @@ buildPythonPackage rec { "--dynamic-linking" ]; - pytestFlagsArray = [ "tests.py" ]; + pytestFlagsArray = [ + "tests.py" + ]; - pythonImportsCheck = [ "yara" ]; + pythonImportsCheck = [ + "yara" + ]; meta = with lib; { description = "Python interface for YARA"; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 319cd7cce0f..b81ac4f1fc5 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.38.3"; + version = "0.38.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-pLTqnIbe7rTZrQFe//0/h5Tyx0GzJW+q9mUuDNifo/0="; + sha256 = "sha256-CLV1/maraSJ3GWnyN/0rLyEyWoQIL18rhm35llgvthw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 1cb2780cc94..f91706b97d1 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zfec"; - version = "1.5.5"; + version = "1.5.7.2"; src = fetchPypi { inherit pname version; - sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca"; + sha256 = "sha256-TuUZvg3MfaLohIK8/Av5d6Ql4dfoJ4z1u7uNAPiir7Y="; }; propagatedBuildInputs = [ pyutil ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index d8398ac4023..56d2704fcc1 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.66"; + version = "0.0.67"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "18g0i6b60ndfmbvdsx5pniq56fyc5k39ylp3sjhrfjcj434wvbvc"; + sha256 = "sha256-qkXXrwqMEtfafHsXtlyy6HFwuo/8sOZuQ9SvGRJkGtA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 54305697272..5f4203634ac 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, pydantic , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.34.0"; + version = "0.35.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,13 +19,16 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-hqq/CYlM9ZahDiH3iFLFzfE22CB19WQnFIDt+gCrEXU="; + sha256 = "sha256-Bte4pAi+atdkMvxYlzdN/UOrHB2WKfl44U9m/vKFMoA="; }; propagatedBuildInputs = [ aiohttp + pydantic ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 6a4a87bc896..7bad0b442da 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -1,6 +1,6 @@ { stdenv, runCommand, ruby, lib, rsync , defaultGemConfig, buildRubyGem, buildEnv -, makeWrapper +, makeBinaryWrapper , bundler }@defs: @@ -118,9 +118,12 @@ let wrappedRuby = stdenv.mkDerivation { name = "wrapped-ruby-${pname'}"; - nativeBuildInputs = [ makeWrapper ]; - inherit (ruby) gemPath meta; - buildCommand = '' + + nativeBuildInputs = [ makeBinaryWrapper ]; + + dontUnpack = true; + + buildPhase = '' mkdir -p $out/bin for i in ${ruby}/bin/*; do makeWrapper "$i" $out/bin/$(basename "$i") \ @@ -131,6 +134,15 @@ let --set GEM_PATH ${basicEnv}/${ruby.gemPath} done ''; + + dontInstall = true; + + doCheck = true; + checkPhase = '' + $out/bin/ruby --help > /dev/null + ''; + + inherit (ruby) meta; }; env = let diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 602f6815fb9..68112b01cfb 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.9"; + version = "1.6.10"; subPackages = [ "cmd/actionlint" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-UDa/qFtRTED6d+lPbjNknX9qFZ3QZ9jiD0ByvLsGARk="; + sha256 = "sha256-RFsNJiCeSAeEWOUnfBpeIZKoS2mlXazYMQd1M6yFLGU="; }; - vendorSha256 = "sha256-0tytdTZxnWYl8AxaquF0ArY3dy51j8H2kzw69qcSHzk="; + vendorSha256 = "sha256-CxNER8aQftMG14M+x6bPwcXgUZRkUDYZtFg1cPxxg+I="; nativeBuildInputs = [ ronn installShellFiles ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 27ad79977ba..f2f9ec46b6e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.906"; + version = "2.0.962"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-sNwdbKaojDR8q/ugs+ot4ObpIodk2uJVvxcBQEb6d5A="; + hash = "sha256-hpoOOU1Z8xVqoJJdGcSoWujm3amiPkZ1Qjiqh66J+ZM="; }; nativeBuildInputs = with py.pkgs; [ @@ -53,6 +53,7 @@ buildPythonApplication rec { bc-python-hcl2 boto3 cachetools + charset-normalizer cloudsplaining colorama configargparse @@ -71,6 +72,7 @@ buildPythonApplication rec { packaging policyuniverse prettytable + pycep-parser pyyaml semantic-version tabulate diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 36c85285704..6ef9806bf37 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.172.0"; + version = "0.173.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-N3mP1dhul7Ljn278CJmge4IrVllQJsc73A3/7mTSU70="; + sha256 = "sha256-F0t85/sq9p+eNEf2XAGxw+ZWeRgUbkhrKFdGASijuAs="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index da73737530e..503d5c63049 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.42.0"; + version = "6.43.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-rVqHMhiuFLVTz/J9TGnA/42m9GaGORsf+CrUUqsdUfs="; + sha256 = "sha256-+eJCN890vm4WBcMZ2VCGOS8WUyIckL+DfQVNaUSovGE="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index c7a96ce247e..9f19dee156d 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "avro-tools"; - version = "1.9.2"; + version = "1.11.0"; src = fetchurl { url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "169cv4fjsj69fa2s87gh1i7wk0xzh3l7sx5yyz3cgyjalg4a12n1"; + sha256 = "sha256-XnfvND5WPojzIS8t0ntwn+3+Zjz9ABEUK2FO6aD4ulw="; }; dontUnpack = true; diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 271d946000b..093a37e2b96 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "1.2.5"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dpdQ1qBfLU6whkqVHQ/zQxqs/y+nmdvxHanaNw66QxA="; + sha256 = "sha256-aOxwM9ur0E/biLOzhDyTCWYBwdbpsTQ49aCfkFea5ck="; }; - cargoSha256 = "sha256-jidZhaB8gF4QBcTvVuygTZdQnlOVwOQO8MMjUuSPht0="; + cargoSha256 = "sha256-AUoLwryuEdUdWasaHuap6qff8DRi90iq/v4afyG9beo="; buildInputs = lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/development/tools/biodiff/default.nix new file mode 100644 index 00000000000..340c3b736ca --- /dev/null +++ b/pkgs/development/tools/biodiff/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "biodiff"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "8051Enthusiast"; + repo = "biodiff"; + rev = "v${version}"; + sha256 = "sha256-M1hwuIe5+quxcvFAacBkxQMiQyN6lhtWA6hEi5Buoho="; + }; + + cargoSha256 = "sha256-NIt4D2/T7Zl7rgksbQeVo6cNBt6cZkUGTJGztnp6SB0="; + + meta = with lib; { + description = "Hex diff viewer using alignment algorithms from biology"; + homepage = "https://github.com/8051Enthusiast/biodiff"; + changelog = "https://github.com/8051Enthusiast/biodiff/blob/v${version}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 60d8d8f58b8..1b0ccab2964 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jJaob2eaozMFRsXwW6ulgM5De3UmpLZddTHwq6PnaeE="; + sha256 = "sha256-8GwZsFvxaTtG/q7DaWvZcGdbyJ4Cm41BqSvwq3SqoEg="; }; - vendorSha256 = "sha256-wPnrkfv6pJB6tkZo2oeMbWHbF9njGh1ZEWu8tkHDhGo="; + vendorSha256 = "sha256-g3bvfNF0XkC12/tRZsO+o2z20w+riWiHOer8Pzp1QF0="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 44e8b9e4414..a53bdd4b0c8 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ijR3RjGzm0HtVp5lSKGJemCGkRzhgQqaDOgg+MjDB1c="; + sha256 = "sha256-8tT00ppqBGLw2h+RxaiD7r3XYzyvXOHj1U8V5H/ftyQ="; }; - vendorSha256 = "sha256-NmTdS5xgv0o7AT4lBJk472Lq1e73EcrcfnI8RIxKEoc="; + vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo="; doCheck = false; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 7dfb6c9b2ad..80919cfc377 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "sha256-948g0ZMfAoJw53vA8MAKWg76Tst6VnYwSjSuT0aeKB0="; + sha256 = "1sgnxw58srjxqnskl700p7r7n23pfpjvqpiqnz1m8r6c76jwnllr"; }; jarsrc = fetchurl { url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-gvAUFKzs3bsOvW1XFQW7Zxpv0JMja82sJGjP5fLqqAI="; + sha256 = "13f4n15i0gsk9jq52gxivnsk32qjahmxgrddm54cf8ynw0a923ia"; }; JARNAME = "${pname}-${version}-standalone.jar"; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 49d454d8686..6e79bee6a24 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - sha256 = "sha256:1acm1z24cw2yzykwwjfrcf66mi16xvsrnrrhrsd9yqrajqab707n"; + hash = "sha256:hYQOmnJjsOIIri5H0/B5LhixwfiLxxpVoN4ON1NUkWg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 6c366be8b42..f6d5de34893 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - hash = "sha256-5RwhIIOtqeMl/Gyufl5U1gTEpoCjdPJP5MbVnhEKYMM="; + hash = "sha256-4PtLe864MQ9wUn+l1fshiiTQvP06ewD39TDYZl70Hgg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 759c9f68159..26770276372 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "8ccccd8a1d7efa097b7f30e0ec76e39b3aa0f3df"; - version = "2021-11-08"; + rev = "ef403f4ce126441f126dfc61ca6357a7b42539af"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "376yaucqzoe36VKaJmCz+5vQHc+KNQG4iamAdOb/YQU="; + sha256 = "G7nR2wV0Wv019bCA+ecfYhmFh/DDHFjihKGFKNQ5dgM="; }; dontBuild = true; diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index b9ae4e4dd88..df644935cf1 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-xjuHMjJjA4sx2Hrr6tPpvKtSmhGZ3AZka733DLxmYfk="; + sha256 = "sha256-Pdnu0zG1LteAob0YUuG/XDh2pfBj5UO2GrkWFlMZeGY="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/development/tools/checkmate/default.nix index b8ad9c6d778..bcb115e409b 100644 --- a/pkgs/development/tools/checkmate/default.nix +++ b/pkgs/development/tools/checkmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "checkmate"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "adedayo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RCGJ7Xa5HLzcngv79NyocbNGoYZMAKyv/svRScM1vq0="; + sha256 = "sha256-nzhzeXy70UQ1HP3/PCBnUPhrjg7CnKURMCH0iJ099E0="; }; - vendorSha256 = "sha256-ZURtNED8gb0QsuXxJd9oBSx68ABcwlvVpkbd7lhiA9s="; + vendorSha256 = "sha256-uQRAVbLnzY+E3glMJ3AvmbtmwD2LkuqCh2mUpqZbmaA="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index bd9819f8a00..0a369bd5f03 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.02.09"; + version = "2022.03.09"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-WfPjn0S7Jd6zFcfaudcSsx9d5luyZuaeB8lFaOLg21w="; + sha256 = "sha256-gPn3wORb30I/zTXUdxUxMesKFJx6ES7jEjUYuC/DAVI="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 4fa198f32c0..f1f44a57775 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y1YpPYTejeZjz4nJmyAPT8rYaEguaJpBfAAfF38dpA4="; + sha256 = "sha256-G1RQEKb3vK8lg0jakCtIMgQXmWqfsq0QWHwU8TAbBbE="; }; vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI="; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index f2136346c1f..f02a6cf8762 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.6.0"; + version = "7.7.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-Zi+gyO+2AKDgcfgYrzLskJYZ6hQKOVlOL7Y9nxH/pGg="; + sha256 = "sha256-BKEUKQQxZ+Maq2JSHeWuQ7Lhgfc33pSiVS6VfAlMu/g="; }; - vendorSha256 = "sha256-OF3parnlTPmcr7tVcc6495sUMRApSpBHHjSE/4EFIxE="; + vendorSha256 = "sha256-G9HdhPi4iezUR6SIVYnjL0fznOfiusY4T9ClLPr1w5c="; doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 67433ab5d88..222ffb0688f 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.287.1"; + version = "2.288.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-4SPrtX3j8blWTYnSkD2Z7IecZvI4xdAqHRJ1lBM0aAo="; + hash = "sha256-bP+6aAKnu6PxN9eppFXsqOSVSGQ6Lv+gEF2MdEz52WE="; }; nativeBuildInputs = [ @@ -102,11 +102,6 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - # Set up Nuget dependencies - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - # Never use nuget.org nuget sources Disable -Name "nuget.org" @@ -184,6 +179,11 @@ stdenv.mkDerivation rec { "EnsureDotnetsdkPowershellDownloadScriptUpToDate" ] ++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ] + # Tests for trimmed runner packages which aim at reducing the update size. Not relevant for Nix. + ++ map (x: "GitHub.Runner.Common.Tests.PackagesTrimL0.${x}") [ + "RunnerLayoutParts_CheckExternalsHash" + "RunnerLayoutParts_CheckDotnetRuntimeHash" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 9c57c500592..6dc0a7d30ee 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "14.8.0"; + version = "14.8.2"; in buildGoModule rec { inherit version; @@ -14,13 +14,13 @@ buildGoModule rec { "-X ${commonPackagePath}.REVISION=v${version}" ]; - vendorSha256 = "sha256-MdGLl77DFXPudt26qICSH+1UuQAR8Rb/nl0Ykb0hjgE="; + vendorSha256 = "1aa04hbavr0bclddp5adjwwj21sp46gbhjydxc3w7vs1siw0ivq2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-+DwOKlFu9m2kt4DwaSp/Jq3eZ/+FFxV1Q7bKOy5DfoE="; + sha256 = "1zwr09lrrc3xx3sp00vs30ks0n77d7v0xkz0mz9jy2qdls9nfmrv"; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 2b61d377e9f..9c87c5f08f4 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.319.3"; + version = "2.332.1"; src = fetchurl { url = "http://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "sha256-c92Rs5W89i/iXm0wdHZfFRDJ5YTswen69EBRBkGBtDQ="; + sha256 = "0xrrqdwfz19mr4wl4sdzk0qnq9rjdh65vd1386qsn6a4axwv652s"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index f137cbd078b..6094df8757a 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sNVl+bbCj3vPYz4wKOaAHeaPCCubG4XvXZ+AZijhFJE="; + sha256 = "sha256-ys7fuaD1jj3tWD6U+BRvqFneZEdKV5c1RO2FLEtqIUk="; }; - cargoSha256 = "sha256-FHiX9XpNjBFfs9fwi3Wzq7bAwRi7e/sqtji5WWPA5Qo="; + cargoSha256 = "sha256-5/uF0aPNNNUruRF8euuEnGSJHsRehSZipa0677zc12c="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/development/tools/database/litestream/default.nix index 6a7e53e6cf2..00e541efc0d 100644 --- a/pkgs/development/tools/database/litestream/default.nix +++ b/pkgs/development/tools/database/litestream/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "litestream"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "benbjohnson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IEdTLf+fEp19FhwL3IaGT9HGKQoa6HwFox2gf0lvFu4="; + sha256 = "sha256-0Yyx8kbpu3T868hI9tJkBIjplAoQDA4XzhraHhOp61Q="; }; ldflags = [ @@ -19,7 +19,7 @@ buildGoModule rec { "-X main.Version=${version}" ]; - vendorSha256 = "sha256-ScG8cukUuChOvN9r0HvVJsYnu1X9DSO7aD32iu55jIM="; + vendorSha256 = "sha256-zCz9dki87dpZCo+/KuFzwtv/0TlBcvQDTxTuLN2FiHY="; meta = with lib; { description = "Streaming replication for SQLite"; diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index eee49d1c6fc..18614291d58 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.8.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-pP5gNWRucr2rJqBPBt4Y/akf7tABFWhmr3EWC3/kj+g="; + sha256 = "sha256-z7ebwidY+p350XaGeyohoSHWc2DhfzpRxsRDLON1BuA="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-F105SOFWEhFVGMmPOEdBZwhNHCYkRh1HI7fESzL2uQw="; + cargoSha256 = "sha256-PQdLoNJL9szPzPtFRznWS0lngTvtWK+Ko2rp4JWH9dQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 7c95565487d..82b7ea8ea95 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-ZgLg+pIdTBxMNXgFFL8jCbQa444pkgtnSx+QjMqQhag="; + hash = "sha256-Cem53w/pzSDTi9A9mh9VeLlRn1m6KhkxWaqJjEtfwUs="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix index 83d57ba5c2e..01cbb22c854 100644 --- a/pkgs/development/tools/database/webdis/default.nix +++ b/pkgs/development/tools/database/webdis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.19"; + version = "0.1.20"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "sha256-Q5tFEuyTfjXaa/0JOpNjzokstKaQPwR1szqdzYrqXxc="; + sha256 = "sha256-QvPawRYmk5HcE4XnI4B4G7AAaN/8cFov9lOa2e++g4A="; }; buildInputs = [ hiredis http-parser jansson libevent ]; diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index a313cc51222..fdec9ad19ed 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-LIk23TZiLP2FEeHVEtd3CCUgBJ9YijclpFLyDhv6zRA="; + sha256 = "sha256-n9xKg8RN2o20dTsV8a0tAJjmvAlwZ7TF2cTrXx+f49k="; }; vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU="; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 9681bfe75bd..478ef3b6fc6 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.8.1"; + version = "1.8.2"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-GIwu3G8cy2xKqFzN/7d/mbpS+5oGJa3QexoELlEwWRA="; + sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik="; }; subPackages = [ "cmd/dlv" ]; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 2b122326bfe..86333625725 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,26 +1,24 @@ { lib +, argon2-cffi-bindings , buildPythonApplication +, check-manifest +, devpi-common +, devpi-server , fetchPypi -# buildInputs +, git , glibcLocales +, mercurial +, mock , pkginfo -, check-manifest -# propagatedBuildInputs -, py -, devpi-common , pluggy -, setuptools -# CheckInputs -, pytest +, py +, pytestCheckHook , pytest-flake8 -, webtest -, mock -, devpi-server -, tox +, setuptools , sphinx +, tox +, webtest , wheel -, git -, mercurial }: buildPythonApplication rec { @@ -29,24 +27,45 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "362eb26e95136a792491861cc2728d14a6309a9d4c4f13a7b9c3e6fd39de58ec"; + hash = "sha256-Ni6ybpUTankkkYYcwnKNFKYwmp1MTxOnucPm/TneWOw="; }; - buildInputs = [ glibcLocales ]; + buildInputs = [ + glibcLocales + ]; - propagatedBuildInputs = [ py devpi-common pluggy setuptools check-manifest pkginfo ]; + propagatedBuildInputs = [ + argon2-cffi-bindings + check-manifest + devpi-common + pkginfo + pluggy + py + setuptools + ]; checkInputs = [ - pytest pytest-flake8 webtest mock - devpi-server tox - sphinx wheel git mercurial + devpi-server + git + mercurial + mock + pytestCheckHook + pytest-flake8 + sphinx + tox + webtest + wheel ]; - # --fast skips tests which try to start a devpi-server improperly - checkPhase = '' - HOME=$TMPDIR py.test --fast + preCheck = '' + export HOME=$(mktemp -d); ''; + pytestFlagsArray = [ + # --fast skips tests which try to start a devpi-server improperly + "--fast" + ]; + LC_ALL = "en_US.UTF-8"; __darwinAllowLocalNetworking = true; @@ -57,5 +76,4 @@ buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; }; - } diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 3bcd0d6777d..0e88e1c4926 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.70.0"; + version = "1.71.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-oLcWVUP9A/tcJYKiaBrqAdyNKESaVFOaNiG/fAVQb2c="; + sha256 = "sha256-cj2+DmJyLa6kFkH9JflaR3yFFXBaVZHO6czJGLEH7L0="; }; meta = with lib; { diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index cd324ae387d..477b28b6a1f 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.8"; + version = "0.6.10"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-VXBDgBcByONEOznUVbzxySE7rcevIwCk8rVxRxhF0Gc="; + sha256 = "sha256-CzVcoIvf9sqomua5AJtNpCnGfPmCNJMwex/l7p+hEfw="; }; - vendorSha256 = "sha256-6lzusbfedDJESJIxsTVGoRnjdtPnMSDdL2OjXIFFL04="; + vendorSha256 = "sha256-uUx9C7uEdXjhDWxehGHuhuFQXdUjZAXK3qogESkRm8E="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix index 96a8d694e77..29304d7d265 100644 --- a/pkgs/development/tools/efm-langserver/default.nix +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.40"; + version = "0.0.41"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-0C7iSWO7zzOhPgzxj9k2MK6poi4XaCbMjTGah3ohVJg="; + sha256 = "sha256-0s6GmMbjtXGUcChzc8Pkqvmt3iU5uDUqe76OUDngboU="; }; vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI="; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index df55b51a0ad..655ad71e7b2 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -83,33 +83,33 @@ rec { headers = "0rxbij6qvi0xzcmbxf3fm1snvakaxp9c512z9ni36y98sgg4s3l8"; }; - electron_15 = mkElectron "15.3.7" { - armv7l-linux = "1cc5ce2ab6d795271f54e67a78eec607c0a14761ee1177078a157abad7aa61e6"; - aarch64-linux = "caf7146c738207b78ea63e95fa055f36829bb360e2d81fce10513fae238f2750"; - x86_64-linux = "e424dded1ac545634128bfb5c6195807aa96b7761be95f52ed760886f42874cc"; - i686-linux = "9f1898f9c96672076a87ca559dd11788964347fd17316f0c24f75c9c53985ce5"; - x86_64-darwin = "282f8737fdc73a3ddc82f56b4affc9f6fefec1b233e532e08d206344b657cd8a"; - aarch64-darwin = "d64e12c680d60b535fea7de4322504db04a83e63e8557d8e9b3677a334911752"; - headers = "0nfk75r72p5dgz0rdyqfqjmlwn2wlgn7h93a1v5ghjpwn1rp89m7"; + electron_15 = mkElectron "15.4.0" { + armv7l-linux = "40c073a3b416f83264327bdf5e33b334ffcd56a729ef237360d66f520f670d16"; + aarch64-linux = "ef18ba74b4fa34a26f9ee819bb908c60d0dd9ec2048414629979760f262d72f8"; + x86_64-linux = "5bdea4cbf5559491e9ad9f365fa6f7ec26603fd6f68bfa8848f2884ebd51662d"; + i686-linux = "636d0e28bb20ca127c9b8722fe39e7e7d95fc63bd15b156b7af563296b3d9595"; + x86_64-darwin = "8a132b2be0f27c7e8fa9a91a8b4b0fcdf3ec571c721cb5f5610dc8a6b3f0fd26"; + aarch64-darwin = "82b29c37a427464a9278d617435ca19f472b00689c9e58163e99f30b90f33046"; + headers = "0fc1sck7g160klpqzfcqv9zc45ia914mrncyma58zzcbzpk6k6yb"; }; - electron_16 = mkElectron "16.0.9" { - armv7l-linux = "7071f18230f5d4bbf84d3f1955056f2a6952e5487dfdecb51708e419c0b1a594"; - aarch64-linux = "a7873d1cb2b632c9c48a6942bf4a436463c07cc488f4b0b4575e0e4a496c357d"; - x86_64-linux = "06d57bc1e59ebe046d5731d64eb67c41e793731e67aefbf33f4e3c23139285d4"; - i686-linux = "8603545bdaec512380050ce6f9f1ef283514b960c8d6c8682eaa6563d93705b2"; - x86_64-darwin = "d092af5e5fddb295e9ebb9b639006deec125b1f6b30896d22e98b84e5a74af40"; - aarch64-darwin = "62fd4d033fd0ad62d1c13ac219bd68e76b1625c305097c7aa2ab799f45c9e879"; - headers = "0d0jkjjfq32j09bjlpmx1hvi20rh8yfkfm7hfcv3xs831physbj5"; + electron_16 = mkElectron "16.0.10" { + armv7l-linux = "1a72fe59011cfcc1f376f2948dd5a70d2f75d6c12fb682a0246d2e596227b5e0"; + aarch64-linux = "46cd1393816364a666ead410505bce4b51d68ce872446a71d16886b88c4b275a"; + x86_64-linux = "3b4779e41e27200ce5fa94d20f9df05ff5c757be6805eb0e8952fe198d66f324"; + i686-linux = "9e1426a8135d3fe195ba9fc1a5ea5ad4d5ce96bd513691897b39106698e3c3c8"; + x86_64-darwin = "00b0222efa67fbb29f723fabebc4221646ebd6d5fdc09524df9a203f63ce660c"; + aarch64-darwin = "1203f6ec4e8b97312254ceb122ca4399f39ae67bfe1636e426a798c89ec2a9ee"; + headers = "10f6px88vg6napyhniczi6l660qs4l5mm0b9gdlds4i1y94s1zrl"; }; - electron_17 = mkElectron "17.0.1" { - armv7l-linux = "0867f74427152c3b4110e11c9ce38e351531554868f62665b064f3d1dae5fd00"; - aarch64-linux = "7715f7eaaa287f83b945f491c2ca1eb0befed93725d81c85d06f8584db3a6cc4"; - x86_64-linux = "de789f548d6cc2ddff8db53b3bbfaac5631e90f14506935d2d7fafedf82e5adf"; - i686-linux = "4e81ce43552f22e271527d5f7ab84db6dda61c0922f8b6350e44fa52967f2dd9"; - x86_64-darwin = "d270858938e2f0e68479d91384e6f4d01be1d4e22b305dc2023ecd1a5e113d17"; - aarch64-darwin = "aecf14a88ede956e93fee5b48b773ad4d8d6605424c9d69a45950b673c89f8ca"; - headers = "1c3fl9fxmhkhvm825vmyxm8dm89xfy4iwqrb4ifmv5cz9dh9b9a8"; + electron_17 = mkElectron "17.1.0" { + armv7l-linux = "09d92195821aad4ac03fbc858287a7372b6aa059081bb825d267853ee1b0425d"; + aarch64-linux = "6a34d6802d44a391902f53baf0adc8b819d33e7c31b34614757b17b3223c9d1e"; + x86_64-linux = "106ec28a5969366c1e1f642cc33ac41950c68bd182db23b04d7ac6886bfe28e8"; + i686-linux = "19fe206be07a6df7f9f0ecdb411e3cafd3a53618edb19cc6adc77156f698444e"; + x86_64-darwin = "bd80d6b0b62c9bec195d264aa21a255f4324a8b56849e04972c1fcc262757c31"; + aarch64-darwin = "83fe2fc24976d09a0e0fcc3a60226f190cf9b67287fe4434d3d76d59fa45315c"; + headers = "1zv1pigfbis1bsan28wx3bgkdwjc48pjq19wmxs73kd1khsy6w8r"; }; } diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/development/tools/ent/default.nix index ba30aa97e09..79470814ada 100644 --- a/pkgs/development/tools/ent/default.nix +++ b/pkgs/development/tools/ent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ent-go"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "ent"; repo = "ent"; rev = "v${version}"; - sha256 = "sha256-TG08GRo1gNxC5iHt/Md5WVWaEQ1m2mUDGqpuxw8Pavg="; + sha256 = "sha256-MvfbQKGVYWbZkqc3X3BqsB+z2KMkr0gMOquL02qHwUY="; }; - vendorSha256 = "sha256-n5dS78SSBAEgE4/9jMZZhbOQZ3IGi9n3ErA0ioP9Tsg="; + vendorSha256 = "sha256-BF2eD/jOtY1XhZ0hB7f3/frKQYwS9PbuGxum5SSnjzA="; subPackages = [ "cmd/ent" ]; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 82e69c2d91e..3d136a62f52 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.23"; + version = "0.14.27"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-7J8l4PCXDSddlUdMYaTo3KQjhUl1IRpks0iMiYxJzD4="; + sha256 = "sha256-h5PodIFzqD0hJb89eGxMJN6uvrF2exOHJYk+Wmwvso8="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index c4b0b656953..58e048b4f5f 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -9,15 +9,13 @@ let in buildGoModule rec { pname = "faas-cli"; - # When updating version change rev. - version = "0.14.2"; - rev = "b1c09c0243f69990b6c81a17d7337f0fd23e7542"; + version = "0.14.3"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-OdFd4q5IHu4FjNArcqVt4dNyLWegR4GdAyyCzgNIU+Q="; + sha256 = "sha256-1aflQXfW/y31Dk0OZW77qNQKEwkhi6p8ZBfTUyRDbdo="; }; CGO_ENABLED = 0; @@ -28,7 +26,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/openfaas/faas-cli/version.GitCommit=${rev}" + "-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}" "-X github.com/openfaas/faas-cli/version.Version=${version}" "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}" ]; diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index db9aba705cf..336c24819ba 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-uioL4ysioxo+YMCa3VPoUMpY1cVZJ0Jljt8d9jWRT9k="; + sha256 = "sha256-QmHb5MWZpbZjc93XgdPFabgzT7S522ZN27p6tdL46Y0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index fc44efca828..f3a5ab297ee 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-bindata"; - version = "3.22.0"; + version = "3.23.0"; goPackagePath = "github.com/kevinburke/go-bindata"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "kevinburke"; repo = pname; rev = "v${version}"; - sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; + sha256 = "sha256-pIEkD0HD/6JFOzkvEG9j9yQP7hLWvmXU3MiyvVFH2rY="; }; subPackages = [ "go-bindata" ]; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 254113f2106..7a4070d96d6 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -2,19 +2,17 @@ buildGoModule rec { pname = "gomodifytags"; - version = "1.6.0"; - - vendorSha256 = null; - - doCheck = false; + version = "1.16.0"; src = fetchFromGitHub { owner = "fatih"; repo = "gomodifytags"; rev = "v${version}"; - sha256 = "1wmzl5sk5mc46njzn86007sqyyv6han058ppiw536qyhk88rzazq"; + sha256 = "1yhkn9mdvsn9i5v03c5smz32zlhkylnxhkcbjb7llafxzbhzgfm6"; }; + vendorSha256 = "sha256-8efqJfu+gtoFbhdlDZfb8NsXV9hBDI2pvAQNH18VVhU="; + meta = { description = "Go tool to modify struct field tags"; homepage = "https://github.com/fatih/gomodifytags"; diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index ae813c0f6ee..0f57be390f2 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-2+tbwFkT3Z2dfYCs1Fd/9IqD39VuTMGHQ43b7gBBktM="; + sha256 = "sha256-VBan3IKqf3AFrPoryT/U7lGabFHSXMhaBpnNw3LRH/I="; }; modRoot = "gopls"; - vendorSha256 = "sha256-8osb5C5G58x9KWCxqiepmN6J0jp+q6aR+As/pJeeTKM="; + vendorSha256 = "sha256-pW4G89fYFwVM2EkIqTCsl2lhN677LIMFpKPvLVV2boY="; doCheck = false; diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 72d5469f0f9..4f51c8238ce 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -28,13 +28,13 @@ }: mkDerivation rec { pname = "vaultenv"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "channable"; repo = "vaultenv"; rev = "v${version}"; - sha256 = "sha256-17tdlqG8z4GviI7kkLbktC6SqnQFDdZhWtejscG0n48="; + sha256 = "sha256-sH4iaKQXgwI/WISXzMR7xqh9Dyx61U/gjYn7exgUetI="; }; buildTools = [ hpack ]; diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix index f18f3f556c5..558c9e019e1 100644 --- a/pkgs/development/tools/jless/default.nix +++ b/pkgs/development/tools/jless/default.nix @@ -1,21 +1,27 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, python3, AppKit, libxcb }: rustPlatform.buildRustPackage rec { pname = "jless"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "PaulJuliusMartinez"; repo = "jless"; rev = "v${version}"; - sha256 = "sha256-IK+EllkctdhIYuzj7eLjadxKoutICPeSXAjLMFiRjmo="; + sha256 = "sha256-NB/s29M46mVhTsJWFYnBgJjSjUVbfdmuz69VdpVuR7c="; }; - cargoSha256 = "sha256-CAyKWwtMq5UOODVRrpVHrhlep2wqG434dMGeYV2FSZY="; + cargoSha256 = "sha256-cPj9cTRhWK/YU8Cae63p4Vm5ohB1IfGL5fu7yyFGSXA="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ python3 ]; + + buildInputs = [ ] + ++ lib.optionals stdenv.isDarwin [ AppKit ] + ++ lib.optionals stdenv.isLinux [ libxcb ]; meta = with lib; { description = "A command-line pager for JSON data"; - homepage = "https://github.com/PaulJuliusMartinez/jless"; + homepage = "https://jless.io"; license = licenses.mit; maintainers = with maintainers; [ jfchevrette zowoq ]; }; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index f1f5b37c10d..ba78a4ce6bc 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "jp"; - version = "0.1.3"; - rev = version; - - goPackagePath = "github.com/jmespath/jp"; + version = "0.2.1"; src = fetchFromGitHub { - inherit rev; + rev = version; owner = "jmespath"; repo = "jp"; - sha256 = "0fdbnihbd0kq56am3bmh2zrfk4fqjslcbm48malbgmpqw3a5nvpi"; + hash = "sha256-a3WvLAdUZk+Y+L+opPDMBvdN5x5B6nAi/lL8JHJG/gY="; }; + + vendorSha256 = "sha256-K6ZNtART7tcVBH5myV6vKrKWfnwK8yTa6/KK4QLyr00="; + meta = with lib; { description = "A command line interface to the JMESPath expression language for JSON"; homepage = "https://github.com/jmespath/jp"; diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 7af7e36b223..732175edab9 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mFTJJCoC5nxo5ugJdi+MmssV70yKrQQsH+a+K7hTyS8="; + sha256 = "sha256-CntAxOsAaKkCvQanLZ4d99VEGrbsVM+IYOhUuimvjlA="; }; - cargoSha256 = "sha256-aclfFy2tQL57EaIsg1e30JCF5nX2Cm/MaxeSPtR/Uas="; + cargoSha256 = "sha256-mzHLAmm0wvF35ku+wg6QG/pKwIFjb22fOtBmMhgC0Ik="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index bc77416896d..29694c08ed8 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,17 +1,25 @@ -{ lib, fetchFromGitHub, stdenv, rustPlatform, coreutils, bash, installShellFiles, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, coreutils +, bash +, installShellFiles +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-Q5ROUXOeqZfIZdrYwP3uaCy+Nh1FggJRUaNF0mMN7d4="; + sha256 = "sha256-hbBAbk0n80BbbIx81427bRz4x6enBsxJ0bHJKww44oc="; }; - cargoSha256 = "sha256-sCijb9/Of38IebulGmdqSewBRrOCH4RzFopFC0cOPrI="; + cargoSha256 = "sha256-lZyFoOCWUE2ahU/lS+bIdrZXNm/sFEfLsQm1BxREg5w="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index d50062e4bdb..66ff4a8b2df 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yWEh0sPMGe6mNcLKhbmJEUCHzZKFGMcTRNQrHgiQ+BQ="; + sha256 = "sha256-5pxOg+pwa2VrEWinDadx2ZFYXiQgochbU4bCkJEezQw="; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 8f0aecba34d..fc604a68cee 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "0zj2hls8m0l9xsfv680wiwq1g2qjdjslv2yx3yd4rzxdsv2wz09a"; - doCheck = false; - subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 04024dc3acf..4b5e6d8bb38 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZCEgv+2WC1XLDFdRtigkiWu81zLMHvmB8vvIBWN2UYY="; + sha256 = "sha256-6mLfMbYbdsjWHpfUHP3Q5nsqdMXo/82+A9PV8xWZBM0="; }; - vendorSha256 = "sha256-LFa0s2FBkw97P0CV+9JBmUAjaKVO+RzCX+iWGPUD9iA="; + vendorSha256 = "sha256-aRS+MwME72qIMyhnnIRqmrx5hcQ1V0pLIBJqSoR+Fkk="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 3d4eb2c7788..a4fd0ee2338 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.1"; + version = "0.11.2"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-wYIuRTvkPqS4SE5RnkBgmLCwmNv+cYB/iPb9TYip9s0="; + outputHash = "sha256-sriiHgKs2hC8inBGWuLM9qFfGgtcYqKHh0VZWNmg51U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 2cb43f115a2..131c899dcfb 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: stdenv.mkDerivation rec { pname = "minizinc"; - version = "2.6.0"; + version = "2.6.1"; nativeBuildInputs = [ cmake flex bison ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "sha256-eeviSmbXSZdW27IGZ2EZjV9eKn6aW1wxzhiRC/LaOX4="; + sha256 = "sha256-JCR2wvtMNyHBIIqrH5eBc0CIOVyo8mnPUZXtwjJt3sw="; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index dc36028332f..4ff990ca0ed 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, m4, perl, xz }: +{ lib, stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { pname = "autoconf"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; }; - nativebuildInputs = [ xz ]; buildInputs = [ m4 perl ]; doCheck = true; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index aa38966b198..8b5e6158059 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -21,7 +21,7 @@ let ccache = stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-h1lhR8P4aNM6tQCodhpEIXwA0bUQ26B3aoiQeX2siCU="; + sha256 = "011i1aczv4nixq4gvjixcd73df2xplcrldfv0w12yaz5iy4vaw6b"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index fde7307b27d..dc6ee481523 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchsvn, autoreconfHook }: stdenv.mkDerivation rec { - name = "ctags-${revision}"; - revision = "816"; + pname = "ctags"; + version = "816"; src = fetchsvn { url = "https://svn.code.sf.net/p/ctags/code/trunk"; - rev = revision; + rev = version; sha256 = "0jmbkrmscbl64j71qffcc39x005jrmphx8kirs1g2ws44wil39hf"; }; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index eb2e124a35e..893a1925dd7 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, cmake, pcre, doxygen }: +{ lib, stdenv, fetchFromGitHub, cmake, pcre, doxygen }: stdenv.mkDerivation rec { pname = "editorconfig-core-c"; version = "0.12.1"; - src = fetchgit { - url = "https://github.com/editorconfig/editorconfig-core-c.git"; + src = fetchFromGitHub { + owner = "editorconfig"; + repo = "editorconfig-core-c"; rev = "v${version}"; - sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4"; + sha256 = "sha256-pFsbyqIt7okfaiOwlYN8EXm1SFlCUnsHVbOgyIZZlys="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index c173b96f6eb..5bb5bc0652f 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -27,11 +27,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename; - version = "11.1"; + version = "11.2"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - sha256 = "151z6d0265hv9cgx9zqqa4bd6vbp20hrljhd6bxl7lr0gd0crkyc"; + hash = "sha256-FJfDanGIG4ZxqahKDuQPqreIyjDXuhnYRjw8x4cVLjI="; }; postPatch = if stdenv.isDarwin then '' diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 4521eee95a2..f7d1667dfa2 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "help2man"; - version = "1.48.5"; + version = "1.49.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ZznkyqQuau0zmb5Dh8p5OZZAlnM06RcohjuOqpIlgr4="; + sha256 = "sha256-/ZmmZOxL6ahqDdiXGZifFPNnqcB5110OHXHhinu1GwM="; }; strictDeps = true; diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index 1907eb8b363..cb0c1cdc8ec 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -24,14 +24,7 @@ let unmanaged = clangStdenv.mkDerivation rec { inherit src pname version; - nativeBuildInputs = [ cmake ]; - - # Building the "unmanaged part" still involves compiling C# code. - preBuild = '' - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - ''; + nativeBuildInputs = [ cmake dotnet-sdk ]; hardeningDisable = [ "strictoverflow" ]; diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 22bf244662b..0d5ceba1253 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -1,29 +1,29 @@ -{lib, stdenv, fetchurl, ncurses, libpcap }: +{ lib, stdenv, fetchurl, ncurses, libpcap, cmake, openssl, git, lksctp-tools }: stdenv.mkDerivation rec { - version = "3.6.0"; - + version = "3.6.1"; pname = "sipp"; src = fetchurl { url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1fx1iy2n0m2kr91n1ii30frbscq375k3lqihdgvrqxn0zq8pnzp4"; + sha256 = "sha256-alYOg6/5gvMx3byt+zvVMMWJbNW3V91utoITPMhg7LE="; }; postPatch = '' - sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp + cp version.h src/version.h ''; - configureFlags = [ - "--with-pcap" + cmakeFlags = [ + "-DUSE_GSL=1" + "-DUSE_PCAP=1" + "-DUSE_SSL=1" + "-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}" ]; + enableParallelBuilding = true; - postInstall = '' - mkdir -pv $out/share/pcap - cp pcap/* $out/share/pcap - ''; - - buildInputs = [ncurses libpcap]; + nativeBuildInputs = [ cmake git ]; + buildInputs = [ ncurses libpcap openssl ] + ++ lib.optional (stdenv.isLinux) lksctp-tools; meta = with lib; { homepage = "http://sipp.sf.net"; @@ -32,4 +32,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 00bcd3a5f12..db1c13da2f9 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+uIP/U7H9P7oy78TL1edX9+JNYUzpwro105PYj3D6Yk="; + sha256 = "sha256-+uPVt3w3A25JFyENxqhAcjZMRzSowi2uHwGjkeQP8Og="; }; buildInputs = [ zlib openssl ]; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index e94e98d8f72..65debca11c2 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, ocaml, perl }: if lib.versionOlder ocaml.version "4.02" +|| lib.versionOlder "4.13" ocaml.version then throw "camlp5 is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 59ea9c43512..f6f45944a81 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/fiber-${version}.tbz"; - sha256 = "sha256-o108qIeWMOX0VU/wWdc5bg/UDCT2CCcw/Xx3nFiDbes="; + sha256 = "sha256-1QRJmhZY8Nmcrvv/1zhvLjHUbOynMWcVf+RobEHlcy8="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index a08aaac832e..39f6d5f7aa2 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -6,6 +6,8 @@ buildDunePackage rec { version = "3.2.1"; pname = "js_of_ocaml-camlp4"; + useDune2 = false; + src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 7cd3196317f..517ca6585fe 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -28,8 +28,10 @@ let src = }."${version}"; }; ocamlPackages = - if lib.versionAtLeast version "0.17.0" + if lib.versionAtLeast version "0.19.0" then ocaml-ng.ocamlPackages + else if lib.versionAtLeast version "0.17.0" + then ocaml-ng.ocamlPackages_4_12 else if lib.versionAtLeast version "0.14.3" then ocaml-ng.ocamlPackages_4_10 else ocaml-ng.ocamlPackages_4_07 diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index a31b6f6f6f9..3e5471db5ae 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,25 +1,23 @@ { lib, stdenv, fetchurl, ocaml, findlib -, lambdaTerm, cppo, makeWrapper, buildDunePackage +, lambda-term, cppo, makeWrapper, buildDunePackage }: -if !lib.versionAtLeast ocaml.version "4.03" -then throw "utop is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "utop"; - version = "2.8.0"; + version = "2.9.0"; useDune2 = true; + minimalOCamlVersion = "4.03"; + src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "0mi571ifjzq4wcjarn8q1b7yl8nxjm1jfx3afac224lqwn6bhb2d"; + sha256 = "sha256:17jd61bc6pva5wqmnc9xq70ysyjplrzf1p25sq1s7wgrfq2vlyyd"; }; nativeBuildInputs = [ makeWrapper cppo ]; - propagatedBuildInputs = [ lambdaTerm ]; + propagatedBuildInputs = [ lambda-term ]; postFixup = let diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 1e805e8932e..66648faed1d 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.37.2"; + version = "0.38.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-2DkqRKAN7eOTBG6P3YYa5N9oJ0ndm35jIxK7o5Z3dfA="; + sha256 = "sha256-x8mSlZ2X0DdkhaW5QXs5axERJkwARu8tHueQHXfamXM="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index cc18a6af227..0cad5686422 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zgiJDmpjmm2rzi12XAT+bHpiOKwi1k6xd9fvPGwFNXQ="; + sha256 = "sha256-TamtjFnh+HT7JHcRTEpALdkXM9MyZGulb644bNr/BQI="; }; - vendorSha256 = "sha256-kilFwOSIToURJFqfa1/PtdUA21ieJzL9vgsXbYNbht0="; + vendorSha256 = "sha256-uci8/gQqLtjmxxqSlpgZhgBnvMotMvklNfwR+ua8H3M="; doCheck = false; diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index fb4abb21c58..212a710de6e 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "sha256-/YKj6JkVbQ4Fz+KSmBIRQ7F7A8fxi5Eg+pvKwhjpGYQ="; + sha256 = "sha256-KJyGDrT3dr8DfjfRrWIENoBFuiWrgQx4qz1V+mT8/yI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 0b3b15d85bf..d42bb9e2860 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "packer"; - version = "1.7.10"; + version = "1.8.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-KkdkLos55n+IE9oIZPADIcSgrE6kn0rDWzEkwoYfoFw="; + sha256 = "sha256-rvOfDMALzZx8LfChgB3nC4GCTlSET43SkhW1EkA59zo="; }; - vendorSha256 = "sha256-oSIwp8t+US8yNziuq0BR8BsVR1/e0jkxE4QuiqyheQQ="; + vendorSha256 = "sha256-ZQ+7F49VnpPtxWlZVBez2mpVCx8gIPEDKBD5qM9NcMo="; subPackages = [ "." ]; @@ -32,7 +32,7 @@ buildGoModule rec { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; license = licenses.mpl20; - maintainers = with maintainers; [ cstrahan zimbatm ma27 ]; + maintainers = with maintainers; [ cstrahan zimbatm ma27 techknowlogick ]; changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 173ff4770da..61e9b210683 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -1,5 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packet"; @@ -7,19 +6,20 @@ buildGoPackage rec { goPackagePath = "github.com/ebsarr/packet"; - src = fetchgit { + src = fetchFromGitHub { + owner = "ebsarr"; + repo = "packet"; rev = "v${version}"; - url = "https://github.com/ebsarr/packet"; - sha256 = "18n8f2rlab4icb28k1b9gnh30zy382v792x07fmcdqq4nkw6wvwf"; + sha256 = "sha256-jm9u+LQE48aqO6CLdLZAw38woH1phYnEYpEsRbNwyKI="; }; goDeps = ./deps.nix; - meta = { + meta = with lib; { description = "a CLI tool to manage packet.net services"; homepage = "https://github.com/ebsarr/packet"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.grahamc ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ grahamc ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 58f0bb54fb1..8991c1419f2 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation rec { dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform; + postInstall = '' + ln -s $out/bin/flex $out/bin/lex + ''; + meta = with lib; { homepage = "https://github.com/westes/flex"; description = "A fast lexical analyser generator"; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index dfed3c91bc5..484254a099c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -29,9 +29,9 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.20.4"; - sha256 = "sha256-H/7j4HnaccmaH5m/FMTbi01uA3JtKVHiJLTQ4VZ7jfo="; - cargoSha256 = "sha256-Pf/gVBQFssOomzq0IZp5H7MYwvFBRjMYfifLKCB7DCs="; + version = "0.20.6"; + sha256 = "sha256-zaxy8VCfJKK8NtfuFFojmmP5a19FP1zO/eB5q1EoQPw="; + cargoSha256 = "sha256-sOOhzm2nz+HC6dvT+8hj/wh19o+OB2zQ6Uz+H89txSA="; src = fetchFromGitHub { owner = "tree-sitter"; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 31eafb1086b..ac00e341878 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -16,8 +16,8 @@ let pname = "systemtap"; inherit version; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkg-config cpio ]; - buildInputs = [ elfutils gettext python3 python3.pkgs.setuptools ]; + nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ]; + buildInputs = [ elfutils gettext ]; enableParallelBuilding = true; }; diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix index acbd23ec292..279f8101f78 100644 --- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "protoc-gen-grpc-web"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-web"; rev = version; - sha256 = "sha256-piKpaylzuanhGR+7BzApplv8e/CWPoR9tG3vHrF7WXw="; + sha256 = "sha256-NRShN4X9JmCjqPVY/q9oSxSOvv1bP//vM9iOZ6ap5vc="; }; sourceRoot = "source/javascript/net/grpc/web/generator"; @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ protobuf ]; buildInputs = [ protobuf ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" "STATIC=no" ]; + + patches = [ + # https://github.com/grpc/grpc-web/pull/1210 + ./optional-static.patch + ]; doCheck = true; checkInputs = [ protobuf ]; diff --git a/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch b/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch new file mode 100644 index 00000000000..a7ca112749c --- /dev/null +++ b/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch @@ -0,0 +1,19 @@ +--- a/Makefile ++++ b/Makefile +@@ -18,12 +18,15 @@ CXXFLAGS += -std=c++11 + LDFLAGS += -L/usr/local/lib -lprotoc -lprotobuf -lpthread -ldl + PREFIX ?= /usr/local + MIN_MACOS_VERSION := 10.7 # Supports OS X Lion ++STATIC ?= yes + + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Darwin) + CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=$(MIN_MACOS_VERSION) + else ifeq ($(UNAME_S),Linux) +- LDFLAGS += -static ++ ifeq ($(STATIC),yes) ++ LDFLAGS += -static ++ endif + endif + + all: protoc-gen-grpc-web diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix new file mode 100644 index 00000000000..9a77437a372 --- /dev/null +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "protoc-gen-validate"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "envoyproxy"; + repo = "protoc-gen-validate"; + rev = "v${version}"; + sha256 = "sha256-ouo6raNbvQyuY4IY1JEN45Ss7zb3EoR/WIRzL7hXLNI="; + }; + + vendorSha256 = "sha256-HbUEhoB6PPHwN/xym6dTkS54+EqVU1n8EIym8W2wt3I="; + + excludedPackages = [ "tests" ]; + + meta = with lib; { + description = "Protobuf plugin for generating polyglot message validators"; + homepage = "https://github.com/envoyproxy/protoc-gen-validate"; + license = licenses.asl20; + maintainers = with maintainers; [ matthewpi ]; + }; +} diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix new file mode 100644 index 00000000000..b9538235c46 --- /dev/null +++ b/pkgs/development/tools/pulumictl/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pulumictl"; + version = "0.0.29"; + + src = fetchFromGitHub { + owner = "pulumi"; + repo = "pulumictl"; + rev = "v${version}"; + sha256 = "sha256-2jTxtgEg+x/NY/LTWT5+9K9bilOw2bLTUIctjd+qwLE="; + }; + + vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s="; + + ldflags = [ + "-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}" + ]; + + subPackages = [ "cmd/pulumictl" ]; + + meta = with lib; { + description = "Swiss Army Knife for Pulumi Development"; + homepage = "https://github.com/pulumi/pulumictl"; + license = licenses.asl20; + maintainers = with maintainers; [ vincentbernat ]; + }; +} diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix index 5dee0a1b9e8..c28701f96a2 100644 --- a/pkgs/development/tools/rebazel/default.nix +++ b/pkgs/development/tools/rebazel/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices }: + rustPlatform.buildRustPackage rec { pname = "rebazel"; version = "0.1.4"; @@ -12,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + meta = with lib; { description = "tool for expediting bazel build workflows"; homepage = "https://github.com/meetup/rebazel"; diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 2734cfa0931..60ca0a51d26 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -7,13 +7,13 @@ # compilers to determine the desired target. , defaultTargets ? []}: stdenv.mkDerivation rec { - version = "4.5.2"; + version = "5.0.1"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; rev = "rocm-${version}"; - sha256 = "sha256-VIlHYiGLen4xmdP7kpmObj5wKy6Qq7iupJFtPa4Zd98="; + sha256 = "sha256-H9JdrDS/pbvYMKkayu/1rrXusHeXBH1CO9jYArsbCNI="; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 9fc89ece06d..90ea1658271 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-iqFE3sz7cIFcd9zCFjU1PjMWVmxCRcdiiGAbirWUWMA="; + sha256 = "sha256-XzjZEVyPVn+7VrjG4QsqVBFmuGC1TWTWLEoqFcwQhaI="; }; - cargoSha256 = "sha256-qlqW5phw7QI5KT2uUamQFEYHZd4uzYaUuvZTG3KhrOU="; + cargoSha256 = "sha256-p87ZnOxaF9ytSUxp0P3QE3K1/jo7hz/N7BH1f2Lc0I0="; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 93593a01f5e..727e9b38c05 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.11.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = version; - sha256 = "sha256-Vi3FwetCpL8qMniaXypw1EYVHh6lfZu6GjDXPDKda5c="; + sha256 = "sha256-cSQEwsUqn+Q0ZWndBVatHL0btO7xLOJWO+MMjtSL0Zo="; }; sourceRoot = "source/cargo-insta"; - cargoSha256 = "sha256-Bjh9we0OD8kqMJtovO1yw9Yta5u93dlYMRsxPdErkaY="; + cargoSha256 = "sha256-rn4ln/MeaDAQmWpxeTn3mGH4sEvO4876o1VPYiz/CR8="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 7fc1da095e5..eede871e38c 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.13"; + version = "0.4.14"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-sN0i2oo0XuxneIK/w+jpxkcdm2rtqhyH2Y3CMPnH+ro="; + sha256 = "sha256-ooFkw6QlMnlvyHPMkqAZUDaOHH8dktzbob5WevQsYXQ="; }; - cargoSha256 = "sha256-Gv7C4NFThNawhT+IYO0ZbpOh6w/yPeIJKZjzTyM/GJw="; + cargoSha256 = "sha256-MgtFNrSjSvyjp1uD/OueSh+MCYSvZCyDabP20pI/8HI="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 29dc1202d1c..2e2ff56fd05 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.9"; + version = "0.35.10"; src = fetchCrate { inherit pname version; - sha256 = "sha256-yjApyM3UM4gLUPpbVMv+7hpF5VGXS8W9RUnlsJd/Sbo="; + sha256 = "sha256-l34sThvzhAW8VfxVuv+UGVil7yOvsOiWSqr/N91V8C8="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-YGpQXz35dPUeY8YlZ4Ul/utpNgEgW90xHiT+I+jOJIo="; + cargoSha256 = "sha256-974Gqtv+g32iHrIqIzqwBsE8frzmjF0Ma/hSMGzMaGs="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index caac565e621..e3694b31083 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OBcRN0tYNnNqytmmAm6DMtHtp+JzPjomfTpeQEtQE84="; + sha256 = "sha256-rmWPkxxrpVamYHII0xkZq62ubL3/jrcqXUvFH9VuNtg="; }; - cargoSha256 = "sha256-uZw/ojPAzbpRYb2pkJ/i/+GXvxxU6piCLuMG/fPII2M="; + cargoSha256 = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix new file mode 100644 index 00000000000..54d568726dd --- /dev/null +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-nextest"; + version = "0.9.10"; + + src = fetchFromGitHub { + owner = "nextest-rs"; + repo = "nextest"; + rev = "cargo-nextest-${version}"; + sha256 = "0gbh990dd4514bfqh4x2nymh5w608ljp3s7akq100m4v723b6339"; + }; + + cargoSha256 = "0c0i274dkz3jx9dzcxl9hyf3imiga8vb6m6jc5z1f1wdq3vknh9r"; + + cargoTestFlags = [ # TODO: investigate some more why these tests fail in nix + "--" + "--skip=tests_integration::test_relocated_run" + "--skip=tests_integration::test_run" + "--skip=tests_integration::test_run_after_build" + ]; + + meta = with lib; { + description = "Next-generation test runner for Rust projects"; + homepage = "https://github.com/nextest-rs/nextest"; + license = with licenses; [ mit asl20 ]; + maintainers = [ maintainers.ekleog ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/development/tools/rust/cargo-rr/default.nix index 47d58e9b92a..f2099a855cc 100644 --- a/pkgs/development/tools/rust/cargo-rr/default.nix +++ b/pkgs/development/tools/rust/cargo-rr/default.nix @@ -1,7 +1,8 @@ { lib , rustPlatform , fetchFromGitHub -, nix-update-script +, genericUpdater +, common-updater-scripts , makeWrapper , rr }: @@ -20,8 +21,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0fjs76n6bbbv83s213h2dgsszgxy4hbjsclyk9m81b3bfbmmb9sa"; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; }; diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 2626de0f84b..a668fdd1172 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -3,14 +3,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.1"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "1nfbpdx378p988q75hka9r8zp3xb9zy3dnagcxmha6dca5dhgsdm"; + sha256 = "sha256-SXA77LXM1SuBJ8BH+ahwJl/3gWsCbdLXBiHZdJySWq0="; }; - cargoSha256 = "05p3vmar00215x4mwsvs5knf4wrwmpq52rmbbi6b4qaqs3gqaghy"; + cargoSha256 = "sha256-e9POSuA/I7IUKUOxMTfCWxNn0AicojpGQpxamzmHa7g="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/knurling-rs/probe-run"; changelog = "https://github.com/knurling-rs/probe-run/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ hoverbear ]; + maintainers = with maintainers; [ hoverbear newam ]; }; } diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 9711ef871c0..2221ae0a14b 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-02-22"; - cargoSha256 = "sha256-5PhmDiYC566KM0PfAaRdMpc0CAzDdez4uuLqBNBrma8="; + version = "2022-02-28"; + cargoSha256 = "sha256-dTw6xp99uGtGp6YuqAX3r3GDD6Wto3KHTaO2DUUE2FA="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-O9onJrAJY0TWxEZZcTWuF7SGPypRtSo0ZbpzDLC5+os="; + sha256 = "sha256-GQ1cPO4povnozLl0MTFs0ZXpmBn+AZeFWQVnxHHWf9g="; }; patches = [ diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index 3ae31bbadb9..77928a1f22a 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -64,11 +64,11 @@ let ''; desktopItem = makeDesktopItem { - name = "Scene Builder"; + name = "scenebuilder"; exec = "scenebuilder"; icon = "scenebuilder"; comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - desktopName = pname; + desktopName = "Scene Builder"; mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; categories = [ "Development" ]; }; diff --git a/pkgs/development/tools/shellharden/default.nix b/pkgs/development/tools/shellharden/default.nix index d444a3685c5..ee56e58f6ca 100644 --- a/pkgs/development/tools/shellharden/default.nix +++ b/pkgs/development/tools/shellharden/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shellharden"; - version = "4.1.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "anordal"; repo = pname; rev = "v${version}"; - sha256 = "04pgmkaqjb1lmlwjjipcrqh9qcyjjkr39vi3h5fl9sr71c8g7dnd"; + sha256 = "081b51h88hhyzn9vb9pcszz1wfdj73xwsyfn2ygz708kabzqpvdl"; }; - cargoSha256 = "0bjqgw49msl288yfa7bl31bfa9kdy4zh1q3j0lyw4vvkv2r14pf5"; + cargoSha256 = "1gwlmds417szwvywvm19wv60a83inp52sf46sd05x5vahb8gv8hg"; postPatch = "patchShebangs moduletests/run"; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 7db111a50f2..e21f058b8a0 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -1,30 +1,26 @@ { fetchFromGitHub , lib , rustPlatform -, stdenvNoCC , lua52Support ? true , luauSupport ? false }: rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.12.3"; + version = "0.12.5"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bgfG1cPhauU85FG/ZX1n2KqfydMeh92q347UsREkOGo="; + sha256 = "sha256-4tQQTTAdIAhlkBJevwwwGXOKd6bJJOyG4nlbCv7909Y="; }; - cargoSha256 = "sha256-njZTD6O67v787Z1tJ7G0QzxJLhqU2sfpOVw6r4woE9s="; + cargoSha256 = "sha256-DGe2lB8xZgY9ikTsIHDOdHzTyHfDaSlmy8FU/S9FDCI="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; - # test_standard fails on darwin - doCheck = !stdenvNoCC.isDarwin; - meta = with lib; { description = "An opinionated Lua code formatter"; homepage = "https://github.com/johnnymorganz/stylua"; diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 4ec62ed4d29..88fa62903dd 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.6.4"; + version = "2.6.7"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-oUIgEWLcpEZHtL1wvTAezLtz2PecddtwhzbLhGqso/k="; + sha256 = "sha256-m9vtopRjxT9Re8pDdzfFUpg3zYAFE8zqFemgaNAbsvM="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index d87ecddbf89..ebb07ec2b49 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.4.1"; + version = "5.4.2"; vendorSha256 = "sha256-MlsgII1QybyW+B7DGbSyn7VQ36n29yOC0pZnaemEHO8="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-92Pth+IrILWkcP4mm3IcSN4+zs7TNg4CPGT2liop7/I="; + sha256 = "sha256-Ci523YoocpCexbXMg3PjQ/x8z/STWt+nro64l+ckKzM="; }; # Tests requires network access diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix index f04de27f1c2..6ff132e8146 100644 --- a/pkgs/development/tools/tokio-console/default.nix +++ b/pkgs/development/tools/tokio-console/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tokio-console"; - version = "0.1.0"; + version = "0.1.3"; src = fetchFromGitHub { owner = "tokio-rs"; repo = "console"; rev = "tokio-console-v${version}"; - sha256 = "sha256-1wxRTdDmgTlGJ3W1txDA/3Rnccs3KBw55vprrGaVnkg="; + sha256 = "sha256-v9BxfBLRJug/1AgvDV7P5AOXwZfCu1mNgJjhbipoZNg="; }; - cargoSha256 = "sha256-RScu5V55OowwWHi3MLjW8DPlTMA/IEBYFt4VUDUHPKo="; + cargoSha256 = "sha256-584EC9x7tJE3pHqgQVh6LWKuCgLXuBBEnaPvo1A8RIs="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 9ce8a9494dd..23b6f535fc3 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dQ+FLKf+zNrUabrXWvdYqpNXzS+j92zQcaZXPTxxB/E="; + sha256 = "sha256-It112+60ze+5rvq3TYlIU+X4lJ4pgdCO7Gb1ADArDvY="; }; - cargoSha256 = "sha256-ud2Hb8EoOiPyzp7qPUeQi8FZ49RXbrDsk8ZEBI6lPtk="; + cargoSha256 = "sha256-yiy1xLxCdjIzqXUlkxWoOZ7cPZzJgDuTUvNHpnnTnwE="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index f9c98bc4fb1..d8f31686320 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2021-12-28"; + version = "unstable-2022-02-16"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "1eeb3538b2a71addd0d8adc9f53ffe80fdfb8ce0"; - sha256 = "sha256-u2VJIDc1yvhbBgdMKL1RijoKEL4Vl8sbrGUYu5t/wJI="; + rev = "2f8a970cbf41ac54d2b4124c9d7db64543031901"; + sha256 = "sha256-jIC9nUWxs4iDpqEQGxl8JrHbBEkz60/elWHqGKQqlX8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index e80bb0f14cd..d6ff0825737 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.24.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-3l0ezObZK/QEmpBlqSm3R3e4pFM7KUnsxDrzvEYExnk="; + sha256 = "sha256-a/fftMJuN6YnjPP0Gk6bMckoCouwgtxhf23OuyLR5Tk="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix new file mode 100644 index 00000000000..2d0576592ec --- /dev/null +++ b/pkgs/development/tools/wails/default.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, pkg-config +, makeWrapper +, go +, gcc +, gtk3 +, webkitgtk +, nodejs +, upx +, zlib +}: + +buildGoModule rec { + pname = "wails"; + version = "2.0.0-beta.33"; + + src = fetchFromGitHub { + owner = "wailsapp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-efxOL/FllToum0P4JyAJt0fbrznTFYh7czTWpZu3uk0="; + } + "/v2"; + + vendorSha256 = "sha256-qPMVsvud2L7hpXUOfYYMiO32JXff8ZZC34EsxFoSJ0g="; + + proxyVendor = true; + + subPackages = [ "cmd/wails" ]; + + # These packages are needed to build wails + # and will also need to be used when building a wails app. + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + # Wails apps are built with Go, so we need to be able to + # add it in propagatedBuildInputs. + allowGoReference = true; + + # Following packages are required when wails used as a builder. + propagatedBuildInputs = [ + pkg-config + go + gcc + gtk3 + webkitgtk + nodejs + upx + ]; + + ldflags = [ + "-s" + "-w" + ]; + + # As Wails calls a compiler, certain apps and libraries need to be made available. + postFixup = '' + wrapProgram $out/bin/wails \ + --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs upx ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 webkitgtk ]} \ + --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ + --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" + ''; + + doCheck = true; + + meta = with lib; { + description = "Build applications using Go + HTML + CSS + JS"; + homepage = "https://wails.io"; + license = licenses.mit; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 85dbc4f731a..0234c936dc1 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,13 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "1.2.8"; + version = "1.3.1"; pname = "wllvm"; - name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1d88fzg4ba4r3hwrinnv6agiyj3xxdy4yryb8wz2ml51nc6bi591"; + sha256 = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; }; meta = with lib; { diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 8d8b1a004d5..9ee452b26f9 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl, writeText, php, makeWrapper }: +{ stdenv +, lib +, fetchurl +, formats +, installShellFiles +, makeWrapper +, php +}: + let - version = "2.5.0"; + version = "2.6.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; - sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; + hash = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; }; - ini = writeText "php.ini" '' - [PHP] - memory_limit = -1 ; no limit as composer uses a lot of memory + ini = (formats.ini { }).generate "php.ini" { + PHP.memory_limit = -1; # no limit as composer uses a lot of memory + Phar."phar.readonly" = "Off"; + }; - [Phar] - phar.readonly = Off - ''; in stdenv.mkDerivation rec { pname = "wp-cli"; @@ -21,19 +27,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k="; + hash = "sha256-0WZSjKtgvIIpwGcp5wc4OPu6aNaytXRQTLAniDXIeIg="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildCommand = '' dir=$out/share/wp-cli - mkdir -p $out/bin $dir - install -Dm444 ${src} $dir/wp-cli install -Dm444 ${ini} $dir/php.ini - install -Dm444 ${completion} $out/share/bash-completion/completions/wp + installShellCompletion --bash --name wp ${completion} + mkdir -p $out/bin makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \ --add-flags "-c $dir/php.ini" \ --add-flags "-f $dir/wp-cli" diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 087658fe551..81d4a36a869 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -174,7 +174,7 @@ in rec { let package = lib.importJSON packageJSON; - packageGlobs = package.workspaces; + packageGlobs = if lib.isList package.workspaces then package.workspaces else package.workspaces.packages; globElemToRegex = lib.replaceStrings ["*"] [".*"]; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index bfe18fc4758..e8cd2a134fd 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.21.1"; + version = "4.22.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-283xe7FVHYSsRl4cZD7WDzIW1gqNAFsNrWYJkthZheU="; + sha256 = "sha256-+yVf9pSK2cH/d5fdaGSBrjce8vVqE9XMpZSI8s4xoJI="; }; vendorSha256 = "sha256-F11FnDYJ59aKrdRXDPpKlhX52yQXdaN1sblSkVI2j9w="; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index fb13244daf7..7f8498a3523 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-Oc4hNeSDsGHsA7V05LHFAJ5xvxWth2wEd3ag2ltVR10="; + sha256 = "sha256-DtzdgEHgxoZRSvylq2vLzU1PAk1ETBDpBWFHcIW95r4="; }; vendorSha256 = null; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 2a888b8056d..0efa2b41a98 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "4.1.0.M1"; + version = "5.1.3"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr"; + sha256 = "sha256-BacAVAnS3qdmzHGVUdZI2hn4Arp9Qep6cAXRabpB10M="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh index 18368588c2a..878e0693a1e 100644 --- a/pkgs/development/web/nodejs/setup-hook.sh +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -1,5 +1,5 @@ addNodePath () { - addToSearchPath NODE_PATH $1/lib/node_modules + addToSearchPath NODE_PATH "$1/lib/node_modules" } addEnvHooks "$hostOffset" addNodePath diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index bf1ed98b473..2c0698b74a8 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "9.13.0"; + version = "9.14.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "sha256-ZlCIqQ4i/jaf/uDBonVXf6kAuKEhinnKTk3nO7mnBV4="; + sha256 = "sha256-pA3gT4xoIWhajY03JzVgHK5KyTx1uH6gyasuLTdt6cM="; name = "${pname}.tar.gz"; }; diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 1fe33a86f97..bc6f2a8dc71 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "airshipper"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitLab { owner = "Veloren"; repo = "airshipper"; rev = "v${version}"; - sha256 = "sha256-m3H2FE1DoV/uk9PGgf9PCagwmWWSQO/gCi7zpS02/WY="; + sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug="; }; - cargoSha256 = "sha256-ddy4TjT/ia+sLBnpwcXBVUzAS07ar+Jjc04KS5/arlU="; + cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw="; buildInputs = [ openssl diff --git a/pkgs/games/blockattack/default.nix b/pkgs/games/blockattack/default.nix index 7616d2e51a3..6deba7987ad 100644 --- a/pkgs/games/blockattack/default.nix +++ b/pkgs/games/blockattack/default.nix @@ -15,14 +15,13 @@ stdenv.mkDerivation rec { pname = "blockattack"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { - name = "${pname}-${version}-src"; owner = "blockattack"; repo = "blockattack-game"; rev = "v${version}"; - hash = "sha256-ySLm3AdoJRiMRdla45OJh8ZIFYNh+HzjG2VnFqoWuZA="; + hash = "sha256-2oKesdr2eNZhDlGrFRiH5/8APFkGJfxPCNvzFoIumdQ="; }; nativeBuildInputs = [ diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 837fb4e1768..c837ba39b44 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -5,13 +5,14 @@ stdenv.mkDerivation rec { version = "2.17"; src = fetchurl { - url = "ftp://metalab.unc.edu/pub/Linux/games/bsd-games-${version}.tar.gz"; - sha256 = "0q7zdyyfvn15y0w4g54kq3gza89h61py727m8slmw73cxx594vq6"; + url = "mirror://ibiblioPubLinux/games/${pname}-${version}.tar.gz"; + hash = "sha256-Bm+SSu9sHF6pRvWI428wMCH138CTlEc48CXY7bxv/2A="; }; buildInputs = [ ncurses openssl flex bison ]; patches = [ + # Remove UTMPX support on Makefrag file (fetchurl { url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch"; sha256 = "1k3qp3jj0dksjr4dnppv6dvkwslrgk9c7p2n9vipqildpxgqp7w2"; diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 7a6dc280880..ac76ab5ad18 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -93,8 +93,10 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin devilutionx install -Dm755 -t $out/share/diasurgical/devilutionx devilutionx.mpq install -Dm755 -t $out/share/applications ../Packaging/nix/devilutionx-hellfire.desktop ../Packaging/nix/devilutionx.desktop - install -Dm755 ../Packaging/resources/icon.png $out/share/icons/hicolor/512x512/apps/devilution.png - install -Dm755 ../Packaging/resources/hellfire.png $out/share/icons/hicolor/512x512/apps/devilution-hellfire.png + install -Dm755 ../Packaging/resources/icon.png $out/share/icons/hicolor/512x512/apps/devilutionx.png + install -Dm755 ../Packaging/resources/hellfire.png $out/share/icons/hicolor/512x512/apps/devilutionx-hellfire.png + install -Dm755 ../Packaging/resources/icon_32.png $out/share/icons/hicolor/32x32/apps/devilutionx.png + install -Dm755 ../Packaging/resources/hellfire_32.png $out/share/icons/hicolor/32x32/apps/devilutionx-hellfire.png '') + '' runHook postInstall diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index dd044656534..b7eae5e5acd 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -11,13 +11,13 @@ let desktopItem = makeDesktopItem { - name = "Domination"; + name = "domination"; desktopName = "Domination"; exec = "domination"; icon = "domination"; }; editorDesktopItem = makeDesktopItem { - name = "Domination Map Editor"; + name = "domination-map-editor"; desktopName = "Domination Map Editor"; exec = "domination-map-editor"; icon = "domination"; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 663dffe2498..3c083c555d2 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.53.tar.xz", + "name": "factorio_alpha_x64-1.1.56.tar.xz", "needsAuth": true, - "sha256": "1l5sk9rhf4pq9l87w5sv4a1ikqx8rpby5hf4xn7sdsm9mshd3wyw", + "sha256": "1i9mcq8m48ar0b3x53zgi5x9rsaddmlm2wqaphyf81xampl7ivcx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.53/alpha/linux64", - "version": "1.1.53" + "url": "https://factorio.com/get-download/1.1.56/alpha/linux64", + "version": "1.1.56" }, "stable": { "name": "factorio_alpha_x64-1.1.53.tar.xz", @@ -20,12 +20,12 @@ }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.53.tar.xz", + "name": "factorio_demo_x64-1.1.56.tar.xz", "needsAuth": false, - "sha256": "0m3mk296w4azma2v5z6pay1caqql2jfnlcyyd120laxl4rdg2k76", + "sha256": "0g1gphysh79h1frcjpfd5i3fpi05y8mq9gwmgnmalmr56w5n4qlz", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.53/demo/linux64", - "version": "1.1.53" + "url": "https://factorio.com/get-download/1.1.56/demo/linux64", + "version": "1.1.56" }, "stable": { "name": "factorio_demo_x64-1.1.53.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.53.tar.xz", + "name": "factorio_headless_x64-1.1.56.tar.xz", "needsAuth": false, - "sha256": "18ra52h32nhdqxz6vagp9nw3an5pgamariy0ny050xr2xpidw3v1", + "sha256": "174fvi9slpdp3y8j46w0w0ays7i7gy98il74xx5wxh7s94zb1b68", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.53/headless/linux64", - "version": "1.1.53" + "url": "https://factorio.com/get-download/1.1.56/headless/linux64", + "version": "1.1.56" }, "stable": { "name": "factorio_headless_x64-1.1.53.tar.xz", diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 567ab267cfe..10d7a23aca4 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-6voM6aQ22zW6NHm9x2TDsM4Kea6TLYZTdSLyc/6fz8A="; + sha256 = "sha256-+VAgS7NR/D0HD/Fy7idSUTMJPp2ctpirMpcFooo+bEg="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index e0582c524ec..84fd9c154a2 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: let version = "0.16.1"; @@ -11,6 +11,15 @@ in stdenv.mkDerivation { sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"; }; + patches = [ + # Pull upstream fix for -fno-common tolchains. + (fetchpatch { + name = "fno-common.patch"; + url = "https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761.patch"; + sha256 = "1s7sw4dkc7b6i72j6x47driq6v0k3wss48l9ivd4fw40n3iaxjb1"; + }) + ]; + nativeBuildInputs = [ pkg-config gettext python3 ]; buildInputs = [ diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 2a8f68ddd2c..6ea02917648 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -2,23 +2,31 @@ , fetchurl , makeWrapper , curl +, espeak , file , gtk3 +, gtkdatabox , intltool , pkg-config }: stdenv.mkDerivation rec { pname = "klavaro"; - version = "3.11"; + version = "3.13"; src = fetchurl { url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2"; - sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w"; + sha256 = "0z6c3lqikk50mkz3ipm93l48qj7b98lxyip8y6ndg9y9k0z0n878"; }; nativeBuildInputs = [ intltool makeWrapper pkg-config ]; - buildInputs = [ curl gtk3 ]; + buildInputs = [ curl gtk3 gtkdatabox ]; + + postPatch = '' + substituteInPlace src/tutor.c --replace '"espeak ' '"${espeak}/bin/espeak ' + ''; + + patches = [ ./icons.patch ./trans_lang_get_similar.patch ]; postInstall = '' wrapProgram $out/bin/klavaro \ diff --git a/pkgs/games/klavaro/icons.patch b/pkgs/games/klavaro/icons.patch new file mode 100644 index 00000000000..1717fdf44e6 --- /dev/null +++ b/pkgs/games/klavaro/icons.patch @@ -0,0 +1,146 @@ +--- a/data/klavaro.glade (revision 137) ++++ b/data/klavaro.glade (working copy) +@@ -311,7 +311,7 @@ + <object class="GtkImage" id="image24"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-delete</property> ++ <property name="icon-name">edit-delete</property> + </object> + <packing> + <property name="expand">False</property> +@@ -708,7 +708,7 @@ + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="tooltip-text" translatable="yes">Drag and drop text here to practice with it.</property> +- <property name="secondary-icon-name">gtk-clear</property> ++ <property name="secondary-icon-name">edit-clear</property> + <property name="secondary-icon-tooltip-text" translatable="yes">Press here to restart the exercise. Hotkey: [Ctrl-R]</property> + <property name="secondary-icon-tooltip-markup" translatable="yes">Press here to restart the exercise. Hotkey: [Ctrl-R]</property> + <signal name="activate" handler="on_entry_mesg_activate" after="yes" swapped="no"/> +@@ -1232,7 +1232,7 @@ + <object class="GtkImage" id="image27"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-delete</property> ++ <property name="icon-name">edit-delete</property> + </object> + <packing> + <property name="expand">False</property> +@@ -1352,7 +1352,7 @@ + <object class="GtkImage" id="image23"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-open</property> ++ <property name="icon-name">document-open</property> + </object> + <packing> + <property name="expand">True</property> +@@ -1510,7 +1510,7 @@ + <object class="GtkImage" id="image11"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-open</property> ++ <property name="icon-name">document-open</property> + <property name="icon_size">2</property> + </object> + <packing> +@@ -1557,7 +1557,7 @@ + <object class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-paste</property> ++ <property name="icon-name">edit-paste</property> + <property name="icon_size">2</property> + </object> + <packing> +@@ -1604,7 +1604,7 @@ + <object class="GtkImage" id="image19"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-delete</property> ++ <property name="icon-name">edit-delete</property> + <property name="icon_size">2</property> + </object> + <packing> +@@ -2051,7 +2051,7 @@ + <object class="GtkImage" id="image14"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-delete</property> ++ <property name="icon-name">edit-delete</property> + </object> + <packing> + <property name="expand">False</property> +@@ -2343,7 +2343,7 @@ + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-media-rewind</property> ++ <property name="icon-name">media-seek-backward</property> + <property name="icon_size">1</property> + </object> + </child> +@@ -2418,7 +2418,7 @@ + <object class="GtkImage" id="image20"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-go-back</property> ++ <property name="icon-name">go-previous</property> + </object> + <packing> + <property name="expand">False</property> +@@ -2469,7 +2469,7 @@ + <object class="GtkImage" id="image18"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-go-forward</property> ++ <property name="icon-name">go-next</property> + </object> + <packing> + <property name="expand">False</property> +@@ -2577,7 +2577,7 @@ + <object class="GtkImage" id="image13"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-save</property> ++ <property name="icon-name">document-save</property> + </object> + <packing> + <property name="expand">False</property> +@@ -2825,7 +2825,7 @@ + <object class="GtkImage" id="image_basic"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-strikethrough</property> ++ <property name="icon-name">format-text-strikethrough</property> + <property name="icon_size">6</property> + </object> + <packing> +@@ -2901,7 +2901,7 @@ + <object class="GtkImage" id="image_adapt"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-bold</property> ++ <property name="icon-name">format-text-bold</property> + <property name="icon_size">6</property> + </object> + <packing> +@@ -3630,7 +3630,7 @@ + <object class="GtkImage" id="image_top10_publish"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-goto-top</property> ++ <property name="icon-name">go-top</property> + </object> + <packing> + <property name="expand">False</property> +@@ -3678,7 +3678,7 @@ + <object class="GtkImage" id="image_top10_update"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="icon-name">gtk-goto-bottom</property> ++ <property name="icon-name">go-bottom</property> + </object> + <packing> + <property name="expand">False</property> diff --git a/pkgs/games/klavaro/trans_lang_get_similar.patch b/pkgs/games/klavaro/trans_lang_get_similar.patch new file mode 100644 index 00000000000..3b6644c5f7f --- /dev/null +++ b/pkgs/games/klavaro/trans_lang_get_similar.patch @@ -0,0 +1,71 @@ +--- a/src/translation.c (revision 137) ++++ b/src/translation.c (working copy) +@@ -257,23 +257,23 @@ + * Private auxiliar function + */ + static gboolean +-trans_lang_get_similar (gchar * test) ++trans_lang_get_similar (gchar ** test) + { + gint i; + gchar aux_code_2[3]; + + /* Prefer C over en_GB for English variants other than en_GB. (Debian patch 02) */ +- if (g_str_has_prefix (test, "en")) ++ if (g_str_has_prefix (*test, "en")) + { +- g_free (test); +- test = g_strdup ("C"); ++ g_free (*test); ++ *test = g_strdup ("C"); + return (TRUE); + } + +- if (g_str_equal (test, "C")) ++ if (g_str_equal (*test, "C")) + return TRUE; + +- strncpy (aux_code_2, test, 2); ++ strncpy (aux_code_2, *test, 2); + aux_code_2[2] = '\0'; + + for (i = 0; i < lang_num; i++) +@@ -280,15 +280,15 @@ + { + if (strstr (lang[i].code, aux_code_2)) + { +- g_free (test); +- test = g_strdup (lang[i].code); ++ g_free (*test); ++ *test = g_strdup (lang[i].code); + break; + } + } +- if (i == lang_num && g_str_has_prefix (test, "en")) ++ if (i == lang_num && g_str_has_prefix (*test, "en")) + { +- g_free (test); +- test = g_strdup ("C"); ++ g_free (*test); ++ *test = g_strdup ("C"); + return (TRUE); + } + return (i == lang_num ? FALSE : TRUE); +@@ -356,7 +356,7 @@ + lang_ok = (i == 0 ? TRUE : FALSE); + break; + } +- lang_ok = trans_lang_get_similar (tmp_code); ++ lang_ok = trans_lang_get_similar (&tmp_code); + if (lang_ok == TRUE) + break; + g_free (tmp_code); +@@ -368,7 +368,7 @@ + tmp_code = g_win32_getlocale (); + lang_ok = trans_lang_is_available (tmp_code); + if (lang_ok == FALSE) +- lang_ok = trans_lang_get_similar (tmp_code); ++ lang_ok = trans_lang_get_similar (&tmp_code); + #endif + } + if (tmp_code == NULL) diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index dceb9755fa2..fbebe85cf00 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -5,7 +5,7 @@ let version = "2.9.3"; desktopItem = makeDesktopItem { - name = "Lunar Client"; + name = "lunar-client"; exec = "lunar-client"; icon = "lunarclient"; comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index ba0b652a6bd..af1b032bd78 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.18": { - "url": "https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar", - "sha1": "125e5adf40c659fd3bce3e66e67a16bb49ecc1b9", - "version": "1.18.1", + "url": "https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar", + "sha1": "c8f83c5655308435b3dcf03c06d9fe8740a77469", + "version": "1.18.2", "javaVersion": 17 }, "1.17": { diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 9e94bb6a4a7..e607fbc7113 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -3,6 +3,7 @@ , freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex , leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp , OpenGL, OpenAL ? openal, Carbon, Cocoa +, Kernel }: with lib; @@ -20,7 +21,8 @@ let sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib libjpeg libpng libGLU libGL libXrandr libX11 libXxf86vm ]; + buildInputs = [ zlib libjpeg libpng libGLU libGL libXrandr libX11 libXxf86vm ] + ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; outputs = [ "out" "dev" ]; meta = irrlicht.meta; }; diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix index 66e17b1752e..63deb3b969c 100644 --- a/pkgs/games/steam-tui/default.nix +++ b/pkgs/games/steam-tui/default.nix @@ -2,7 +2,7 @@ , rustPlatform , steamcmd , fetchFromGitHub -, steam-run-native +, steam-run , runtimeShell , withWine ? false , wine @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo="; - buildInputs = [ steamcmd steam-run-native ] + buildInputs = [ steamcmd ] ++ lib.optional withWine wine; preFixup = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cat > $out/bin/steam-tui <<EOF #!${runtimeShell} export PATH=${steamcmd}/bin:\$PATH - exec ${steam-run-native}/bin/steam-run $out/bin/.steam-tui-unwrapped '\$@' + exec ${steam-run}/bin/steam-run $out/bin/.steam-tui-unwrapped '\$@' EOF chmod +x $out/bin/steam-tui ''; diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index bfe19a88ca9..430a2b3a67d 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -14,7 +14,6 @@ let steam-runtime = callPackage ./runtime.nix { }; steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; steam = callPackage ./steam.nix { }; - steam-fonts = callPackage ./fonts.nix { }; steam-fhsenv = callPackage ./fhsenv.nix { glxinfo-i686 = pkgsi686Linux.glxinfo; steam-runtime-wrapped-i686 = diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 447ff94bf9d..37ec8ef8c7e 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -3,7 +3,6 @@ , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile -, nativeOnly ? false , runtimeOnly ? false , runtimeShell , stdenv @@ -16,7 +15,6 @@ let commonTargetPkgs = pkgs: with pkgs; [ - steamPackages.steam-fonts # Needed for operating system detection until # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved lsb-release @@ -62,22 +60,6 @@ let fi ''; - setupSh = writeScript "setup.sh" '' - #!${runtimeShell} - ''; - - runSh = writeScript "run.sh" '' - #!${runtimeShell} - runtime_paths="${lib.concatStringsSep ":" ldPath}" - if [ "$1" == "--print-steam-runtime-library-paths" ]; then - echo "$runtime_paths''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - exit 0 - fi - export LD_LIBRARY_PATH="$runtime_paths''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - exec "$@" - ''; - in buildFHSUserEnv rec { name = "steam"; @@ -123,7 +105,6 @@ in buildFHSUserEnv rec { gtk3 dbus zlib - glib atk cairo freetype @@ -149,9 +130,6 @@ in buildFHSUserEnv rec { openssl_1_1 rtmpdump - # needed by getcap for vr startup - libcap - # dependencies for mesa drivers, needed inside pressure-vessel mesa.drivers mesa.llvmPackages.llvm.lib @@ -163,52 +141,36 @@ in buildFHSUserEnv rec { xorg.libxshmfence xorg.libXxf86vm libelf - ] ++ (if (!nativeOnly) then [ - (steamPackages.steam-runtime-wrapped.override { - inherit runtimeOnly; - }) - ] else [ + # Required glib gtk2 bzip2 - zlib - gdk-pixbuf # Without these it silently fails xorg.libXinerama - xorg.libXdamage xorg.libXcursor xorg.libXrender xorg.libXScrnSaver - xorg.libXxf86vm xorg.libXi xorg.libSM xorg.libICE gnome2.GConf - freetype (curl.override { gnutlsSupport = true; opensslSupport = false; }) nspr nss - fontconfig - cairo - expat - dbus cups libcap SDL2 libusb1 dbus-glib ffmpeg - atk # Only libraries are needed from those two libudev0-shim - networkmanager098 # Verified games requirements xorg.libXt xorg.libXmu - xorg.libxcb libogg libvorbis SDL @@ -216,7 +178,6 @@ in buildFHSUserEnv rec { glew110 libidn tbb - wayland # Other things from runtime flac @@ -242,21 +203,14 @@ in buildFHSUserEnv rec { librsvg xorg.libXft libvdpau - ] ++ steamPackages.steam-runtime-wrapped.overridePkgs) ++ extraLibraries pkgs; - - extraBuildCommands = if (!nativeOnly) then '' - mkdir -p steamrt - ln -s ../lib/steam-runtime steamrt/${steam-runtime-wrapped.arch} - ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' - ln -s ../lib32/steam-runtime steamrt/${steam-runtime-wrapped-i686.arch} - ''} - ln -s ${runSh} steamrt/run.sh - ln -s ${setupSh} steamrt/setup.sh - '' else '' + ] + ++ steamPackages.steam-runtime-wrapped.overridePkgs + ++ extraLibraries pkgs; + + extraBuildCommands = '' ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0 - ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' - ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0 - ''} + '' + lib.optionalString (steam-runtime-wrapped-i686 != null) '' + ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0 ''; extraInstallCommands = '' @@ -276,8 +230,6 @@ in buildFHSUserEnv rec { fi fi - export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"} - # XDG_DATA_DIRS is used by pressure-vessel and vulkan loaders to find the corresponding icd export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share '' + extraProfile; @@ -300,14 +252,13 @@ in buildFHSUserEnv rec { EOF fi fi - ${lib.optionalString (!nativeOnly) exportLDPath} + + ${exportLDPath} ${fixBootstrap} exec steam "$@" ''; - meta = steam.meta // { - broken = nativeOnly; - }; + inherit (steam) meta; # allows for some gui applications to share IPC # this fixes certain issues where they don't render correctly @@ -322,7 +273,7 @@ in buildFHSUserEnv rec { name = "steam-run"; targetPkgs = commonTargetPkgs; - inherit multiPkgs extraBuildCommands profile; + inherit multiPkgs extraBuildCommands profile extraInstallCommands; inherit unshareIpc unsharePid; @@ -334,7 +285,8 @@ in buildFHSUserEnv rec { exit 1 fi shift - ${lib.optionalString (!nativeOnly) exportLDPath} + + ${exportLDPath} ${fixBootstrap} exec -- "$run" "$@" ''; diff --git a/pkgs/games/steam/fonts.nix b/pkgs/games/steam/fonts.nix deleted file mode 100644 index 65efd42a22a..00000000000 --- a/pkgs/games/steam/fonts.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation { - pname = "steam-fonts"; - version = "1"; - - src = fetchurl { - url = "https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip"; - sha256 = "1cgygmwich5f1jhhbmbkkpnzasjl8gy36xln76n6r2gjh6awqfx0"; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -r *.TTF *.ttf $out/share/fonts/truetype - ''; -} diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index c4094f2816d..cd4895fc064 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "terraria-server"; - version = "1.4.3.2"; + version = "1.4.3.6"; urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip"; - sha256 = "sha256-/OClQTO9iBRQk3iTvYbjG1cCicKIBh+yi2OFpurJx8U="; + sha256 = "sha256-OFI7U6Mqu09pIbgJQs0O+GS8jf1uVuhAVEJhYNYXrBE="; }; buildInputs = [ file ]; diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index 289b4e386be..638fa170f50 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -1,17 +1,21 @@ -{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, - cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf, imagemagick }: +{ lib, stdenv, fetchurl, SDL, SDL_gfx, SDL_image, SDL_ttf, SDL_mixer, libpng +, libimagequant, cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf +, imagemagick +}: stdenv.mkDerivation rec { - version = "0.9.24"; + version = "0.9.27"; pname = "tuxpaint"; src = fetchurl { url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz"; - sha256 = "06m1lg2pikfkmassfvvrbwqffwgixcmjh1li6akaldgkalpmfql7"; + sha256 = "sha256-qyuA6J34gijNDsCmyQtJ1UPLFXqjj7kMvTop8AFAVXo="; }; - nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo - librsvg gettext libpaper fribidi pkg-config gperf imagemagick ]; + nativeBuildInputs = [ + SDL SDL_gfx SDL_image SDL_ttf SDL_mixer libpng cairo libimagequant librsvg + gettext libpaper fribidi pkg-config gperf imagemagick + ]; hardeningDisable = [ "format" ]; makeFlags = [ "GPERF=${gperf}/bin/gperf" "PREFIX=$$out" @@ -25,8 +29,8 @@ stdenv.mkDerivation rec { # stamps stamps = fetchurl { - url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2014-08-23/tuxpaint-stamps-2014.08.23.tar.gz"; - sha256 = "0rhlwrjz44wp269v3rid4p8pi0i615pzifm1ym6va64gn1bms06q"; + url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2021-11-25/tuxpaint-stamps-2021.11.25.tar.gz"; + sha256 = "sha256-y1XuIbLSW0QO4has+rC7jZBq8cma28d+jbEe7DBYnVI="; }; postInstall = '' @@ -37,15 +41,17 @@ stdenv.mkDerivation rec { # Install stamps tar xzf $stamps - cd tuxpaint-stamps-2014.08.23 + cd tuxpaint-stamps-* make install-all PREFIX=$out rm -rf $out/share/tuxpaint/stamps/military ''; + enableParallelBuilding = true; + meta = { description = "Open Source Drawing Software for Children"; homepage = "http://www.tuxpaint.org/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ woffs ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 89f8f5ec91b..1dc2abbf762 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -24,7 +24,13 @@ stdenv.mkDerivation rec { curl libjpeg libpng gettext cunit ]; - NIX_CFLAGS_LINK = "-lgcc_s"; # to avoid occasional runtime error in finding libgcc_s.so.1 + NIX_CFLAGS_LINK = [ + # to avoid occasional runtime error in finding libgcc_s.so.1 + "-lgcc_s" + # tests are underlinked against libm: + # ld: release-linux-x86_64/testall/client/sound/s_mix.c.o: undefined reference to symbol 'acos@@GLIBC_2.2.5' + "-lm" + ]; meta = { homepage = "http://ufoai.org"; diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index d58c9aee0de..50db51b4e89 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.19.8"; + version = "3.19.12"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-ubMREVcislhkA3pzxuqI+HpBHq9vbMa8nyq0qhTh2x8="; + sha256 = "sha256-PALrOyaUYXyNH+QdE8oy1TM5U4SZjw1N0NJ2BKiqjtU="; }; dontUnpack = true; diff --git a/pkgs/games/vimgolf/Gemfile b/pkgs/games/vimgolf/Gemfile new file mode 100644 index 00000000000..a375239ffc8 --- /dev/null +++ b/pkgs/games/vimgolf/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'vimgolf' diff --git a/pkgs/games/vimgolf/Gemfile.lock b/pkgs/games/vimgolf/Gemfile.lock new file mode 100644 index 00000000000..9eaf1172d05 --- /dev/null +++ b/pkgs/games/vimgolf/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + highline (2.0.3) + json_pure (2.6.1) + thor (1.2.1) + vimgolf (0.5.0) + highline (~> 2.0, >= 2.0.3) + json_pure (~> 2.3, >= 2.3.1) + thor (~> 1.0, >= 1.0.1) + +PLATFORMS + ruby + +DEPENDENCIES + vimgolf + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/games/vimgolf/default.nix b/pkgs/games/vimgolf/default.nix new file mode 100644 index 00000000000..2847ff7dd3b --- /dev/null +++ b/pkgs/games/vimgolf/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "vimgolf"; + gemdir = ./.; + exes = [ "vimgolf" ]; + + passthru.updateScript = bundlerUpdateScript "vimgolf"; + + meta = with lib; { + description = "A game that tests Vim efficiency"; + homepage = "https://vimgolf.com"; + license = licenses.mit; + maintainers = with maintainers; [ leungbk ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/vimgolf/gemset.nix b/pkgs/games/vimgolf/gemset.nix new file mode 100644 index 00000000000..17d66b934b2 --- /dev/null +++ b/pkgs/games/vimgolf/gemset.nix @@ -0,0 +1,43 @@ +{ + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + type = "gem"; + }; + version = "2.0.3"; + }; + json_pure = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ddn30jkpw6anfakfm7lffnrl2i0265ryrrwa4j0ivihjr95y82"; + type = "gem"; + }; + version = "2.6.1"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + type = "gem"; + }; + version = "1.2.1"; + }; + vimgolf = { + dependencies = ["highline" "json_pure" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "190dzqkvshd4i6jf30xnpm4sczraw6rdh4wvfh6qnmg0czmj0sny"; + type = "gem"; + }; + version = "0.5.0"; + }; +} diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index a14e80759b5..e6e7d28e17b 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.16.3"; + version = "1.16.4"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-PpvTHG/EBKBhtlgIrAz/B+U1aHbZURN2cWTlZ/DkZQs="; + sha256 = "sha256-wdwQ1Dv0872nEOYIB+rEzYtG5rnSw8DZgoSlSvCvtrI="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 788fbdbf6c8..e4a2ff4c31b 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-IkD1WkeKas9qtUUTTo9w4cEoGAoX+d+Cr2C5PTUFaEg="; + sha256 = "sha256-sdHc/i1ffbTAY7ehO6LsIa+ll+LHkuXIwcwTIEOY28g="; }; buildInputs = [ diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index ee7cbd8fb48..ff34bfe729b 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.3.6"; + version = "3.4.4"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "sha256-rTJO1btS1VBHatj9Yr2R6vZBUPQtCB1Aa6AD6IzwuLg="; + sha256 = "sha256-fPMy5AxKspFkcWphf/IjMc/ZQtayljThKxbcMtvOjRc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 2d0129e21c5..af43c55072c 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.4.0"; + version = if stdenv.isDarwin then "2.2.6" else "2.4.1"; src = fetchurl (if stdenv.isDarwin then { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"; } else { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "1pm6lf08z8vgs62g5b5rjw32qy3vr0q3sgidpg2lfs6a530wxgls"; + sha256 = "sha256-xzOfdfjU8t7FDGczQaRfwGtohbttQ2bWv1mk5sEK4Xg="; }); outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/misc/dxvk/darwin-dxvk-compat.patch b/pkgs/misc/dxvk/darwin-dxvk-compat.patch new file mode 100644 index 00000000000..1c68659215f --- /dev/null +++ b/pkgs/misc/dxvk/darwin-dxvk-compat.patch @@ -0,0 +1,35 @@ +Source: https://github.com/marzent/dxvk/commit/65247afe2de5dd6b555b8fdd46dddcdc6325e1d6 +--- + src/d3d11/d3d11_device.cpp | 12 +- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp +index 21f0d1b4a..5b1d05335 100644 +--- a/src/d3d11/d3d11_device.cpp ++++ b/src/d3d11/d3d11_device.cpp +@@ -799,8 +799,12 @@ namespace dxvk { + InitReturnPtr(ppGeometryShader); + D3D11CommonShader module; + +- if (!m_dxvkDevice->features().extTransformFeedback.transformFeedback) +- return DXGI_ERROR_INVALID_CALL; ++ if (!m_dxvkDevice->features().extTransformFeedback.transformFeedback) { ++ Logger::err( ++ "D3D11: CreateGeometryShaderWithStreamOutput:" ++ "\n Transform feedback not supported by device"); ++ return S_OK; ++ } + + // Zero-init some counterss so that we can increment + // them while walking over the stream output entries +@@ -1973,8 +1977,8 @@ namespace dxvk { + enabled.core.features.logicOp = supported.core.features.logicOp; + enabled.core.features.shaderImageGatherExtended = VK_TRUE; + enabled.core.features.variableMultisampleRate = supported.core.features.variableMultisampleRate; +- enabled.extTransformFeedback.transformFeedback = VK_TRUE; +- enabled.extTransformFeedback.geometryStreams = VK_TRUE; ++ enabled.extTransformFeedback.transformFeedback = supported.extTransformFeedback.transformFeedback; ++ enabled.extTransformFeedback.geometryStreams = supported.extTransformFeedback.geometryStreams; + } + + if (featureLevel >= D3D_FEATURE_LEVEL_10_1) { diff --git a/pkgs/misc/dxvk/darwin-moltenvk-compat.patch b/pkgs/misc/dxvk/darwin-moltenvk-compat.patch new file mode 100644 index 00000000000..7d16fdf7033 --- /dev/null +++ b/pkgs/misc/dxvk/darwin-moltenvk-compat.patch @@ -0,0 +1,59 @@ +Source: https://github.com/Gcenx/MoltenVK/commit/1f268bd45f6c928784d7cb90dedce382895f10ae + +Fake extensions for DXVK; +- _features.geometryShader +- _features.tessellationShader +- _features.shaderCullDistance + +Enabled defaults; +- MVK_ALLOW_METAL_FENCES=1 +- MVK_CONFIG_RESUME_LOST_DEVICE=1 +--- + MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm | 3 +++ + MoltenVK/MoltenVK/Utility/MVKEnvironment.h | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm +index bc6d19df..e1959c6e 100644 +--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm ++++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm +@@ -1656,6 +1656,8 @@ + _features.robustBufferAccess = true; // XXX Required by Vulkan spec + _features.fullDrawIndexUint32 = true; + _features.independentBlend = true; ++ _features.geometryShader = true; // XXX Required by DXVK for D3D10 ++ _features.tessellationShader = true; // XXX Required by DXVK for D3D11 + _features.sampleRateShading = true; + _features.depthBiasClamp = true; + _features.fillModeNonSolid = true; +@@ -1669,6 +1671,7 @@ + _features.shaderUniformBufferArrayDynamicIndexing = true; + _features.shaderStorageBufferArrayDynamicIndexing = true; + _features.shaderClipDistance = true; ++ _features.shaderCullDistance = true; // XXX Required by DXVK for 10level9 + _features.shaderInt16 = true; + _features.multiDrawIndirect = true; + _features.inheritedQueries = true; +diff --git a/MoltenVK/MoltenVK/Utility/MVKEnvironment.h b/MoltenVK/MoltenVK/Utility/MVKEnvironment.h +index 81d0defc..80c414d3 100644 +--- a/MoltenVK/MoltenVK/Utility/MVKEnvironment.h ++++ b/MoltenVK/MoltenVK/Utility/MVKEnvironment.h +@@ -240,7 +240,7 @@ void mvkSetConfig(const MVKConfiguration& mvkConfig); + # define MVK_ALLOW_METAL_EVENTS 1 + #endif + #ifndef MVK_ALLOW_METAL_FENCES +-# define MVK_ALLOW_METAL_FENCES 0 ++# define MVK_ALLOW_METAL_FENCES 1 // XXX Required by DXVK for Apple/NVidia GPUs (better FPS than CPU Emulation) + #endif + + /** Substitute Metal 2D textures for Vulkan 1D images. Enabled by default. */ +@@ -275,7 +275,7 @@ void mvkSetConfig(const MVKConfiguration& mvkConfig); + + /** Resume MVKDevice VK_ERROR_DEVICE_LOST errors that do not cause MVKPhysicalDevice errors. Disabled by default. */ + #ifndef MVK_CONFIG_RESUME_LOST_DEVICE +-# define MVK_CONFIG_RESUME_LOST_DEVICE 0 ++# define MVK_CONFIG_RESUME_LOST_DEVICE 1 + #endif + + /** Support Metal argument buffers. Disabled by default. */ + \ No newline at end of file diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix new file mode 100644 index 00000000000..61e2d78b45c --- /dev/null +++ b/pkgs/misc/dxvk/default.nix @@ -0,0 +1,80 @@ +{ lib +, pkgs +, stdenv +, fetchFromGitHub +, pkgsCross +}: + +let + # 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 (self) src version dxvkPatches; }; + dxvk64 = pkgsCross.mingwW64.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; }; + + # Use the self pattern to support overriding `src` and `version` via `overrideAttrs`. A recursive + # attrset wouldn’t work. + self = stdenv.mkDerivation { + name = "dxvk"; + version = "1.10"; + + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + rev = "v${self.version}"; + hash = "sha256-/zH6vER/6s/d+Tt181UJOa97sqdkJyKGw6E36+1owzQ="; + }; + + # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. + # Some games will work poorly (particularly Unreal Engine 4 games), but others work pretty well. + # Override this to patch DXVK itself (rather than the setup script). + dxvkPatches = lib.optional stdenv.isDarwin ./darwin-dxvk-compat.patch; + + outputs = [ "out" "bin" "lib" ]; + + # Also copy `mcfgthread-12.dll` due to DXVK’s being built in a MinGW cross environment. + patches = [ ./mcfgthread.patch ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $bin $lib + substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \ + --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \ + --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \ + --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" + chmod a+x $out/bin/setup_dxvk.sh + declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) + for arch in "''${!dxvks[@]}"; do + ln -s "''${dxvks[$arch]}/bin" $bin/$arch + ln -s "''${dxvks[$arch]}/lib" $lib/$arch + done + ''; + + # DXVK with MoltenVK requires a patched MoltenVK in addition to its own patches. Provide a + # convenience function to handle the necessary patching. + # Usage: + # let + # patchedMoltenVK = dxvk.patchMoltenVK darwin.moltenvk; + # in + # wine64Packages.full.override { moltenvk = patchedMoltenVK; vkd3dSupport = false; } + passthru.patchMoltenVK = moltenvk: + moltenvk.overrideAttrs (old: { + patches = old.patches or [ ] ++ [ + # Lie to DXVK about certain features that DXVK expects to be available and set defaults + # for better performance/compatability on certain hardware. + ./darwin-moltenvk-compat.patch + ]; + }); + + meta = { + description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + homepage = "https://github.com/doitsujin/dxvk"; + changelog = "https://github.com/doitsujin/dxvk/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + }; + }; +in +self diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/misc/dxvk/dxvk.nix new file mode 100644 index 00000000000..40b674df922 --- /dev/null +++ b/pkgs/misc/dxvk/dxvk.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, glslang +, meson +, ninja +, windows +, src +, version +, dxvkPatches +}: + +stdenv.mkDerivation { + pname = "dxvk"; + inherit src version; + + nativeBuildInputs = [ glslang meson ninja ]; + buildInputs = [ windows.pthreads ]; + + patches = dxvkPatches; + + # Replace use of DXVK’s threading classes with the ones from the C++ standard library, which uses + # mcfgthreads in nixpkgs. + postPatch = '' + for class in mutex recursive_mutex condition_variable; do + for file in $(grep -rl dxvk::$class *); do + if [ "$(basename "$file")" != "thread.h" ]; then + substituteInPlace "$file" --replace dxvk::$class std::$class + fi + done + done + ''; + + mesonFlags = + let + arch = if stdenv.is32bit then "32" else "64"; + in + [ + "--buildtype" "release" + "--cross-file" "build-win${arch}.txt" + "--prefix" "${placeholder "out"}" + ]; + + meta = { + description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + homepage = "https://github.com/doitsujin/dxvk"; + changelog = "https://github.com/doitsujin/dxvk/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.zlib; + platforms = lib.platforms.windows; + }; +} diff --git a/pkgs/misc/dxvk/mcfgthread.patch b/pkgs/misc/dxvk/mcfgthread.patch new file mode 100644 index 00000000000..03707163017 --- /dev/null +++ b/pkgs/misc/dxvk/mcfgthread.patch @@ -0,0 +1,34 @@ +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/pkgs/misc/i3a/default.nix b/pkgs/misc/i3a/default.nix new file mode 100644 index 00000000000..36f58c16cc2 --- /dev/null +++ b/pkgs/misc/i3a/default.nix @@ -0,0 +1,21 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "i3a"; + version = "2.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + hash = "sha256-2k1HYtgJ76qXLvX6RmOSKtMMg+K722n8U9YmBANvQvE="; + }; + + nativeBuildInputs = [ python3Packages.setuptools-scm ]; + propagatedBuildInputs = [ python3Packages.i3ipc ]; + + meta = with lib; { + homepage = "https://git.goral.net.pl/mgoral/i3a"; + description = "A set of scripts used for automation of i3 and sway window manager layouts"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index b75f9c3f800..9527c156e48 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.22.1"; + version = "2.22.2"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-cqwtVMMQwxQcC3gtTgvvkALVUZz0ZjJ1mx8D72lpzDA="; + sha256 = "sha256-3ekIVPp94QEvThMEpoYXrqmrMiky7AznaYT2DSaqI74="; }; postInstall = '' diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix new file mode 100644 index 00000000000..07194380d4a --- /dev/null +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -0,0 +1,102 @@ +{ lib +, stdenv +, autoconf +, automake +, bash +, bzip2 +, corosync +, dbus +, fetchFromGitHub +, glib +, gnutls +, libqb +, libtool +, libuuid +, libxml2 +, libxslt +, pam +, pkg-config +, python3 +, nixosTests + +# Pacemaker is compiled twice, once with forOCF = true to extract its +# OCF definitions for use in the ocf-resource-agents derivation, then +# again with forOCF = false, where the ocf-resource-agents is provided +# as the OCF_ROOT. +, forOCF ? false +, ocf-resource-agents +} : + +stdenv.mkDerivation rec { + pname = "pacemaker"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "ClusterLabs"; + repo = pname; + rev = "Pacemaker-${version}"; + sha256 = "1w7vq3lmgcz38pfww9vccm142vjsjqz3qc9nnk09ynkx4agqhxdg"; + }; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; + + buildInputs = [ + bash + bzip2 + corosync + dbus.dev + glib + gnutls + libqb + libuuid + libxml2.dev + libxslt.dev + pam + python3 + ]; + + preConfigure = '' + ./autogen.sh --prefix="$out" + ''; + configureFlags = [ + "--exec-prefix=${placeholder "out"}" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-initdir=/etc/systemd/system" + "--with-systemdsystemunitdir=/etc/systemd/system" + "--with-corosync" + # allows Type=notify in the systemd service + "--enable-systemd" + ] ++ lib.optional (!forOCF) "--with-ocfdir=${ocf-resource-agents}/usr/lib/ocf"; + + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + "-Wno-error=strict-prototypes" + ]; + + enableParallelBuilding = true; + + postInstall = '' + # pacemaker's install linking requires a weirdly nested hierarchy + mv $out$out/* $out + rm -r $out/nix + ''; + + passthru.tests = { + inherit (nixosTests) pacemaker; + }; + + meta = with lib; { + homepage = "https://clusterlabs.org/pacemaker/"; + description = "Pacemaker is an open source, high availability resource manager suitable for both small and large clusters."; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ryantm astro ]; + }; +} diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix index 24c0b6bece7..4f30fd91896 100644 --- a/pkgs/misc/openrussian-cli/default.nix +++ b/pkgs/misc/openrussian-cli/default.nix @@ -1,6 +1,9 @@ { stdenv, lib, fetchFromGitHub, gnumake, pkg-config, wget, unzip, gawk -, sqlite, which, luaPackages, installShellFiles, makeWrapper +, sqlite, which, lua, installShellFiles, makeWrapper }: +let + luaEnv = lua.withPackages(p: with p; [ luasql-sqlite3 luautf8 ]); +in stdenv.mkDerivation rec { pname = "openrussian-cli"; version = "1.0.0"; @@ -16,11 +19,11 @@ stdenv.mkDerivation rec { gnumake pkg-config wget unzip gawk sqlite which installShellFiles makeWrapper ]; - buildInputs = with luaPackages; [ lua luasql-sqlite3 luautf8 ]; + buildInputs = [ luaEnv ]; makeFlags = [ - "LUA=${luaPackages.lua}/bin/lua" - "LUAC=${luaPackages.lua}/bin/luac" + "LUA=${luaEnv}/bin/lua" + "LUAC=${luaEnv}/bin/luac" ]; dontConfigure = true; @@ -34,8 +37,8 @@ stdenv.mkDerivation rec { cp openrussian $out/bin wrapProgram $out/bin/openrussian \ - --prefix LUA_PATH ';' "$LUA_PATH" \ - --prefix LUA_CPATH ';' "$LUA_CPATH" + --prefix LUA_PATH ';' '${lua.pkgs.lib.genLuaPathAbsStr luaEnv}' \ + --prefix LUA_CPATH ';' '${lua.pkgs.lib.genLuaCPathAbsStr luaEnv}' runHook postInstall ''; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 8d6b5eba5bf..ac739d6a0db 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.68"; + version = "5.69"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-MHMf3LID8W61wcQ8BdQuRSrQ60VVyXxVVmpuyxh3zW4="; + sha256 = "sha256-6pJlTAASJoSHZaJRpzvLxHPM7xe3IcwY1TYfWdvW07k="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 5c30040f491..941943a495e 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "6.02"; + version = "6.03"; pname = "xscreensaver"; src = fetchurl { url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Xm1ssJAzrVYs/m1Gv5MS5EUfeUa+2KRnGqk0TfkZMYQ="; + sha256 = "sha256-Mo1ReXNSrPWMpbq0nnb78mA058rXhfZR6hHOe0P7olo="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 5d7a344088e..986494e599d 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -111,7 +111,7 @@ let homepage = "http://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; license = licenses.gpl2; - maintainers = with maintainers; [ dezgeg samueldr lopsided98 ]; + maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" ]); in { @@ -139,6 +139,12 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootA20OlinuxinoLime2EMMC = buildUBoot { + defconfig = "A20-OLinuXino-Lime2-eMMC_defconfig"; + extraMeta.platforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootAmx335xEVM = buildUBoot { defconfig = "am335x_evm_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/pkgs/os-specific/darwin/dockutil/default.nix b/pkgs/os-specific/darwin/dockutil/default.nix new file mode 100644 index 00000000000..d937ce8fd12 --- /dev/null +++ b/pkgs/os-specific/darwin/dockutil/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "dockutil"; + version = "2.0.5"; + + src = fetchFromGitHub { + owner = "kcrawford"; + repo = "dockutil"; + rev = version; + sha256 = "sha256-8tDkueCTCtvxc7owp3K9Tsrn4hL79CM04zBNv7AcHgA="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 scripts/dockutil -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Tool for managing dock items"; + homepage = "https://github.com/kcrawford/dockutil"; + license = licenses.asl20; + maintainers = with maintainers; [ tboerger ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index be44db38fe1..cc5c4ae2045 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, SkyLight }: +{ lib, stdenv, fetchFromGitHub, memstreamHook, Carbon, Cocoa, SkyLight }: let inherit (stdenv.hostPlatform) system; @@ -10,20 +10,17 @@ in stdenv.mkDerivation rec { pname = "sketchybar"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${version}"; - sha256 = "1370xjl8sas5nghxgjxmc1zgskf28g40pv7nxgh37scjwdrkrrvb"; + sha256 = "sha256-ucTyJhRhSVyE4E/x6PtFz7nHRUg6cKKVOrRpPs39iO8="; }; - buildInputs = [ Carbon Cocoa SkyLight ]; - - postPatch = '' - sed -i -e '/^#include <malloc\/_malloc.h>/d' src/*.[ch] src/*/*.[ch] - ''; + buildInputs = [ Carbon Cocoa SkyLight ] + ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memstreamHook ]; makeFlags = [ target diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 700389a4a18..0724118431c 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; sourceRoot = "source/src"; - makeFlags = [ + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 62437d662b9..98fd83ed5d5 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 9fd24eea6d9..de71b7d8c3e 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -3,11 +3,10 @@ runCommand, autoreconfHook, autoconf, automake, libtool, - enablePython ? false, python ? null, + enablePython ? true, python3, swig, + linuxHeaders ? stdenv.cc.libc.linuxHeaders }: -assert enablePython -> python != null; - stdenv.mkDerivation rec { pname = "audit"; version = "2.8.5"; # at the next release, remove the patches below! @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optional enablePython python; + buildInputs = lib.optionals enablePython [ python3 swig ]; configureFlags = [ # z/OS plugin is not useful on Linux, @@ -69,8 +68,11 @@ stdenv.mkDerivation rec { }) ]; - prePatch = '' + postPatch = '' sed -i 's,#include <sys/poll.h>,#include <poll.h>\n#include <limits.h>,' audisp/audispd.c + substituteInPlace bindings/swig/src/auditswig.i \ + --replace "/usr/include/linux/audit.h" \ + "${linuxHeaders}/include/linux/audit.h" '' # According to https://stackoverflow.com/questions/13089166 # --whole-archive linker flag is required to be sure that linker diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 354f4b1bff2..123c42e8397 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -12,11 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ + "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; hardeningDisable = [ "pic" ]; preBuild = '' - makeFlags="KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" sed -i -e "s,INSTALL_MOD_DIR=,INSTALL_MOD_PATH=$out INSTALL_MOD_DIR=," \ -e /depmod/d Makefile ''; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 5e81cf6b2c1..fb75b99f03d 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -22,11 +22,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.62"; + version = "5.63"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-OAkKW3UOF/wI0+UheO2NMlTF9L0sSIMNXBlVuI47wMI="; + sha256 = "sha256-k0nhHoFguz1yCDXScSUNinQk02kPUonm22/gfMZsbXY="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 9e21955808f..7aaedb5b1ac 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, buildPackages, fetchurl, fetchFromGitLab , enableStatic ? stdenv.hostPlatform.isStatic , enableMinimal ? false +, enableAppletSymlinks ? true # Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping: # nix build -f pkgs/top-level/release.nix stdenvBootstrapTools.x86_64-linux.dist , useMusl ? stdenv.hostPlatform.libc == "musl", musl @@ -95,6 +96,11 @@ stdenv.mkDerivation rec { CONFIG_STATIC y ''} + ${lib.optionalString (!enableAppletSymlinks) '' + CONFIG_INSTALL_APPLET_DONT y + CONFIG_INSTALL_APPLET_SYMLINKS n + ''} + # Use the external mount.cifs program. CONFIG_FEATURE_MOUNT_CIFS n CONFIG_FEATURE_MOUNT_HELPERS y diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 9c30aae86fe..73edb3be9ec 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -13,16 +13,13 @@ stdenv.mkDerivation { sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; - KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; + makeFlags = kernel.makeFlags ++ [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; - buildPhase = '' - make modules - ''; - - installPhase = '' - make modules_install - ''; + buildFlags = [ "modules" ]; + installTargets = [ "modules_install" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index f09679ba212..cc3a1d81109 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-vJQ10rG5FGbeEOqCUmH/pZ0P77kAW/MtUarywbtIyHw="; }; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 27f32c64813..a9bd508d16e 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" "--disable-ssh-token" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "--enable-static-cryptsetup" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/dddvb/default.nix b/pkgs/os-specific/linux/dddvb/default.nix index 63849173eae..7db444bff0f 100644 --- a/pkgs/os-specific/linux/dddvb/default.nix +++ b/pkgs/os-specific/linux/dddvb/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "dddvb"; - version = "0.9.33-404-ge9ccab3"; + version = "0.9.38-pre.4"; src = fetchFromGitHub { owner = "DigitalDevices"; diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 6b5f66f825b..e26509d3a7c 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "1l54j85540386a8aypqka7p5hy1b63cwmpsscv9rmmf10f78v8mm"; }; - INSTALL_MOD_PATH = "\${out}"; - postPatch = '' sed 's/udevadm /true /' -i Makefile sed 's/depmod /true /' -i Makefile @@ -38,10 +36,11 @@ stdenv.mkDerivation rec { rm -r $out/lib/udev ''; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KVERSION=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "DESTDIR=${placeholder "out"}" + "INSTALL_MOD_PATH=${placeholder "out"}" ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index a188336cbe5..694e508dcd0 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; + makeFlags = kernel.makeFlags ++ [ + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -18,10 +21,9 @@ stdenv.mkDerivation rec { preBuild = "cd linux/igb_uio"; installPhase = '' - make -C ${KSRC} M=$(pwd) modules_install + make -C ${KSRC} M=$(pwd) modules_install $makeFlags ''; - INSTALL_MOD_PATH = placeholder "out"; enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 930e9381bb7..46e83609722 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "earlyoom"; - version = "1.6.2"; + version = "1.7"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${version}"; - sha256 = "16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq"; + sha256 = "sha256-8YcT1TTlAet7F1U9Ginda4IApNqkudegOXqm8rnRGfc="; }; nativeBuildInputs = lib.optionals withManpage [ pandoc installShellFiles ]; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 1257217a520..5873a2fe2c1 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; # linux 3.12 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - strip -S ena.ko + $STRIP -S ena.ko dest=$out/lib/modules/${kernel.modDirVersion}/misc mkdir -p $dest cp ena.ko $dest/ diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index e40448be435..721a49ed4a5 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ kernel libdrm ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index 66194430b25..bdb2fc34728 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,28 +1,27 @@ diff --git a/data/meson.build b/data/meson.build -index f10d4ff6..2dc66fb6 100644 +index 2ae29ce5..342cac92 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -21,7 +21,7 @@ endif +@@ -26,7 +26,7 @@ endif if build_standalone install_data(['daemon.conf'], - install_dir : join_paths(sysconfdir, 'fwupd') + install_dir : join_paths(sysconfdir_install, 'fwupd') ) - install_data(['power.quirk'], + install_data(['power.quirk', 'cfi.quirk'], install_dir: join_paths(datadir, 'fwupd', 'quirks.d')) diff --git a/data/pki/meson.build b/data/pki/meson.build -index dcd9e128..ff137f3a 100644 +index 2a7d0f24..091981f7 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build -@@ -2,24 +2,23 @@ install_data([ +@@ -12,13 +12,13 @@ install_data([ 'GPG-KEY-Linux-Foundation-Firmware', 'GPG-KEY-Linux-Vendor-Firmware-Service', ], - install_dir : join_paths(sysconfdir, 'pki', 'fwupd') + install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') ) - install_data([ 'GPG-KEY-Linux-Foundation-Metadata', 'GPG-KEY-Linux-Vendor-Firmware-Service', @@ -30,7 +29,9 @@ index dcd9e128..ff137f3a 100644 - install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') + install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') ) + endif +@@ -26,11 +26,11 @@ if supported_pkcs7 == '1' install_data([ 'LVFS-CA.pem', ], @@ -43,7 +44,7 @@ index dcd9e128..ff137f3a 100644 - install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') + install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') ) -- + endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build index 02d8777b..2c89d593 100644 --- a/data/remotes.d/meson.build @@ -82,10 +83,10 @@ index 02d8777b..2c89d593 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index 7557cd4a..4c98de6d 100644 +index 394f40fa..7b602c73 100644 --- a/meson.build +++ b/meson.build -@@ -190,6 +190,12 @@ endif +@@ -187,6 +187,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -99,14 +100,14 @@ index 7557cd4a..4c98de6d 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 94f73898..5de6cc7b 100644 +index c1b483cb..047dbdd8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type') option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') - option('firmware-packager', type : 'boolean', value : true, description : 'enable firmware-packager installation') + 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 e9f12879..a0126dbb 100644 --- a/plugins/dell-esrt/meson.build @@ -119,8 +120,21 @@ index e9f12879..a0126dbb 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) endif +diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build +index 3ea47456..40dbd116 100644 +--- a/plugins/msr/meson.build ++++ b/plugins/msr/meson.build +@@ -12,7 +12,7 @@ install_data(['fwupd-msr.conf'], + endif + + install_data(['msr.conf'], +- install_dir: join_paths(sysconfdir, 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'fwupd') + ) + shared_module('fu_plugin_msr', + fu_hash, diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 5263048c..c46fac64 100644 +index 4a0a8664..7d9ba77d 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build @@ -53,7 +53,7 @@ shared_module('fu_plugin_redfish', @@ -129,14 +143,14 @@ index 5263048c..c46fac64 100644 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 646ed6cb..8d7c59aa 100644 +index 1ba9562f..c074f770 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', +@@ -37,7 +37,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', ) install_data(['thunderbolt.conf'], @@ -146,7 +160,7 @@ index 646ed6cb..8d7c59aa 100644 # we use functions from 2.52 in the tests if get_option('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 708586b0..f29536b1 100644 +index 04cbd51a..9a8c43de 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -21,7 +21,7 @@ if host_machine.system() == 'linux' @@ -158,7 +172,7 @@ index 708586b0..f29536b1 100644 ) elif host_machine.system() == 'freebsd' backend_srcs += 'fu-uefi-backend-freebsd.c' -@@ -116,7 +116,7 @@ if get_option('man') +@@ -114,7 +114,7 @@ if get_option('compat_cli') and get_option('man') endif install_data(['uefi_capsule.conf'], diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 077c37a72cb..272bd6dbe8f 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -12,6 +12,7 @@ , libgudev , polkit , libxmlb +, glib , gusb , sqlite , libarchive @@ -50,6 +51,9 @@ , nixosTests , runCommand , unstableGitUpdater +, modemmanager +, libqmi +, libmbim }: let @@ -112,7 +116,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.7.2"; + version = "1.7.6"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -121,7 +125,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-hjLfacO6/Fk4fNy1F8POMaWXoJAm5E9ZB9g4RnG5+DQ="; + sha256 = "sha256-fr4VFKy2iNJknOzDktuSkJTaPwPPyYqcD6zKuwhJEvo="; }; patches = [ @@ -136,15 +140,26 @@ let # they are not really part of the library. ./install-fwupdplugin-to-out.patch + # Fix detection of installed tests + # https://github.com/fwupd/fwupd/issues/3880 + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/5bc546221331feae9cedc1892219a25d8837955f.patch"; + sha256 = "XcLhcDrB2/MFCXjKAyhftQgvJG4BBkp07geM9eK3q1g="; + }) + # Installed tests are installed to different output # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. ./installed-tests-path.patch - # Tests detect fwupd is installed when prefix is /usr. - ./fix-install-detection.patch - # EFI capsule is located in fwupd-efi now. ./efi-app-path.patch + + # Drop hard-coded FHS path + # https://github.com/fwupd/fwupd/issues/4360 + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/14cc2e7ee471b66ee2ef54741f4bec1f92204620.patch"; + sha256 = "47682oqE66Y6QKPtN2mYpnb2+TIJFqBgsgx60LmC3FM="; + }) ]; nativeBuildInputs = [ @@ -187,6 +202,9 @@ let efivar fwupd-efi protobufc + modemmanager + libmbim + libqmi ] ++ lib.optionals haveDell [ libsmbios ]; @@ -206,6 +224,7 @@ let "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" "-Defi_os_dir=nixos" + "-Dplugin_modem_manager=true" # We do not want to place the daemon into lib (cyclic reference) "--libexecdir=${placeholder "out"}/libexec" @@ -250,6 +269,9 @@ let contrib/generate-version-script.py \ meson_post_install.sh \ po/test-deps + + substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ + --replace "gdbus" ${glib.bin}/bin/gdbus ''; preCheck = '' @@ -301,6 +323,7 @@ let passthru = { filesInstalledToEtc = [ "fwupd/daemon.conf" + "fwupd/msr.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch deleted file mode 100644 index 56d7def5c16..00000000000 --- a/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c -index 4710c769..1c68fdb9 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, "/usr"); -+ return g_str_has_prefix(builddir, "/nix"); - } - - static void diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch index 2024e84b0a8..ea50d88dfed 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build -index adadbcdd..1b51bb9c 100644 +index b8ec916f0..38209b363 100644 --- a/data/installed-tests/meson.build +++ b/data/installed-tests/meson.build -@@ -65,5 +65,5 @@ configure_file( +@@ -83,5 +83,5 @@ configure_file( output : 'fwupd-tests.conf', configuration : con2, install: true, @@ -10,10 +10,10 @@ index adadbcdd..1b51bb9c 100644 + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index 772b7bbe..f59302cd 100644 +index 32fe6e408..b35d741e0 100644 --- a/meson.build +++ b/meson.build -@@ -177,8 +177,8 @@ else +@@ -183,8 +183,8 @@ else datadir = join_paths(prefix, get_option('datadir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -24,6 +24,14 @@ index 772b7bbe..f59302cd 100644 endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) +@@ -484,6 +484,7 @@ gnome = import('gnome') + i18n = import('i18n') + + conf.set_quoted('FWUPD_PREFIX', prefix) ++conf.set_quoted('FWUPD_INSTALLED_TEST_PREFIX', get_option('installed_test_prefix')) + conf.set_quoted('FWUPD_BINDIR', bindir) + conf.set_quoted('FWUPD_LIBDIR', libdir) + conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) diff --git a/meson_options.txt b/meson_options.txt index 0a0e2853..5f68d78b 100644 --- a/meson_options.txt @@ -36,3 +44,16 @@ index 0a0e2853..5f68d78b 100644 option('tests', type : 'boolean', value : true, description : 'enable tests') option('tpm', type : 'boolean', value : true, description : 'enable TPM support') option('udevdir', type: 'string', value: '', description: 'Directory for udev rules') +diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c +index c507fabc8..0cddc3248 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/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index 4aff785b855..22dc930d293 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20220209"; + version = "20220310"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "refs/tags/${version}"; - sha256 = "sha256-QWGnaGQrDUQeYUIBq0/63YdHZgyaF4s9fdyLA9bb6qs="; + sha256 = "sha256-U5XZHzriZaPlgiAcrZnAA7K8PKnIGy58Pi6JziVFTR8="; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-ahXZK13wrcZW/8ZCgUTHU6N4QKsL3NV98eRbYGBp3jw="; + outputHash = "sha256-CAYJssH36aKhzvl0q60HyxgDXeAluspfnLLmawmWIQw="; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix new file mode 100644 index 00000000000..0375eb0eead --- /dev/null +++ b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchurl, cabextract }: + +stdenv.mkDerivation rec { + pname = "xow_dongle-firmware"; + version = "2017-07"; + + dontUnpack = true; + dontInstall = true; + + src = fetchurl { + url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab"; + sha256 = "013g1zngxffavqrk5jy934q3bdhsv6z05ilfixdn8dj0zy26lwv5"; + }; + + nativeBuildInputs = [ cabextract ]; + + buildPhase = '' + cabextract -F FW_ACC_00U.bin ${src} + mkdir -p $out/lib/firmware + cp -a FW_ACC_00U.bin $out/lib/firmware/xow_dongle.bin + ''; + + meta = with lib; { + description = "Xbox One wireless dongle firmware"; + homepage = "https://www.xbox.com/en-NZ/accessories/adapters/wireless-adapter-windows"; + license = licenses.unfree; + maintainers = with lib.maintainers; [ rhysmdnz ]; + platforms = platforms.linux; + }; +} + + diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix index f060557cdec..7dc1f0c3b2e 100644 --- a/pkgs/os-specific/linux/forktty/default.nix +++ b/pkgs/os-specific/linux/forktty/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1.3"; src = fetchurl { - url = "http://sunsite.unc.edu/pub/linux/utils/terminal/forktty-${version}.tgz"; - sha256 = "sha256-6xc5eshCuCIOsDh0r2DizKAeypGH0TRRotZ4itsvpVk="; + url = "mirror://ibiblioPubLinux/utils/terminal/${pname}-${version}.tgz"; + hash = "sha256-6xc5eshCuCIOsDh0r2DizKAeypGH0TRRotZ4itsvpVk="; }; preBuild = '' diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index 737d3316e21..72f25aa800e 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix index ab2e099d970..bcea220cc96 100644 --- a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix +++ b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/hid-nintendo/default.nix b/pkgs/os-specific/linux/hid-nintendo/default.nix index e9ee88252ea..7d01120b2f3 100644 --- a/pkgs/os-specific/linux/hid-nintendo/default.nix +++ b/pkgs/os-specific/linux/hid-nintendo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 3f725e3e5b2..72ecaffe5f5 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-GcqmMqrZSgvSrsY8FJbPynNWTzSi5A6kmyq+xJ+2i3Y="; }; - outputs = [ "out" "man" ] + outputs = [ "out" "man" "doc" ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; nativeBuildInputs = [ @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { doCheck = true; postInstall = '' - mkdir -p $out/share - cp -a doc $out/share/ - cp -a README AUTHORS TODO $out/share/doc/ + mkdir -p $doc/share/doc + cp -a doc $doc/share/doc/iwd + cp -a README AUTHORS TODO $doc/share/doc/iwd '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $test/bin cp -a test/* $test/bin/ diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 2fd10778e2c..9246ca679a6 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -16,13 +16,12 @@ stdenv.mkDerivation { sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile ''; - buildPhase = '' - make -C src/mod - ''; + makeFlags = kernel.makeFlags ++ [ + "-C src/mod" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; - installPhase = '' - make -C src/mod modules_install INSTALL_MOD_PATH=$out - ''; + installTargets = "modules_install"; meta = with lib; { homepage = "https://www.jool.mx/"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 34e1b10b32a..068aedf3121 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -65,7 +65,7 @@ let X86_INTEL_PSTATE = yes; INTEL_IDLE = yes; CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes; - CPU_FREQ_GOV_SCHEDUTIL = whenAtLeast "4.9" yes; + CPU_FREQ_GOV_SCHEDUTIL = yes; PM_WAKELOCKS = yes; # Power-capping framework and support for INTEL RAPL POWERCAP = yes; @@ -148,12 +148,12 @@ let IPV6_MROUTE = yes; IPV6_MROUTE_MULTIPLE_TABLES = yes; IPV6_PIMSM_V2 = yes; - IPV6_FOU_TUNNEL = whenAtLeast "4.7" module; + IPV6_FOU_TUNNEL = module; IPV6_SEG6_LWTUNNEL = whenAtLeast "4.10" yes; IPV6_SEG6_HMAC = whenAtLeast "4.10" yes; IPV6_SEG6_BPF = whenAtLeast "4.18" yes; - NET_CLS_BPF = whenAtLeast "4.4" module; - NET_ACT_BPF = whenAtLeast "4.4" module; + NET_CLS_BPF = module; + NET_ACT_BPF = module; NET_SCHED = yes; L2TP_V3 = yes; L2TP_IP = module; @@ -168,7 +168,7 @@ let PPP_FILTER = yes; # needed for iwd WPS support (wpa_supplicant replacement) - KEY_DH_OPERATIONS = whenAtLeast "4.7" yes; + KEY_DH_OPERATIONS = yes; # needed for nftables # Networking Options @@ -208,7 +208,7 @@ let INET_TCP_DIAG = mkDefault module; INET_UDP_DIAG = mkDefault module; INET_RAW_DIAG = whenAtLeast "4.14" (mkDefault module); - INET_DIAG_DESTROY = whenAtLeast "4.9" (mkDefault yes); + INET_DIAG_DESTROY = mkDefault yes; # enable multipath-tcp MPTCP = whenAtLeast "5.6" yes; @@ -218,6 +218,11 @@ let # Kernel TLS TLS = whenAtLeast "4.13" module; TLS_DEVICE = whenAtLeast "4.18" yes; + + # infiniband + INFINIBAND = module; + INFINIBAND_IPOIB = module; + INFINIBAND_IPOIB_CM = yes; }; wireless = { @@ -267,11 +272,11 @@ let # necessary for amdgpu polaris support DRM_AMD_POWERPLAY = whenBetween "4.5" "4.9" yes; # (experimental) amdgpu support for verde and newer chipsets - DRM_AMDGPU_SI = whenAtLeast "4.9" yes; + DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets - DRM_AMDGPU_CIK = whenAtLeast "4.9" yes; + DRM_AMDGPU_CIK = yes; # Allow device firmware updates - DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes; + DRM_DP_AUX_CHARDEV = yes; # amdgpu display core (DC) support DRM_AMD_DC_DCN1_0 = whenBetween "4.15" "5.6" yes; DRM_AMD_DC_PRE_VEGA = whenBetween "4.15" "4.18" yes; @@ -403,7 +408,6 @@ let F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; - NFSD_PNFS = whenBetween "4.0" "4.6" yes; NFSD_V2_ACL = yes; NFSD_V3 = yes; NFSD_V3_ACL = yes; @@ -460,7 +464,7 @@ let DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; }; RANDOMIZE_BASE = option yes; STRICT_DEVMEM = mkDefault yes; # Filter access to /dev/mem - IO_STRICT_DEVMEM = whenAtLeast "4.5" (mkDefault yes); + IO_STRICT_DEVMEM = mkDefault yes; SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; @@ -515,10 +519,9 @@ let MEMCG = yes; MEMCG_SWAP = yes; - DEVPTS_MULTIPLE_INSTANCES = whenOlder "4.7" yes; BLK_DEV_THROTTLING = yes; CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1 - CGROUP_PIDS = whenAtLeast "4.3" yes; + CGROUP_PIDS = yes; }; staging = { @@ -543,9 +546,9 @@ let STACK_TRACER = yes; UPROBE_EVENT = { optional = true; tristate = whenOlder "4.11" "y";}; UPROBE_EVENTS = { optional = true; tristate = whenAtLeast "4.11" "y";}; - BPF_SYSCALL = whenAtLeast "4.4" yes; + BPF_SYSCALL = yes; BPF_UNPRIV_DEFAULT_OFF = whenBetween "5.10" "5.15" yes; - BPF_EVENTS = whenAtLeast "4.4" yes; + BPF_EVENTS = yes; FUNCTION_PROFILER = yes; RING_BUFFER_BENCHMARK = no; }; @@ -556,11 +559,10 @@ let HYPERVISOR_GUEST = yes; PARAVIRT_SPINLOCKS = option yes; - KVM_APIC_ARCHITECTURE = whenOlder "4.8" yes; KVM_ASYNC_PF = yes; KVM_COMPAT = { optional = true; tristate = whenBetween "4.0" "4.12" "y"; }; KVM_DEVICE_ASSIGNMENT = { optional = true; tristate = whenBetween "3.10" "4.12" "y"; }; - KVM_GENERIC_DIRTYLOG_READ_PROTECT = whenAtLeast "4.0" yes; + KVM_GENERIC_DIRTYLOG_READ_PROTECT = yes; KVM_GUEST = yes; KVM_MMIO = yes; KVM_VFIO = yes; @@ -722,7 +724,12 @@ let HID_ACRUX_FF = yes; DRAGONRISE_FF = yes; + GREENASIA_FF = yes; HOLTEK_FF = yes; + JOYSTICK_PSXPAD_SPI_FF = whenAtLeast "4.14" yes; + LOGIG940_FF = yes; + NINTENDO_FF = whenAtLeast "5.16" yes; + PLAYSTATION_FF = whenAtLeast "5.12" yes; SONY_FF = yes; SMARTJOYPLUS_FF = yes; THRUSTMASTER_FF = yes; @@ -774,14 +781,14 @@ let SERIAL_DEV_CTRL_TTYPORT = whenAtLeast "4.11" yes; # enables support for TTY serial devices BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support - BT_HCIUART_QCA = whenAtLeast "4.3" yes; # Qualcomm Atheros protocol support + BT_HCIUART_QCA = yes; # Qualcomm Atheros protocol support BT_HCIUART_SERDEV = whenAtLeast "4.12" yes; # required by BT_HCIUART_QCA - BT_HCIUART = whenAtLeast "2.5.45" module; # required for BT devices with serial port interface (QCA6390) + BT_HCIUART = module; # required for BT devices with serial port interface (QCA6390) BT_HCIUART_BCSP = option yes; BT_HCIUART_H4 = option yes; # UART (H4) protocol support BT_HCIUART_LL = option yes; BT_RFCOMM_TTY = option yes; # RFCOMM TTY support - BT_QCA = whenAtLeast "4.3" module; # enables QCA6390 bluetooth + BT_QCA = module; # enables QCA6390 bluetooth CLEANCACHE = option yes; CRASH_DUMP = option no; @@ -820,14 +827,12 @@ let MEDIA_ATTACH = yes; MEGARAID_NEWGEN = yes; - MLX4_EN_VXLAN = whenOlder "4.8" yes; MLX5_CORE_EN = option yes; NVME_MULTIPATH = whenAtLeast "4.15" yes; PSI = whenAtLeast "4.20" yes; - MODVERSIONS = whenOlder "4.9" yes; MOUSE_ELAN_I2C_SMBUS = yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension MOUSE_PS2_VMMOUSE = yes; diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch deleted file mode 100644 index 8f2418c9efc..00000000000 --- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch +++ /dev/null @@ -1,407 +0,0 @@ -commit e7cae741f6d645ac68fe8823ca6ef45dbbf6891b -Author: Tejun Heo <tj@kernel.org> -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Misc preps for cgroup unified hierarchy interface - - Make the following changes in preparation for the cpu controller - interface implementation for the unified hierarchy. This patch - doesn't cause any functional differences. - - * s/cpu_stats_show()/cpu_cfs_stats_show()/ - - * s/cpu_files/cpu_legacy_files/ - - * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While - at it, remove pointless cpuacct_stat_desc[] array. - - Signed-off-by: Tejun Heo <tj@kernel.org> - Cc: Ingo Molnar <mingo@redhat.com> - Cc: Peter Zijlstra <peterz@infradead.org> - Cc: Li Zefan <lizefan@huawei.com> - Cc: Johannes Weiner <hannes@cmpxchg.org> - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 732e993..77f3ddd 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8512,7 +8512,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) - return ret; - } - --static int cpu_stats_show(struct seq_file *sf, void *v) -+static int cpu_cfs_stats_show(struct seq_file *sf, void *v) - { - struct task_group *tg = css_tg(seq_css(sf)); - struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -@@ -8552,7 +8552,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, - } - #endif /* CONFIG_RT_GROUP_SCHED */ - --static struct cftype cpu_files[] = { -+static struct cftype cpu_legacy_files[] = { - #ifdef CONFIG_FAIR_GROUP_SCHED - { - .name = "shares", -@@ -8573,7 +8573,7 @@ static struct cftype cpu_files[] = { - }, - { - .name = "stat", -- .seq_show = cpu_stats_show, -+ .seq_show = cpu_cfs_stats_show, - }, - #endif - #ifdef CONFIG_RT_GROUP_SCHED -@@ -8599,7 +8599,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .fork = cpu_cgroup_fork, - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, -- .legacy_cftypes = cpu_files, -+ .legacy_cftypes = cpu_legacy_files, - .early_init = 1, - }; - -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index dd7cbb5..42b2dd5 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -177,36 +177,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V) - return 0; - } - --static const char * const cpuacct_stat_desc[] = { -- [CPUACCT_STAT_USER] = "user", -- [CPUACCT_STAT_SYSTEM] = "system", --}; -- --static int cpuacct_stats_show(struct seq_file *sf, void *v) -+static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp) - { -- struct cpuacct *ca = css_ca(seq_css(sf)); - int cpu; -- s64 val = 0; - -+ *userp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_USER]; -- val += kcpustat->cpustat[CPUTIME_NICE]; -+ *userp += kcpustat->cpustat[CPUTIME_USER]; -+ *userp += kcpustat->cpustat[CPUTIME_NICE]; - } -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val); - -- val = 0; -+ *sysp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_SYSTEM]; -- val += kcpustat->cpustat[CPUTIME_IRQ]; -- val += kcpustat->cpustat[CPUTIME_SOFTIRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SYSTEM]; -+ *sysp += kcpustat->cpustat[CPUTIME_IRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ]; - } -+} - -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val); -+static int cpuacct_stats_show(struct seq_file *sf, void *v) -+{ -+ cputime64_t user, sys; - -+ cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys); -+ seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user)); -+ seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys)); - return 0; - } - - -commit 1bb33e8a69f089f2d3f58a0e681d4ff352e11c97 -Author: Tejun Heo <tj@kernel.org> -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Implement interface for cgroup unified hierarchy - - While the cpu controller doesn't have any functional problems, there - are a couple interface issues which can be addressed in the v2 - interface. - - * cpuacct being a separate controller. This separation is artificial - and rather pointless as demonstrated by most use cases co-mounting - the two controllers. It also forces certain information to be - accounted twice. - - * Use of different time units. Writable control knobs use - microseconds, some stat fields use nanoseconds while other cpuacct - stat fields use centiseconds. - - * Control knobs which can't be used in the root cgroup still show up - in the root. - - * Control knob names and semantics aren't consistent with other - controllers. - - This patchset implements cpu controller's interface on the unified - hierarchy which adheres to the controller file conventions described - in Documentation/cgroups/unified-hierarchy.txt. Overall, the - following changes are made. - - * cpuacct is implictly enabled and disabled by cpu and its information - is reported through "cpu.stat" which now uses microseconds for all - time durations. All time duration fields now have "_usec" appended - to them for clarity. While this doesn't solve the double accounting - immediately, once majority of users switch to v2, cpu can directly - account and report the relevant stats and cpuacct can be disabled on - the unified hierarchy. - - Note that cpuacct.usage_percpu is currently not included in - "cpu.stat". If this information is actually called for, it can be - added later. - - * "cpu.shares" is replaced with "cpu.weight" and operates on the - standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). - The weight is scaled to scheduler weight so that 100 maps to 1024 - and the ratio relationship is preserved - if weight is W and its - scaled value is S, W / 100 == S / 1024. While the mapped range is a - bit smaller than the orignal scheduler weight range, the dead zones - on both sides are relatively small and covers wider range than the - nice value mappings. This file doesn't make sense in the root - cgroup and isn't create on root. - - * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" - which contains both quota and period. - - * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by - "cpu.rt.max" which contains both runtime and period. - - v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for - CFS bandwidth stats and also using raw division for u64. Use - CONFIG_CFS_BANDWITH and do_div() instead. - - The semantics of "cpu.rt.max" is not fully decided yet. Dropped - for now. - - Signed-off-by: Tejun Heo <tj@kernel.org> - Cc: Ingo Molnar <mingo@redhat.com> - Cc: Peter Zijlstra <peterz@infradead.org> - Cc: Li Zefan <lizefan@huawei.com> - Cc: Johannes Weiner <hannes@cmpxchg.org> - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 77f3ddd..7aafe63 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8591,6 +8591,139 @@ static struct cftype cpu_legacy_files[] = { - { } /* terminate */ - }; - -+static int cpu_stats_show(struct seq_file *sf, void *v) -+{ -+ cpuacct_cpu_stats_show(sf); -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ struct task_group *tg = css_tg(seq_css(sf)); -+ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -+ u64 throttled_usec; -+ -+ throttled_usec = cfs_b->throttled_time; -+ do_div(throttled_usec, NSEC_PER_USEC); -+ -+ seq_printf(sf, "nr_periods %d\n" -+ "nr_throttled %d\n" -+ "throttled_usec %llu\n", -+ cfs_b->nr_periods, cfs_b->nr_throttled, -+ throttled_usec); -+ } -+#endif -+ return 0; -+} -+ -+#ifdef CONFIG_FAIR_GROUP_SCHED -+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, -+ struct cftype *cft) -+{ -+ struct task_group *tg = css_tg(css); -+ u64 weight = scale_load_down(tg->shares); -+ -+ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); -+} -+ -+static int cpu_weight_write_u64(struct cgroup_subsys_state *css, -+ struct cftype *cftype, u64 weight) -+{ -+ /* -+ * cgroup weight knobs should use the common MIN, DFL and MAX -+ * values which are 1, 100 and 10000 respectively. While it loses -+ * a bit of range on both ends, it maps pretty well onto the shares -+ * value used by scheduler and the round-trip conversions preserve -+ * the original value over the entire range. -+ */ -+ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) -+ return -ERANGE; -+ -+ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); -+ -+ return sched_group_set_shares(css_tg(css), scale_load(weight)); -+} -+#endif -+ -+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, -+ long period, long quota) -+{ -+ if (quota < 0) -+ seq_puts(sf, "max"); -+ else -+ seq_printf(sf, "%ld", quota); -+ -+ seq_printf(sf, " %ld\n", period); -+} -+ -+/* caller should put the current value in *@periodp before calling */ -+static int __maybe_unused cpu_period_quota_parse(char *buf, -+ u64 *periodp, u64 *quotap) -+{ -+ char tok[21]; /* U64_MAX */ -+ -+ if (!sscanf(buf, "%s %llu", tok, periodp)) -+ return -EINVAL; -+ -+ *periodp *= NSEC_PER_USEC; -+ -+ if (sscanf(tok, "%llu", quotap)) -+ *quotap *= NSEC_PER_USEC; -+ else if (!strcmp(tok, "max")) -+ *quotap = RUNTIME_INF; -+ else -+ return -EINVAL; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+static int cpu_max_show(struct seq_file *sf, void *v) -+{ -+ struct task_group *tg = css_tg(seq_css(sf)); -+ -+ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); -+ return 0; -+} -+ -+static ssize_t cpu_max_write(struct kernfs_open_file *of, -+ char *buf, size_t nbytes, loff_t off) -+{ -+ struct task_group *tg = css_tg(of_css(of)); -+ u64 period = tg_get_cfs_period(tg); -+ u64 quota; -+ int ret; -+ -+ ret = cpu_period_quota_parse(buf, &period, "a); -+ if (!ret) -+ ret = tg_set_cfs_bandwidth(tg, period, quota); -+ return ret ?: nbytes; -+} -+#endif -+ -+static struct cftype cpu_files[] = { -+ { -+ .name = "stat", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_stats_show, -+ }, -+#ifdef CONFIG_FAIR_GROUP_SCHED -+ { -+ .name = "weight", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .read_u64 = cpu_weight_read_u64, -+ .write_u64 = cpu_weight_write_u64, -+ }, -+#endif -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ .name = "max", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_max_show, -+ .write = cpu_max_write, -+ }, -+#endif -+ { } /* terminate */ -+}; -+ - struct cgroup_subsys cpu_cgrp_subsys = { - .css_alloc = cpu_cgroup_css_alloc, - .css_free = cpu_cgroup_css_free, -@@ -8600,7 +8733,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, - .legacy_cftypes = cpu_legacy_files, -+ .dfl_cftypes = cpu_files, - .early_init = 1, -+#ifdef CONFIG_CGROUP_CPUACCT -+ /* -+ * cpuacct is enabled together with cpu on the unified hierarchy -+ * and its stats are reported through "cpu.stat". -+ */ -+ .depends_on = 1 << cpuacct_cgrp_id, -+#endif - }; - - #endif /* CONFIG_CGROUP_SCHED */ -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index 42b2dd5..b4d32a6 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -224,6 +224,30 @@ static struct cftype files[] = { - { } /* terminate */ - }; - -+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ -+void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+ struct cgroup_subsys_state *css; -+ u64 usage, user, sys; -+ -+ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); -+ -+ usage = cpuusage_read(css, seq_cft(sf)); -+ cpuacct_stats_read(css_ca(css), &user, &sys); -+ -+ user *= TICK_NSEC; -+ sys *= TICK_NSEC; -+ do_div(usage, NSEC_PER_USEC); -+ do_div(user, NSEC_PER_USEC); -+ do_div(sys, NSEC_PER_USEC); -+ -+ seq_printf(sf, "usage_usec %llu\n" -+ "user_usec %llu\n" -+ "system_usec %llu\n", usage, user, sys); -+ -+ css_put(css); -+} -+ - /* - * charge this task's execution time to its accounting group. - * -diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h -index ed60562..44eace9 100644 ---- a/kernel/sched/cpuacct.h -+++ b/kernel/sched/cpuacct.h -@@ -2,6 +2,7 @@ - - extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); - extern void cpuacct_account_field(struct task_struct *p, int index, u64 val); -+extern void cpuacct_cpu_stats_show(struct seq_file *sf); - - #else - -@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *p, int index, u64 val) - { - } - -+static inline void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+} -+ - #endif diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2a923ee5783..cdb6099d4a1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,51 +2,51 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.267-hardened1.patch", - "sha256": "0fd3x22j8i3w3knilh8v6sadw3pvl03vfzg9dpi2mgy6kxxxb3qv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.267-hardened1/linux-hardened-4.14.267-hardened1.patch" + "name": "linux-hardened-4.14.269-hardened1.patch", + "sha256": "1hj3yn70aifprcfz4k088pj0lbr92cl5y840g08p0cqz3f3jvf24", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.269-hardened1/linux-hardened-4.14.269-hardened1.patch" }, - "sha256": "13hq4hcq686gdragjcgmz3m0kkk8abz5lna0ildaa9gybj43yd4c", - "version": "4.14.267" + "sha256": "1lhqq3va468k8w5f4hhsq1rgjcfrgi5l8lnrikfy9jisbi05z9h3", + "version": "4.14.269" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.230-hardened1.patch", - "sha256": "1yf65n69rlhl0cdgaaj45ylsjf8x4xrbvj0wfxfwd2kxwbjxp9jr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.230-hardened1/linux-hardened-4.19.230-hardened1.patch" + "name": "linux-hardened-4.19.232-hardened1.patch", + "sha256": "195gbiial5rpiak4mszw3kn1dmm38npk2bchyb9lfvk1f26h2ybc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.232-hardened1/linux-hardened-4.19.232-hardened1.patch" }, - "sha256": "107sqv4izdnazscwhyam88vbinsvnd33z8agn4awc42hkqh9l20p", - "version": "4.19.230" + "sha256": "0b520cwwqr5b1skc3gbq35hfjqpidxcl3gq7x5bdqqqdg0afiksg", + "version": "4.19.232" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.101-hardened1.patch", - "sha256": "1nhxkzkhqff97lhc0piczn8v02hyva5gm004l79v31xklxhpc9r0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.101-hardened1/linux-hardened-5.10.101-hardened1.patch" + "name": "linux-hardened-5.10.103-hardened1.patch", + "sha256": "0i70cya9llz6nnhf4d5zz3f8xhj21si8capymmzcjczz0378argj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.103-hardened1/linux-hardened-5.10.103-hardened1.patch" }, - "sha256": "13hwpb85dynbayghxs3ln3hbyh8djgl5fj63vxwc8izfny62aj87", - "version": "5.10.101" + "sha256": "02jq126r8dgqrhgdg8dym2v8xgp9jkjm8kf9zgj440s3wrasvf2g", + "version": "5.10.103" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.24-hardened1.patch", - "sha256": "1lz4p2rvp1q9c4s6czqvwlhb2gkcix8vmg9gcyd4vpzjmd0dhws4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.24-hardened1/linux-hardened-5.15.24-hardened1.patch" + "name": "linux-hardened-5.15.26-hardened1.patch", + "sha256": "14pdmiqnn06by8mvxw4gklqfrnngrimyz1ag76pr60iz6ka6y5g8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.26-hardened1/linux-hardened-5.15.26-hardened1.patch" }, - "sha256": "0zx9big7n8gh6y14c05llxsqh543q0czjdrq906m8cc7r01yp5pl", - "version": "5.15.24" + "sha256": "0fmydc5v51iacd5ys7p1m1k2318p47prj8xv02rcngv1y8s224jq", + "version": "5.15.26" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.180-hardened1.patch", - "sha256": "1cjxi6i8l5s2q54jiqpki4m25w9wp91yrbck86sxfr2ljhll0j1c", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.180-hardened1/linux-hardened-5.4.180-hardened1.patch" + "name": "linux-hardened-5.4.182-hardened1.patch", + "sha256": "0hcxy2hn836mivydmrbqrpvm4bfdsgf9xpx0iyz92rhd91ipgcyq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.182-hardened1/linux-hardened-5.4.182-hardened1.patch" }, - "sha256": "07ckmgcqpr39bzpp8v60b2vkb03p8931k7sl3ywg6f00lvcbaf8n", - "version": "5.4.180" + "sha256": "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj", + "version": "5.4.182" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8e00263a2e1..9daf9c4bd19 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.268"; + version = "4.14.272"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1xdn247j5n3xzm93wr9ff75rg9hbp64ypfp5sf78hnkzm8m44qng"; + sha256 = "0scx13pc5y5jmm5xa17my242gsgb1mf0cgqzjx656g7kkh4phqcv"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 56af836e8d9..c4bd2f8fc5d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.231"; + version = "4.19.235"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0cc1ipar37gvzr1xdbda5hghnvjmy8pk8an8hs2jspmhnfrj6cb7"; + sha256 = "1615y3ma9icmqqr7lisl8nd8zvvkh77a81yl39yvy6qi9345l32k"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix deleted file mode 100644 index 9271aa0182e..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: - -buildLinux (args // rec { - version = "4.4.302"; - extraMeta.branch = "4.4"; - extraMeta.broken = stdenv.isAarch64; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1cvnydc7y5xrb1c4yfmsl846dd1jfrr7xf62gxbhnkk01fs7n09m"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 83179c4bbe2..9eae11205ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.303"; + version = "4.9.307"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1r8s28ckmg0av9716350hadn99q738k2slciw8pzxw1xq47hbsa5"; + sha256 = "1xyhz7hq8yyclxyavzk36sbl41vlb74pccd56240kq34ma1hyis7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f87aa91b58d..dec0ebb154a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.102"; + version = "5.10.106"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0yg3y2cb3lb0whxkdrgbdig0kwjf5c71ci473aj0dr62n6alhhg6"; + sha256 = "0yjrlghcxw3lhd6nc2m4zy4gk536w3a3w6mxdsml690fqz4531n6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index e02262c79a4..7b76ab0c8a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.25"; + version = "5.15.29"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0y9qahkya5dfnr6g04w5ym0p6h9ixmcdhvgz9g2b64aaaazgz6a3"; + sha256 = "0vl7xm4xs59z071wfjna392yada3hg5h6h3dfjaswircc22fc1ar"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix index 8144bb2df50..1fadc0d420e 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.11"; + version = "5.16.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "08xhm3ngg9157r69v44akp6cj73g33l6wa7073s4sjn4lic6263d"; + sha256 = "1mi41npkk1inqchm3yp14xmzc5lrp50d7vbpazwxwq5kw04c8c4g"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 239f5181a38..c234b4f898c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.181"; + version = "5.4.185"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0awsv38cclk7npp6q7kb5n0dsdic3k8xnqdsz780yl92dh6s0qzw"; + sha256 = "11rp3x05bq9cs9gwy4x36ynkgl7nb5ss29zi6m7n5ywvczdfjpyi"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 16577980809..8c4dc41e8f5 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18613"; - sha256 = "1qgvhrh4nnn56aykaxqmlnzy8s111b5vn277n7qm4ldyr312g4hs"; + rev = "18635"; + sha256 = "0d74hji2cms9z3h3s1j4i7qnw1350a95vafrqargf9s2zz0bkgfc"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 70be0e58ebc..50b3f18e9e2 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.100-rt62"; # updated by ./update-rt.sh + version = "5.10.104-rt63"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "16892wnfkdpqy3v4xmdzlqn5zlfrgz9wqh6vadnx58xnr6pnasfm"; + sha256 = "1wb2ql58md45wi49bp3rck7ppgisyjdl7lxarzqd094fx9kr4jir"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1wimp4ckaqp5cfvkf50gv3s5biyr0sjifz4faw23m07ciydm15k0"; + sha256 = "17ivd6dm49axc9k6cqf39wjjqrjqbj5xd3n7lqk7vv95rg9fg0g7"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index bb789797a53..747563e3c01 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.177-rt69"; # updated by ./update-rt.sh + version = "5.4.182-rt71"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0wvb5is8rqvfxia1i8lw4yd3fm2bhb6wdl0bdjq90dx7y46wpxqq"; + sha256 = "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "16m1swkg54cgcgqwl6vifbpfvdf7waigbwi9brafwplb965zq5a2"; + sha256 = "1lxj63v37bhdgynr8ffyd5g8vp5a79dnzi6fng7jsjapfriywzqh"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 52fc24e101e..63d47dd8a38 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, date ? "2022-01-12" -, commit ? "0e6eb60f8be14b02e0a76cb330f4b22c80ec82e9" -, diffHash ? "091w4r7h93s5rv8hk65aix7l0rr4bd504mv998j7x360bqlb7vpi" +, date ? "2022-03-09" +, commit ? "2280551cebc1735f74eef75d650dd5e175461657" +, diffHash ? "1mrrydidbapdq0fs0vpqhs88k6ghdrvmjpk2zi7xlwj7j32h0nwp" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... @@ -16,7 +16,7 @@ extraMeta = { branch = "master"; - maintainers = with lib.maintainers; [ davidak chiiruno ]; + maintainers = with lib.maintainers; [ davidak Madouura ]; }; } // argsOverride; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 636803f2909..b170ec044b0 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.15.24"; + version = "5.15.27"; release = "1"; suffix = "xanmod${release}-tt"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-O3OadPMBl74IK92w7IPGfiePeo/Ox+bIVr4XmOmPYTg="; + sha256 = "sha256-ycUvTXDKnffxs8FKZJurX2bDr85gMQlSIFD0nST2Q98="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 1432eb5598e..d990d6d4ed1 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.16.8-zen1"; + modDirVersion = "5.16.11-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-/CYPuj+P5KlYFur0X2FYrrJFUDhKVL7xm53uOSym+Rc="; + sha256 = "sha256-aCmHtWTOlFo9r6g0pcOXMzksAH3spcOqElE9hynFbFo="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4f12337c893..1ac9cbe00ea 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -56,7 +56,7 @@ let hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; # Dependencies that are required to build kernel modules - moduleBuildDependencies = optional (lib.versionAtLeast version "4.14") libelf; + moduleBuildDependencies = [ perl ] ++ optional (lib.versionAtLeast version "4.14") libelf; installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index aeb261aaaca..070a18f6984 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libpsm2"; - version = "11.2.203"; + version = "11.2.206"; preConfigure= '' export UDEVDIR=$out/etc/udev @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "opa-psm2"; rev = "PSM2_${version}"; - sha256 = "sha256-W5Mg5ATUARMFAy1VVpMKPar0VpbKfrkxa6bDhqVYpoc="; + sha256 = "sha256-HsM2OaoX+SdbIednX1MWw1M4kkkPwUs5Dm32q2H7Mg4="; }; postInstall = '' diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index f88cdcda523..d880e6a60e0 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -14,12 +14,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-aTi+EogY1aDWYq3anjRkjz1mzINVfUPQbOPHthxrvS4="; }; - buildPhase = '' - runHook preBuild - + postPatch = '' substituteInPlace lsiutil.c \ --replace /sbin/modprobe "${kmod}/bin/modprobe" \ --replace /bin/mknod "${coreutils}/bin/mknod" + ''; + + buildPhase = '' + runHook preBuild + gcc -Wall -O lsiutil.c -o lsiutil runHook postBuild diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 8753f34087c..99ffb7756da 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0hzksx2fw008jdsgfzpws9g7imy6ryw09ai5y0knvrmvr68nvj57"; }; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - preConfigure = '' - export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - export INSTALL_MOD_PATH="$out" - ''; + makeFlags = kernel.makeFlags ++ [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; installTargets = [ "modules_install" ]; diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 555ff6b0dc1..73f1e9fbdee 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.14"; - sha256 = "0p5077h3z7mrr0b49ikmhlhrs4v4qb530raypk3y72ja125bqqsa"; + version = "2.03.15"; + sha256 = "17n9xl01by7dcbjwjnr6b4rrkp2frz8hwnjl59svsyp13sjq6llk"; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 0749292531b..0f2e6efe3a2 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in + '' + lib.optionalString (lib.versionOlder version "2.03.15") '' substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ --replace /usr/bin/udevadm /run/current-system/systemd/bin/udevadm # https://github.com/lvmteam/lvm2/issues/36 @@ -82,7 +83,7 @@ stdenv.mkDerivation rec { sed -i 's|^#define LVM_CONFIGURE_LINE.*$|#define LVM_CONFIGURE_LINE "<removed>"|g' ./include/configure.h ''; - patches = [ + patches = lib.optionals (lib.versionOlder version "2.03.15") [ # Musl fixes from Alpine. ./fix-stdio-usage.patch (fetchpatch { diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index fe9c11ace1f..04a89ad038d 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix index 070b4a6207e..0b4fec4dfb4 100644 --- a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix +++ b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -11,14 +11,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-o6yGiR+Y5SnX1johdi7fQWP5ts7HdDMqeju75UOhgik="; }; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; + buildPhase = '' make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ - -j$NIX_BUILD_CORES M=$(pwd) modules + -j$NIX_BUILD_CORES M=$(pwd) modules $makeFlags ''; installPhase = '' make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ - INSTALL_MOD_PATH=$out M=$(pwd) modules_install + INSTALL_MOD_PATH=$out M=$(pwd) modules_install $makeFlags ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 28f989929a4..dec1399d169 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation { sha256 = "0qjw8glfdmngfvbn1w63q128vxdz2jlabw13y140ga9i5ibl6vvk"; }; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kmod zlib ]; hardeningDisable = [ "pic" ]; @@ -36,6 +37,8 @@ stdenv.mkDerivation { kmod=${kmod} substituteAllInPlace netatop.service ''; + makeFlags = kernel.makeFlags; + preInstall = '' mkdir -p $out/lib/systemd/system $out/bin $out/sbin $out/share/man/man{4,8} mkdir -p $out/lib/modules/${kernel.modDirVersion}/extra diff --git a/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/os-specific/linux/ocf-resource-agents/default.nix index 9c9557c7be8..8d7f2b52714 100644 --- a/pkgs/os-specific/linux/ocf-resource-agents/default.nix +++ b/pkgs/os-specific/linux/ocf-resource-agents/default.nix @@ -1,3 +1,5 @@ +# This combines together OCF definitions from other derivations. +# https://github.com/ClusterLabs/resource-agents/blob/master/doc/dev-guides/ra-dev-guide.asc { stdenv , lib , runCommand @@ -8,12 +10,16 @@ , python3 , glib , drbd +, pacemaker }: let drbdForOCF = drbd.override { forOCF = true; }; + pacemakerForOCF = pacemaker.override { + forOCF = true; + }; resource-agentsForOCF = stdenv.mkDerivation rec { pname = "resource-agents"; @@ -53,4 +59,5 @@ runCommand "ocf-resource-agents" {} '' mkdir -p $out/usr/lib/ocf ${lndir}/bin/lndir -silent "${resource-agentsForOCF}/lib/ocf/" $out/usr/lib/ocf ${lndir}/bin/lndir -silent "${drbdForOCF}/usr/lib/ocf/" $out/usr/lib/ocf + ${lndir}/bin/lndir -silent "${pacemakerForOCF}/usr/lib/ocf/" $out/usr/lib/ocf '' diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index 511dd162785..1952d31b024 100644 --- a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -10,12 +10,12 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.3"; + version = "1.2.5"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "sha256-EKD6tkdQCPlVlb9ScvRwDxYAtbbv9PIqBHH6SvtPDsE="; + sha256 = "sha256-PU7WX5RAV6wWVRsqq6MdEjr00AtlTT4cSacRaxrEF2s="; }; vendorSha256 = null; diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 6e387de0719..2de63580ac3 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (common // { nativeBuildInputs = kernel.moduleBuildDependencies; - buildFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 1476ae49006..72f91e89c74 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ] ++ lib.optional stdenv.buildPlatform.isDarwin gettext; - buildInputs = [ cracklib db4 audit ] + buildInputs = [ cracklib db4 ] + ++ lib.optional stdenv.buildPlatform.isLinux audit ++ lib.optional withLibxcrypt libxcrypt; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 91e15db2eeb..680cc531af4 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -27,11 +27,13 @@ in stdenv.mkDerivation rec { # avoid using the Makefile directly -- it doesn't understand # any kernel but the current. # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168 + makeFlags = kernel.makeFlags ++ [ + "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(PWD)/src" + "modules" + ]; preBuild = '' - makeFlagsArray+=("-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build") - makeFlagsArray+=("M=$PWD/src") makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN -DCONFIG_ASPM -DENABLE_S5WOL -DENABLE_EEE") - makeFlagsArray+=("modules") ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index 500359f7e4f..d6b5785210b 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { name = "rtl8189es-${kernel.version}-${version}"; - version = "2020-10-03"; + version = "2021-10-01"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "03ac413135a355b55b693154c44b70f86a39732e"; - sha256 = "0wiikviwyvy6h55rgdvy7csi1zqniqg26p8x44rd6mhbw0g00h56"; + rev = "be378f47055da1bae42ff6ec1d62f1a5052ef097"; + sha256 = "sha256-+19q1Xux2BjquavY+s0UDzTubEt6BEUZ9XVDVmj36us="; }; - nativeBuildInputs = [ bc nukeReferences ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; @@ -23,13 +22,10 @@ stdenv.mkDerivation rec { substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - makeFlags = [ - "ARCH=${stdenv.hostPlatform.linuxArch}" + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n")) ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; preInstall = '' diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index b33330611b8..6fa15358582 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ]; - makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index f9ca60b1112..f12adf73d5f 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0lk3ldff489ggbqmlfi4zvnp1cvxj1b06m0fhpzai82070klzzmj"; }; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 75e12a1b7a4..27303c02980 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 9229a3c1306..0ea0682214b 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 310dac3933f..e092d145abd 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2021-11-04"; + version = "${kernel.version}-unstable-2022-02-22"; src = fetchFromGitHub { owner = "morrownr"; - repo = "88x2bu"; - rev = "745d134080b74b92389ffe59c03dcfd6658f8655"; - sha256 = "0f1hsfdw3ar78kqzr4hi04kpp5wnx0hd29f9rm698k0drxaw1g44"; + repo = "88x2bu-20210702"; + rev = "6a5b7f005c071ffa179b6183ee034c98ed30db80"; + sha256 = "sha256-BqTyJpICW3D4EfHHoN5svasteJnunu2Uz449u/CmNE0="; }; hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; - prePatch = '' + prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtek rtl88x2bu driver"; - homepage = "https://github.com/morrownr/88x2bu"; + homepage = "https://github.com/morrownr/88x2bu-20210702"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index c3f849df118..529ee621892 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { hash = "sha256-PRzWXC1lre8gt1GfVdnaG836f5YK57P9a8tG20yef0w="; }; - makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix index 6b0f06c5bdc..6ff208fa6dd 100644 --- a/pkgs/os-specific/linux/rtw89/default.nix +++ b/pkgs/os-specific/linux/rtw89/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632"; }; - makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/tuigreet/default.nix b/pkgs/os-specific/linux/tuigreet/default.nix index 581b89fb1c6..95de5b8c8d9 100644 --- a/pkgs/os-specific/linux/tuigreet/default.nix +++ b/pkgs/os-specific/linux/tuigreet/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-H5xqk7Yd3M8sFGHlmhAS0fhh3eM4dkvkNQGVxRSXUJs="; meta = with lib; { - description = "Graphical console greter for greetd"; + description = "Graphical console greeter for greetd"; homepage = "https://github.com/apognu/tuigreet"; license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ivar ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index fd321d90cb2..427e19ac921 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { blkid = "${util-linux}/bin/blkid"; false = "${coreutils}/bin/false"; mdadm = "${mdadm}/bin/mdadm"; + mkswap = "${util-linux}/bin/mkswap"; sed = "${gnused}/bin/sed"; sh = "${bash}/bin/sh"; sleep = "${coreutils}/bin/sleep"; + swapon = "${util-linux}/bin/swapon"; true = "${coreutils}/bin/true"; }) (substituteAll { @@ -77,7 +79,7 @@ stdenv.mkDerivation rec { description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies"; homepage = "https://www.freedesktop.org/wiki/Software/udisks/"; license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon - maintainers = with maintainers; [ johnazoidberg ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ johnazoidberg ]); platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/udisks/fix-paths.patch b/pkgs/os-specific/linux/udisks/fix-paths.patch index 215df565ecc..30bc08da8cf 100644 --- a/pkgs/os-specific/linux/udisks/fix-paths.patch +++ b/pkgs/os-specific/linux/udisks/fix-paths.patch @@ -1,17 +1,5 @@ -diff --git a/Makefile.am b/Makefile.am -index 56922b79..697f8c6e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --SHELL = @BASH@ -+SHELL = @bash@ - .SHELLFLAGS = -o pipefail -c - - PYTHON ?= python3 diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules -index 39bfa28b..ee1ca90a 100644 +index ca802cce..bfd1c29e 100644 --- a/data/80-udisks2.rules +++ b/data/80-udisks2.rules @@ -17,9 +17,9 @@ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end" @@ -66,9 +54,27 @@ index e7df4ed2..ab4356d9 100644 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # diff --git a/src/tests/integration-test b/src/tests/integration-test -index 4499a6a9..8b711f95 100755 +index 07e4e029..3bd8ec51 100755 --- a/src/tests/integration-test +++ b/src/tests/integration-test +@@ -299,7 +299,7 @@ class UDisksTestCase(unittest.TestCase): + if not device: + device = cls.devname(partition) + result = {} +- cmd = subprocess.Popen(['blkid', '-p', '-o', 'udev', device], stdout=subprocess.PIPE) ++ cmd = subprocess.Popen(['@blkid@', '-p', '-o', 'udev', device], stdout=subprocess.PIPE) + for l in cmd.stdout: + (key, value) = l.decode('UTF-8').split('=', 1) + result[key] = value.strip() +@@ -437,7 +437,7 @@ class UDisksTestCase(unittest.TestCase): + f.write('KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ' + 'ATTRS{model}=="scsi_debug*", ' + 'ENV{ID_CDROM_MEDIA}=="?*", ' +- 'IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"\n') ++ 'IMPORT{program}="@blkid@ -o udev -p -u noraid $tempnode"\n') + # reload udev + subprocess.call('sync; pkill --signal HUP udevd || ' + 'pkill --signal HUP systemd-udevd', @@ -1142,7 +1142,7 @@ class FS(UDisksTestCase): self.assertFalse(os.access(f, os.X_OK)) @@ -150,6 +156,3 @@ index 3ddbdf2c..a87f960a 100644 udisks_spawned_job_start (job); g_object_unref (job); } --- -2.33.1 - diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index d2f17c6666a..51ae7b002f9 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,8 +1,13 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , pkg-config +, rsync , libxslt +, meson +, ninja +, python3 +, gtk-doc , docbook_xsl , udev , libgudev @@ -15,23 +20,31 @@ , libimobiledevice }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "upower"; - version = "0.99.13"; + version = "0.99.15"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz"; - sha256 = "sha256-XK1w+RVAzH3BIcsX4K1kXl5mPIaC9gp75C7jjNeyPXo="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "upower"; + repo = "upower"; + rev = "v${version}"; + sha256 = "sha256-GlLy2MPip21KOabdW8Vw6NVe3xhzsd9htxQ2xO/hZ/4="; }; nativeBuildInputs = [ + meson + ninja + python3 + gtk-doc docbook_xsl gettext gobject-introspection libxslt pkg-config + rsync ]; buildInputs = [ @@ -39,29 +52,50 @@ stdenv.mkDerivation { libusb1 udev systemd - ] - ++ lib.optional useIMobileDevice libimobiledevice - ; + ] ++ lib.optionals useIMobileDevice [ + libimobiledevice + ]; propagatedBuildInputs = [ glib ]; - configureFlags = [ + mesonFlags = [ "--localstatedir=/var" - "--with-backend=linux" - "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - "--with-systemdutildir=${placeholder "out"}/lib/systemd" - "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" "--sysconfdir=/etc" + "-Dos_backend=linux" + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" ]; doCheck = false; # fails with "env: './linux/integration-test': No such file or directory" - installFlags = [ - "historydir=$(TMPDIR)/foo" - "sysconfdir=${placeholder "out"}/etc" - ]; + postPatch = '' + patchShebangs src/linux/unittest_inspector.py + ''; + + postInstall = '' + # Move stuff from DESTDIR to proper location. + # We use rsync to merge the directories. + for dir in etc var; do + rsync --archive "${DESTDIR}/$dir" "$out" + rm --recursive "${DESTDIR}/$dir" + done + for o in out dev; do + rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" + rm --recursive "${DESTDIR}/''${!o}" + done + # Ensure the DESTDIR is removed. + rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}" + ''; + + # HACK: We want to install configuration files to $out/etc + # but upower should read them from /etc on a NixOS system. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "${placeholder "out"}/dest"; meta = with lib; { homepage = "https://upower.freedesktop.org/"; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 8485565e0a8..bedd2417e7e 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.37.3"; + version = "2.37.4"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-WQxZLljNa/OFGctGevBc5qGrGAQOPjQY8kvPsvVfl3Y="; + sha256 = "sha256-Y05pFq2RM2bDU2tkaOeER2lUm5mnsr+AMU3nirVlW4M="; }; patches = [ diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 90a052fdef9..3fdd9e791bd 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -12,11 +12,11 @@ let # we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt in stdenv.mkDerivation rec { pname = "v4l-utils"; - version = "1.20.0"; + version = "1.22.1"; src = fetchurl { url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1xr66y6w422hil6s7n8d61a2vhwh4im8l267amf41jvw7xqihqcm"; + hash = "sha256-Zcb76DCkTKEFxEOwJxgsGyyQU6kdHnKthJ36s4i5TjE="; }; outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ]; @@ -40,14 +40,16 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ libjpeg ]; postPatch = '' - patchShebangs utils/cec-ctl/msg2ctl.pl - patchShebangs utils/libcecutil/cec-gen.pl + patchShebangs utils/ ''; + enableParallelBuilding = true; + meta = with lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = "https://linuxtv.org/projects.php"; - license = licenses.lgpl21Plus; + changelog = "https://git.linuxtv.org/v4l-utils.git/plain/ChangeLog?h=v4l-utils-${version}"; + license = with licenses; [ lgpl21Plus gpl2Plus ]; maintainers = with maintainers; [ codyopel ]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index c1aa7be2af6..095d873e66c 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -16,12 +16,9 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" sed -i '/depmod/d' Makefile - export PATH=${kmod}/sbin:$PATH ''; - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildInputs = [ kmod ]; + nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; postInstall = '' make install-utils PREFIX=$bin @@ -29,7 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix index a1019d7b7fd..8cf4896ae02 100644 --- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ kernel ]; - buildPhase = '' - make BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - ''; + makeFlags = kernel.makeFlags ++ [ + "BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; installPhase = '' mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk diff --git a/pkgs/os-specific/linux/xmm7360-pci/default.nix b/pkgs/os-specific/linux/xmm7360-pci/default.nix index 6a589ff889c..435ff94afb7 100644 --- a/pkgs/os-specific/linux/xmm7360-pci/default.nix +++ b/pkgs/os-specific/linux/xmm7360-pci/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1wdb0phqg9rj9g9ycqdya0m7lx24kzjlh25yw0ifp898ddxrrr0c"; }; - makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.makeFlags ++ [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; nativeBuildInputs = kernel.moduleBuildDependencies; - INSTALL_MOD_PATH = placeholder "out"; installFlags = [ "DEPMOD=true" ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix new file mode 100644 index 00000000000..f04ccc569df --- /dev/null +++ b/pkgs/os-specific/linux/xone/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, kernel, fetchurl }: + +stdenv.mkDerivation rec { + name = "xone-${version}-${kernel.version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "medusalix"; + repo = "xone"; + rev = "v${version}"; + sha256 = "sha256-m4305Xl5w4nyAVqubjwWsiyPDVtfGykjlSW2eKEytVk="; + }; + + setSourceRoot = '' + export sourceRoot=$(pwd)/source + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "-C" + "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(sourceRoot)" + "VERSION=${version}" + ]; + + buildFlags = [ "modules" ]; + installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; + installTargets = [ "modules_install" ]; + + meta = with lib; { + description = "Linux kernel driver for Xbox One and Xbox Series X|S accessories"; + homepage = "https://github.com/medusalix/xone"; + license = licenses.gpl2; + maintainers = with lib.maintainers; [ rhysmdnz ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index c1874877620..c5aa09a8860 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ bluez ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 7341240f95a..b5260d47caa 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,11 +16,12 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 +, linuxPackages_5_16 ? pkgs.linuxKernel.packages.linux_5_16 }: -with lib; let + inherit (lib) any optionalString optionals optional makeBinPath; + smartmon = smartmontools.override { inherit enableMail; }; buildKernel = any (n: n == configFile) [ "kernel" "all" ]; @@ -113,7 +114,7 @@ let configureFlags = [ "--with-config=${configFile}" "--with-tirpc=1" - (withFeatureAs (buildUser && enablePython) "python" python3.interpreter) + (lib.withFeatureAs (buildUser && enablePython) "python" python3.interpreter) ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" @@ -200,9 +201,9 @@ let ''; homepage = "https://github.com/openzfs/zfs"; changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; - license = licenses.cddl; - platforms = platforms.linux; - maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; + license = lib.licenses.cddl; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. @@ -215,28 +216,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17"; + latestCompatibleLinuxPackages = linuxPackages_5_16; # this package should point to the latest release. - version = "2.1.2"; + version = "2.1.3"; - sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8="; + sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl"; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17"; + latestCompatibleLinuxPackages = linuxPackages_5_16; # 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-<version>-staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.2"; + version = "2.1.3"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8="; + sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl"; isUnstable = true; }; diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index c07933129fa..1c2f0621b5d 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,19 +1,19 @@ { fetchurl, fetchzip }: { "x86_64-darwin" = fetchzip { - sha256 = "sha256-hB3TL1FocAtLpBe+Rv2Pyon4f1ld+Fqapz6TUQ0O1jU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-bTbjkBHOjcI78+jyJJ1JGe/WrmTxXi5RRB1yQO2zuYw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_darwin_amd64.zip"; }; "i686-linux" = fetchurl { - sha256 = "sha256-ZPHmFxKLJ1oxT18P6FDv74/leCzlESTrhNYuC8T6u+I="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-wdzj7P+Hhm65i5hY4l2Ty486W473coZyZnCbzx9Poro="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_linux_386.tar.gz"; }; "x86_64-linux" = fetchurl { - sha256 = "sha256-yOvkEimDp646BCCFV2fnmVGe6R8geFlxtWLfPMVQ9Uk="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-sZQe8rNYD0gBSpNeXS+4hbqoT5nUFbkQSI3c6VuQOC8="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_linux_amd64.tar.gz"; }; "aarch64-linux" = fetchurl { - sha256 = "sha256-ayNv2O0Ge3dT6YAN4SW/gsyoErCB3BJYsx/daMbGHjs="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-9JsGzFf03en2ClrodglREsYqrwr6j/vypsfEVaMzCTI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index cce9a1c1590..03d2b2ec966 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.3"; + version = "0.107.5"; src = (import ./bins.nix { inherit fetchurl fetchzip; }).${stdenv.hostPlatform.system}; diff --git a/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/pkgs/servers/computing/slurm-spank-stunnel/default.nix new file mode 100644 index 00000000000..9fdd5625f78 --- /dev/null +++ b/pkgs/servers/computing/slurm-spank-stunnel/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, slurm } : + +stdenv.mkDerivation rec { + pname = "slurm-spank-stunnel"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "stanford-rc"; + repo = "slurm-spank-stunnel"; + rev = version; + sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj"; + }; + + buildPhase = '' + gcc -I${slurm.dev}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c + ''; + + installPhase = '' + mkdir -p $out/lib $out/etc/slurm/plugstack.conf.d + install -m 755 stunnel.so $out/lib + install -m 644 plugstack.conf $out/etc/slurm/plugstack.conf.d/stunnel.conf.example + ''; + + meta = with lib; { + homepage = "https://github.com/stanford-rc/slurm-spank-stunnel"; + description = "Plugin for SLURM for SSH tunneling and port forwarding support"; + platforms = platforms.linux; + license = licenses.gpl3Only; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index c1e092dedcb..1179e86351a 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "21.08.5.1"; + version = "21.08.6.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-2ctJnCZCziPnfWeDNvvcE0tPGVdhzjjhqMWJhWhitGo="; + sha256 = "1pdj2nxxky2g9j0y5h6f7fvpypbh0a4g76z90115yr770yf4g2hz"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 9b2e9e20dd5..240769bfe09 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.11.3"; + version = "1.11.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-kIV6XMicvBdtNOt3BJsOK/KZO3zQLuPgastMVoY8jM8="; + sha256 = "sha256-dQwJ3HzzYxolGrjgHXBElDZO65uXJKEv8UH5sYZ4swc="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-7oQGoMR7woN2RaEMCap9OWJdtGL4MvLN+FTKLqJHsCk="; + vendorSha256 = "sha256-VB7agtH6V7mJU689bFXuhi82qqzGxY16vFOPFBd/DQc="; doCheck = false; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index df73fb9f48e..4df8a547dff 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, kronosnet, nss, nspr, libqb -, dbus, rdma-core, libstatgrab, net-snmp +, systemd, dbus, rdma-core, libstatgrab, net-snmp , enableDbus ? false , enableInfiniBandRdma ? false , enableMonitoring ? false @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ - kronosnet nss nspr libqb + kronosnet nss nspr libqb systemd.dev ] ++ optional enableDbus dbus ++ optional enableInfiniBandRdma rdma-core ++ optional enableMonitoring libstatgrab @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { "--with-logdir=/var/log/corosync" "--enable-watchdog" "--enable-qdevices" + # allows Type=notify in the systemd service + "--enable-systemd" ] ++ optional enableDbus "--enable-dbus" ++ optional enableInfiniBandRdma "--enable-rdma" ++ optional enableMonitoring "--enable-monitoring" @@ -63,6 +65,10 @@ stdenv.mkDerivation rec { --prefix PATH ":" "$out/sbin:${libqb}/sbin" ''; + passthru.tests = { + inherit (nixosTests) pacemaker; + }; + meta = { homepage = "http://corosync.org/"; description = "A Group Communication System with features for implementing high availability within applications"; diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 3d92b2cd4ba..b1c0f1424d9 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.5.1"; + version = "0.6.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "1HCVWSxXOR2syN+dLDSvrNzYHTj/vXZRHkXhU0f3m1k="; + sha256 = "jSn2awZsfsniSOTNkaEdQw/sZm7nUfiMntsxigy/51Y="; }; - vendorSha256 = "sha256-RqEt0RAsKWKy6NvMzulqY56nZ7fIxgJkgN/WpEZ3F2I="; + vendorSha256 = "sha256-B4d3FGXy8TrED3oikTjETQso/AtEfIWWcdY6FykD/8A="; passthru.tests = { inherit (nixosTests) dendrite; diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 16dc5f8bafd..c93f7316301 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dex"; - version = "2.30.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z/X9Db57eNUJdjzLCJNIW3lCRw05JP2TQ43PqKO6CiI="; + sha256 = "sha256-tr7rs2ymHpMEtNwvLhgEzp94wO/k/oY814NS0N4ONsg="; }; - vendorSha256 = "sha256-ksN/1boBQVhevlDseVZsGUWL+Bwy4AMgGNdOPgsNNxk="; + vendorSha256 = "sha256-l+/qjYokg5zHAFkKxtkdX49HqVW6kfz7OHqs6SRKDYg="; subPackages = [ "cmd/dex" diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 5aa702e28d6..2601266f4d7 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, fetchpatch , perl, pkg-config -, libcap, libtool, libxml2, openssl, libuv +, libcap, libtool, libxml2, openssl, libuv, nghttp2, jemalloc , enableGSSAPI ? true, libkrb5 , enablePython ? false, python3 , enableSeccomp ? false, libseccomp @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.25"; + version = "9.18.0"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-n6MohQ+ChD74t78f9TIstosRAnOjPzdbpB81Jw9eH/M="; + sha256 = "sha256-VlJb9crwH9j9nZCRCIDMD4qQonqX0WkYfWUdTs8MQRw="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ libtool libxml2 openssl libuv ] + buildInputs = [ libtool libxml2 openssl libuv nghttp2 jemalloc ] ++ lib.optional stdenv.isLinux libcap ++ lib.optional enableSeccomp libseccomp ++ lib.optional enableGSSAPI libkrb5 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "--with-aes" ] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}" ++ lib.optional enableSeccomp "--enable-seccomp" - ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}" + ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config" ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)"; postInstall = '' @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) bind; }; meta = with lib; { - homepage = "https://www.isc.org/downloads/bind/"; + homepage = "https://www.isc.org/bind/"; description = "Domain name server"; license = licenses.mpl20; diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index 89c58226573..b1677da434f 100644 --- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -2,38 +2,38 @@ diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals index 82b632ef04..dedfd4d33b 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h -@@ -71,7 +71,9 @@ EXTERN const char *named_g_version INIT(VERSION); - EXTERN const char *named_g_product INIT(PRODUCT); - EXTERN const char *named_g_description INIT(DESCRIPTION); - EXTERN const char *named_g_srcid INIT(SRCID); +@@ -69,7 +69,9 @@ EXTERN const char *named_g_version INIT(PACKAGE_VERSION); + EXTERN const char *named_g_product INIT(PACKAGE_NAME); + EXTERN const char *named_g_description INIT(PACKAGE_DESCRIPTION); + EXTERN const char *named_g_srcid INIT(PACKAGE_SRCID); +#if 0 - EXTERN const char *named_g_configargs INIT(CONFIGARGS); + EXTERN const char *named_g_configargs INIT(PACKAGE_CONFIGARGS); +#endif - EXTERN const char *named_g_builder INIT(BUILDER); - EXTERN in_port_t named_g_port INIT(0); - EXTERN isc_dscp_t named_g_dscp INIT(-1); + EXTERN const char *named_g_builder INIT(PACKAGE_BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN in_port_t named_g_tlsport INIT(0); diff --git a/bin/named/main.c b/bin/named/main.c index 9ad2d0e277..9729a2b3fc 100644 --- a/bin/named/main.c +++ b/bin/named/main.c -@@ -521,7 +521,9 @@ printversion(bool verbose) { +@@ -481,7 +481,9 @@ printversion(bool verbose) { } printf("running on %s\n", named_os_uname()); +#if 0 - printf("built by %s with %s\n", named_g_builder, named_g_configargs); + printf("built by %s with %s\n", PACKAGE_BUILDER, PACKAGE_CONFIGARGS); +#endif #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); #else /* ifdef __clang__ */ -@@ -1089,9 +1091,11 @@ setup(void) { +@@ -1027,9 +1029,11 @@ setup(void) { NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", named_os_uname()); +#if 0 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s", - named_g_configargs); + PACKAGE_CONFIGARGS); +#endif isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 7e6347e9ba3..5c20134180f 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -13,12 +13,19 @@ buildGoModule rec { vendorSha256 = "sha256-Vxs+k4WF55xwjgdlW/1NM4NWnYqj2EOLOONflj+BoY4="; - doCheck = false; + postPatch = '' + substituteInPlace test/file_cname_proxy_test.go \ + --replace "TestZoneExternalCNAMELookupWithProxy" \ + "SkipZoneExternalCNAMELookupWithProxy" + + substituteInPlace test/readme_test.go \ + --replace "TestReadme" "SkipReadme" + ''; meta = with lib; { homepage = "https://coredns.io"; description = "A DNS server that runs middleware"; license = licenses.asl20; - maintainers = with maintainers; [ rushmorem rtreffer deltaevo ]; + maintainers = with maintainers; [ rushmorem rtreffer deltaevo superherointj ]; }; } diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix new file mode 100644 index 00000000000..eae3cd6a8d5 --- /dev/null +++ b/pkgs/servers/endlessh-go/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "endlessh-go"; + version = "20220308.1"; + + src = fetchFromGitHub { + owner = "shizunge"; + repo = "endlessh-go"; + rev = version; + hash = "sha256-U+h/WmTVwwUIBEOiNa/EKS6HvkeoGNmP3NpeP1fcqYw="; + }; + + vendorSha256 = "sha256-h/DpbXO+LUsB9NOAXUfNx3VOfEsiolfBEMBrAqVlU3A="; + + proxyVendor = true; + + meta = with lib; { + description = "An implementation of endlessh exporting Prometheus metrics"; + homepage = "https://github.com/shizunge/endlessh-go"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix deleted file mode 100644 index 4fb6f44b454..00000000000 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'. - -stdenv.mkDerivation rec { - pname = "bsd-fingerd"; - version = "0.17"; - - src = fetchurl { - url = "mirror://metalab/system/network/finger/bsd-finger-${version}.tar.gz"; - sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; - }; - - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - - patches = [ ./ubuntu-0.17-9.patch ]; - - preBuild = "cd fingerd"; - - preInstall = "mkdir -p $out/man/man8 $out/sbin "; - - meta = with lib; { - platforms = platforms.linux; - license = licenses.bsdOriginal; - }; -} diff --git a/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch b/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch deleted file mode 100644 index 80968d587ba..00000000000 --- a/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- bsd-finger-0.17.orig/fingerd/fingerd.8 -+++ bsd-finger-0.17/fingerd/fingerd.8 -@@ -36,10 +36,10 @@ - .Dt FINGERD 8 - .Os "Linux NetKit (0.17)" - .Sh NAME --.Nm fingerd -+.Nm in.fingerd - .Nd remote user information server - .Sh SYNOPSIS --.Nm fingerd -+.Nm in.fingerd - .Op Fl wulf - .Op Fl pL Ar path - .Op Fl t Ar timeout -@@ -61,7 +61,7 @@ - banner - which also shows some informations (e.g. uptime, operating system name and - release) about the system the --.Nm fingerd -+.Nm in.fingerd - is running on. Some sites may consider this a security risk as it - gives out information that may be useful to crackers. - .Pp -@@ -85,7 +85,7 @@ - .Pp - The - .Fl p --option allows specification of an alternate location for fingerd to find -+option allows specification of an alternate location for in.fingerd to find - the - .Dq finger - program. The -@@ -97,7 +97,7 @@ - option specifies the time to wait for a request before closing the - connection. A value of 0 waits forever. The default is 60 seconds. - .Pp --Options to fingerd should be specified in -+Options to in.fingerd should be specified in - .Pa /etc/inetd.conf . - .Pp - The finger protocol consists mostly of specifying command arguments. -@@ -105,12 +105,12 @@ - .Xr inetd 8 - .Dq super-server - runs --.Nm fingerd -+.Nm in.fingerd - for - .Tn TCP - requests received on port 79. - Once connected --.Nm fingerd -+.Nm in.fingerd - reads a single command line - terminated by a - .Aq Tn CRLF ---- bsd-finger-0.17.orig/fingerd/fingerd.c -+++ bsd-finger-0.17/fingerd/fingerd.c -@@ -55,6 +55,7 @@ - #include <netinet/in.h> - #include <sys/utsname.h> - #include <sys/wait.h> -+#include <sys/socket.h> - - #include "pathnames.h" - #include "../version.h" diff --git a/pkgs/servers/fishnet/Cargo.lock.patch b/pkgs/servers/fishnet/Cargo.lock.patch new file mode 100644 index 00000000000..7929eeee088 --- /dev/null +++ b/pkgs/servers/fishnet/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 963e40e..fb76d78 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -230,7 +230,7 @@ dependencies = [ + + [[package]] + name = "fishnet" +-version = "2.5.1-dev" ++version = "2.5.1" + dependencies = [ + "arrayvec", + "atty", \ No newline at end of file diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix index 784a5525133..10695e54781 100644 --- a/pkgs/servers/fishnet/default.nix +++ b/pkgs/servers/fishnet/default.nix @@ -6,21 +6,21 @@ }: let - nnueFile = "nn-6762d36ad265.nnue"; + nnueFile = "nn-13406b1dcbe0.nnue"; nnue = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; - sha256 = "0727dsxfpns9fkyir95fybibqmigk5h45k154b2c5rk5s9md6qk7"; + sha256 = "sha256-E0BrHcvgo238XgfaUdjbOLekXX2kMHjsJadiTCuDI28="; }; in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "niklasf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Gl2vJFn9yVYH62yBJefAOBX/jJaFAdSZj2Lj3imcps="; + sha256 = "sha256-nVRG60sSpTqfqhCclvWoeyHR0+oO1Jn1PgftigDGq5c="; fetchSubmodules = true; }; @@ -29,7 +29,13 @@ rustPlatform.buildRustPackage rec { cp -v '${nnue}' 'Fairy-Stockfish/src/${nnueFile}' ''; - cargoSha256 = "sha256-/s7Yyi2FUh+EDvgaHLgZ/FA6kk2FQrZr3L3B76fqTuc="; + cargoSha256 = "sha256-BJK7M/pjHRj74xoeciavhkK2YRpeogkELIuXetX73so="; + + # TODO: Cargo.lock is out of date, so fix it. Likely not necessary anymore in + # the next update. + cargoPatches = [ + ./Cargo.lock.patch + ]; meta = with lib; { description = "Distributed Stockfish analysis for lichess.org"; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index a3cdec3fec8..3999d422d21 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -1,28 +1,23 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, talloc, finger_bsd, perl -, openssl -, linkOpenssl? true -, openldap -, withLdap ? true -, sqlite -, withSqlite ? true -, libpcap -, withPcap ? true -, libcap -, withCap ? true -, libmemcached -, withMemcached ? false -, hiredis -, withRedis ? false -, libmysqlclient -, withMysql ? false -, json_c -, withJson ? false -, libyubikey -, withYubikey ? false -, collectd -, withCollectd ? false -, curl -, withRest ? false +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, bsd-finger +, perl +, talloc +, linkOpenssl? true, openssl +, withCap ? true, libcap +, withCollectd ? false, collectd +, withJson ? false, json_c +, withLdap ? true, openldap +, withMemcached ? false, libmemcached +, withMysql ? false, libmysqlclient +, withPcap ? true, libpcap +, withRedis ? false, hiredis +, withRest ? false, curl +, withSqlite ? true, sqlite +, withYubikey ? false, libyubikey }: assert withSqlite -> sqlite != null; @@ -36,43 +31,38 @@ assert withYubikey -> libyubikey != null; assert withCollectd -> collectd != null; assert withRest -> curl != null && withJson; -## TODO: include windbind optionally (via samba?) -## TODO: include oracle optionally -## TODO: include ykclient optionally - -with lib; stdenv.mkDerivation rec { pname = "freeradius"; version = "3.0.25"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "SIOmi7PO5GAlNZqXwWkc5lXour/W3DwCHQDhCaL/TBA="; + hash = "sha256-SIOmi7PO5GAlNZqXwWkc5lXour/W3DwCHQDhCaL/TBA="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ openssl talloc finger_bsd perl ] - ++ optional withLdap openldap - ++ optional withSqlite sqlite - ++ optional withPcap libpcap - ++ optional withCap libcap - ++ optional withMemcached libmemcached - ++ optional withRedis hiredis - ++ optional withMysql libmysqlclient - ++ optional withJson json_c - ++ optional withYubikey libyubikey - ++ optional withCollectd collectd - ++ optional withRest curl; - + buildInputs = [ openssl talloc bsd-finger perl ] + ++ lib.optional withCap libcap + ++ lib.optional withCollectd collectd + ++ lib.optional withJson json_c + ++ lib.optional withLdap openldap + ++ lib.optional withMemcached libmemcached + ++ lib.optional withMysql libmysqlclient + ++ lib.optional withPcap libpcap + ++ lib.optional withRedis hiredis + ++ lib.optional withRest curl + ++ lib.optional withSqlite sqlite + ++ lib.optional withYubikey libyubikey; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ] ++ optional (!linkOpenssl) "--with-openssl=no"; + ] ++ lib.optional (!linkOpenssl) "--with-openssl=no"; postPatch = '' - substituteInPlace src/main/checkrad.in --replace "/usr/bin/finger" "${finger_bsd}/bin/finger" + substituteInPlace src/main/checkrad.in \ + --replace "/usr/bin/finger" "${bsd-finger}/bin/finger" ''; # By default, freeradius will generate Diffie-Hellman parameters and @@ -99,6 +89,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann elseym ]; platforms = with platforms; linux; }; - } - +## TODO: include windbind optionally (via samba?) +## TODO: include oracle optionally +## TODO: include ykclient optionally diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 3aad0460b3f..3a3517f4f23 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libcap, openssl, pam }: +{ lib, stdenv, fetchurl, libcap, libseccomp, openssl, pam, nixosTests }: stdenv.mkDerivation rec { pname = "vsftpd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM="; }; - buildInputs = [ libcap openssl pam ]; + buildInputs = [ libcap openssl libseccomp pam ]; patches = [ ./CVE-2015-1419.patch ]; @@ -30,10 +30,14 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}cc" ]; - NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap"; + NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap -lseccomp"; enableParallelBuilding = true; + passthru = { + tests = { inherit (nixosTests) vsftpd; }; + }; + meta = with lib; { description = "A very secure FTP daemon"; license = licenses.gpl2; diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 32fcb856d26..ae198707ec5 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, nixosTests, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, nixosTests, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o4tjEIgDTj2EUbfaKCHZfvEKCwxNpsabU437kU+Vpnk="; + sha256 = "sha256-nkWk/0TIAHcYQjxbg0HnT+4S4Cinl22WfqHb9U6u5eI="; }; + cargoSha256 = "sha256-aF86QpizJ+lMNmN9DQKA9o1QZWZObyQ3v3+HmT/s02g="; - cargoSha256 = "sha256-rE0I13dKbGgJmh6vF/cWvIZfqtKzzgn7pTiB3HJ7cgY="; + patches = [ + # https://github.com/mbrubeck/agate/pull/143 + (fetchpatch { + name = "fix-port-collision.patch"; + url = "https://github.com/mbrubeck/agate/commit/2f5d7878ec9d0dd51762c4c7680fc9f825d8ecd5.patch"; + sha256 = "sha256-NEFmfb0y97O2W96YggD+MgcN7tlFEi9T4FNzLCND77s="; + }) + ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 1e7fa059d7e..82b443c0115 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-nVGhLL7HN9m5zIZOFVOMYZXxUUx3WkLpeH/59kXoTHo="; + sha256 = "sha256-9nBFBvYAhybg97oU4mi899ss4/nzBCY95KfdkSs2f8s="; }; - vendorSha256 = "sha256-v76UWaF6kdmuvABg6sDMmDpJ4HWvgliyEWAbAebK3wM="; + vendorSha256 = "sha256-qFoSK27D6bznksdm7Fl4SsVt13g2LSwuGe0As/MUo5o="; ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d13c5be5c1d..7f765eb9fd8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.2.9"; + version = "2022.3.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -44,7 +44,6 @@ "apache_kafka" = ps: with ps; [ aiokafka ]; "apcupsd" = ps: with ps; [ apcaccess ]; "api" = ps: with ps; [ aiohttp-cors ]; - "apns" = ps: with ps; [ ]; # missing inputs: apns2 "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr pyatv zeroconf ]; "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ aprslib geopy ]; @@ -166,7 +165,7 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client emoji hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors sqlalchemy ]; @@ -188,12 +187,13 @@ "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ directv ]; "discogs" = ps: with ps; [ discogs-client ]; - "discord" = ps: with ps; [ discordpy ]; + "discord" = ps: with ps; [ nextcord ]; "discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; "dlib_face_detect" = ps: with ps; [ face_recognition ]; "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; + "dlna_dms" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; "dnsip" = ps: with ps; [ aiodns ]; "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow pydoods ]; @@ -224,7 +224,7 @@ "eight_sleep" = ps: with ps; [ pyeight ]; "elgato" = ps: with ps; [ elgato ]; "eliqonline" = ps: with ps; [ eliqonline ]; - "elkm1" = ps: with ps; [ elkm1-lib ]; + "elkm1" = ps: with ps; [ aiohttp-cors elkm1-lib ifaddr ]; "elmax" = ps: with ps; [ elmax-api ]; "elv" = ps: with ps; [ pypca ]; "emby" = ps: with ps; [ pyemby ]; @@ -273,6 +273,7 @@ "fireservicerota" = ps: with ps; [ pyfireservicerota ]; "firmata" = ps: with ps; [ pymata-express ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; + "fivem" = ps: with ps; [ ]; # missing inputs: fivem-api "fixer" = ps: with ps; [ fixerio ]; "fjaraskupan" = ps: with ps; [ fjaraskupan ]; "fleetgo" = ps: with ps; [ ritassist ]; @@ -324,7 +325,6 @@ "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "glances" = ps: with ps; [ glances-api ]; - "gntp" = ps: with ps; [ gntp ]; "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalzero" = ps: with ps; [ goalzero ]; "gogogate2" = ps: with ps; [ ismartgate ]; @@ -446,7 +446,7 @@ "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "kmtronic" = ps: with ps; [ pykmtronic ]; "knx" = ps: with ps; [ xknx ]; - "kodi" = ps: with ps; [ pykodi ]; + "kodi" = ps: with ps; [ aiohttp-cors pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors konnected ]; "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore "kraken" = ps: with ps; [ krakenex pykrakenapi ]; @@ -532,11 +532,12 @@ "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors emoji hass-nabucasa pillow ]; + "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa pillow ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ pymodbus ]; "modem_callerid" = ps: with ps; [ aiohttp-cors phone-modem pyserial pyudev ]; "modern_forms" = ps: with ps; [ aiomodernforms ]; + "moehlenhoff_alpha2" = ps: with ps; [ ]; # missing inputs: moehlenhoff-alpha2 "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; @@ -680,6 +681,7 @@ "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; + "pure_energie" = ps: with ps; [ gridnet ]; "push" = ps: with ps; [ aiohttp-cors ]; "pushbullet" = ps: with ps; [ pushbullet ]; "pushover" = ps: with ps; [ pushover-complete ]; @@ -697,6 +699,7 @@ "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa rachiopy ]; "radarr" = ps: with ps; [ ]; + "radio_browser" = ps: with ps; [ radios ]; "radiotherm" = ps: with ps; [ radiotherm ]; "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy @@ -791,7 +794,7 @@ "skybeacon" = ps: with ps; [ pygatt ]; "skybell" = ps: with ps; [ skybellpy ]; "slack" = ps: with ps; [ slackclient ]; - "sleepiq" = ps: with ps; [ sleepyq ]; + "sleepiq" = ps: with ps; [ asyncsleepiq ]; "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; @@ -814,7 +817,7 @@ "soma" = ps: with ps; [ pysoma ]; "somfy" = ps: with ps; [ aiohttp-cors pymfy ]; "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; - "sonarr" = ps: with ps; [ sonarr ]; + "sonarr" = ps: with ps; [ aiopyarr ]; "songpal" = ps: with ps; [ python-songpal ]; "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco spotipy zeroconf ]; "sony_projector" = ps: with ps; [ pysdcp ]; @@ -924,7 +927,7 @@ "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "twinkly" = ps: with ps; [ ttls ]; - "twitch" = ps: with ps; [ python-twitch-client ]; + "twitch" = ps: with ps; [ twitchapi ]; "twitter" = ps: with ps; [ twitterapi ]; "ubus" = ps: with ps; [ openwrt-ubus-rpc ]; "ue_smart_radio" = ps: with ps; [ ]; @@ -990,6 +993,7 @@ "wilight" = ps: with ps; [ pywilight ]; "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api + "wiz" = ps: with ps; [ aiohttp-cors ifaddr pywizlight ]; "wled" = ps: with ps; [ wled ]; "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset "workday" = ps: with ps; [ holidays ]; @@ -998,7 +1002,6 @@ "worxlandroid" = ps: with ps; [ ]; "wsdot" = ps: with ps; [ ]; "x10" = ps: with ps; [ ]; - "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ]; "xbox_live" = ps: with ps; [ xboxapi ]; "xeoma" = ps: with ps; [ pyxeoma ]; @@ -1031,6 +1034,7 @@ "zoneminder" = ps: with ps; [ zm-py ]; "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; "zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ]; + "zwave_me" = ps: with ps; [ aiohttp-cors ifaddr url-normalize zeroconf ]; # missing inputs: zwave_me_ws }; # components listed in tests/components for which all dependencies are packaged supportedComponentsWithTests = [ @@ -1143,6 +1147,7 @@ "directv" "discovery" "dlna_dmr" + "dlna_dms" "dnsip" "doorbird" "dsmr" @@ -1343,6 +1348,7 @@ "min_max" "minecraft_server" "minio" + "mjpeg" "mobile_app" "modbus" "modem_callerid" @@ -1423,6 +1429,7 @@ "prometheus" "prosegur" "proximity" + "pure_energie" "push" "pushbullet" "pvoutput" @@ -1431,6 +1438,7 @@ "qld_bushfire" "rachio" "radarr" + "radio_browser" "rainforest_eagle" "rainmachine" "random" @@ -1459,6 +1467,7 @@ "safe_mode" "samsungtv" "scene" + "scrape" "screenlogic" "script" "search" @@ -1605,6 +1614,7 @@ "whois" "wiffi" "wilight" + "wiz" "wled" "workday" "worldclock" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 920343de67b..9e7fc76e4e3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -29,7 +29,33 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt - (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") + (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=") + + # pytest-aiohttp>0.3.0 breaks home-assistant tests + (self: super: { + pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { + version = "0.3.0"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-ySmFQzljeXc3WDhwO2L+9jUoWYvAqdRRY566lfSqpE8="; + }; + propagatedBuildInputs = with python3.pkgs; [ aiohttp pytest ]; + doCheck = false; + patches = []; + }); + aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); + hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); + snitun = super.snitun.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); + zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); + }) (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { @@ -58,7 +84,7 @@ let }) # Pinned due to API changes in 0.1.0 - (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") + (mkOverride "poolsense" "0.0.8" "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=") # Pinned due to API changes >0.3.5.3 (self: super: { @@ -105,12 +131,12 @@ let }) ]; - mkOverride = attrName: version: sha256: + mkOverride = attrName: version: hash: self: super: { ${attrName} = super.${attrName}.overridePythonAttrs (oldAttrs: { inherit version; src = oldAttrs.src.override { - inherit version sha256; + inherit version hash; }; }); }; @@ -138,7 +164,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 = "2022.2.9"; + hassVersion = "2022.3.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -156,7 +182,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-So/MAKyFVa1TchrVE4ego1fRbgOXCoXR3w/rJLFSBqI="; + hash = "sha256-VXE2zQH/HHhogo5qjneC0zlo9892wgGN1qd3ZFKfyqw="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -217,6 +243,8 @@ in python.pkgs.buildPythonApplication rec { yarl # Not in setup.py, but used in homeassistant/util/package.py setuptools + # Not in setup.py, but uncounditionally imported via tests/conftest.py + paho-mqtt ] ++ componentBuildInputs ++ extraBuildInputs; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 2aabb0d9312..9f13a6652d7 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/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 = "20220203.1"; + version = "20220301.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-6+TzBhHo9+eo6Hlk8RF+BAt4O0i759iAN+dKAPDmTNY="; + sha256 = "sha256-iIywlG9ATLV/+bHtOQFx4mRwToelpPdE3DOKSp4yxN0="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 31dbe64725c..ae2d91b933f 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -11,8 +11,9 @@ let config = [ pydispatcher ]; generic = [ ha-av ]; google_translate = [ mutagen ]; + lovelace = [ PyChromecast ]; nest = [ ha-av ]; - onboarding = [ pymetno rpi-bad-power ]; + onboarding = [ pymetno radios rpi-bad-power ]; version = [ aioaseko ]; voicerss = [ mutagen ]; yandextts = [ mutagen ]; @@ -28,6 +29,13 @@ let ]; }; + extraDisabledTests = { + roku = [ + # 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" + ]; + }; + extraPytestFlagsArray = { asuswrt = [ # asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error @@ -45,6 +53,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( ++ home-assistant.getPackages component home-assistant.python.pkgs ++ extraCheckInputs.${component} or [ ]; + disabledTests = old.disabledTests ++ extraDisabledTests.${component} or []; disabledTestPaths = old.disabledTestPaths ++ extraDisabledTestPaths.${component} or [ ]; pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray @@ -59,6 +68,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( broken = lib.elem component [ "airtouch4" "dnsip" + "zwave" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 1f0fe884554..7b65a789af8 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.29.1-80"; + version = "4.30.3-87"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}sse42.fc34.x86_64.rpm"; - sha256 = "sha256-TL5zq7fu7tLoWadmVDMXrE8oiVhHbggpmwWrIGRuAnI="; + hash = "sha256-RX9KI+4HGDUJ3y3An1zTMJTz28Of2Awn7COeX6EQc38="; }; unpackPhase = '' diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 56d66a2e99c..d72dcb9170b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx +{ lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre2, libiconv, lynx, which , nixosTests , proxySupport ? true , sslSupport ? true, openssl @@ -11,17 +11,19 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.52"; + version = "2.4.53"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-ASf33El+mYPpxRR0vtdeRWB/L4cKdnWobckK9tVy9ck="; + sha256 = "sha256-0LvREhpXtfKm/5LXuW+AUMWkXT8U2xGPZJedUlhY22M="; }; # FIXME: -dev depends on -doc outputs = [ "out" "dev" "man" "doc" ]; setOutputFlags = false; # it would move $out/modules, etc. + nativeBuildInputs = [ which ]; + buildInputs = [ perl ] ++ lib.optional brotliSupport brotli ++ lib.optional sslSupport openssl ++ @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { "--with-apr=${apr.dev}" "--with-apr-util=${aprutil.dev}" "--with-z=${zlib.dev}" - "--with-pcre=${pcre.dev}" + "--with-pcre=${pcre2.dev}/bin/pcre2-config" "--disable-maintainer-mode" "--disable-debugger-mode" "--enable-mods-shared=all" diff --git a/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch b/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch deleted file mode 100644 index 4bf0a0d0e95..00000000000 --- a/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch +++ /dev/null @@ -1,2980 +0,0 @@ -From 97d7c456e03d4a11157fac17c7b8cbcee1d8a657 Mon Sep 17 00:00:00 2001 -From: danzh <danzh2010@users.noreply.github.com> -Date: Mon, 16 Nov 2020 14:27:13 -0500 -Subject: [PATCH] quiche: update QUICHE tar (#13949) - -Signed-off-by: Dan Zhang <danzh@google.com> ---- - bazel/envoy_internal.bzl | 2 + - bazel/external/quiche.BUILD | 85 +-- - bazel/repository_locations.bzl | 6 +- - source/extensions/quic_listeners/quiche/BUILD | 1 + - .../quiche/active_quic_listener.cc | 2 +- - .../quiche/envoy_quic_client_connection.cc | 2 +- - .../quiche/envoy_quic_client_stream.cc | 1 + - .../quiche/envoy_quic_connection.cc | 6 +- - .../quiche/envoy_quic_connection.h | 1 + - .../quiche/envoy_quic_dispatcher.cc | 6 +- - .../quiche/envoy_quic_dispatcher.h | 2 +- - .../quiche/envoy_quic_proof_source.cc | 2 +- - .../quiche/envoy_quic_proof_source.h | 2 +- - .../quiche/envoy_quic_proof_source_base.cc | 7 +- - .../quiche/envoy_quic_proof_source_base.h | 6 +- - .../quiche/envoy_quic_proof_verifier_base.cc | 4 +- - .../quiche/envoy_quic_server_connection.cc | 10 +- - .../quiche/envoy_quic_server_connection.h | 1 + - .../quic_listeners/quiche/platform/BUILD | 42 +- - .../quiche/platform/flags_impl.cc | 108 +++- - .../quiche/platform/flags_impl.h | 46 +- - .../quiche/platform/flags_list.h | 502 ------------------ - .../quiche/platform/http2_flags_impl.h | 4 +- - .../quiche/platform/quic_aligned_impl.h | 18 - - .../quiche/platform/quic_cert_utils_impl.cc | 38 +- - .../quiche/platform/quic_cert_utils_impl.h | 9 +- - .../quiche/platform/quic_fallthrough_impl.h | 11 - - .../quiche/platform/quic_file_utils_impl.cc | 4 +- - .../quiche/platform/quic_file_utils_impl.h | 6 +- - .../quiche/platform/quic_flags_impl.h | 6 +- - .../platform/quic_hostname_utils_impl.cc | 6 +- - .../platform/quic_hostname_utils_impl.h | 8 +- - .../quiche/platform/quic_macros_impl.h | 13 - - .../platform/quic_mem_slice_span_impl.cc | 3 +- - .../platform/quic_mem_slice_span_impl.h | 9 +- - ..._ptr_util_impl.h => quic_testvalue_impl.h} | 11 +- - .../platform/quic_udp_socket_platform_impl.h | 3 + - .../quiche/platform/quiche_arraysize_impl.h | 11 - - .../quiche/platform/quiche_optional_impl.h | 17 - - .../quiche/platform/quiche_text_utils_impl.h | 63 +-- - .../quiche/platform/quiche_time_utils_impl.cc | 4 +- - .../quiche/platform/quiche_time_utils_impl.h | 4 +- - .../platform/spdy_endianness_util_impl.h | 29 - - .../quiche/platform/spdy_flags_impl.h | 4 +- - .../quiche/platform/spdy_string_utils_impl.h | 2 +- - .../spdy_server_push_utils_for_envoy.cc | 10 +- - .../quiche/envoy_quic_client_session_test.cc | 2 +- - .../quiche/envoy_quic_client_stream_test.cc | 44 +- - .../quiche/envoy_quic_proof_source_test.cc | 6 +- - .../quiche/envoy_quic_proof_verifier_test.cc | 8 +- - .../quiche/envoy_quic_server_session_test.cc | 3 +- - .../quiche/envoy_quic_server_stream_test.cc | 53 +- - .../quic_listeners/quiche/platform/BUILD | 22 - - .../quiche/platform/http2_platform_test.cc | 22 +- - .../quiche/platform/quic_platform_test.cc | 61 +-- - .../quiche/platform/quic_test_output_impl.cc | 15 +- - .../quiche/platform/quic_test_output_impl.h | 12 +- - .../quiche/platform/quiche_platform_test.cc | 39 -- - .../quiche/platform/spdy_platform_test.cc | 20 +- - .../quic_listeners/quiche/test_proof_source.h | 2 +- - .../quic_listeners/quiche/test_utils.h | 4 +- - 61 files changed, 396 insertions(+), 1054 deletions(-) - delete mode 100644 source/extensions/quic_listeners/quiche/platform/flags_list.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h - rename source/extensions/quic_listeners/quiche/platform/{quiche_ptr_util_impl.h => quic_testvalue_impl.h} (52%) - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h - delete mode 100644 test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc - -diff --git a/bazel/envoy_internal.bzl b/bazel/envoy_internal.bzl -index 5ad86609a..3f9ddfd23 100644 ---- a/bazel/envoy_internal.bzl -+++ b/bazel/envoy_internal.bzl -@@ -54,6 +54,8 @@ def envoy_copts(repository, test = False): - }) + select({ - repository + "//bazel:clang_build": ["-fno-limit-debug-info", "-Wgnu-conditional-omitted-operand", "-Wc++2a-extensions", "-Wrange-loop-analysis"], - repository + "//bazel:gcc_build": ["-Wno-maybe-uninitialized"], -+ # TODO: Replace with /Zc:preprocessor for cl.exe versions >= 16.5 -+ repository + "//bazel:windows_x86_64": ["-experimental:preprocessor", "-Wv:19.4"], - "//conditions:default": [], - }) + select({ - repository + "//bazel:no_debug_info": ["-g0"], -diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD -index 7541909aa..b6b208fc5 100644 ---- a/bazel/external/quiche.BUILD -+++ b/bazel/external/quiche.BUILD -@@ -57,16 +57,12 @@ quiche_common_copts = [ - "-Wno-unused-function", - # quic_inlined_frame.h uses offsetof() to optimize memory usage in frames. - "-Wno-invalid-offsetof", -- "-Wno-range-loop-analysis", - ] - - quiche_copts = select({ - # Ignore unguarded #pragma GCC statements in QUICHE sources - "@envoy//bazel:windows_x86_64": ["-wd4068"], - # Remove these after upstream fix. -- "@envoy//bazel:gcc_build": [ -- "-Wno-sign-compare", -- ] + quiche_common_copts, - "//conditions:default": quiche_common_copts, - }) - -@@ -737,7 +733,6 @@ envoy_cc_library( - hdrs = [ - "quiche/spdy/platform/api/spdy_bug_tracker.h", - "quiche/spdy/platform/api/spdy_containers.h", -- "quiche/spdy/platform/api/spdy_endianness_util.h", - "quiche/spdy/platform/api/spdy_estimate_memory_usage.h", - "quiche/spdy/platform/api/spdy_flags.h", - "quiche/spdy/platform/api/spdy_logging.h", -@@ -935,6 +930,7 @@ envoy_cc_library( - copts = quiche_copts, - repository = "@envoy", - deps = [ -+ ":http2_hpack_huffman_hpack_huffman_encoder_lib", - ":spdy_core_protocol_lib", - ":spdy_platform", - ], -@@ -1049,19 +1045,16 @@ envoy_cc_library( - envoy_cc_library( - name = "quic_platform_base", - hdrs = [ -- "quiche/quic/platform/api/quic_aligned.h", - "quiche/quic/platform/api/quic_bug_tracker.h", - "quiche/quic/platform/api/quic_client_stats.h", - "quiche/quic/platform/api/quic_containers.h", - "quiche/quic/platform/api/quic_error_code_wrappers.h", - "quiche/quic/platform/api/quic_estimate_memory_usage.h", - "quiche/quic/platform/api/quic_exported_stats.h", -- "quiche/quic/platform/api/quic_fallthrough.h", - "quiche/quic/platform/api/quic_flag_utils.h", - "quiche/quic/platform/api/quic_flags.h", - "quiche/quic/platform/api/quic_iovec.h", - "quiche/quic/platform/api/quic_logging.h", -- "quiche/quic/platform/api/quic_macros.h", - "quiche/quic/platform/api/quic_map_util.h", - "quiche/quic/platform/api/quic_mem_slice.h", - "quiche/quic/platform/api/quic_prefetch.h", -@@ -1072,6 +1065,7 @@ envoy_cc_library( - "quiche/quic/platform/api/quic_stream_buffer_allocator.h", - "quiche/quic/platform/api/quic_string_utils.h", - "quiche/quic/platform/api/quic_uint128.h", -+ "quiche/quic/platform/api/quic_testvalue.h", - # TODO: uncomment the following files as implementations are added. - # "quiche/quic/platform/api/quic_fuzzed_data_provider.h", - # "quiche/quic/platform/api/quic_test_loopback.h", -@@ -1147,7 +1141,6 @@ envoy_cc_test_library( - hdrs = ["quiche/quic/platform/api/quic_port_utils.h"], - repository = "@envoy", - tags = ["nofips"], -- deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_impl_lib"], - ) - - envoy_cc_library( -@@ -1216,15 +1209,14 @@ envoy_cc_test_library( - ) - - envoy_cc_library( -- name = "quiche_common_platform_endian", -- hdrs = ["quiche/common/platform/api/quiche_endian.h"], -+ name = "quiche_common_endian_lib", -+ hdrs = ["quiche/common/quiche_endian.h"], - repository = "@envoy", - tags = ["nofips"], - visibility = ["//visibility:public"], - deps = - [ - ":quiche_common_platform_export", -- "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_endian_impl_lib", - ], - ) - -@@ -1932,6 +1924,7 @@ envoy_cc_library( - visibility = ["//visibility:public"], - deps = [ - ":quic_core_clock_lib", -+ ":quic_core_crypto_certificate_view_lib", - ":quic_core_crypto_encryption_lib", - ":quic_core_crypto_hkdf_lib", - ":quic_core_crypto_proof_source_interface_lib", -@@ -2167,6 +2160,15 @@ envoy_cc_library( - ], - ) - -+envoy_cc_library( -+ name = "quic_core_flags_list_lib", -+ hdrs = ["quiche/quic/core/quic_flags_list.h"], -+ copts = quiche_copts, -+ repository = "@envoy", -+ tags = ["nofips"], -+ visibility = ["//visibility:public"], -+) -+ - envoy_cc_library( - name = "quic_core_framer_lib", - srcs = ["quiche/quic/core/quic_framer.cc"], -@@ -2339,6 +2341,7 @@ envoy_cc_library( - repository = "@envoy", - tags = ["nofips"], - deps = [ -+ ":http2_constants_lib", - ":quic_core_data_lib", - ":quic_core_error_codes_lib", - ":quic_core_http_http_frames_lib", -@@ -2723,6 +2726,27 @@ envoy_cc_library( - ], - ) - -+envoy_cc_library( -+ name = "quic_core_path_validator_lib", -+ srcs = ["quiche/quic/core/quic_path_validator.cc"], -+ hdrs = ["quiche/quic/core/quic_path_validator.h"], -+ copts = quiche_copts, -+ repository = "@envoy", -+ tags = ["nofips"], -+ deps = [ -+ ":quic_core_alarm_factory_interface_lib", -+ ":quic_core_alarm_interface_lib", -+ ":quic_core_arena_scoped_ptr_lib", -+ ":quic_core_clock_lib", -+ ":quic_core_constants_lib", -+ ":quic_core_crypto_random_lib", -+ ":quic_core_one_block_arena_lib", -+ ":quic_core_packet_writer_interface_lib", -+ ":quic_core_types_lib", -+ ":quic_platform", -+ ], -+) -+ - envoy_cc_library( - name = "quic_core_process_packet_interface_lib", - hdrs = ["quiche/quic/core/quic_process_packet_interface.h"], -@@ -2735,6 +2759,15 @@ envoy_cc_library( - ], - ) - -+envoy_cc_library( -+ name = "quic_core_protocol_flags_list_lib", -+ hdrs = ["quiche/quic/core/quic_protocol_flags_list.h"], -+ copts = quiche_copts, -+ repository = "@envoy", -+ tags = ["nofips"], -+ visibility = ["//visibility:public"], -+) -+ - envoy_cc_library( - name = "quic_core_qpack_blocking_manager_lib", - srcs = ["quiche/quic/core/qpack/qpack_blocking_manager.cc"], -@@ -2896,6 +2929,7 @@ envoy_cc_library( - deps = [ - ":http2_decoder_decode_buffer_lib", - ":http2_decoder_decode_status_lib", -+ ":quic_core_error_codes_lib", - ":quic_core_qpack_qpack_instruction_decoder_lib", - ":quic_core_qpack_qpack_instructions_lib", - ":quic_core_qpack_qpack_stream_receiver_lib", -@@ -3368,7 +3402,7 @@ envoy_cc_library( - ":quic_core_error_codes_lib", - ":quic_core_time_lib", - ":quic_platform_base", -- ":quiche_common_platform_endian", -+ ":quiche_common_endian_lib", - ], - ) - -@@ -3420,6 +3454,7 @@ envoy_cc_library( - repository = "@envoy", - tags = ["nofips"], - deps = [ -+ ":quic_core_circular_deque_lib", - ":quic_core_connection_stats_lib", - ":quic_core_packets_lib", - ":quic_core_session_notifier_interface_lib", -@@ -3459,6 +3494,7 @@ envoy_cc_library( - deps = [ - ":quic_core_versions_lib", - ":quic_platform_base", -+ ":quiche_common_endian_lib", - ], - ) - -@@ -3475,7 +3511,6 @@ envoy_cc_library( - ":quic_core_tag_lib", - ":quic_core_types_lib", - ":quic_platform_base", -- ":quiche_common_platform_endian", - ], - ) - -@@ -3746,6 +3781,7 @@ envoy_cc_test_library( - ":quic_core_packet_creator_lib", - ":quic_core_packet_writer_interface_lib", - ":quic_core_packets_lib", -+ ":quic_core_path_validator_lib", - ":quic_core_received_packet_manager_lib", - ":quic_core_sent_packet_manager_lib", - ":quic_core_server_id_lib", -@@ -3836,25 +3872,10 @@ envoy_cc_test_library( - deps = [":epoll_server_platform"], - ) - --envoy_cc_library( -- name = "quiche_common_platform_optional", -- hdrs = ["quiche/common/platform/api/quiche_optional.h"], -- repository = "@envoy", -- tags = ["nofips"], -- visibility = ["//visibility:public"], -- deps = [ -- ":quiche_common_platform_export", -- "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_optional_impl_lib", -- ], --) -- - envoy_cc_library( - name = "quiche_common_platform", - hdrs = [ -- "quiche/common/platform/api/quiche_arraysize.h", - "quiche/common/platform/api/quiche_logging.h", -- "quiche/common/platform/api/quiche_optional.h", -- "quiche/common/platform/api/quiche_ptr_util.h", - "quiche/common/platform/api/quiche_str_cat.h", - "quiche/common/platform/api/quiche_string_piece.h", - "quiche/common/platform/api/quiche_text_utils.h", -@@ -3866,7 +3887,6 @@ envoy_cc_library( - visibility = ["//visibility:public"], - deps = [ - ":quiche_common_platform_export", -- ":quiche_common_platform_optional", - "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_impl_lib", - ], - ) -@@ -3874,7 +3894,6 @@ envoy_cc_library( - envoy_cc_test_library( - name = "quiche_common_platform_test", - srcs = [ -- "quiche/common/platform/api/quiche_endian_test.cc", - "quiche/common/platform/api/quiche_str_cat_test.cc", - "quiche/common/platform/api/quiche_text_utils_test.cc", - "quiche/common/platform/api/quiche_time_utils_test.cc", -@@ -3884,7 +3903,6 @@ envoy_cc_test_library( - tags = ["nofips"], - deps = [ - ":quiche_common_platform", -- ":quiche_common_platform_endian", - "@envoy//test/extensions/quic_listeners/quiche/platform:quiche_common_platform_test_impl_lib", - ], - ) -@@ -3904,8 +3922,8 @@ envoy_cc_library( - tags = ["nofips"], - visibility = ["//visibility:public"], - deps = [ -+ ":quiche_common_endian_lib", - ":quiche_common_platform", -- ":quiche_common_platform_endian", - ], - ) - -@@ -3944,6 +3962,7 @@ envoy_cc_test( - deps = [ - ":http2_platform", - ":http2_test_tools_random", -+ ":quiche_common_test_tools_test_utils_lib", - ], - ) - -diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl -index 6eba5a821..19ddc76e8 100644 ---- a/bazel/repository_locations.bzl -+++ b/bazel/repository_locations.bzl -@@ -671,9 +671,9 @@ DEPENDENCY_REPOSITORIES_SPEC = dict( - project_name = "QUICHE", - project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols", - project_url = "https://quiche.googlesource.com/quiche", -- # Static snapshot of https://quiche.googlesource.com/quiche/+archive/f555d99a084cdd086a349548c70fb558ac5847cf.tar.gz -- version = "f555d99a084cdd086a349548c70fb558ac5847cf", -- sha256 = "1833f08e7b0f18b49d7498b029b7f3e6559a82113ec82a98a9e945553756e351", -+ # Static snapshot of https://quiche.googlesource.com/quiche/+archive/ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea.tar.gz -+ version = "ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea", -+ sha256 = "52680dea984dbe899c27176155578b97276e1f1516b7c3a63fb16ba593061859", - urls = ["https://storage.googleapis.com/quiche-envoy-integration/{version}.tar.gz"], - use_category = ["dataplane_ext"], - extensions = ["envoy.transport_sockets.quic"], -diff --git a/source/extensions/quic_listeners/quiche/BUILD b/source/extensions/quic_listeners/quiche/BUILD -index 29eb78d15..a90cfde6d 100644 ---- a/source/extensions/quic_listeners/quiche/BUILD -+++ b/source/extensions/quic_listeners/quiche/BUILD -@@ -212,6 +212,7 @@ envoy_cc_library( - "//source/common/buffer:buffer_lib", - "//source/common/common:assert_lib", - "//source/common/http:header_map_lib", -+ "//source/common/http:header_utility_lib", - "//source/extensions/quic_listeners/quiche/platform:quic_platform_mem_slice_storage_impl_lib", - "@com_googlesource_quiche//:quic_core_http_client_lib", - ], -diff --git a/source/extensions/quic_listeners/quiche/active_quic_listener.cc b/source/extensions/quic_listeners/quiche/active_quic_listener.cc -index f4808adc5..86912292a 100644 ---- a/source/extensions/quic_listeners/quiche/active_quic_listener.cc -+++ b/source/extensions/quic_listeners/quiche/active_quic_listener.cc -@@ -55,7 +55,7 @@ ActiveQuicListener::ActiveQuicListener( - quic::QuicRandom* const random = quic::QuicRandom::GetInstance(); - random->RandBytes(random_seed_, sizeof(random_seed_)); - crypto_config_ = std::make_unique<quic::QuicCryptoServerConfig>( -- quiche::QuicheStringPiece(reinterpret_cast<char*>(random_seed_), sizeof(random_seed_)), -+ absl::string_view(reinterpret_cast<char*>(random_seed_), sizeof(random_seed_)), - quic::QuicRandom::GetInstance(), - std::make_unique<EnvoyQuicProofSource>(listen_socket_, listener_config.filterChainManager(), - stats_), -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc -index e79b08ad9..95d63729d 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc -@@ -43,7 +43,7 @@ EnvoyQuicClientConnection::EnvoyQuicClientConnection( - const quic::ParsedQuicVersionVector& supported_versions, Event::Dispatcher& dispatcher, - Network::ConnectionSocketPtr&& connection_socket) - : EnvoyQuicConnection( -- server_connection_id, -+ server_connection_id, quic::QuicSocketAddress(), - envoyIpAddressToQuicSocketAddress(connection_socket->remoteAddress()->ip()), helper, - alarm_factory, writer, owns_writer, quic::Perspective::IS_CLIENT, supported_versions, - std::move(connection_socket)), -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc -index 866e35416..a759b26b1 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc -@@ -20,6 +20,7 @@ - - #include "common/buffer/buffer_impl.h" - #include "common/http/header_map_impl.h" -+#include "common/http/header_utility.h" - #include "common/common/assert.h" - - namespace Envoy { -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc -index dcc311a6e..d813dfe4b 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc -@@ -6,6 +6,7 @@ namespace Envoy { - namespace Quic { - - EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id, -+ quic::QuicSocketAddress initial_self_address, - quic::QuicSocketAddress initial_peer_address, - quic::QuicConnectionHelperInterface& helper, - quic::QuicAlarmFactory& alarm_factory, -@@ -13,8 +14,9 @@ EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_co - quic::Perspective perspective, - const quic::ParsedQuicVersionVector& supported_versions, - Network::ConnectionSocketPtr&& connection_socket) -- : quic::QuicConnection(server_connection_id, initial_peer_address, &helper, &alarm_factory, -- writer, owns_writer, perspective, supported_versions), -+ : quic::QuicConnection(server_connection_id, initial_self_address, initial_peer_address, -+ &helper, &alarm_factory, writer, owns_writer, perspective, -+ supported_versions), - connection_socket_(std::move(connection_socket)) {} - - EnvoyQuicConnection::~EnvoyQuicConnection() { connection_socket_->close(); } -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h -index f4c8589d7..f8543bc93 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h -@@ -26,6 +26,7 @@ class EnvoyQuicConnection : public quic::QuicConnection, - protected Logger::Loggable<Logger::Id::connection> { - public: - EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id, -+ quic::QuicSocketAddress initial_self_address, - quic::QuicSocketAddress initial_peer_address, - quic::QuicConnectionHelperInterface& helper, - quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc -index ba8f7f3a8..e6351f643 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc -@@ -48,11 +48,11 @@ void EnvoyQuicDispatcher::OnConnectionClosed(quic::QuicConnectionId connection_i - } - - std::unique_ptr<quic::QuicSession> EnvoyQuicDispatcher::CreateQuicSession( -- quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& /*self_address*/, -- const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece /*alpn*/, -+ quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& self_address, -+ const quic::QuicSocketAddress& peer_address, absl::string_view /*alpn*/, - const quic::ParsedQuicVersion& version) { - auto quic_connection = std::make_unique<EnvoyQuicServerConnection>( -- server_connection_id, peer_address, *helper(), *alarm_factory(), writer(), -+ server_connection_id, self_address, peer_address, *helper(), *alarm_factory(), writer(), - /*owns_writer=*/false, quic::ParsedQuicVersionVector{version}, listen_socket_); - auto quic_session = std::make_unique<EnvoyQuicServerSession>( - config(), quic::ParsedQuicVersionVector{version}, std::move(quic_connection), this, -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h -index 589ff5327..d59307f41 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h -@@ -62,7 +62,7 @@ protected: - std::unique_ptr<quic::QuicSession> - CreateQuicSession(quic::QuicConnectionId server_connection_id, - const quic::QuicSocketAddress& self_address, -- const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece alpn, -+ const quic::QuicSocketAddress& peer_address, absl::string_view alpn, - const quic::ParsedQuicVersion& version) override; - - private: -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc -index 1f65e4e7e..967765829 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc -@@ -36,7 +36,7 @@ EnvoyQuicProofSource::GetCertChain(const quic::QuicSocketAddress& server_address - - void EnvoyQuicProofSource::signPayload( - const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address, -- const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in, -+ const std::string& hostname, uint16_t signature_algorithm, absl::string_view in, - std::unique_ptr<quic::ProofSource::SignatureCallback> callback) { - CertConfigWithFilterChain res = - getTlsCertConfigAndFilterChain(server_address, client_address, hostname); -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h -index 6e1c74c92..e22bf3465 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h -@@ -28,7 +28,7 @@ protected: - // quic::ProofSource - void signPayload(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, const std::string& hostname, -- uint16_t signature_algorithm, quiche::QuicheStringPiece in, -+ uint16_t signature_algorithm, absl::string_view in, - std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override; - - private: -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc -index 2c82c04d9..9ad3cb07f 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc -@@ -21,7 +21,7 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad - const std::string& hostname, - const std::string& server_config, - quic::QuicTransportVersion /*transport_version*/, -- quiche::QuicheStringPiece chlo_hash, -+ absl::string_view chlo_hash, - std::unique_ptr<quic::ProofSource::Callback> callback) { - quic::QuicReferenceCountedPointer<quic::ProofSource::Chain> chain = - GetCertChain(server_address, client_address, hostname); -@@ -68,13 +68,12 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad - auto signature_callback = std::make_unique<SignatureCallback>(std::move(callback), chain); - - signPayload(server_address, client_address, hostname, sign_alg, -- quiche::QuicheStringPiece(payload.get(), payload_size), -- std::move(signature_callback)); -+ absl::string_view(payload.get(), payload_size), std::move(signature_callback)); - } - - void EnvoyQuicProofSourceBase::ComputeTlsSignature( - const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address, -- const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in, -+ const std::string& hostname, uint16_t signature_algorithm, absl::string_view in, - std::unique_ptr<quic::ProofSource::SignatureCallback> callback) { - signPayload(server_address, client_address, hostname, signature_algorithm, in, - std::move(callback)); -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h -index b7d76981e..a9e7e8c3f 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h -@@ -57,7 +57,7 @@ public: - void GetProof(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, const std::string& hostname, - const std::string& server_config, quic::QuicTransportVersion /*transport_version*/, -- quiche::QuicheStringPiece chlo_hash, -+ absl::string_view chlo_hash, - std::unique_ptr<quic::ProofSource::Callback> callback) override; - - TicketCrypter* GetTicketCrypter() override { return nullptr; } -@@ -65,14 +65,14 @@ public: - void ComputeTlsSignature(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, - const std::string& hostname, uint16_t signature_algorithm, -- quiche::QuicheStringPiece in, -+ absl::string_view in, - std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override; - - protected: - virtual void signPayload(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, - const std::string& hostname, uint16_t signature_algorithm, -- quiche::QuicheStringPiece in, -+ absl::string_view in, - std::unique_ptr<quic::ProofSource::SignatureCallback> callback) PURE; - - private: -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc -index 229b3ab36..e37590529 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc -@@ -58,8 +58,8 @@ bool EnvoyQuicProofVerifierBase::verifySignature(const std::string& server_confi - *error_details = "QuicPacketWriter error."; - return false; - } -- bool valid = cert_view->VerifySignature(quiche::QuicheStringPiece(payload.get(), payload_size), -- signature, sign_alg); -+ bool valid = cert_view->VerifySignature(absl::string_view(payload.get(), payload_size), signature, -+ sign_alg); - if (!valid) { - *error_details = "Signature is not valid."; - } -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc -index b8fa94221..974c6c8eb 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc -@@ -11,11 +11,13 @@ namespace Quic { - - EnvoyQuicServerConnection::EnvoyQuicServerConnection( - const quic::QuicConnectionId& server_connection_id, -- quic::QuicSocketAddress initial_peer_address, quic::QuicConnectionHelperInterface& helper, -- quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, bool owns_writer, -+ quic::QuicSocketAddress initial_self_address, quic::QuicSocketAddress initial_peer_address, -+ quic::QuicConnectionHelperInterface& helper, quic::QuicAlarmFactory& alarm_factory, -+ quic::QuicPacketWriter* writer, bool owns_writer, - const quic::ParsedQuicVersionVector& supported_versions, Network::Socket& listen_socket) -- : EnvoyQuicConnection(server_connection_id, initial_peer_address, helper, alarm_factory, writer, -- owns_writer, quic::Perspective::IS_SERVER, supported_versions, -+ : EnvoyQuicConnection(server_connection_id, initial_self_address, initial_peer_address, helper, -+ alarm_factory, writer, owns_writer, quic::Perspective::IS_SERVER, -+ supported_versions, - std::make_unique<Network::ConnectionSocketImpl>( - // Wraps the real IoHandle instance so that if the connection socket - // gets closed, the real IoHandle won't be affected. -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h -index 7b7fac05e..7625fad02 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h -@@ -10,6 +10,7 @@ namespace Quic { - class EnvoyQuicServerConnection : public EnvoyQuicConnection { - public: - EnvoyQuicServerConnection(const quic::QuicConnectionId& server_connection_id, -+ quic::QuicSocketAddress initial_self_address, - quic::QuicSocketAddress initial_peer_address, - quic::QuicConnectionHelperInterface& helper, - quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, -diff --git a/source/extensions/quic_listeners/quiche/platform/BUILD b/source/extensions/quic_listeners/quiche/platform/BUILD -index f53e07b58..839664d52 100644 ---- a/source/extensions/quic_listeners/quiche/platform/BUILD -+++ b/source/extensions/quic_listeners/quiche/platform/BUILD -@@ -36,15 +36,16 @@ envoy_extension_package() - envoy_cc_library( - name = "flags_impl_lib", - srcs = ["flags_impl.cc"], -- hdrs = [ -- "flags_impl.h", -- "flags_list.h", -- ], -+ hdrs = ["flags_impl.h"], - external_deps = [ - "abseil_base", - "abseil_synchronization", - ], - visibility = ["//visibility:public"], -+ deps = [ -+ "@com_googlesource_quiche//:quic_core_flags_list_lib", -+ "@com_googlesource_quiche//:quic_core_protocol_flags_list_lib", -+ ], - ) - - envoy_cc_library( -@@ -62,7 +63,6 @@ envoy_cc_library( - envoy_cc_library( - name = "http2_platform_impl_lib", - hdrs = [ -- "http2_arraysize_impl.h", - "http2_bug_tracker_impl.h", - "http2_containers_impl.h", - "http2_estimate_memory_usage_impl.h", -@@ -74,7 +74,6 @@ envoy_cc_library( - ], - external_deps = [ - "abseil_base", -- "abseil_optional", - "abseil_str_format", - ], - visibility = ["//visibility:public"], -@@ -114,16 +113,13 @@ envoy_cc_library( - "quic_mem_slice_impl.cc", - ], - hdrs = [ -- "quic_aligned_impl.h", - "quic_client_stats_impl.h", - "quic_containers_impl.h", - "quic_error_code_wrappers_impl.h", - "quic_estimate_memory_usage_impl.h", -- "quic_fallthrough_impl.h", - "quic_flag_utils_impl.h", - "quic_flags_impl.h", - "quic_iovec_impl.h", -- "quic_macros_impl.h", - "quic_map_util_impl.h", - "quic_mem_slice_impl.h", - "quic_prefetch_impl.h", -@@ -132,6 +128,7 @@ envoy_cc_library( - "quic_server_stats_impl.h", - "quic_stack_trace_impl.h", - "quic_stream_buffer_allocator_impl.h", -+ "quic_testvalue_impl.h", - "quic_uint128_impl.h", - ], - external_deps = [ -@@ -141,7 +138,6 @@ envoy_cc_library( - "abseil_memory", - "abseil_node_hash_map", - "abseil_node_hash_set", -- "abseil_optional", - ], - tags = ["nofips"], - visibility = ["//visibility:public"], -@@ -236,6 +232,7 @@ envoy_cc_library( - }), - repository = "@envoy", - tags = ["nofips"], -+ visibility = ["//visibility:public"], - ) - - envoy_cc_library( -@@ -250,23 +247,12 @@ envoy_cc_library( - ], - ) - --envoy_cc_library( -- name = "quiche_common_platform_optional_impl_lib", -- hdrs = ["quiche_optional_impl.h"], -- external_deps = [ -- "abseil_node_hash_map", -- ], -- visibility = ["//visibility:public"], --) -- - envoy_cc_library( - name = "quiche_common_platform_impl_lib", - srcs = ["quiche_time_utils_impl.cc"], - hdrs = [ -- "quiche_arraysize_impl.h", - "quiche_logging_impl.h", - "quiche_map_util_impl.h", -- "quiche_ptr_util_impl.h", - "quiche_str_cat_impl.h", - "quiche_string_piece_impl.h", - "quiche_text_utils_impl.h", -@@ -281,17 +267,14 @@ envoy_cc_library( - deps = [ - ":quic_platform_logging_impl_lib", - ":string_utils_lib", -- "@com_googlesource_quiche//:quiche_common_platform_optional", - ], - ) - - envoy_cc_library( - name = "spdy_platform_impl_lib", - hdrs = [ -- "spdy_arraysize_impl.h", - "spdy_bug_tracker_impl.h", - "spdy_containers_impl.h", -- "spdy_endianness_util_impl.h", - "spdy_estimate_memory_usage_impl.h", - "spdy_flags_impl.h", - "spdy_logging_impl.h", -@@ -331,14 +314,3 @@ envoy_cc_library( - tags = ["nofips"], - visibility = ["//visibility:public"], - ) -- --envoy_cc_library( -- name = "quiche_common_platform_endian_impl_lib", -- hdrs = ["quiche_endian_impl.h"], -- tags = ["nofips"], -- visibility = ["//visibility:public"], -- deps = [ -- "quiche_common_platform_export_impl_lib", -- "//source/common/common:byte_order_lib", -- ], --) -diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc -index 70fb182d6..9d4ea89ce 100644 ---- a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc -@@ -15,12 +15,24 @@ namespace quiche { - - namespace { - --absl::flat_hash_map<std::string, Flag*> MakeFlagMap() { -+absl::flat_hash_map<std::string, Flag*> makeFlagMap() { - absl::flat_hash_map<std::string, Flag*> flags; - --#define QUICHE_FLAG(type, flag, value, help) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag); --#include "extensions/quic_listeners/quiche/platform/flags_list.h" --#undef QUICHE_FLAG -+#define QUIC_FLAG(flag, ...) flags.emplace(flag->name(), flag); -+#include "quiche/quic/core/quic_flags_list.h" -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) -+ QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) -+ QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) -+#undef QUIC_FLAG -+ -+#define QUIC_PROTOCOL_FLAG(type, flag, ...) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag); -+#include "quiche/quic/core/quic_protocol_flags_list.h" -+#undef QUIC_PROTOCOL_FLAG - - return flags; - } -@@ -28,75 +40,123 @@ absl::flat_hash_map<std::string, Flag*> MakeFlagMap() { - } // namespace - - // static --FlagRegistry& FlagRegistry::GetInstance() { -+FlagRegistry& FlagRegistry::getInstance() { - static auto* instance = new FlagRegistry(); - return *instance; - } - --FlagRegistry::FlagRegistry() : flags_(MakeFlagMap()) {} -+FlagRegistry::FlagRegistry() : flags_(makeFlagMap()) {} - --void FlagRegistry::ResetFlags() const { -+void FlagRegistry::resetFlags() const { - for (auto& kv : flags_) { -- kv.second->ResetValue(); -+ kv.second->resetValue(); - } - } - --Flag* FlagRegistry::FindFlag(const std::string& name) const { -+Flag* FlagRegistry::findFlag(const std::string& name) const { - auto it = flags_.find(name); - return (it != flags_.end()) ? it->second : nullptr; - } - --template <> bool TypedFlag<bool>::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag<bool>::setValueFromString(const std::string& value_str) { - static const auto* kTrueValues = new std::set<std::string>({"1", "t", "true", "y", "yes"}); - static const auto* kFalseValues = new std::set<std::string>({"0", "f", "false", "n", "no"}); - auto lower = absl::AsciiStrToLower(value_str); - if (kTrueValues->find(lower) != kTrueValues->end()) { -- SetValue(true); -+ setValue(true); - return true; - } - if (kFalseValues->find(lower) != kFalseValues->end()) { -- SetValue(false); -+ setValue(false); - return true; - } - return false; - } - --template <> bool TypedFlag<int32_t>::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag<int32_t>::setValueFromString(const std::string& value_str) { - int32_t value; - if (absl::SimpleAtoi(value_str, &value)) { -- SetValue(value); -+ setValue(value); - return true; - } - return false; - } - --template <> bool TypedFlag<int64_t>::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag<int64_t>::setValueFromString(const std::string& value_str) { - int64_t value; - if (absl::SimpleAtoi(value_str, &value)) { -- SetValue(value); -+ setValue(value); - return true; - } - return false; - } - --template <> bool TypedFlag<double>::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag<double>::setValueFromString(const std::string& value_str) { - double value; - if (absl::SimpleAtod(value_str, &value)) { -- SetValue(value); -+ setValue(value); - return true; - } - return false; - } - --template <> bool TypedFlag<std::string>::SetValueFromString(const std::string& value_str) { -- SetValue(value_str); -+template <> bool TypedFlag<std::string>::setValueFromString(const std::string& value_str) { -+ setValue(value_str); - return true; - } - -+template <> bool TypedFlag<unsigned long>::setValueFromString(const std::string& value_str) { -+ unsigned long value; -+ if (absl::SimpleAtoi(value_str, &value)) { -+ setValue(value); -+ return true; -+ } -+ return false; -+} -+ -+template <> bool TypedFlag<unsigned long long>::setValueFromString(const std::string& value_str) { -+ unsigned long long value; -+ if (absl::SimpleAtoi(value_str, &value)) { -+ setValue(value); -+ return true; -+ } -+ return false; -+} -+ - // Flag definitions --#define QUICHE_FLAG(type, flag, value, help) \ -- TypedFlag<type>* FLAGS_##flag = new TypedFlag<type>(#flag, value, help); --#include "extensions/quic_listeners/quiche/platform/flags_list.h" --#undef QUICHE_FLAG -+#define QUIC_FLAG(flag, value) TypedFlag<bool>* flag = new TypedFlag<bool>(#flag, value, ""); -+#include "quiche/quic/core/quic_flags_list.h" -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) -+ -+#undef QUIC_FLAG -+ -+#define STRINGIFY(X) #X -+ -+#define DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, help) \ -+ TypedFlag<type>* FLAGS_##flag = new TypedFlag<type>(STRINGIFY(FLAGS_##flag), value, help); -+ -+#define DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE(type, flag, value, doc) \ -+ DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, doc) -+ -+#define DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES(type, flag, internal_value, external_value, doc) \ -+ DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, external_value, doc) -+ -+// Select the right macro based on the number of arguments. -+#define GET_6TH_ARG(arg1, arg2, arg3, arg4, arg5, arg6, ...) arg6 -+ -+#define QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(...) \ -+ GET_6TH_ARG(__VA_ARGS__, DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES, \ -+ DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE) -+ -+#define QUIC_PROTOCOL_FLAG(...) QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__) -+#include "quiche/quic/core/quic_protocol_flags_list.h" -+#undef QUIC_PROTOCOL_FLAG - - } // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.h b/source/extensions/quic_listeners/quiche/platform/flags_impl.h -index 5db939925..83ed8430c 100644 ---- a/source/extensions/quic_listeners/quiche/platform/flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.h -@@ -26,13 +26,13 @@ public: - ~FlagRegistry() = default; - - // Return singleton instance. -- static FlagRegistry& GetInstance(); -+ static FlagRegistry& getInstance(); - - // Reset all registered flags to their default values. -- void ResetFlags() const; -+ void resetFlags() const; - - // Look up a flag by name. -- Flag* FindFlag(const std::string& name) const; -+ Flag* findFlag(const std::string& name) const; - - private: - FlagRegistry(); -@@ -48,10 +48,10 @@ public: - virtual ~Flag() = default; - - // Set flag value from given string, returning true iff successful. -- virtual bool SetValueFromString(const std::string& value_str) = 0; -+ virtual bool setValueFromString(const std::string& value_str) = 0; - - // Reset flag to default value. -- virtual void ResetValue() = 0; -+ virtual void resetValue() = 0; - - // Return flag name. - std::string name() const { return name_; } -@@ -70,15 +70,15 @@ public: - TypedFlag(const char* name, T default_value, const char* help) - : Flag(name, help), value_(default_value), default_value_(default_value) {} - -- bool SetValueFromString(const std::string& value_str) override; -+ bool setValueFromString(const std::string& value_str) override; - -- void ResetValue() override { -+ void resetValue() override { - absl::MutexLock lock(&mutex_); - value_ = default_value_; - } - - // Set flag value. -- void SetValue(T value) { -+ void setValue(T value) { - absl::MutexLock lock(&mutex_); - value_ = value; - } -@@ -96,15 +96,29 @@ private: - }; - - // SetValueFromString specializations --template <> bool TypedFlag<bool>::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag<int32_t>::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag<int64_t>::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag<double>::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag<std::string>::SetValueFromString(const std::string& value_str); -+template <> bool TypedFlag<bool>::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag<int32_t>::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag<int64_t>::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag<double>::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag<std::string>::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag<unsigned long>::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag<unsigned long long>::setValueFromString(const std::string& value_str); - - // Flag declarations --#define QUICHE_FLAG(type, flag, value, help) extern TypedFlag<type>* FLAGS_##flag; --#include "extensions/quic_listeners/quiche/platform/flags_list.h" --#undef QUICHE_FLAG -+#define QUIC_FLAG(flag, ...) extern TypedFlag<bool>* flag; -+#include "quiche/quic/core/quic_flags_list.h" -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) -+#undef QUIC_FLAG -+ -+#define QUIC_PROTOCOL_FLAG(type, flag, ...) extern TypedFlag<type>* FLAGS_##flag; -+#include "quiche/quic/core/quic_protocol_flags_list.h" -+#undef QUIC_PROTOCOL_FLAG - - } // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/flags_list.h b/source/extensions/quic_listeners/quiche/platform/flags_list.h -deleted file mode 100644 -index 7e9e20a7c..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/flags_list.h -+++ /dev/null -@@ -1,502 +0,0 @@ --// This file intentionally does not have header guards. It is intended to be --// included multiple times, each time with a different definition of --// QUICHE_FLAG. -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --// This file is generated by //third_party/quic/tools:quic_flags_list in --// Google3. -- --#if defined(QUICHE_FLAG) -- --QUICHE_FLAG( -- bool, http2_reloadable_flag_http2_backend_alpn_failure_error_code, false, -- "If true, the GFE will return a new ResponseCodeDetails error when ALPN to the backend fails.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_ip_based_cwnd_exp, true, -- "If true, enable IP address based CWND bootstrapping experiment with different " -- "bandwidth models and priorities in HTTP2.") -- --QUICHE_FLAG( -- bool, http2_reloadable_flag_http2_load_based_goaway_warning, false, -- "If true, load-based connection closures will send a warning GOAWAY before the actual GOAWAY.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_security_requirement_for_client3, false, -- "If true, check whether client meets security requirements during SSL handshake. If " -- "flag is true and client does not meet security requirements, do not negotiate HTTP/2 " -- "with client or terminate the session with SPDY_INADEQUATE_SECURITY if HTTP/2 is " -- "already negotiated. The spec contains both cipher and TLS version requirements.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_websocket_detection, false, -- "If true, uses a HTTP/2-specific method of detecting websocket upgrade requests.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_permissive_http2_switch, false, -- "If true, the GFE allows both HTTP/1.0 and HTTP/1.1 versions in HTTP/2 upgrade " -- "requests/responses.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_debugips, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_external_users, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_gclb_quic_allow_alia, true, -- "If gfe2_reloadable_flag_gclb_use_alia is also true, use Alia for GCLB QUIC " -- "handshakes. To be used as a big red button if there's a problem with Alia/QUIC.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_abort_qpack_on_stream_close, false, -- "If true, abort async QPACK header decompression in QuicSpdyStream::OnClose().") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_ack_delay_alarm_granularity, false, -- "When true, ensure the ACK delay is never less than the alarm granularity when ACK " -- "decimation is enabled.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_missing_connected_checks, false, -- "If true, add missing connected checks.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_silent_idle_timeout, true, -- "If true, when server is silently closing connections due to idle timeout, serialize " -- "the connection close packets which will be added to time wait list.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, false, -- "If true, include stream information in idle timeout connection close detail.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_backend_set_stream_ttl, false, -- "If true, check backend response header for X-Response-Ttl. If it is provided, the " -- "stream TTL is set. A QUIC stream will be immediately canceled when tries to write " -- "data if this TTL expired.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_client_enabled_bbr_v2, true, -- "If true, allow client to enable BBRv2 on server via connection option 'B2ON'.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_alpn_dispatch, false, -- "Support different QUIC sessions, as indicated by ALPN. Used for QBONE.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_avoid_too_low_probe_bw_cwnd, false, -- "If true, QUIC BBRv2's PROBE_BW mode will not reduce cwnd below BDP+ack_height.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_fewer_startup_round_trips, false, -- "When true, the 1RTT and 2RTT connection options decrease the number of round trips in " -- "BBRv2 STARTUP without a 25% bandwidth increase to 1 or 2 round trips respectively.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_bbr2_limit_inflight_hi, false, -- "When true, the B2HI connection option limits reduction of inflight_hi to (1-Beta)*CWND.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_use_post_inflight_to_detect_queuing, false, -- "If true, QUIC BBRv2 will use inflight byte after congestion event to detect queuing " -- "during PROBE_UP.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr_no_bytes_acked_in_startup_recovery, false, -- "When in STARTUP and recovery, do not add bytes_acked to QUIC BBR's CWND in " -- "CalculateCongestionWindow()") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true, -- "If true, bootstrap initial QUIC cwnd by SPDY priorities.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_cap_large_client_initial_rtt, true, -- "If true, cap client suggested initial RTT to 1s if it is longer than 1s.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_clean_up_spdy_session_destructor, false, -- "If true, QuicSpdySession's destructor won't need to do cleanup.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_in_on_can_write_with_blocked_writer, -- false, -- "If true, close connection if writer is still blocked while OnCanWrite is called.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_on_serialization_failure, false, -- "If true, close connection on packet serialization failures.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_bursts, false, -- "If true, set burst token to 2 in cwnd bootstrapping experiment.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_cwnd_and_pacing_gains, false, -- "If true, uses conservative cwnd gain and pacing gain when cwnd gets bootstrapped.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_copy_bbr_cwnd_to_bbr2, false, -- "If true, when switching from BBR to BBRv2, BBRv2 will use BBR's cwnd as its initial cwnd.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_enable_5rto_blackhole_detection2, true, -- "If true, default-enable 5RTO blachole detection.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_on_pto, false, -- "If true, default on PTO which unifies TLP + RTO loss recovery.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr, true, -- "When true, defaults to BBR congestion control instead of Cubic.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr_v2, false, -- "If true, use BBRv2 as the default congestion controller. Takes precedence over " -- "--quic_default_to_bbr.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_server_blackhole_detection, false, -- "If true, disable blackhole detection on server side.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_27, false, -- "If true, disable QUIC version h3-27.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_29, false, -- "If true, disable QUIC version h3-29.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q043, false, -- "If true, disable QUIC version Q043.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q046, false, -- "If true, disable QUIC version Q046.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q050, false, -- "If true, disable QUIC version Q050.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t050, false, -- "If true, disable QUIC version h3-T050.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t051, false, -- "If true, disable QUIC version h3-T051.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_discard_initial_packet_with_key_dropped, false, -- "If true, discard INITIAL packet if the key has been dropped.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_do_not_accept_stop_waiting, false, -- "In v44 and above, where STOP_WAITING is never sent, close the connection if it's received.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_donot_reset_ideal_next_packet_send_time, false, -- "If true, stop resetting ideal_next_packet_send_time_ in pacing sender.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_experiment_at_gfe, false, -- "If ture, enable GFE-picked loss detection experiment.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_tuner, false, -- "If true, allow QUIC loss detection tuning to be enabled by connection option ELDT.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false, -- "If true, QUIC will default enable MTU discovery at server, with a target of 1450 bytes.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_enabled, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_arm_pto_for_application_data, false, -- "If true, do not arm PTO for application data until handshake confirmed.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_bytes_left_for_batch_write, false, -- "If true, convert bytes_left_for_batch_write_ to unsigned int.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_fix_http3_goaway_stream_id, false, -- "If true, send the lowest stream ID that can be retried by the client in a GOAWAY frame. If " -- "false, send the highest received stream ID, which actually should not be retried.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_out_of_order_sending, false, -- "If true, fix a potential out of order sending caused by handshake gets confirmed " -- "while the coalescer is not empty.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_fix_pto_pending_timer_count, false, -- "If true, make sure there is pending timer credit when trying to PTO retransmit any packets.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_undecryptable_packets2, false, -- "If true, remove processed undecryptable packets.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_get_stream_information_from_stream_map, true, -- "If true, gQUIC will only consult stream_map in QuicSession::GetNumActiveStreams().") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_give_sent_packet_to_debug_visitor_after_sent, false, -- "If true, QUIC connection will pass sent packet information to the debug visitor after " -- "a packet is recorded as sent in sent packet manager.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_http3_new_default_urgency_value, false, -- "If true, QuicStream::kDefaultUrgency is 3, otherwise 1.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_ip_based_cwnd_exp, true, -- "If true, enable IP address based CWND bootstrapping experiment with different " -- "bandwidth models and priorities. ") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_listener_never_fake_epollout, false, -- "If true, QuicListener::OnSocketIsWritable will always return false, which means there " -- "will never be a fake EPOLLOUT event in the next epoll iteration.") -- --QUICHE_FLAG(bool, -- quic_reloadable_flag_quic_neuter_initial_packet_in_coalescer_with_initial_key_discarded, -- false, "If true, neuter initial packet in the coalescer when discarding initial keys.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_dup_experiment_id_2, false, -- "If true, transport connection stats doesn't report duplicated experiments for same " -- "connection.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_silent_close_for_idle_timeout, true, -- "If true, always send connection close for idle timeout if NSLC is received.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_set_uaid_in_tcs_visitor, false, -- "If true, QuicTransportConnectionStatsVisitor::PopulateTransportConnectionStats will " -- "be the only place where TCS's uaid field is set.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_truncate_long_cids, true, -- "In IETF QUIC, only truncate long CIDs from the client's Initial, don't modify them.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_preferred_altsvc_version, false, -- "When true, we will send a preferred QUIC version at the start of our Alt-Svc list.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_proxy_write_packed_strings, false, -- "If true, QuicProxyDispatcher will write packed_client_address and packed_server_vip " -- "in TcpProxyHeaderProto.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_frontend_service_vip_mapping, true, -- "If true, for L1 GFE, as requests come in, record frontend service to VIP mapping " -- "which is used to announce VIP in SHLO for proxied sessions. ") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_received_min_ack_delay, false, -- "If true, record the received min_ack_delay in transport parameters to QUIC config.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_reject_all_traffic, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_remove_zombie_streams, true, -- "If true, QuicSession doesn't keep a separate zombie_streams. Instead, all streams are " -- "stored in stream_map_.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_require_handshake_confirmation, false, -- "If true, require handshake confirmation for QUIC connections, functionally disabling " -- "0-rtt handshakes.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_send_key_update_not_yet_supported, false, -- "When true, QUIC+TLS versions will send the key_update_not_yet_supported transport parameter.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_path_response, false, -- "If true, send PATH_RESPONSE upon receiving PATH_CHALLENGE regardless of perspective. " -- "--gfe2_reloadable_flag_quic_start_peer_migration_earlier has to be true before turn " -- "on this flag.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_timestamps, false, -- "When the STMP connection option is sent by the client, timestamps in the QUIC ACK " -- "frame are sent and processed.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_server_push, false, -- "If true, enable server push feature on QUIC.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_set_resumed_ssl_session_early, false, -- "If true, set resumed_ssl_session if this is a 0-RTT connection.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_start_peer_migration_earlier, false, -- "If true, while reading an IETF quic packet, start peer migration immediately when " -- "detecting the existence of any non-probing frame instead of at the end of the packet.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_stop_sending_uses_ietf_error_code, false, -- "If true, use IETF QUIC application error codes in STOP_SENDING frames. If false, use " -- "QuicRstStreamErrorCodes.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_false, false, -- "A testonly reloadable flag that will always default to false.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_true, true, -- "A testonly reloadable flag that will always default to true.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_unified_iw_options, false, -- "When true, set the initial congestion control window from connection options in " -- "QuicSentPacketManager rather than TcpCubicSenderBytes.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_header_stage_idle_list2, false, -- "If true, use header stage idle list for QUIC connections in GFE.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_leto_key_exchange, false, -- "If true, QUIC will attempt to use the Leto key exchange service and only fall back to " -- "local key exchange if that fails.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_send_quic_fallback_server_config_on_leto_error, false, -- "If true and using Leto for QUIC shared-key calculations, GFE will react to a failure " -- "to contact Leto by sending a REJ containing a fallback ServerConfig, allowing the " -- "client to continue the handshake.") -- --QUICHE_FLAG( -- bool, quic_restart_flag_dont_fetch_quic_private_keys_from_leto, false, -- "If true, GFE will not request private keys when fetching QUIC ServerConfigs from Leto.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_adjust_initial_cwnd_by_gws, true, -- "If true, GFE informs backend that a client request is the first one on the connection " -- "via frontline header \"first_request=1\". Also, adjust initial cwnd based on " -- "X-Google-Gws-Initial-Cwnd-Mode sent by GWS.") -- --QUICHE_FLAG( -- bool, quic_restart_flag_quic_allow_loas_multipacket_chlo, false, -- "If true, inspects QUIC CHLOs for kLOAS and early creates sessions to allow multi-packet CHLOs") -- --QUICHE_FLAG( -- bool, quic_restart_flag_quic_disable_gws_cwnd_experiment, false, -- "If true, X-Google-Gws-Initial-Cwnd-Mode related header sent by GWS becomes no-op for QUIC.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_enable_tls_resumption_v4, true, -- "If true, enables support for TLS resumption in QUIC.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_enable_zero_rtt_for_tls_v2, true, -- "If true, support for IETF QUIC 0-rtt is enabled.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_offload_pacing_to_usps2, false, -- "If true, QUIC offload pacing when using USPS as egress method.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_rx_ring_use_tpacket_v3, false, -- "If true, use TPACKET_V3 for QuicRxRing instead of TPACKET_V2.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_should_accept_new_connection, false, -- "If true, reject QUIC CHLO packets when dispatcher is asked to do so.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_support_release_time_for_gso, false, -- "If true, QuicGsoBatchWriter will support release time if it is available and the " -- "process has the permission to do so.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_false, false, -- "A testonly restart flag that will always default to false.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_true, true, -- "A testonly restart flag that will always default to true.") -- --QUICHE_FLAG( -- bool, quic_restart_flag_quic_use_leto_for_quic_configs, false, -- "If true, use Leto to fetch QUIC server configs instead of using the seeds from Memento.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_use_pigeon_socket_to_backend, false, -- "If true, create a shared pigeon socket for all quic to backend connections and switch " -- "to use it after successful handshake.") -- --QUICHE_FLAG(bool, spdy_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true, -- "If true, bootstrap initial QUIC cwnd by SPDY priorities.") -- --QUICHE_FLAG(bool, spdy_reloadable_flag_quic_clean_up_spdy_session_destructor, false, -- "If true, QuicSpdySession's destructor won't need to do cleanup.") -- --QUICHE_FLAG( -- bool, spdy_reloadable_flag_spdy_discard_response_body_if_disallowed, false, -- "If true, SPDY will discard all response body bytes when response code indicates no response " -- "body should exist. Previously, we only discard partial bytes on the first response processing " -- "and the rest of the response bytes would still be delivered even though the response code " -- "said there should not be any body associated with the response code.") -- --QUICHE_FLAG(bool, quic_allow_chlo_buffering, true, -- "If true, allows packets to be buffered in anticipation of a " -- "future CHLO, and allow CHLO packets to be buffered until next " -- "iteration of the event loop.") -- --QUICHE_FLAG(bool, quic_disable_pacing_for_perf_tests, false, "If true, disable pacing in QUIC") -- --QUICHE_FLAG(bool, quic_enforce_single_packet_chlo, true, -- "If true, enforce that QUIC CHLOs fit in one packet") -- --QUICHE_FLAG(int64_t, quic_time_wait_list_max_connections, 600000, -- "Maximum number of connections on the time-wait list. " -- "A negative value implies no configured limit.") -- --QUICHE_FLAG(int64_t, quic_time_wait_list_seconds, 200, -- "Time period for which a given connection_id should live in " -- "the time-wait state.") -- --QUICHE_FLAG(double, quic_bbr_cwnd_gain, 2.0f, -- "Congestion window gain for QUIC BBR during PROBE_BW phase.") -- --QUICHE_FLAG(int32_t, quic_buffered_data_threshold, 8 * 1024, -- "If buffered data in QUIC stream is less than this " -- "threshold, buffers all provided data or asks upper layer for more data") -- --QUICHE_FLAG(int32_t, quic_send_buffer_max_data_slice_size, 4 * 1024, -- "Max size of data slice in bytes for QUIC stream send buffer.") -- --QUICHE_FLAG(int32_t, quic_lumpy_pacing_size, 2, -- "Number of packets that the pacing sender allows in bursts during " -- "pacing. This flag is ignored if a flow's estimated bandwidth is " -- "lower than 1200 kbps.") -- --QUICHE_FLAG(double, quic_lumpy_pacing_cwnd_fraction, 0.25f, -- "Congestion window fraction that the pacing sender allows in bursts " -- "during pacing.") -- --QUICHE_FLAG(int32_t, quic_max_pace_time_into_future_ms, 10, -- "Max time that QUIC can pace packets into the future in ms.") -- --QUICHE_FLAG(double, quic_pace_time_into_future_srtt_fraction, 0.125f, -- "Smoothed RTT fraction that a connection can pace packets into the future.") -- --QUICHE_FLAG(bool, quic_export_server_num_packets_per_write_histogram, false, -- "If true, export number of packets written per write operation histogram.") -- --QUICHE_FLAG(bool, quic_disable_version_negotiation_grease_randomness, false, -- "If true, use predictable version negotiation versions.") -- --QUICHE_FLAG(bool, quic_enable_http3_grease_randomness, true, -- "If true, use random greased settings and frames.") -- --QUICHE_FLAG(int64_t, quic_max_tracked_packet_count, 10000, "Maximum number of tracked packets.") -- --QUICHE_FLAG(bool, quic_prober_uses_length_prefixed_connection_ids, false, -- "If true, QuicFramer::WriteClientVersionNegotiationProbePacket uses " -- "length-prefixed connection IDs.") -- --QUICHE_FLAG(bool, quic_client_convert_http_header_name_to_lowercase, true, -- "If true, HTTP request header names sent from QuicSpdyClientBase(and " -- "descendents) will be automatically converted to lower case.") -- --QUICHE_FLAG(bool, quic_enable_http3_server_push, false, -- "If true, server push will be allowed in QUIC versions that use HTTP/3.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_base_duration_ms, 2000, -- "The default minimum duration for BBRv2-native probes, in milliseconds.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_max_rand_duration_ms, 1000, -- "The default upper bound of the random amount of BBRv2-native " -- "probes, in milliseconds.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_rtt_period_ms, 10000, -- "The default period for entering PROBE_RTT, in milliseconds.") -- --QUICHE_FLAG(double, quic_bbr2_default_loss_threshold, 0.02, -- "The default loss threshold for QUIC BBRv2, should be a value " -- "between 0 and 1.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_startup_full_loss_count, 8, -- "The default minimum number of loss marking events to exit STARTUP.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_full_loss_count, 2, -- "The default minimum number of loss marking events to exit PROBE_UP phase.") -- --QUICHE_FLAG(double, quic_bbr2_default_inflight_hi_headroom, 0.01, -- "The default fraction of unutilized headroom to try to leave in path " -- "upon high loss.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_initial_ack_height_filter_window, 10, -- "The default initial value of the max ack height filter's window length.") -- --QUICHE_FLAG(double, quic_ack_aggregation_bandwidth_threshold, 1.0, -- "If the bandwidth during ack aggregation is smaller than (estimated " -- "bandwidth * this flag), consider the current aggregation completed " -- "and starts a new one.") -- --QUICHE_FLAG(int32_t, quic_anti_amplification_factor, 5, -- "Anti-amplification factor. Before address validation, server will " -- "send no more than factor times bytes received.") -- --QUICHE_FLAG(int32_t, quic_max_buffered_crypto_bytes, 16 * 1024, -- "The maximum amount of CRYPTO frame data that can be buffered.") -- --QUICHE_FLAG(int32_t, quic_max_aggressive_retransmittable_on_wire_ping_count, 0, -- "If set to non-zero, the maximum number of consecutive pings that " -- "can be sent with aggressive initial retransmittable on wire timeout " -- "if there is no new data received. After which, the timeout will be " -- "exponentially back off until exceeds the default ping timeout.") -- --QUICHE_FLAG(int32_t, quic_max_congestion_window, 2000, "The maximum congestion window in packets.") -- --QUICHE_FLAG(int32_t, quic_max_streams_window_divisor, 2, -- "The divisor that controls how often MAX_STREAMS frame is sent.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_testonly_default_false, false, -- "A testonly reloadable flag that will always default to false.") -- --QUICHE_FLAG(bool, http2_restart_flag_http2_testonly_default_false, false, -- "A testonly restart flag that will always default to false.") -- --QUICHE_FLAG(bool, spdy_reloadable_flag_spdy_testonly_default_false, false, -- "A testonly reloadable flag that will always default to false.") -- --QUICHE_FLAG(bool, spdy_restart_flag_spdy_testonly_default_false, false, -- "A testonly restart flag that will always default to false.") -- --#endif -diff --git a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h -index 7d2561469..dc6fe5429 100644 ---- a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h -@@ -8,10 +8,10 @@ - - #include "extensions/quic_listeners/quiche/platform/flags_impl.h" - --#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_http2_reloadable_flag_##flag->value() -+#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() - - #define SetHttp2ReloadableFlagImpl(flag, value) \ -- quiche::FLAGS_http2_reloadable_flag_##flag->SetValue(value) -+ quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value) - - #define HTTP2_CODE_COUNT_N_IMPL(flag, instance, total) \ - do { \ -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h -deleted file mode 100644 -index 3f595380b..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h -+++ /dev/null -@@ -1,18 +0,0 @@ --#pragma once -- --#include "absl/base/optimization.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#define QUIC_ALIGN_OF_IMPL alignof --#ifdef _MSC_VER --#define QUIC_ALIGNED_IMPL(X) __declspec(align(X)) --#else --#define QUIC_ALIGNED_IMPL(X) __attribute__((aligned(X))) --#endif --#define QUIC_CACHELINE_ALIGNED_IMPL ABSL_CACHELINE_ALIGNED --#define QUIC_CACHELINE_SIZE_IMPL ABSL_CACHELINE_SIZE -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc -index 2a886a12c..27b977908 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc -@@ -10,25 +10,7 @@ - - namespace quic { - --// static --bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert, -- quiche::QuicheStringPiece* subject_out) { -- CBS tbs_certificate; -- if (!SeekToSubject(cert, &tbs_certificate)) { -- return false; -- } -- -- CBS subject; -- if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) { -- return false; -- } -- *subject_out = -- absl::string_view(reinterpret_cast<const char*>(CBS_data(&subject)), CBS_len(&subject)); -- return true; --} -- --// static --bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate) { -+bool seekToSubject(absl::string_view cert, CBS* tbs_certificate) { - CBS der; - CBS_init(&der, reinterpret_cast<const uint8_t*>(cert.data()), cert.size()); - CBS certificate; -@@ -65,4 +47,22 @@ bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_c - return true; - } - -+// static -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(absl::string_view cert, -+ absl::string_view* subject_out) { -+ CBS tbs_certificate; -+ if (!seekToSubject(cert, &tbs_certificate)) { -+ return false; -+ } -+ -+ CBS subject; -+ if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) { -+ return false; -+ } -+ *subject_out = -+ absl::string_view(reinterpret_cast<const char*>(CBS_data(&subject)), CBS_len(&subject)); -+ return true; -+} -+ - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h -index 0c41b9dbc..29b882b7d 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h -@@ -6,18 +6,15 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - -+#include "absl/strings/string_view.h" - #include "openssl/base.h" --#include "quiche/common/platform/api/quiche_string_piece.h" - - namespace quic { - - class QuicCertUtilsImpl { - public: -- static bool ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert, -- quiche::QuicheStringPiece* subject_out); -- --private: -- static bool SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static bool ExtractSubjectNameFromDERCert(absl::string_view cert, absl::string_view* subject_out); - }; - - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h -deleted file mode 100644 -index aa9d6bc36..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h -+++ /dev/null -@@ -1,11 +0,0 @@ --#pragma once -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#include "absl/base/macros.h" -- --#define QUIC_FALLTHROUGH_INTENDED_IMPL ABSL_FALLTHROUGH_INTENDED -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc -index 91d52c44a..b2e396fab 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc -@@ -36,6 +36,7 @@ void depthFirstTraverseDirectory(const std::string& dirname, std::vector<std::st - } // namespace - - // Traverses the directory |dirname| and returns all of the files it contains. -+// NOLINTNEXTLINE(readability-identifier-naming) - std::vector<std::string> ReadFileContentsImpl(const std::string& dirname) { - std::vector<std::string> files; - depthFirstTraverseDirectory(dirname, files); -@@ -43,7 +44,8 @@ std::vector<std::string> ReadFileContentsImpl(const std::string& dirname) { - } - - // Reads the contents of |filename| as a string into |contents|. --void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+void ReadFileContentsImpl(absl::string_view filename, std::string* contents) { - #ifdef WIN32 - Envoy::Filesystem::InstanceImplWin32 fs; - #else -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h -index 654c1ad18..25c31e9de 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h -@@ -8,7 +8,7 @@ - - #include <vector> - --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - - namespace quic { - -@@ -16,6 +16,7 @@ namespace quic { - * Traverses the directory |dirname| and returns all of the files it contains. - * @param dirname full path without trailing '/'. - */ -+// NOLINTNEXTLINE(readability-identifier-naming)` - std::vector<std::string> ReadFileContentsImpl(const std::string& dirname); - - /** -@@ -23,6 +24,7 @@ std::vector<std::string> ReadFileContentsImpl(const std::string& dirname); - * @param filename the full path to the file. - * @param contents output location of the file content. - */ --void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents); -+// NOLINTNEXTLINE(readability-identifier-naming) -+void ReadFileContentsImpl(absl::string_view filename, std::string* contents); - - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h -index 872495f2d..d562bb1a4 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h -@@ -15,16 +15,16 @@ - #define GetQuicFlagImpl(flag) (quiche::flag)->value() - - // |flag| is the global flag variable, which is a pointer to TypedFlag<type>. --#define SetQuicFlagImpl(flag, value) (quiche::flag)->SetValue(value) -+#define SetQuicFlagImpl(flag, value) (quiche::flag)->setValue(value) - - #define GetQuicReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() - - #define SetQuicReloadableFlagImpl(flag, value) \ -- quiche::FLAGS_quic_reloadable_flag_##flag->SetValue(value) -+ quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value) - - #define GetQuicRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value() - --#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->SetValue(value) -+#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->setValue(value) - - // Not wired into command-line parsing. - #define DEFINE_QUIC_COMMAND_LINE_FLAG_IMPL(type, flag, value, help) \ -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc -index bcbafb566..75849611d 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc -@@ -19,7 +19,8 @@ - namespace quic { - - // static --bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicHostnameUtilsImpl::IsValidSNI(absl::string_view sni) { - // TODO(wub): Implement it on top of GoogleUrl, once it is available. - - return sni.find_last_of('.') != std::string::npos && -@@ -27,7 +28,8 @@ bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) { - } - - // static --std::string QuicHostnameUtilsImpl::NormalizeHostname(quiche::QuicheStringPiece hostname) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+std::string QuicHostnameUtilsImpl::NormalizeHostname(absl::string_view hostname) { - // TODO(wub): Implement it on top of GoogleUrl, once it is available. - std::string host = absl::AsciiStrToLower(hostname); - -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h -index 2b7ed4357..67cd787d0 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h -@@ -6,7 +6,7 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - #include "quiche/quic/platform/api/quic_export.h" - - namespace quic { -@@ -18,7 +18,8 @@ public: - // (2) check that the hostname contains valid characters only; and - // (3) contains at least one dot. - // NOTE(wub): Only (3) is implemented for now. -- static bool IsValidSNI(quiche::QuicheStringPiece sni); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static bool IsValidSNI(absl::string_view sni); - - // Normalize a hostname: - // (1) Canonicalize it, similar to what Chromium does in -@@ -27,7 +28,8 @@ public: - // (3) Remove the trailing '.'. - // WARNING: May mutate |hostname| in place. - // NOTE(wub): Only (2) and (3) are implemented for now. -- static std::string NormalizeHostname(quiche::QuicheStringPiece hostname); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static std::string NormalizeHostname(absl::string_view hostname); - - private: - QuicHostnameUtilsImpl() = delete; -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h -deleted file mode 100644 -index b8b70a042..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h -+++ /dev/null -@@ -1,13 +0,0 @@ --#pragma once -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#include "absl/base/attributes.h" -- --#define QUIC_MUST_USE_RESULT_IMPL ABSL_MUST_USE_RESULT --#define QUIC_UNUSED_IMPL ABSL_ATTRIBUTE_UNUSED --#define QUIC_CONST_INIT_IMPL ABSL_CONST_INIT -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc -index c2eb527d6..9e46c37df 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc -@@ -10,7 +10,8 @@ - - namespace quic { - --quiche::QuicheStringPiece QuicMemSliceSpanImpl::GetData(size_t index) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+absl::string_view QuicMemSliceSpanImpl::GetData(size_t index) { - Envoy::Buffer::RawSliceVector slices = buffer_->getRawSlices(/*max_slices=*/index + 1); - ASSERT(slices.size() > index); - return {reinterpret_cast<char*>(slices[index].mem_), slices[index].len_}; -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h -index 1824fb8d1..ef40e6387 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h -@@ -9,7 +9,7 @@ - #include "envoy/buffer/buffer.h" - - #include "absl/container/fixed_array.h" --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - #include "quiche/quic/core/quic_types.h" - #include "quiche/quic/platform/api/quic_mem_slice.h" - -@@ -43,9 +43,13 @@ public: - } - - // QuicMemSliceSpan -- quiche::QuicheStringPiece GetData(size_t index); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ absl::string_view GetData(size_t index); -+ // NOLINTNEXTLINE(readability-identifier-naming) - QuicByteCount total_length() { return buffer_->length(); }; -+ // NOLINTNEXTLINE(readability-identifier-naming) - size_t NumSlices() { return buffer_->getRawSlices().size(); } -+ // NOLINTNEXTLINE(readability-identifier-naming) - template <typename ConsumeFunction> QuicByteCount ConsumeAll(ConsumeFunction consume); - bool empty() const { return buffer_->length() == 0; } - -@@ -54,6 +58,7 @@ private: - }; - - template <typename ConsumeFunction> -+// NOLINTNEXTLINE(readability-identifier-naming) - QuicByteCount QuicMemSliceSpanImpl::ConsumeAll(ConsumeFunction consume) { - size_t saved_length = 0; - for (auto& slice : buffer_->getRawSlices()) { -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h -similarity index 52% -rename from source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h -rename to source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h -index aaebe5d5c..4b0201c35 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h -@@ -6,12 +6,11 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - --#include "absl/memory/memory.h" -+#include "absl/strings/string_view.h" - --namespace quiche { -+namespace quic { - --template <typename T> std::unique_ptr<T> QuicheWrapUniqueImpl(T* ptr) { -- return absl::WrapUnique<T>(ptr); --} -+// NOLINTNEXTLINE(readability-identifier-naming) -+template <class T> void AdjustTestValueImpl(absl::string_view /*label*/, T* /*var*/) {} - --} // namespace quiche -+} // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h -index 248cfc193..1e88abe46 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h -@@ -19,4 +19,7 @@ inline bool GetGooglePacketHeadersFromControlMessageImpl(struct ::cmsghdr* /*cms - return false; - } - -+// NOLINTNEXTLINE(readability-identifier-naming) -+inline void SetGoogleSocketOptionsImpl(int /*fd*/) {} -+ - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h -deleted file mode 100644 -index 7a23b53da..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h -+++ /dev/null -@@ -1,11 +0,0 @@ --#pragma once -- --#include "absl/base/macros.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#define QUICHE_ARRAYSIZE_IMPL(array) ABSL_ARRAYSIZE(array) -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h -deleted file mode 100644 -index f8b2b6c08..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h -+++ /dev/null -@@ -1,17 +0,0 @@ --#pragma once -- --#include "absl/types/optional.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --namespace quiche { -- --template <typename T> using QuicheOptionalImpl = absl::optional<T>; -- --#define QUICHE_NULLOPT_IMPL absl::nullopt -- --} // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h -index 3a6d1a393..7b87c1cd6 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h -@@ -2,7 +2,6 @@ - - #include "common/common/base64.h" - --#include "extensions/quic_listeners/quiche/platform/quiche_optional_impl.h" - #include "extensions/quic_listeners/quiche/platform/quiche_string_piece_impl.h" - #include "extensions/quic_listeners/quiche/platform/string_utils.h" - -@@ -13,6 +12,7 @@ - #include "absl/strings/str_cat.h" - #include "absl/strings/str_format.h" - #include "absl/strings/str_split.h" -+#include "absl/types/optional.h" - - // NOLINT(namespace-envoy) - -@@ -25,58 +25,16 @@ namespace quiche { - class QuicheTextUtilsImpl { - public: - // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StartsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl prefix) { -- return absl::StartsWith(data, prefix); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool EndsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) { -- return absl::EndsWith(data, suffix); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool EndsWithIgnoreCase(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) { -- return absl::EndsWithIgnoreCase(data, suffix); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string ToLower(QuicheStringPieceImpl data) { return absl::AsciiStrToLower(data); } -+ static std::string ToLower(absl::string_view data) { return absl::AsciiStrToLower(data); } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static void RemoveLeadingAndTrailingWhitespace(QuicheStringPieceImpl* data) { -+ static void RemoveLeadingAndTrailingWhitespace(absl::string_view* data) { - *data = absl::StripAsciiWhitespace(*data); - } - -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToUint64(QuicheStringPieceImpl in, uint64_t* out) { -- return absl::SimpleAtoi(in, out); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToInt(QuicheStringPieceImpl in, int* out) { return absl::SimpleAtoi(in, out); } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToUint32(QuicheStringPieceImpl in, uint32_t* out) { -- return absl::SimpleAtoi(in, out); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToSizeT(QuicheStringPieceImpl in, size_t* out) { -- return absl::SimpleAtoi(in, out); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string HexEncode(QuicheStringPieceImpl data) { return absl::BytesToHexString(data); } -- - // NOLINTNEXTLINE(readability-identifier-naming) - static std::string Hex(uint32_t v) { return absl::StrCat(absl::Hex(v)); } - -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string HexDecode(QuicheStringPieceImpl data) { return absl::HexStringToBytes(data); } -- - // NOLINTNEXTLINE(readability-identifier-naming) - static void Base64Encode(const uint8_t* data, size_t data_len, std::string* output) { - *output = -@@ -84,27 +42,28 @@ public: - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static QuicheOptionalImpl<std::string> Base64Decode(QuicheStringPieceImpl input) { -+ static absl::optional<std::string> Base64Decode(absl::string_view input) { - return Envoy::Base64::decodeWithoutPadding(input); - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string HexDump(QuicheStringPieceImpl binary_data) { -- return quiche::HexDump(binary_data); -- } -+ static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); } -+ -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static std::string HexDump(absl::string_view binary_data) { return quiche::HexDump(binary_data); } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static bool ContainsUpperCase(QuicheStringPieceImpl data) { -+ static bool ContainsUpperCase(absl::string_view data) { - return std::any_of(data.begin(), data.end(), absl::ascii_isupper); - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static bool IsAllDigits(QuicheStringPieceImpl data) { -+ static bool IsAllDigits(absl::string_view data) { - return std::all_of(data.begin(), data.end(), absl::ascii_isdigit); - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static std::vector<QuicheStringPieceImpl> Split(QuicheStringPieceImpl data, char delim) { -+ static std::vector<absl::string_view> Split(absl::string_view data, char delim) { - return absl::StrSplit(data, delim); - } - }; -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc -index 3260eafee..5387e0598 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc -@@ -9,7 +9,7 @@ - namespace quiche { - - namespace { --QuicheOptional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour, -+absl::optional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour, - int minute, int second) { - const absl::CivilSecond civil_time(year, month, day, hour, minute, second); - if (second != 60 && (civil_time.year() != year || civil_time.month() != month || -@@ -24,7 +24,7 @@ QuicheOptional<int64_t> quicheUtcDateTimeToUnixSecondsInner(int year, int month, - } // namespace - - // NOLINTNEXTLINE(readability-identifier-naming) --QuicheOptional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, -+absl::optional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, - int minute, int second) { - // Handle leap seconds without letting any other irregularities happen. - if (second == 60) { -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h -index a1b70b70a..5e2ef7956 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h -@@ -10,12 +10,12 @@ - - #include "absl/time/civil_time.h" - #include "absl/time/time.h" --#include "quiche/common/platform/api/quiche_optional.h" -+#include "absl/types/optional.h" - - namespace quiche { - - // NOLINTNEXTLINE(readability-identifier-naming) --QuicheOptional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, -+absl::optional<int64_t> QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, - int minute, int second); - - } // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h -deleted file mode 100644 -index 737b81ee2..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h -+++ /dev/null -@@ -1,29 +0,0 @@ --#pragma once -- --#include <cstdint> -- --#include "envoy/common/platform.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --namespace spdy { -- --inline uint16_t SpdyNetToHost16Impl(uint16_t x) { return ntohs(x); } -- --inline uint32_t SpdyNetToHost32Impl(uint32_t x) { return ntohl(x); } -- --// TODO: implement --inline uint64_t SpdyNetToHost64Impl(uint64_t /*x*/) { return 0; } -- --inline uint16_t SpdyHostToNet16Impl(uint16_t x) { return htons(x); } -- --inline uint32_t SpdyHostToNet32Impl(uint32_t x) { return htonl(x); } -- --// TODO: implement --inline uint64_t SpdyHostToNet64Impl(uint64_t /*x*/) { return 0; } -- --} // namespace spdy -diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h -index a3cbd680f..833562fab 100644 ---- a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h -@@ -8,9 +8,9 @@ - - #include "extensions/quic_listeners/quiche/platform/flags_impl.h" - --#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_spdy_reloadable_flag_##flag->value() -+#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() - --#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_spdy_restart_flag_##flag->value() -+#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value() - - #define SPDY_CODE_COUNT_N_IMPL(flag, instance, total) \ - do { \ -diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h -index 41fa3cad8..4b01b2dbd 100644 ---- a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h -@@ -50,7 +50,7 @@ inline std::string SpdyHexEncodeUInt32AndTrimImpl(uint32_t data) { - inline std::string SpdyHexDumpImpl(absl::string_view data) { return quiche::HexDump(data); } - - struct SpdyStringPieceCaseHashImpl { -- size_t operator()(quiche::QuicheStringPiece data) const { -+ size_t operator()(absl::string_view data) const { - std::string lower = absl::AsciiStrToLower(data); - return absl::Hash<std::string>()(lower); - } -diff --git a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc -index 3bd0bc295..5ac5738c4 100644 ---- a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc -+++ b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc -@@ -12,25 +12,29 @@ using spdy::SpdyHeaderBlock; - namespace quic { - - // static -+// NOLINTNEXTLINE(readability-identifier-naming) - std::string SpdyServerPushUtils::GetPromisedUrlFromHeaders(const SpdyHeaderBlock& /*headers*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - - // static - std::string -+// NOLINTNEXTLINE(readability-identifier-naming) - SpdyServerPushUtils::GetPromisedHostNameFromHeaders(const SpdyHeaderBlock& /*headers*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - - // static -+// NOLINTNEXTLINE(readability-identifier-naming) - bool SpdyServerPushUtils::PromisedUrlIsValid(const SpdyHeaderBlock& /*headers*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - - // static --std::string SpdyServerPushUtils::GetPushPromiseUrl(quiche::QuicheStringPiece /*scheme*/, -- quiche::QuicheStringPiece /*authority*/, -- quiche::QuicheStringPiece /*path*/) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+std::string SpdyServerPushUtils::GetPushPromiseUrl(absl::string_view /*scheme*/, -+ absl::string_view /*authority*/, -+ absl::string_view /*path*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc -index e2d90d916..8fa7d9fe9 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc -@@ -49,9 +49,9 @@ public: - Network::ConnectionSocketPtr&& connection_socket) - : EnvoyQuicClientConnection(server_connection_id, helper, alarm_factory, &writer, false, - supported_versions, dispatcher, std::move(connection_socket)) { -- SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - SetEncrypter(quic::ENCRYPTION_FORWARD_SECURE, - std::make_unique<quic::NullEncrypter>(quic::Perspective::IS_CLIENT)); -+ SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - } - - MOCK_METHOD(void, SendConnectionClosePacket, (quic::QuicErrorCode, const std::string&)); -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc -index 98359c618..f3b02f4cc 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc -@@ -48,11 +48,11 @@ public: - quic_session_.ActivateStream(std::unique_ptr<EnvoyQuicClientStream>(quic_stream_)); - EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false)); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional<quic::EncryptionLevel>) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillRepeatedly( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)) - .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&, - const quic::QuicSocketAddress&, quic::PerPacketOptions*) { -@@ -146,7 +146,7 @@ TEST_P(EnvoyQuicClientStreamTest, PostRequestAndResponse) { - std::unique_ptr<char[]> data_buffer; - quic::QuicByteCount data_frame_header_length = - quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer); -- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); -+ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); - data = absl::StrCat(data_frame_header, response_body_); - } - quic::QuicStreamFrame frame(stream_id_, false, 0, data); -@@ -184,7 +184,7 @@ TEST_P(EnvoyQuicClientStreamTest, OutOfOrderTrailers) { - std::unique_ptr<char[]> data_buffer; - quic::QuicByteCount data_frame_header_length = - quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer); -- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); -+ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); - data = absl::StrCat(data_frame_header, response_body_); - } - quic::QuicStreamFrame frame(stream_id_, false, 0, data); -@@ -301,11 +301,11 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) { - // Unblock writing now, and this will write out 16kB data and cause stream to - // be blocked by the flow control limit. - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional<quic::EncryptionLevel>) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark()); - quic_session_.OnCanWrite(); - EXPECT_TRUE(quic_stream_->IsFlowControlBlocked()); -@@ -315,20 +315,20 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) { - 32 * 1024); - quic_stream_->OnWindowUpdateFrame(window_update1); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional<quic::EncryptionLevel>) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - quic_session_.OnCanWrite(); - // No data should be buffered at this point. - - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional<quic::EncryptionLevel>) { -- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { -+ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -+ })); - // Send more data. If watermark bytes counting were not cleared in previous - // OnCanWrite, this write would have caused the stream to exceed its high watermark. - std::string request1(16 * 1024 - 3, 'a'); -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc -index cbf66f511..8a493a8e8 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc -@@ -25,7 +25,7 @@ namespace Quic { - class TestGetProofCallback : public quic::ProofSource::Callback { - public: - TestGetProofCallback(bool& called, bool should_succeed, const std::string& server_config, -- quic::QuicTransportVersion& version, quiche::QuicheStringPiece chlo_hash, -+ quic::QuicTransportVersion& version, absl::string_view chlo_hash, - Network::FilterChain& filter_chain) - : called_(called), should_succeed_(should_succeed), server_config_(server_config), - version_(version), chlo_hash_(chlo_hash), expected_filter_chain_(filter_chain) { -@@ -100,7 +100,7 @@ private: - bool should_succeed_; - const std::string& server_config_; - const quic::QuicTransportVersion& version_; -- quiche::QuicheStringPiece chlo_hash_; -+ absl::string_view chlo_hash_; - Network::FilterChain& expected_filter_chain_; - NiceMock<Stats::MockStore> store_; - Event::GlobalTimeSystem time_system_; -@@ -178,7 +178,7 @@ protected: - quic::QuicSocketAddress server_address_; - quic::QuicSocketAddress client_address_; - quic::QuicTransportVersion version_{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash_{"aaaaa"}; -+ absl::string_view chlo_hash_{"aaaaa"}; - std::string server_config_{"Server Config"}; - std::string expected_certs_{quic::test::kTestCertificateChainPem}; - std::string pkey_{quic::test::kTestCertificatePrivateKeyPem}; -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc -index 4a1dfe144..9cdc169cd 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc -@@ -163,7 +163,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureEmptyCertChain) { - std::unique_ptr<quic::CertificateView> cert_view = - quic::CertificateView::ParseSingleCertificate(leaf_cert_); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -@@ -181,7 +181,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) { - std::unique_ptr<quic::CertificateView> cert_view = - quic::CertificateView::ParseSingleCertificate(leaf_cert_); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -@@ -197,7 +197,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) { - TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureUnsupportedECKey) { - configCertVerificationDetails(true); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -@@ -236,7 +236,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidSignature) { - std::unique_ptr<quic::CertificateView> cert_view = - quic::CertificateView::ParseSingleCertificate(leaf_cert_); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc -index 05307c6b9..4fc376857 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc -@@ -61,6 +61,7 @@ public: - const quic::ParsedQuicVersionVector& supported_versions, - Network::Socket& listen_socket) - : EnvoyQuicServerConnection(quic::test::TestConnectionId(), -+ quic::QuicSocketAddress(quic::QuicIpAddress::Any4(), 12345), - quic::QuicSocketAddress(quic::QuicIpAddress::Loopback4(), 12345), - helper, alarm_factory, &writer, /*owns_writer=*/false, - supported_versions, listen_socket) {} -@@ -201,10 +202,10 @@ public: - crypto_stream_ = test_crypto_stream; - } - quic::test::QuicServerSessionBasePeer::SetCryptoStream(&envoy_quic_session_, crypto_stream); -- quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - quic_connection_->SetEncrypter( - quic::ENCRYPTION_FORWARD_SECURE, - std::make_unique<quic::NullEncrypter>(quic::Perspective::IS_SERVER)); -+ quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - } - - bool installReadFilter() { -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc -index c2fd31c6f..f602e2c9a 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc -@@ -51,6 +51,7 @@ public: - POOL_GAUGE(listener_config_.listenerScope()), - POOL_HISTOGRAM(listener_config_.listenerScope()))}), - quic_connection_(quic::test::TestConnectionId(), -+ quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 123), - quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 12345), - connection_helper_, alarm_factory_, &writer_, - /*owns_writer=*/false, {quic_version_}, *listener_config_.socket_), -@@ -66,11 +67,11 @@ public: - quic_session_.ActivateStream(std::unique_ptr<EnvoyQuicServerStream>(quic_stream_)); - EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false)); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional<quic::EncryptionLevel>) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillRepeatedly( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)) - .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&, - const quic::QuicSocketAddress&, quic::PerPacketOptions*) { -@@ -110,7 +111,7 @@ public: - std::unique_ptr<char[]> data_buffer; - quic::QuicByteCount data_frame_header_length = - quic::HttpEncoder::SerializeDataFrameHeader(body.length(), &data_buffer); -- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); -+ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); - data = absl::StrCat(data_frame_header, body); - } - return data; -@@ -397,11 +398,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { - - // Make the stream blocked by congestion control. - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional<quic::EncryptionLevel>) { -- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { -+ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -+ })); - quic_stream_->encodeHeaders(response_headers_, /*end_stream=*/false); - - // Encode 16kB -10 bytes request body. Because the high watermark is 16KB, with previously -@@ -415,11 +416,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { - // Unblock writing now, and this will write out 16kB data and cause stream to - // be blocked by the flow control limit. - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional<quic::EncryptionLevel>) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark()); - quic_session_.OnCanWrite(); - EXPECT_TRUE(quic_stream_->IsFlowControlBlocked()); -@@ -429,20 +430,20 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { - 32 * 1024); - quic_stream_->OnWindowUpdateFrame(window_update1); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional<quic::EncryptionLevel>) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - quic_session_.OnCanWrite(); - // No data should be buffered at this point. - - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional<quic::EncryptionLevel>) { -- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -- })); -+ .WillRepeatedly( -+ Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional<quic::EncryptionLevel>) { -+ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -+ })); - // Send more data. If watermark bytes counting were not cleared in previous - // OnCanWrite, this write would have caused the stream to exceed its high watermark. - std::string response1(16 * 1024 - 3, 'a'); -diff --git a/test/extensions/quic_listeners/quiche/platform/BUILD b/test/extensions/quic_listeners/quiche/platform/BUILD -index 420e812b8..7dbb08d82 100644 ---- a/test/extensions/quic_listeners/quiche/platform/BUILD -+++ b/test/extensions/quic_listeners/quiche/platform/BUILD -@@ -9,16 +9,6 @@ licenses(["notice"]) # Apache 2 - - envoy_package() - --envoy_cc_test( -- name = "quiche_platform_test", -- srcs = ["quiche_platform_test.cc"], -- external_deps = ["quiche_common_platform"], -- deps = [ -- "@com_googlesource_quiche//:quiche_common_platform", -- "@com_googlesource_quiche//:quiche_common_platform_endian", -- ], --) -- - envoy_cc_test( - name = "http2_platform_test", - srcs = ["http2_platform_test.cc"], -@@ -63,7 +53,6 @@ envoy_cc_test( - "@com_googlesource_quiche//:quic_platform_mem_slice_span", - "@com_googlesource_quiche//:quic_platform_mem_slice_storage", - "@com_googlesource_quiche//:quic_platform_mock_log", -- "@com_googlesource_quiche//:quic_platform_port_utils", - "@com_googlesource_quiche//:quic_platform_sleep", - "@com_googlesource_quiche//:quic_platform_system_event_loop", - "@com_googlesource_quiche//:quic_platform_test", -@@ -150,17 +139,6 @@ envoy_cc_test_library( - deps = ["@com_googlesource_quiche//:quic_platform_base"], - ) - --envoy_cc_test_library( -- name = "quic_platform_port_utils_impl_lib", -- srcs = ["quic_port_utils_impl.cc"], -- hdrs = ["quic_port_utils_impl.h"], -- tags = ["nofips"], -- deps = [ -- "//source/common/network:utility_lib", -- "//test/test_common:environment_lib", -- ], --) -- - envoy_cc_test_library( - name = "quic_platform_test_mem_slice_vector_impl_lib", - hdrs = ["quic_test_mem_slice_vector_impl.h"], -diff --git a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc -index 069a79eab..35aee5d27 100644 ---- a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc -+++ b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc -@@ -72,20 +72,14 @@ TEST(Http2PlatformTest, Http2Log) { - HTTP2_DLOG_EVERY_N(ERROR, 2) << "DLOG_EVERY_N(ERROR, 2)"; - } - --TEST(Http2PlatformTest, Http2StringPiece) { -- std::string s = "bar"; -- quiche::QuicheStringPiece sp(s); -- EXPECT_EQ('b', sp[0]); --} -- - TEST(Http2PlatformTest, Http2Macro) { - EXPECT_DEBUG_DEATH(HTTP2_UNREACHABLE(), ""); - EXPECT_DEATH(HTTP2_DIE_IF_NULL(nullptr), ""); - } - - TEST(Http2PlatformTest, Http2Flags) { -- auto& flag_registry = quiche::FlagRegistry::GetInstance(); -- flag_registry.ResetFlags(); -+ auto& flag_registry = quiche::FlagRegistry::getInstance(); -+ flag_registry.resetFlags(); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - SetHttp2ReloadableFlag(http2_testonly_default_false, true); - EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -@@ -93,22 +87,22 @@ TEST(Http2PlatformTest, Http2Flags) { - for (std::string s : {"1", "t", "true", "TRUE", "y", "yes", "Yes"}) { - SetHttp2ReloadableFlag(http2_testonly_default_false, false); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -- EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") -- ->SetValueFromString(s)); -+ EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") -+ ->setValueFromString(s)); - EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - } - for (std::string s : {"0", "f", "false", "FALSE", "n", "no", "No"}) { - SetHttp2ReloadableFlag(http2_testonly_default_false, true); - EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -- EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") -- ->SetValueFromString(s)); -+ EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") -+ ->setValueFromString(s)); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - } - for (std::string s : {"some", "invalid", "values", ""}) { - SetHttp2ReloadableFlag(http2_testonly_default_false, false); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -- EXPECT_FALSE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") -- ->SetValueFromString(s)); -+ EXPECT_FALSE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") -+ ->setValueFromString(s)); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - } - } -diff --git a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc -index 68141aa94..902ad1a9e 100644 ---- a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc -+++ b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc -@@ -30,7 +30,6 @@ - #include "gtest/gtest.h" - #include "quiche/common/platform/api/quiche_string_piece.h" - #include "quiche/epoll_server/fake_simple_epoll_server.h" --#include "quiche/quic/platform/api/quic_aligned.h" - #include "quiche/quic/platform/api/quic_bug_tracker.h" - #include "quiche/quic/platform/api/quic_cert_utils.h" - #include "quiche/quic/platform/api/quic_client_stats.h" -@@ -42,7 +41,6 @@ - #include "quiche/quic/platform/api/quic_flags.h" - #include "quiche/quic/platform/api/quic_hostname_utils.h" - #include "quiche/quic/platform/api/quic_logging.h" --#include "quiche/quic/platform/api/quic_macros.h" - #include "quiche/quic/platform/api/quic_map_util.h" - #include "quiche/quic/platform/api/quic_mem_slice.h" - #include "quiche/quic/platform/api/quic_mem_slice_span.h" -@@ -50,7 +48,6 @@ - #include "quiche/quic/platform/api/quic_mock_log.h" - #include "quiche/quic/platform/api/quic_mutex.h" - #include "quiche/quic/platform/api/quic_pcc_sender.h" --#include "quiche/quic/platform/api/quic_port_utils.h" - #include "quiche/quic/platform/api/quic_ptr_util.h" - #include "quiche/quic/platform/api/quic_server_stats.h" - #include "quiche/quic/platform/api/quic_sleep.h" -@@ -92,8 +89,6 @@ protected: - const int verbosity_log_threshold_; - }; - --TEST_F(QuicPlatformTest, QuicAlignOf) { EXPECT_LT(0, QUIC_ALIGN_OF(int)); } -- - enum class TestEnum { ZERO = 0, ONE, TWO, COUNT }; - - TEST_F(QuicPlatformTest, QuicBugTracker) { -@@ -468,9 +463,9 @@ TEST_F(QuicPlatformTest, QuicCertUtils) { - unsigned char* der = nullptr; - int len = i2d_X509(x509_cert.get(), &der); - ASSERT_GT(len, 0); -- quiche::QuicheStringPiece out; -+ absl::string_view out; - QuicCertUtils::ExtractSubjectNameFromDERCert( -- quiche::QuicheStringPiece(reinterpret_cast<const char*>(der), len), &out); -+ absl::string_view(reinterpret_cast<const char*>(der), len), &out); - EXPECT_EQ("0z1\v0\t\x6\x3U\x4\x6\x13\x2US1\x13" - "0\x11\x6\x3U\x4\b\f\nCalifornia1\x16" - "0\x14\x6\x3U\x4\a\f\rSan Francisco1\r" -@@ -566,8 +561,8 @@ TEST_F(QuicPlatformTest, MonotonicityWithFakeEpollClock) { - } - - TEST_F(QuicPlatformTest, QuicFlags) { -- auto& flag_registry = quiche::FlagRegistry::GetInstance(); -- flag_registry.ResetFlags(); -+ auto& flag_registry = quiche::FlagRegistry::getInstance(); -+ flag_registry.resetFlags(); - - EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false)); - EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_true)); -@@ -583,14 +578,15 @@ TEST_F(QuicPlatformTest, QuicFlags) { - SetQuicFlag(FLAGS_quic_time_wait_list_seconds, 100); - EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); - -- flag_registry.ResetFlags(); -+ flag_registry.resetFlags(); - EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false)); - EXPECT_TRUE(GetQuicRestartFlag(quic_testonly_default_true)); - EXPECT_EQ(200, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); -- flag_registry.FindFlag("quic_reloadable_flag_quic_testonly_default_false") -- ->SetValueFromString("true"); -- flag_registry.FindFlag("quic_restart_flag_quic_testonly_default_true")->SetValueFromString("0"); -- flag_registry.FindFlag("quic_time_wait_list_seconds")->SetValueFromString("100"); -+ flag_registry.findFlag("FLAGS_quic_reloadable_flag_quic_testonly_default_false") -+ ->setValueFromString("true"); -+ flag_registry.findFlag("FLAGS_quic_restart_flag_quic_testonly_default_true") -+ ->setValueFromString("0"); -+ flag_registry.findFlag("FLAGS_quic_time_wait_list_seconds")->setValueFromString("100"); - EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_false)); - EXPECT_FALSE(GetQuicRestartFlag(quic_testonly_default_true)); - EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); -@@ -661,35 +657,6 @@ TEST_F(FileUtilsTest, ReadFileContents) { - EXPECT_EQ(data, output); - } - --TEST_F(QuicPlatformTest, PickUnsedPort) { -- int port = QuicPickServerPortForTestsOrDie(); -- std::vector<Envoy::Network::Address::IpVersion> supported_versions = -- Envoy::TestEnvironment::getIpVersionsForTest(); -- for (auto ip_version : supported_versions) { -- Envoy::Network::Address::InstanceConstSharedPtr addr = -- Envoy::Network::Test::getCanonicalLoopbackAddress(ip_version); -- Envoy::Network::Address::InstanceConstSharedPtr addr_with_port = -- Envoy::Network::Utility::getAddressWithPort(*addr, port); -- Envoy::Network::SocketImpl sock(Envoy::Network::Socket::Type::Datagram, addr_with_port); -- // binding of given port should success. -- EXPECT_EQ(0, sock.bind(addr_with_port).rc_); -- } --} -- --TEST_F(QuicPlatformTest, FailToPickUnsedPort) { -- Envoy::Api::MockOsSysCalls os_sys_calls; -- Envoy::TestThreadsafeSingletonInjector<Envoy::Api::OsSysCallsImpl> os_calls(&os_sys_calls); -- // Actually create sockets. -- EXPECT_CALL(os_sys_calls, socket(_, _, _)).WillRepeatedly([](int domain, int type, int protocol) { -- os_fd_t fd = ::socket(domain, type, protocol); -- return Envoy::Api::SysCallSocketResult{fd, errno}; -- }); -- // Fail bind call's to mimic port exhaustion. -- EXPECT_CALL(os_sys_calls, bind(_, _, _)) -- .WillRepeatedly(Return(Envoy::Api::SysCallIntResult{-1, SOCKET_ERROR_ADDR_IN_USE})); -- EXPECT_DEATH(QuicPickServerPortForTestsOrDie(), "Failed to pick a port for test."); --} -- - TEST_F(QuicPlatformTest, TestEnvoyQuicBufferAllocator) { - QuicStreamBufferAllocator allocator; - Envoy::Stats::TestUtil::MemoryTest memory_test; -@@ -711,14 +678,6 @@ TEST_F(QuicPlatformTest, TestSystemEventLoop) { - QuicSystemEventLoop("dummy"); - } - --QUIC_MUST_USE_RESULT bool dummyTestFunction() { return false; } -- --TEST_F(QuicPlatformTest, TestQuicMacros) { -- // Just make sure it compiles. -- EXPECT_FALSE(dummyTestFunction()); -- int a QUIC_UNUSED; --} -- - TEST(EnvoyQuicMemSliceTest, ConstructMemSliceFromBuffer) { - std::string str(512, 'b'); - // Fragment needs to out-live buffer. -diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc -index 556f6cd3e..9eaf8532a 100644 ---- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc -+++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc -@@ -19,7 +19,7 @@ - namespace quic { - namespace { - --void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStringPiece data) { -+void quicRecordTestOutputToFile(const std::string& filename, absl::string_view data) { - const char* output_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR"); - if (output_dir_env == nullptr) { - QUIC_LOG(WARNING) << "Could not save test output since QUIC_TEST_OUTPUT_DIR is not set"; -@@ -64,11 +64,13 @@ void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStrin - } - } // namespace - --void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data) { -- QuicRecordTestOutputToFile(filename.data(), data); -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data) { -+ quicRecordTestOutputToFile(filename.data(), data); - } - --bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data) { - const char* read_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR"); - if (read_dir_env == nullptr) { - QUIC_LOG(WARNING) << "Could not load test output since QUIC_TEST_OUTPUT_DIR is not set"; -@@ -96,7 +98,8 @@ bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* dat - return true; - } - --void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data) { - const testing::TestInfo* test_info = testing::UnitTest::GetInstance()->current_test_info(); - - std::string timestamp = absl::FormatTime("%Y%m%d%H%M%S", absl::Now(), absl::LocalTimeZone()); -@@ -104,7 +107,7 @@ void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStr - std::string filename = fmt::sprintf("%s.%s.%s.%s.qtr", test_info->name(), - test_info->test_case_name(), identifier.data(), timestamp); - -- QuicRecordTestOutputToFile(filename, data); -+ quicRecordTestOutputToFile(filename, data); - } - - } // namespace quic -diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h -index a1c6c7305..fcf0c47b3 100644 ---- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h -+++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h -@@ -6,14 +6,16 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - - namespace quic { -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data); - --void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data); -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data); - --bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data); -- --void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data); -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data); - - } // namespace quic -diff --git a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc -deleted file mode 100644 -index a733894b5..000000000 ---- a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc -+++ /dev/null -@@ -1,39 +0,0 @@ --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#include "gtest/gtest.h" --#include "quiche/common/platform/api/quiche_arraysize.h" --#include "quiche/common/platform/api/quiche_endian.h" --#include "quiche/common/platform/api/quiche_optional.h" --#include "quiche/common/platform/api/quiche_ptr_util.h" --#include "quiche/common/platform/api/quiche_string_piece.h" -- --namespace quiche { -- --TEST(QuichePlatformTest, Arraysize) { -- int array[] = {0, 1, 2, 3, 4}; -- EXPECT_EQ(5, QUICHE_ARRAYSIZE(array)); --} -- --TEST(QuichePlatformTest, StringPiece) { -- std::string s = "bar"; -- QuicheStringPiece sp(s); -- EXPECT_EQ('b', sp[0]); --} -- --TEST(QuichePlatformTest, WrapUnique) { -- auto p = QuicheWrapUnique(new int(6)); -- EXPECT_EQ(6, *p); --} -- --TEST(QuichePlatformTest, TestQuicheOptional) { -- QuicheOptional<int32_t> maybe_a; -- EXPECT_FALSE(maybe_a.has_value()); -- maybe_a = 1; -- EXPECT_EQ(1, *maybe_a); --} -- --} // namespace quiche -diff --git a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc -index 56453e232..eeae58c0a 100644 ---- a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc -+++ b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc -@@ -8,7 +8,6 @@ - #include "gtest/gtest.h" - #include "quiche/spdy/platform/api/spdy_bug_tracker.h" - #include "quiche/spdy/platform/api/spdy_containers.h" --#include "quiche/spdy/platform/api/spdy_endianness_util.h" - #include "quiche/spdy/platform/api/spdy_estimate_memory_usage.h" - #include "quiche/spdy/platform/api/spdy_flags.h" - #include "quiche/spdy/platform/api/spdy_logging.h" -@@ -47,11 +46,6 @@ TEST(SpdyPlatformTest, SpdyHashSet) { - EXPECT_EQ(0, hset.count("qux")); - } - --TEST(SpdyPlatformTest, SpdyEndianness) { -- EXPECT_EQ(0x1234, spdy::SpdyNetToHost16(spdy::SpdyHostToNet16(0x1234))); -- EXPECT_EQ(0x12345678, spdy::SpdyNetToHost32(spdy::SpdyHostToNet32(0x12345678))); --} -- - TEST(SpdyPlatformTest, SpdyEstimateMemoryUsage) { - std::string s = "foo"; - // Stubbed out to always return 0. -@@ -92,19 +86,19 @@ TEST(SpdyPlatformTest, SpdyTestHelpers) { - } - - TEST(SpdyPlatformTest, SpdyFlags) { -- auto& flag_registry = quiche::FlagRegistry::GetInstance(); -- flag_registry.ResetFlags(); -+ auto& flag_registry = quiche::FlagRegistry::getInstance(); -+ flag_registry.resetFlags(); - EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false)); - EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false)); - -- flag_registry.FindFlag("spdy_reloadable_flag_spdy_testonly_default_false") -- ->SetValueFromString("true"); -+ flag_registry.findFlag("FLAGS_quic_reloadable_flag_spdy_testonly_default_false") -+ ->setValueFromString("true"); - EXPECT_TRUE(GetSpdyReloadableFlag(spdy_testonly_default_false)); - EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false)); - -- flag_registry.ResetFlags(); -- flag_registry.FindFlag("spdy_restart_flag_spdy_testonly_default_false") -- ->SetValueFromString("yes"); -+ flag_registry.resetFlags(); -+ flag_registry.findFlag("FLAGS_quic_restart_flag_spdy_testonly_default_false") -+ ->setValueFromString("yes"); - EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false)); - EXPECT_TRUE(GetSpdyRestartFlag(spdy_testonly_default_false)); - } -diff --git a/test/extensions/quic_listeners/quiche/test_proof_source.h b/test/extensions/quic_listeners/quiche/test_proof_source.h -index a249b4314..bbedfd6c7 100644 ---- a/test/extensions/quic_listeners/quiche/test_proof_source.h -+++ b/test/extensions/quic_listeners/quiche/test_proof_source.h -@@ -36,7 +36,7 @@ protected: - void signPayload(const quic::QuicSocketAddress& /*server_address*/, - const quic::QuicSocketAddress& /*client_address*/, - const std::string& /*hostname*/, uint16_t /*signature_algorithm*/, -- quiche::QuicheStringPiece in, -+ absl::string_view in, - std::unique_ptr<quic::ProofSource::SignatureCallback> callback) override { - callback->Run(true, absl::StrCat("Fake signature for { ", in, " }"), - std::make_unique<EnvoyQuicProofSourceDetails>(filter_chain_)); -diff --git a/test/extensions/quic_listeners/quiche/test_utils.h b/test/extensions/quic_listeners/quiche/test_utils.h -index 102f7608e..7f0ea78e8 100644 ---- a/test/extensions/quic_listeners/quiche/test_utils.h -+++ b/test/extensions/quic_listeners/quiche/test_utils.h -@@ -46,7 +46,7 @@ public: - MOCK_METHOD(quic::QuicConsumedData, WritevData, - (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset, - quic::StreamSendingState state, quic::TransmissionType type, -- quiche::QuicheOptional<quic::EncryptionLevel> level)); -+ absl::optional<quic::EncryptionLevel> level)); - MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id)); - - absl::string_view requestedServerName() const override { -@@ -90,7 +90,7 @@ public: - MOCK_METHOD(quic::QuicConsumedData, WritevData, - (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset, - quic::StreamSendingState state, quic::TransmissionType type, -- quiche::QuicheOptional<quic::EncryptionLevel> level)); -+ absl::optional<quic::EncryptionLevel> level)); - MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id)); - - absl::string_view requestedServerName() const override { --- -2.29.2 - diff --git a/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch b/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch deleted file mode 100644 index 370682efaa3..00000000000 --- a/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 8b531c41f956b27e4be32b430db2e7a44e0cdd3e Mon Sep 17 00:00:00 2001 -From: Luke Granger-Brown <git@lukegb.com> -Date: Thu, 7 Jan 2021 11:09:18 +0000 -Subject: [PATCH] Add upb patch to make it compile under GCC10 - ---- - bazel/repositories.bzl | 5 +++- - bazel/upb2.patch | 55 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 59 insertions(+), 1 deletion(-) - create mode 100644 bazel/upb2.patch - -diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl -index 64d61ea49..c6cadc9df 100644 ---- a/bazel/repositories.bzl -+++ b/bazel/repositories.bzl -@@ -811,7 +811,10 @@ def _com_github_grpc_grpc(): - def _upb(): - _repository_impl( - name = "upb", -- patches = ["@envoy//bazel:upb.patch"], -+ patches = [ -+ "@envoy//bazel:upb.patch", -+ "@envoy//bazel:upb2.patch", -+ ], - patch_args = ["-p1"], - ) - -diff --git a/bazel/upb2.patch b/bazel/upb2.patch -new file mode 100644 -index 000000000..6e436c61b ---- /dev/null -+++ b/bazel/upb2.patch -@@ -0,0 +1,55 @@ -+From 9bd23dab4240b015321a53c45b3c9e4847fbf020 Mon Sep 17 00:00:00 2001 -+From: Joshua Haberman <jhaberman@gmail.com> -+Date: Tue, 7 Apr 2020 15:22:11 -0700 -+Subject: [PATCH] Changed upb status to suit GCC10's warning about strncpy(). -+ (#268) -+ -+Added tests for all cases. Also removed ellipses from truncated -+messages, they were more trouble than they are worth. -+--- -+ tests/test_generated_code.c | 33 +++++++++++++++++++++++++++++++++ -+ upb/upb.c | 17 +++-------------- -+ 2 files changed, 36 insertions(+), 14 deletions(-) -+ -+diff --git a/upb/upb.c b/upb/upb.c -+index cb2cdfd9d..258192d79 100644 -+--- a/upb/upb.c -++++ b/upb/upb.c -+@@ -11,17 +11,6 @@ -+ -+ #include "upb/port_def.inc" -+ -+-/* Guarantee null-termination and provide ellipsis truncation. -+- * It may be tempting to "optimize" this by initializing these final -+- * four bytes up-front and then being careful never to overwrite them, -+- * this is safer and simpler. */ -+-static void nullz(upb_status *status) { -+- const char *ellipsis = "..."; -+- size_t len = strlen(ellipsis); -+- UPB_ASSERT(sizeof(status->msg) > len); -+- memcpy(status->msg + sizeof(status->msg) - len, ellipsis, len); -+-} -+- -+ /* upb_status *****************************************************************/ -+ -+ void upb_status_clear(upb_status *status) { -+@@ -37,8 +26,8 @@ const char *upb_status_errmsg(const upb_status *status) { return status->msg; } -+ void upb_status_seterrmsg(upb_status *status, const char *msg) { -+ if (!status) return; -+ status->ok = false; -+- strncpy(status->msg, msg, sizeof(status->msg)); -+- nullz(status); -++ strncpy(status->msg, msg, UPB_STATUS_MAX_MESSAGE - 1); -++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0'; -+ } -+ -+ void upb_status_seterrf(upb_status *status, const char *fmt, ...) { -+@@ -52,7 +41,7 @@ void upb_status_vseterrf(upb_status *status, const char *fmt, va_list args) { -+ if (!status) return; -+ status->ok = false; -+ _upb_vsnprintf(status->msg, sizeof(status->msg), fmt, args); -+- nullz(status); -++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0'; -+ } -+ -+ /* upb_alloc ******************************************************************/ --- -2.29.2 - diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index c81d79dbb24..0c5038898ea 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -1,6 +1,8 @@ { lib +, bazel_4 , buildBazelPackage , fetchFromGitHub +, fetchpatch , stdenv , cmake , gn @@ -8,6 +10,7 @@ , jdk , ninja , python3 +, linuxHeaders , nixosTests }: @@ -17,23 +20,24 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.19.1"; - commit = "a2a1e3eed4214a38608ec223859fcfa8fb679b14"; + version = "1.21.1"; + rev = "af50070ee60866874b0a9383daf9364e884ded22"; }; in buildBazelPackage rec { pname = "envoy"; - version = srcVer.version; + inherit (srcVer) version; + bazel = bazel_4; src = fetchFromGitHub { owner = "envoyproxy"; repo = "envoy"; - rev = srcVer.commit; - hash = "sha256:1v1hv4blrppnhllsxd9d3k2wl6nhd59r4ydljy389na3bb41jwf9"; + inherit (srcVer) rev ; + hash = "sha256:11mm72zmb479ss585jzqzhklyyqmdadnvr91ghzvjxc0j2a1hrr4"; extraPostFetch = '' chmod -R +w $out rm $out/.bazelversion - echo ${srcVer.commit} > $out/SOURCE_VERSION + echo ${srcVer.rev} > $out/SOURCE_VERSION sed -i 's/GO_VERSION = ".*"/GO_VERSION = "host"/g' $out/bazel/dependency_imports.bzl ''; }; @@ -48,6 +52,14 @@ buildBazelPackage rec { --replace '"''$$WEE8_BUILD_ARGS"' '"''$$WEE8_BUILD_ARGS use_gold=false"' ''; + patches = [ + # make linux/tcp.h relative. drop when upgrading to >1.21 + (fetchpatch { + url = "https://github.com/envoyproxy/envoy/commit/68448aae7a78a3123097b6ea96016b270457e7b8.patch"; + sha256 = "123kv3x37p8fgfp29jhw5xg5js5q5ipibs8hsm7gzfd5bcllnpfh"; + }) + ]; + nativeBuildInputs = [ cmake python3 @@ -57,8 +69,12 @@ buildBazelPackage rec { ninja ]; + buildInputs = [ + linuxHeaders + ]; + fetchAttrs = { - sha256 = "sha256:0vnl0gq6nhvyzz39jg1bvvna0xyhxalg71bp1jbxib7ql026004r"; + sha256 = "0f7mls2zrpjjvbz6pgkzrvr55bv05xn2l76j9i1r0cf367qqfkz8"; dontUseCmakeConfigure = true; dontUseGnConfigure = true; preInstall = '' @@ -84,7 +100,7 @@ buildBazelPackage rec { dontUseGnConfigure = true; dontUseNinjaInstall = true; preConfigure = '' - sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl + sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/foreign_cc/private/framework/toolchains/linux_commands.bzl # Add paths to Nix store back. sed -i \ diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 86139e7a24f..645abba303a 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.45.v20220203"; + version = "11.0.8"; src = fetchurl { - url = "mirror://maven/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; - sha256 = "sha256-wmM03qAnNsiEDsLkWyJKZIb3SPCRGCxTsgKBWwopMAw="; + url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; + sha256 = "sha256-fHd0o5f+WLdbDK1nmSnHNKjDO0mV7+vkPs4zVEaqeyw="; }; dontBuild = true; installPhase = '' mkdir -p $out - mv etc lib modules start.ini start.jar $out + mv etc lib modules start.jar $out ''; meta = with lib; { diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index ee36216686a..f4b5bf65fea 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, openssl_3_0, ... }@args: callPackage ./generic.nix (args // { openssl = openssl_3_0; }) { - version = "1.21.5"; - sha256 = "sha256-sg879TOlGKbw86eWff7thy0mjTHkzBIaAAEylgLdz7s="; + version = "1.21.6"; + sha256 = "1bh52jqqcaj5wlh2kvhxr00jhk2hnk8k97ki4pwyj4c8920p1p36"; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index b159cc00aaa..2b8e2ac7f79 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -256,6 +256,7 @@ in sha256 = "sha256-UXiitc3jZlgXlCsDPS+xEFLNRVgRbn8BCCXUEqAWlII="; }; inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; + disableIPC = true; }; moreheaders = { diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index f0a7a367555..4db1b19644c 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "6f8253673669"; # branch=quic - sha256 = "sha256:0zl4rws07vr8z7ml7sqlb70v3cx1cms7iablndqd38iqcx0bvjrq"; + rev = "55b38514729b"; # branch=quic + sha256 = "sha256-EJ3Fuxb4Z43I5eSb3mzzIOBfppAZ4Adv1yVZWbVCv0A="; }; preConfigure = '' @@ -19,5 +19,5 @@ callPackage ./generic.nix args { "--with-stream_quic_module" ]; - version = "1.21.5-quic"; + version = "1.21.7-quic"; } diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index cbf2fe19435..8a5580d5d0d 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -4,6 +4,7 @@ , envoy , zip , nixosTests +, pomerium-cli }: let @@ -11,18 +12,17 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.15.7"; + version = "0.17.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256:0adlk4ylny1z43x1dw3ny0s1932vhb61hpf5wdz4r65y8k9qyfgr"; + hash = "sha256:1hv76i6k9f0kp527nxlxqhklsvkh2cmfnqlszmlk2hxij31qnf8q"; }; - vendorSha256 = "sha256:1fszfbra84pcs8v1h2kf7iy603vf9v2ysg6il76aqmqrxmb1p7nv"; + vendorSha256 = "sha256:1cq4m5a7z64yg3v1c68d15ilw78il6p53vaqzxgn338zjggr3kig"; subPackages = [ "cmd/pomerium" - "cmd/pomerium-cli" ]; ldflags = let @@ -74,11 +74,11 @@ buildGoModule rec { installPhase = '' install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium - install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli ''; passthru.tests = { inherit (nixosTests) pomerium; + inherit pomerium-cli; }; meta = with lib; { diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 7a0d75dab24..4a6adb2b024 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.9.5"; + version = "2.9.6"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "sha256-yKnG+wxWVgLwG9hRRiLPmNzm9pBrf/mh5V/lLdj8Sv8="; + sha256 = "sha256:1kcn1kkhm8fkwhjqmpysd2hvnrvh6bka8r67yq8d58m117l9wnpq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 29b33cd6610..2b7ed9e1c9c 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-8oUPqtoxdJ768CmDNBicBGCyejt2v9GIahVRL6pYDJ4="; + sha256 = "sha256-GZYaFK6g26gbVa3sHwTZ4fNGMFWBWevqcfJc/3SC890="; rev = "v${version}"; }; - vendorSha256 = "sha256-Dr5qCLVsv22BcISo2OyB+VEDncPwpcp323w9IfDTQv0="; + vendorSha256 = "sha256-uV5pnnvVYviw2LnceQUiTJXva3WI51pgW6IeZzVhULc="; doCheck = false; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 27228cc5bf7..865c4490a04 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.631"; + version = "0.20.671"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1y5SQzizjslQ5+JWGrrtk45uvI/hOMnwLL69NhBmNMc="; + sha256 = "AoOaBryZHkqp5SabfKeW5E1YoJCwGhg2luK8SQvabow="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index e9138c2eedd..3400b5c5054 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "0.11.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-otTIDwcbF8Rcas048Vkn30v39GYIYbAIY72ipJhIwC4="; + sha256 = "sha256-BREPSDmGR85kDx1PWLdwpbwImAFuctLLx3AcHqAcURk="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 4dce2a7258f..814d8eecdc3 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -70,11 +70,6 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - export HOME=$(mktemp -d) - - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - nuget sources Add -Name nixos -Source "$PWD/nixos" nuget init "$nugetDeps" "$PWD/nixos" diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index fd80dc4b87c..e2932c16a10 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2022-02-07"; + version = "unstable-2022-03-11"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "6d7c03365ad13c4661675aaccd0a3dc5be544493"; - sha256 = "sha256-xFSZkOFETGcJXA6CUCReoyNZXhDAfgKkWoeDRqueBVw="; + rev = "e3beafbdb4f2ac3f889f81aec0cad5ec473c8612"; + sha256 = "sha256-xZSZUJ2TNaUzfwEFpnzr5EPlOvILLyiQ/3K1iiup7kU="; }; sourceRoot = "source/klippy"; diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix new file mode 100644 index 00000000000..823f3125cbe --- /dev/null +++ b/pkgs/servers/kubemq-community/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubemq-community"; + version = "2.2.12"; + src = fetchFromGitHub { + owner = "kubemq-io"; + repo = pname; + rev = "v${version}"; + sha256 = "06n3avcqknqzf9y03xqcsg36pwcha29j2psp9xsnir7hrx66zww8"; + }; + + CGO_ENABLED=0; + + ldflags=[ "-w" "-s" "-X main.version=${version}" ]; + + doCheck = false; # grpc tests are flaky + + vendorSha256 = "1sh0dzz8z065964k2gzkzw9p3db3rcf6mv901zym0wqm4p71045w"; + + meta = { + homepage = "https://github.com/kubemq-io/kubemq-community"; + description = "KubeMQ Community is the open-source version of KubeMQ, the Kubernetes native message broker."; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ brianmcgee ]; + }; +} diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index 598946037db..11da56c6eb9 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "maddy"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-UB9Y2nNkiN0L3NIfUqnpaJJqNuAnCYIeEyS60TnnIRs="; + sha256 = "sha256-FWoPAb/aHaQLxT+UUUoViCmLvauVuAzUyOmRNB8F72U="; }; - vendorSha256 = "sha256-lL9hlICc9t/2v6eawG8LU6hpAKpY7raTg5l1RagewPs="; + vendorSha256 = "sha256-rcHboPfs2mWg3sgsLmN1IPoppmuDcsx0bQICp6EzYsQ="; ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 9af34371490..e6ec0063338 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }: stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.5.2"; + version = "1.5.4b"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "1ap4jb43gvy7caa8lg2hg811q0n5c2gqbmcjl4126wz44hb7waa1"; + sha256 = "sha256-RzwJjcUgk1XXQZpNdz86Pr9HsUaQCOSt5oSejnGVmgA="; }; - buildInputs = [ dovecot xapian icu64 ]; + buildInputs = [ dovecot xapian icu64 sqlite ]; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; diff --git a/pkgs/servers/mapcache/default.nix b/pkgs/servers/mapcache/default.nix index ff502d20328..744a529496d 100644 --- a/pkgs/servers/mapcache/default.nix +++ b/pkgs/servers/mapcache/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mapcache"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "MapServer"; repo = pname; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-HrvcJAf0a6tu8AKKuW5TaCtqPMgzH21fGMBxIfUzdgY="; + sha256 = "sha256-13lOQC4PJtByhvceuF00uoipLFHrFiyJrsy2iWcEANc="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 578c5ec7228..f23275d1df2 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.53.0"; + version = "1.54.0"; src = fetchPypi { inherit pname version; - sha256 = "0pp9l3191rg9iildknm1s1phi896y7zh7b3a6m16f6bmchmn8jz3"; + sha256 = "sha256-TmUu6KpL111mjd4Dgm/kYnKpDZjw9rWrpMQ5isXmWRo="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index 58b19586e4b..014460ab230 100644 --- a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -1,41 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, fetchpatch }: +{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse }: buildPythonPackage rec { pname = "matrix-synapse-mjolnir-antispam"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc="; + sha256 = "HDfLndiFm9ayCmixuv4MYBbQ76mzCtTS+4UuBRdpP0E="; }; - patches = [ - # Update legacy antispam plugin with newer types. Or it'll just ignore mjolnir 1.3.1 rules. - (fetchpatch { - url = "https://github.com/matrix-org/mjolnir/commit/eb8c5e08b4c2b78e6a796e38e826ac3b7e9dfbaf.patch"; - sha256 = "sha256-rfFU45PfxR2YmNRU74eBI9M2hqBVZcNH0Sw8W/cavD4="; - stripLen = 1; - }) - # Port to Synapse module API (needs Synapse >= 1.37.0) - (fetchpatch { - url = "https://github.com/matrix-org/mjolnir/commit/9c9bd0e02907412b5fa6b95844e9f53ac07b61fd.patch"; - sha256 = "sha256-HR2OvqFnlQwRV7ezfOjseatjo+3P8i9PsV7D+hLD1Yo="; - stripLen = 1; - excludes = [ - "README.md" - "mx-tester.yml" - ]; - }) - # Move glob_to_regex into the source - (fetchpatch { - url = "https://github.com/matrix-org/mjolnir/commit/6cb461fed424f07bf50a1fdc0693d40ed8bbee12.patch"; - sha256 = "sha256-tqcKXNs+fxwPIvN5sJjdNgcz5KUVHiXgulLHR2redYk="; - stripLen = 1; - }) - ]; - sourceRoot = "./source/synapse_antispam"; propagatedBuildInputs = [ matrix-synapse ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 57a554ff581..fa1133b7d53 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.35"; + version = "2.0.36"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-tOainlvEB0O6yMzIm0df4r8D68swtjXBFUDsPcNc3uA="; + sha256 = "sha256-Ly4Ep+ZyjEb1ywXO/W1P1ZDvqSAtJY4wuE8n9jbbeuU="; }; - vendorSha256 = "sha256-dxtQAGlNOVO9NtuGbF6Nifa4QhnFGyHKhlDS3+V5HuM="; + vendorSha256 = "sha256-ZEIQeN7t9Az1W6T2Z+ZKHqs2O8UNNMl0nANM1mVyiTA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index dc1b0d6bd6a..0a3e9af5107 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.34.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-xyakq5DXwzONEP6EvDpAuzCrTDWcs+7asDlq9Vf4c1k="; + sha256 = "sha256-gyaAtFJubvDiz5b7lk6vmPHIqr9ccWK3N2iy4LvYiMg="; }; - vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; + vendorSha256 = "sha256-RSsvFD3RvYKxdwPDGG3YHVUzKLgwReZkoVabH5KWXMA="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index cff0f88ba92..539ac38f4f4 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "mjolnir"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc="; + sha256 = "HDfLndiFm9ayCmixuv4MYBbQ76mzCtTS+4UuBRdpP0E="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mjolnir/node-deps.nix b/pkgs/servers/mjolnir/node-deps.nix index 2a868156806..1454b69fc1f 100644 --- a/pkgs/servers/mjolnir/node-deps.nix +++ b/pkgs/servers/mjolnir/node-deps.nix @@ -67,13 +67,13 @@ let sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; }; - "@jest/types-27.4.2" = { + "@jest/types-27.5.1" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "27.4.2"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz"; - sha512 = "j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg=="; + url = "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz"; + sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; }; }; "@selderee/plugin-htmlparser2-0.6.0" = { @@ -103,6 +103,15 @@ let sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; }; + "@types/config-0.0.41" = { + name = "_at_types_slash_config"; + packageName = "@types/config"; + version = "0.0.41"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/config/-/config-0.0.41.tgz"; + sha512 = "HjXUmIld0gwvyG8MU/17QtLzOyuMX4jbGuijmS9sWsob5xxgZ/hY9cbRCaHIHqTQ3HMLhwS3F8uXq3Bt9zgzHA=="; + }; + }; "@types/connect-3.4.35" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; @@ -112,13 +121,13 @@ let sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; - "@types/crypto-js-4.1.0" = { + "@types/crypto-js-4.1.1" = { name = "_at_types_slash_crypto-js"; packageName = "@types/crypto-js"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.1.0.tgz"; - sha512 = "DCFfy/vh2lG6qHSGezQ+Sn2Ulf/1Mx51dqOdmOKyW5nMK3maLlxeS3onC7r212OnBM2pBR95HkAmAjjF08YkxQ=="; + url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.1.1.tgz"; + sha512 = "BG7fQKZ689HIoc5h+6D2Dgq1fABRa0RbBWKBd9SP/MVRVXROflpm5fhwyATX5duFmbStzyzyycPB8qUYKDH3NA=="; }; }; "@types/express-4.17.13" = { @@ -139,6 +148,15 @@ let sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; }; + "@types/html-to-text-8.0.1" = { + name = "_at_types_slash_html-to-text"; + packageName = "@types/html-to-text"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/html-to-text/-/html-to-text-8.0.1.tgz"; + sha512 = "0B/OifmJYmk5r9z9+KJtGWOF0LEjbTN4D2QeCh+mAw81JkJwC83NvNWUZFEqRT5PpnjX7vX0ab1SMGcwCs3Lag=="; + }; + }; "@types/istanbul-lib-coverage-2.0.4" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; @@ -202,13 +220,13 @@ let sha512 = "QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg=="; }; }; - "@types/node-16.11.22" = { + "@types/node-16.11.25" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.22"; + version = "16.11.25"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.22.tgz"; - sha512 = "DYNtJWauMQ9RNpesl4aVothr97/tIJM8HbyOXJ0AYT1Z2bEjLHyfjOBPAQQVMLf8h3kSShYfNk8Wnto8B2zHUA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.25.tgz"; + sha512 = "NrTwfD7L1RTc2qrHQD4RTTy4p0CO2LatKBEKEds3CaVuhoM/+DJzmWZl5f+ikR8cm8F5mfJxK+9rQq07gRiSjQ=="; }; }; "@types/parse5-6.0.3" = { @@ -301,13 +319,13 @@ let sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; }; }; - "accepts-1.3.7" = { + "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; + sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; "acorn-7.4.1" = { @@ -373,13 +391,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.9.0" = { + "ajv-8.10.0" = { name = "ajv"; packageName = "ajv"; - version = "8.9.0"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; - sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz"; + sha512 = "bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw=="; }; }; "ansi-colors-4.1.1" = { @@ -571,13 +589,13 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "body-parser-1.19.1" = { + "body-parser-1.19.2" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz"; - sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; }; }; "brace-expansion-1.1.11" = { @@ -634,13 +652,13 @@ let sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "bytes-3.1.1" = { + "bytes-3.1.2" = { name = "bytes"; packageName = "bytes"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"; - sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; + sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; "callsites-3.1.0" = { @@ -805,13 +823,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "cookie-0.4.1" = { + "cookie-0.4.2" = { name = "cookie"; packageName = "cookie"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; - sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; + sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; }; }; "cookie-signature-1.0.6" = { @@ -1012,13 +1030,13 @@ let sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; }; }; - "diff-sequences-27.4.0" = { + "diff-sequences-27.5.1" = { name = "diff-sequences"; packageName = "diff-sequences"; - version = "27.4.0"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz"; - sha512 = "YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww=="; + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz"; + sha512 = "k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="; }; }; "discontinuous-range-1.0.0" = { @@ -1327,22 +1345,22 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "expect-27.4.6" = { + "expect-27.5.1" = { name = "expect"; packageName = "expect"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-27.4.6.tgz"; - sha512 = "1M/0kAALIaj5LaG66sFJTbRsWTADnylly82cu4bspI0nl+pgP4E6Bh/aqdHlTUjul06K7xQnnrAoqfxVU0+/ag=="; + url = "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz"; + sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw=="; }; }; - "express-4.17.2" = { + "express-4.17.3" = { name = "express"; packageName = "express"; - version = "4.17.2"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz"; - sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; + url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; + sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; }; }; "extend-3.0.2" = { @@ -1579,13 +1597,13 @@ let sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; - "globals-13.12.0" = { + "globals-13.12.1" = { name = "globals"; packageName = "globals"; - version = "13.12.0"; + version = "13.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"; - sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; + url = "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz"; + sha512 = "317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw=="; }; }; "graceful-fs-4.2.9" = { @@ -1948,40 +1966,40 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "jest-diff-27.4.6" = { + "jest-diff-27.5.1" = { name = "jest-diff"; packageName = "jest-diff"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz"; - sha512 = "zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz"; + sha512 = "m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw=="; }; }; - "jest-get-type-27.4.0" = { + "jest-get-type-27.5.1" = { name = "jest-get-type"; packageName = "jest-get-type"; - version = "27.4.0"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz"; - sha512 = "tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ=="; + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz"; + sha512 = "2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="; }; }; - "jest-matcher-utils-27.4.6" = { + "jest-matcher-utils-27.5.1" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz"; - sha512 = "XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz"; + sha512 = "z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw=="; }; }; - "jest-message-util-27.4.6" = { + "jest-message-util-27.5.1" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.6.tgz"; - sha512 = "0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz"; + sha512 = "rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g=="; }; }; "js-tokens-4.0.0" = { @@ -2290,6 +2308,15 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; + "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.5" = { name = "minimist"; packageName = "minimist"; @@ -2317,13 +2344,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mocha-9.2.0" = { + "mocha-9.2.1" = { name = "mocha"; packageName = "mocha"; - version = "9.2.0"; + version = "9.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz"; - sha512 = "kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz"; + sha512 = "T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ=="; }; }; "moo-0.5.1" = { @@ -2380,6 +2407,15 @@ let sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; }; }; + "nanoid-3.3.1" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"; + sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; + }; + }; "natural-compare-1.4.0" = { name = "natural-compare"; packageName = "natural-compare"; @@ -2398,13 +2434,13 @@ let sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; }; }; - "negotiator-0.6.2" = { + "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; }; "normalize-path-3.0.0" = { @@ -2650,13 +2686,13 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-27.4.6" = { + "pretty-format-27.5.1" = { name = "pretty-format"; packageName = "pretty-format"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.6.tgz"; - sha512 = "NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz"; + sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; }; }; "progress-2.0.3" = { @@ -2713,13 +2749,13 @@ let sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "qs-6.9.6" = { + "qs-6.9.7" = { name = "qs"; packageName = "qs"; - version = "6.9.6"; + version = "6.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; + sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; }; }; "railroad-diagrams-1.0.0" = { @@ -2758,13 +2794,13 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.2" = { + "raw-body-2.4.3" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz"; - sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; + sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; }; "react-is-17.0.2" = { @@ -2902,13 +2938,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-2.6.1" = { + "sanitize-html-2.7.0" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.6.1.tgz"; - sha512 = "DzjSz3H5qDntD7s1TcWCSoRPmNR8UmA+y+xZQOvWgjATe2Br9ZW73+vD3Pj6Snrg0RuEuJdXgrKvnYuiuixRkA=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz"; + sha512 = "jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA=="; }; }; "saxes-5.0.1" = { @@ -3559,13 +3595,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.5.6" = { + "ws-7.5.7" = { name = "ws"; packageName = "ws"; - version = "7.5.6"; + version = "7.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz"; - sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"; + sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; }; }; "xml-name-validator-3.0.0" = { @@ -3662,8 +3698,8 @@ let args = { name = "mjolnir"; packageName = "mjolnir"; - version = "1.3.1"; - src = ../../../../../../../nix/store/k1myvl4f3yvjk9jw4d1b1k1rc8rlwcy2-source; + version = "1.3.2"; + src = ../../../../../../../nix/store/yikp7bs3z15vp8rpaghdqc9kpngsfvyj-source; dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.16.7" @@ -3693,14 +3729,16 @@ let ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@jest/types-27.4.2" + sources."@jest/types-27.5.1" sources."@selderee/plugin-htmlparser2-0.6.0" sources."@tootallnate/once-1.1.2" sources."@types/body-parser-1.19.2" + sources."@types/config-0.0.41" sources."@types/connect-3.4.35" - sources."@types/crypto-js-4.1.0" + sources."@types/crypto-js-4.1.1" sources."@types/express-4.17.13" sources."@types/express-serve-static-core-4.17.28" + sources."@types/html-to-text-8.0.1" sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" @@ -3708,7 +3746,7 @@ let sources."@types/json5-0.0.29" sources."@types/mime-1.3.2" sources."@types/mocha-9.1.0" - sources."@types/node-16.11.22" + sources."@types/node-16.11.25" sources."@types/parse5-6.0.3" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -3719,7 +3757,7 @@ let sources."@types/yargs-parser-20.2.1" sources."@ungap/promise-all-settled-1.1.2" sources."abab-2.0.5" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ @@ -3757,14 +3795,14 @@ let sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" sources."bluebird-3.7.2" - sources."body-parser-1.19.1" + sources."body-parser-1.19.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" sources."browser-stdout-1.3.1" sources."buffer-from-1.1.2" sources."builtin-modules-1.1.1" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."callsites-3.1.0" sources."camelcase-6.3.0" sources."caseless-0.12.0" @@ -3780,7 +3818,7 @@ let sources."config-3.3.7" sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" @@ -3802,7 +3840,7 @@ let sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff-sequences-27.4.0" + sources."diff-sequences-27.5.1" sources."discontinuous-range-1.0.0" sources."doctrine-3.0.0" sources."dom-serializer-1.3.2" @@ -3866,8 +3904,8 @@ let sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" - sources."expect-27.4.6" - sources."express-4.17.2" + sources."expect-27.5.1" + sources."express-4.17.3" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -3893,7 +3931,7 @@ let sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."graceful-fs-4.2.9" sources."growl-1.10.5" sources."har-schema-2.0.0" @@ -3941,10 +3979,10 @@ let sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."jest-diff-27.4.6" - sources."jest-get-type-27.4.0" - sources."jest-matcher-utils-27.4.6" - (sources."jest-message-util-27.4.6" // { + sources."jest-diff-27.5.1" + sources."jest-get-type-27.5.1" + sources."jest-matcher-utils-27.5.1" + (sources."jest-message-util-27.5.1" // { dependencies = [ sources."@babel/code-frame-7.16.7" ]; @@ -3983,17 +4021,19 @@ let sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - (sources."mocha-9.2.0" // { + (sources."mocha-9.2.1" // { dependencies = [ (sources."debug-4.3.3" // { dependencies = [ sources."ms-2.1.2" ]; }) + sources."minimatch-3.0.4" sources."ms-2.1.3" + sources."nanoid-3.2.0" sources."supports-color-8.1.1" ]; }) @@ -4004,10 +4044,10 @@ let ]; }) sources."ms-2.0.0" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."natural-compare-1.4.0" sources."nearley-2.20.1" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -4033,7 +4073,7 @@ let sources."pify-3.0.0" sources."postcss-8.4.6" sources."prelude-ls-1.1.2" - (sources."pretty-format-27.4.6" // { + (sources."pretty-format-27.5.1" // { dependencies = [ sources."ansi-styles-5.2.0" ]; @@ -4043,12 +4083,12 @@ let sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."react-is-17.0.2" sources."readdirp-3.6.0" sources."regexpp-3.2.0" @@ -4073,7 +4113,7 @@ let sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sanitize-html-2.6.1" + sources."sanitize-html-2.7.0" sources."saxes-5.0.1" sources."selderee-0.6.0" sources."semver-7.3.5" @@ -4112,7 +4152,7 @@ let sources."symbol-tree-3.2.4" (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -4177,7 +4217,7 @@ let sources."workerpool-6.2.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 425dcdfa56c..bc669bbf502 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.4.2"; + version = "8.4.3"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-ZRVX7nqBsjTODRtfdL4l/azC3ZH2WJCBOXjldkNvweE="; + sha256 = "sha256-+d4pcuNLbM2PY1rFpnIjoakpr63kMqI/SjpTRZecRXw="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-4k+6KMoSzoEffPFl/y2paheeY1F35jRPsHtH05Zxr/Y="; + sha256 = "sha256-l3GPSUci812KbHKMXHtS4OlvYyuKlBOeQCLtLvvkhzI="; }; vendorSha256 = "sha256-RugV5cHlpR739CA1C/7FkXasvkv18m7pPsK6mxfSkC0="; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index de64666ec77..96604042838 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "sha256-tUmRWXdPu3nGj+dUBNvF7cRayMn8vCyA94vyUmQrfRk="; + sha256 = "sha256-ytnaygAVKppyyUnxfMlwf9GvHzt8SN5I+b2FTcyaM/4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix new file mode 100644 index 00000000000..98848ee6702 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix @@ -0,0 +1,58 @@ +{ poetry2nix, pkgs, lib }: + +let + inherit (poetry2nix.mkPoetryPackages { + projectDir = ./.; + overrides = [ + poetry2nix.defaultPoetryOverrides + (import ./poetry-git-overlay.nix { inherit pkgs; }) + (self: super: { + dmarc-metrics-exporter = super.dmarc-metrics-exporter.overridePythonAttrs ({ meta ? {}, ... }: { + meta = with lib; meta // { + license = licenses.mit; + homepage = "https://github.com/jgosmann/dmarc-metrics-exporter/"; + description = " Export Prometheus metrics from DMARC reports"; + maintainers = with maintainers; [ ma27 ]; + }; + }); + more-properties = super.more-properties.overridePythonAttrs (old: { + src = pkgs.fetchFromGitHub { + owner = "madman-bob"; + repo = "python-more-properties"; + rev = old.version; + sha256 = "sha256-dKG97rw5IG19m7u3ZDBM2yGScL5cFaKBvGZxPVJaUTE="; + }; + postPatch = '' + sed -i -e '/dataclasses/d' requirements.txt + cp ./pypi_upload/setup.py setup.py + substituteInPlace setup.py \ + --replace "parents[1]" "parents[0]" + ''; + }); + dataclasses-serialization = super.dataclasses-serialization.overridePythonAttrs (old: { + src = pkgs.fetchFromGitHub { + owner = "madman-bob"; + repo = "python-dataclasses-serialization"; + rev = old.version; + sha256 = "sha256-jLMR2D01KgzHHRP0zduMBJt8xgBmIquWLCjZYLo2/AA="; + }; + postPatch = '' + sed -i -e '/dataclasses/d' requirements.txt + cp ./pypi_upload/setup.py setup.py + substituteInPlace setup.py \ + --replace "parents[1]" "parents[0]" + ''; + }); + dataclasses = null; + }) + ]; + }) python; + env = python.withPackages (p: [ p.dmarc-metrics-exporter ]); +in + +(pkgs.writeShellScriptBin "prometheus-dmarc-exporter" '' + export PYTHONPATH="${env}/lib/${env.libPrefix}/site-packages''${PYTHONPATH:+:}''${PYTHONPATH}" + exec ${env}/bin/python3 -m dmarc_metrics_exporter "$@" +'') // { + inherit (python.pkgs.dmarc-metrics-exporter) meta; +} diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry-git-overlay.nix b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry-git-overlay.nix new file mode 100644 index 00000000000..cb8d7170a19 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry-git-overlay.nix @@ -0,0 +1,14 @@ +{ pkgs }: +self: super: { + + dmarc-metrics-exporter = super.dmarc-metrics-exporter.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/jgosmann/dmarc-metrics-exporter.git"; + rev = "3f1a0161d7ed51b9de48c056dcbc545b6375e872"; + sha256 = "18sndv32ig0xq7s42hvkdxbb9qxvycmnrawm3x22cp7zfidgfkh2"; + }; + } + ); + +} diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry.lock b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry.lock new file mode 100644 index 00000000000..80b99127b0c --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry.lock @@ -0,0 +1,503 @@ +[[package]] +name = "asgiref" +version = "3.5.0" +description = "ASGI specs, helper code, and adapters" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + +[package.extras] +tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] + +[[package]] +name = "bite-parser" +version = "0.1.1" +description = "Asynchronous parser taking incremental bites out of your byte input stream." +category = "main" +optional = false +python-versions = ">=3.7,<=3.10" + +[[package]] +name = "click" +version = "8.0.4" +description = "Composable command line interface toolkit" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} + +[[package]] +name = "colorama" +version = "0.4.4" +description = "Cross-platform colored terminal text." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "dataclasses" +version = "0.6" +description = "A backport of the dataclasses module for Python 3.6" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "dataclasses-serialization" +version = "1.3.1" +description = "Serialize/deserialize Python dataclasses to various other data formats" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +dataclasses = "*" +more-properties = ">=1.1.0" +toolz = "*" +toposort = "*" +typing-inspect = "*" + +[[package]] +name = "dmarc-metrics-exporter" +version = "0.5.1" +description = "Export Prometheus metrics from DMARC reports." +category = "main" +optional = false +python-versions = "^3.7,<3.10" +develop = false + +[package.dependencies] +bite-parser = "^0.1.1" +dataclasses-serialization = "^1.3.1" +prometheus_client = "^0.11.0" +typing-extensions = "^4.0.1" +uvicorn = {version = "^0.15.0", extras = ["standard"]} +xsdata = "^21.9" + +[package.source] +type = "git" +url = "https://github.com/jgosmann/dmarc-metrics-exporter.git" +reference = "v0.5.1" +resolved_reference = "3f1a0161d7ed51b9de48c056dcbc545b6375e872" + +[[package]] +name = "h11" +version = "0.13.0" +description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + +[[package]] +name = "httptools" +version = "0.2.0" +description = "A collection of framework independent HTTP protocol utils." +category = "main" +optional = false +python-versions = "*" + +[package.extras] +test = ["Cython (==0.29.22)"] + +[[package]] +name = "importlib-metadata" +version = "4.11.1" +description = "Read metadata from Python packages" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} +zipp = ">=0.5" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +perf = ["ipython"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)", "importlib-resources (>=1.3)"] + +[[package]] +name = "more-properties" +version = "1.1.1" +description = "A collection of property variants" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +dataclasses = "*" + +[[package]] +name = "mypy-extensions" +version = "0.4.3" +description = "Experimental type system extensions for programs checked with the mypy typechecker." +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "prometheus-client" +version = "0.11.0" +description = "Python client for the Prometheus monitoring system." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.extras] +twisted = ["twisted"] + +[[package]] +name = "python-dotenv" +version = "0.19.2" +description = "Read key-value pairs from a .env file and set them as environment variables" +category = "main" +optional = false +python-versions = ">=3.5" + +[package.extras] +cli = ["click (>=5.0)"] + +[[package]] +name = "pyyaml" +version = "6.0" +description = "YAML parser and emitter for Python" +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "toolz" +version = "0.11.2" +description = "List processing tools and functional utilities" +category = "main" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "toposort" +version = "1.7" +description = "\"Implements a topological sort algorithm.\"" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "typing-extensions" +version = "4.1.1" +description = "Backported and Experimental Type Hints for Python 3.6+" +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "typing-inspect" +version = "0.7.1" +description = "Runtime inspection utilities for typing module." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +mypy-extensions = ">=0.3.0" +typing-extensions = ">=3.7.4" + +[[package]] +name = "uvicorn" +version = "0.15.0" +description = "The lightning-fast ASGI server." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +asgiref = ">=3.4.0" +click = ">=7.0" +colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} +h11 = ">=0.8" +httptools = {version = ">=0.2.0,<0.3.0", optional = true, markers = "extra == \"standard\""} +python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} +PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} +websockets = {version = ">=9.1", optional = true, markers = "extra == \"standard\""} + +[package.extras] +standard = ["websockets (>=9.1)", "httptools (>=0.2.0,<0.3.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] + +[[package]] +name = "uvloop" +version = "0.16.0" +description = "Fast implementation of asyncio event loop on top of libuv" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +dev = ["Cython (>=0.29.24,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)", "aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] +docs = ["Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)"] +test = ["aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] + +[[package]] +name = "watchgod" +version = "0.7" +description = "Simple, modern file watching and code reload in python." +category = "main" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "websockets" +version = "10.2" +description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" +category = "main" +optional = false +python-versions = ">=3.7" + +[[package]] +name = "xsdata" +version = "21.12" +description = "Python XML Binding" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} + +[package.extras] +cli = ["click (>=5.0)", "click-default-group (>=1.2)", "docformatter", "jinja2 (>=2.10)", "toposort (>=1.5)"] +docs = ["furo", "sphinx", "sphinx-autobuild", "sphinx-autodoc-typehints", "sphinx-copybutton", "sphinx-inline-tabs"] +lxml = ["lxml (>=4.4.1)"] +soap = ["requests"] +test = ["codecov", "pre-commit", "pytest", "pytest-benchmark", "pytest-cov", "tox"] + +[[package]] +name = "zipp" +version = "3.7.0" +description = "Backport of pathlib-compatible object wrapper for zip files" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] + +[metadata] +lock-version = "1.1" +python-versions = "^3.7,<3.10" +content-hash = "60bf34673c42fc90f369a810cb542b1b03c8e52cd019e7a9e86650de19544d01" + +[metadata.files] +asgiref = [ + {file = "asgiref-3.5.0-py3-none-any.whl", hash = "sha256:88d59c13d634dcffe0510be048210188edd79aeccb6a6c9028cdad6f31d730a9"}, + {file = "asgiref-3.5.0.tar.gz", hash = "sha256:2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0"}, +] +bite-parser = [ + {file = "bite-parser-0.1.1.tar.gz", hash = "sha256:8021100bfbd6cc6056605361e763a3591efdea38014b3d8aa76c74c74de4ead4"}, + {file = "bite_parser-0.1.1-py3-none-any.whl", hash = "sha256:96803e7d63112e81544c9747fbd50cca61097dcf5973ae6cc710f3a96646600a"}, +] +click = [ + {file = "click-8.0.4-py3-none-any.whl", hash = "sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1"}, + {file = "click-8.0.4.tar.gz", hash = "sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb"}, +] +colorama = [ + {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, + {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, +] +dataclasses = [ + {file = "dataclasses-0.6-py3-none-any.whl", hash = "sha256:454a69d788c7fda44efd71e259be79577822f5e3f53f029a22d08004e951dc9f"}, + {file = "dataclasses-0.6.tar.gz", hash = "sha256:6988bd2b895eef432d562370bb707d540f32f7360ab13da45340101bc2307d84"}, +] +dataclasses-serialization = [ + {file = "dataclasses_serialization-1.3.1-py3-none-any.whl", hash = "sha256:34294b1a68944c8d8ac00d2a53aecb8499301401aec6d024ba829ac3931e3b2a"}, + {file = "dataclasses_serialization-1.3.1.tar.gz", hash = "sha256:7f9cf6b11e0650ab89691b1a0050dcce3aef4d389dd4540a53316c4151485921"}, +] +dmarc-metrics-exporter = [] +h11 = [ + {file = "h11-0.13.0-py3-none-any.whl", hash = "sha256:8ddd78563b633ca55346c8cd41ec0af27d3c79931828beffb46ce70a379e7442"}, + {file = "h11-0.13.0.tar.gz", hash = "sha256:70813c1135087a248a4d38cc0e1a0181ffab2188141a93eaf567940c3957ff06"}, +] +httptools = [ + {file = "httptools-0.2.0-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:79dbc21f3612a78b28384e989b21872e2e3cf3968532601544696e4ed0007ce5"}, + {file = "httptools-0.2.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:78d03dd39b09c99ec917d50189e6743adbfd18c15d5944392d2eabda688bf149"}, + {file = "httptools-0.2.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:a23166e5ae2775709cf4f7ad4c2048755ebfb272767d244e1a96d55ac775cca7"}, + {file = "httptools-0.2.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:3ab1f390d8867f74b3b5ee2a7ecc9b8d7f53750bd45714bf1cb72a953d7dfa77"}, + {file = "httptools-0.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a7594f9a010cdf1e16a58b3bf26c9da39bbf663e3b8d46d39176999d71816658"}, + {file = "httptools-0.2.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:01b392a166adcc8bc2f526a939a8aabf89fe079243e1543fd0e7dc1b58d737cb"}, + {file = "httptools-0.2.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:80ffa04fe8c8dfacf6e4cef8277347d35b0442c581f5814f3b0cf41b65c43c6e"}, + {file = "httptools-0.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d5682eeb10cca0606c4a8286a3391d4c3c5a36f0c448e71b8bd05be4e1694bfb"}, + {file = "httptools-0.2.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:a289c27ccae399a70eacf32df9a44059ca2ba4ac444604b00a19a6c1f0809943"}, + {file = "httptools-0.2.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:813871f961edea6cb2fe312f2d9b27d12a51ba92545380126f80d0de1917ea15"}, + {file = "httptools-0.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:cc9be041e428c10f8b6ab358c6b393648f9457094e1dcc11b4906026d43cd380"}, + {file = "httptools-0.2.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:b08d00d889a118f68f37f3c43e359aab24ee29eb2e3fe96d64c6a2ba8b9d6557"}, + {file = "httptools-0.2.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fd3b8905e21431ad306eeaf56644a68fdd621bf8f3097eff54d0f6bdf7262065"}, + {file = "httptools-0.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:200fc1cdf733a9ff554c0bb97a4047785cfaad9875307d6087001db3eb2b417f"}, + {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, +] +importlib-metadata = [ + {file = "importlib_metadata-4.11.1-py3-none-any.whl", hash = "sha256:e0bc84ff355328a4adfc5240c4f211e0ab386f80aa640d1b11f0618a1d282094"}, + {file = "importlib_metadata-4.11.1.tar.gz", hash = "sha256:175f4ee440a0317f6e8d81b7f8d4869f93316170a65ad2b007d2929186c8052c"}, +] +more-properties = [ + {file = "more_properties-1.1.1-py3-none-any.whl", hash = "sha256:0992c49041cb2600e5ff4d8414bdf5761551f5404d00a4e553ced4f14d34b0bb"}, + {file = "more_properties-1.1.1.tar.gz", hash = "sha256:47b136857d89c72b53def0fade2f2e0a23a95071c3eb87d5a77cfc91554f106c"}, +] +mypy-extensions = [ + {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, + {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, +] +prometheus-client = [ + {file = "prometheus_client-0.11.0-py2.py3-none-any.whl", hash = "sha256:b014bc76815eb1399da8ce5fc84b7717a3e63652b0c0f8804092c9363acab1b2"}, + {file = "prometheus_client-0.11.0.tar.gz", hash = "sha256:3a8baade6cb80bcfe43297e33e7623f3118d660d41387593758e2fb1ea173a86"}, +] +python-dotenv = [ + {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"}, + {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"}, +] +pyyaml = [ + {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, + {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, + {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, + {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, + {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, + {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, + {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, + {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, + {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, + {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, + {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, + {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, + {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, + {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, + {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, +] +toolz = [ + {file = "toolz-0.11.2-py3-none-any.whl", hash = "sha256:a5700ce83414c64514d82d60bcda8aabfde092d1c1a8663f9200c07fdcc6da8f"}, + {file = "toolz-0.11.2.tar.gz", hash = "sha256:6b312d5e15138552f1bda8a4e66c30e236c831b612b2bf0005f8a1df10a4bc33"}, +] +toposort = [ + {file = "toposort-1.7-py2.py3-none-any.whl", hash = "sha256:8ed8e109e96ae30bf66da2d2155e4eb9989d9c5c743c837e37d9774a4eddd804"}, + {file = "toposort-1.7.tar.gz", hash = "sha256:ddc2182c42912a440511bd7ff5d3e6a1cabc3accbc674a3258c8c41cbfbb2125"}, +] +typing-extensions = [ + {file = "typing_extensions-4.1.1-py3-none-any.whl", hash = "sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2"}, + {file = "typing_extensions-4.1.1.tar.gz", hash = "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42"}, +] +typing-inspect = [ + {file = "typing_inspect-0.7.1-py2-none-any.whl", hash = "sha256:b1f56c0783ef0f25fb064a01be6e5407e54cf4a4bf4f3ba3fe51e0bd6dcea9e5"}, + {file = "typing_inspect-0.7.1-py3-none-any.whl", hash = "sha256:3cd7d4563e997719a710a3bfe7ffb544c6b72069b6812a02e9b414a8fa3aaa6b"}, + {file = "typing_inspect-0.7.1.tar.gz", hash = "sha256:047d4097d9b17f46531bf6f014356111a1b6fb821a24fe7ac909853ca2a782aa"}, +] +uvicorn = [ + {file = "uvicorn-0.15.0-py3-none-any.whl", hash = "sha256:17f898c64c71a2640514d4089da2689e5db1ce5d4086c2d53699bf99513421c1"}, + {file = "uvicorn-0.15.0.tar.gz", hash = "sha256:d9a3c0dd1ca86728d3e235182683b4cf94cd53a867c288eaeca80ee781b2caff"}, +] +uvloop = [ + {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:6224f1401025b748ffecb7a6e2652b17768f30b1a6a3f7b44660e5b5b690b12d"}, + {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:30ba9dcbd0965f5c812b7c2112a1ddf60cf904c1c160f398e7eed3a6b82dcd9c"}, + {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bd53f7f5db562f37cd64a3af5012df8cac2c464c97e732ed556800129505bd64"}, + {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:772206116b9b57cd625c8a88f2413df2fcfd0b496eb188b82a43bed7af2c2ec9"}, + {file = "uvloop-0.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b572256409f194521a9895aef274cea88731d14732343da3ecdb175228881638"}, + {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04ff57aa137230d8cc968f03481176041ae789308b4d5079118331ab01112450"}, + {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a19828c4f15687675ea912cc28bbcb48e9bb907c801873bd1519b96b04fb805"}, + {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e814ac2c6f9daf4c36eb8e85266859f42174a4ff0d71b99405ed559257750382"}, + {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bd8f42ea1ea8f4e84d265769089964ddda95eb2bb38b5cbe26712b0616c3edee"}, + {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:647e481940379eebd314c00440314c81ea547aa636056f554d491e40503c8464"}, + {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0d26fa5875d43ddbb0d9d79a447d2ace4180d9e3239788208527c4784f7cab"}, + {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6ccd57ae8db17d677e9e06192e9c9ec4bd2066b77790f9aa7dede2cc4008ee8f"}, + {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:089b4834fd299d82d83a25e3335372f12117a7d38525217c2258e9b9f4578897"}, + {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98d117332cc9e5ea8dfdc2b28b0a23f60370d02e1395f88f40d1effd2cb86c4f"}, + {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e5f2e2ff51aefe6c19ee98af12b4ae61f5be456cd24396953244a30880ad861"}, + {file = "uvloop-0.16.0.tar.gz", hash = "sha256:f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"}, +] +watchgod = [ + {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, + {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, +] +websockets = [ + {file = "websockets-10.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d5396710f86a306cf52f87fd8ea594a0e894ba0cc5a36059eaca3a477dc332aa"}, + {file = "websockets-10.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b22bdc795e62e71118b63e14a08bacfa4f262fd2877de7e5b950f5ac16b0348f"}, + {file = "websockets-10.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5b04270b5613f245ec84bb2c6a482a9d009aefad37c0575f6cda8499125d5d5c"}, + {file = "websockets-10.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5c335dc0e7dc271ef36df3f439868b3c790775f345338c2f61a562f1074187b"}, + {file = "websockets-10.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6a009eb551c46fd79737791c0c833fc0e5b56bcd1c3057498b262d660b92e9cd"}, + {file = "websockets-10.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a10c0c1ee02164246f90053273a42d72a3b2452a7e7486fdae781138cf7fbe2d"}, + {file = "websockets-10.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7b38a5c9112e3dbbe45540f7b60c5204f49b3cb501b40950d6ab34cd202ab1d0"}, + {file = "websockets-10.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:2aa9b91347ecd0412683f28aabe27f6bad502d89bd363b76e0a3508b1596402e"}, + {file = "websockets-10.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b7fe45ae43ac814beb8ca09d6995b56800676f2cfa8e23f42839dc69bba34a42"}, + {file = "websockets-10.2-cp310-cp310-win32.whl", hash = "sha256:cef40a1b183dcf39d23b392e9dd1d9b07ab9c46aadf294fff1350fb79146e72b"}, + {file = "websockets-10.2-cp310-cp310-win_amd64.whl", hash = "sha256:c21a67ab9a94bd53e10bba21912556027fea944648a09e6508415ad14e37c325"}, + {file = "websockets-10.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cb316b87cbe3c0791c2ad92a5a36bf6adc87c457654335810b25048c1daa6fd5"}, + {file = "websockets-10.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f14bd10e170abc01682a9f8b28b16e6f20acf6175945ef38db6ffe31b0c72c3f"}, + {file = "websockets-10.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:fa35c5d1830d0fb7b810324e9eeab9aa92e8f273f11fdbdc0741dcded6d72b9f"}, + {file = "websockets-10.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:71a4491cfe7a9f18ee57d41163cb6a8a3fa591e0f0564ca8b0ed86b2a30cced4"}, + {file = "websockets-10.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:6193bbc1ee63aadeb9a4d81de0e19477401d150d506aee772d8380943f118186"}, + {file = "websockets-10.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8beac786a388bb99a66c3be4ab0fb38273c0e3bc17f612a4e0a47c4fc8b9c045"}, + {file = "websockets-10.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c67d9cacb3f6537ca21e9b224d4fd08481538e43bcac08b3d93181b0816def39"}, + {file = "websockets-10.2-cp37-cp37m-win32.whl", hash = "sha256:a03a25d95cc7400bd4d61a63460b5d85a7761c12075ee2f51de1ffe73aa593d3"}, + {file = "websockets-10.2-cp37-cp37m-win_amd64.whl", hash = "sha256:f8296b8408ec6853b26771599990721a26403e62b9de7e50ac0a056772ac0b5e"}, + {file = "websockets-10.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:7bb9d8a6beca478c7e9bdde0159bd810cc1006ad6a7cb460533bae39da692ca2"}, + {file = "websockets-10.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:05f6e9757017270e7a92a2975e2ae88a9a582ffc4629086fd6039aa80e99cd86"}, + {file = "websockets-10.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1c9031e90ebfc486e9cdad532b94004ade3aa39a31d3c46c105bb0b579cd2490"}, + {file = "websockets-10.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82bc33db6d8309dc27a3bee11f7da2288ad925fcbabc2a4bb78f7e9c56249baf"}, + {file = "websockets-10.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:24b879ba7db12bb525d4e58089fcbe6a3df3ce4666523183654170e86d372cbe"}, + {file = "websockets-10.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cf931c33db9c87c53d009856045dd524e4a378445693382a920fa1e0eb77c36c"}, + {file = "websockets-10.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:669e54228a4d9457abafed27cbf0e2b9f401445c4dfefc12bf8e4db9751703b8"}, + {file = "websockets-10.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:bffc65442dd35c473ca9790a3fa3ba06396102a950794f536783f4b8060af8dd"}, + {file = "websockets-10.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d4d110a84b63c5cfdd22485acc97b8b919aefeecd6300c0c9d551e055b9a88ea"}, + {file = "websockets-10.2-cp38-cp38-win32.whl", hash = "sha256:117383d0a17a0dda349f7a8790763dde75c1508ff8e4d6e8328b898b7df48397"}, + {file = "websockets-10.2-cp38-cp38-win_amd64.whl", hash = "sha256:0b66421f9f13d4df60cd48ab977ed2c2b6c9147ae1a33caf5a9f46294422fda1"}, + {file = "websockets-10.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:ac081aa0307f263d63c5ff0727935c736c8dad51ddf2dc9f5d0c4759842aefaa"}, + {file = "websockets-10.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b4059e2ccbe6587b6dc9a01db5fc49ead9a884faa4076eea96c5ec62cb32f42a"}, + {file = "websockets-10.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9ca2ca05a4c29179f06cf6727b45dba5d228da62623ec9df4184413d8aae6cb9"}, + {file = "websockets-10.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97950c7c844ec6f8d292440953ae18b99e3a6a09885e09d20d5e7ecd9b914cf8"}, + {file = "websockets-10.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:98f57b3120f8331cd7440dbe0e776474f5e3632fdaa474af1f6b754955a47d71"}, + {file = "websockets-10.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a72b92f96e5e540d5dda99ee3346e199ade8df63152fa3c737260da1730c411f"}, + {file = "websockets-10.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:038afef2a05893578d10dadbdbb5f112bd115c46347e1efe99f6a356ff062138"}, + {file = "websockets-10.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f09f46b1ff6d09b01c7816c50bd1903cf7d02ebbdb63726132717c2fcda835d5"}, + {file = "websockets-10.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2349fa81b6b959484bb2bda556ccb9eb70ba68987646a0f8a537a1a18319fb03"}, + {file = "websockets-10.2-cp39-cp39-win32.whl", hash = "sha256:bef03a51f9657fb03d8da6ccd233fe96e04101a852f0ffd35f5b725b28221ff3"}, + {file = "websockets-10.2-cp39-cp39-win_amd64.whl", hash = "sha256:1c1f3b18c8162e3b09761d0c6a0305fd642934202541cc511ef972cb9463261e"}, + {file = "websockets-10.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5a38a0175ae82e4a8c4bac29fc01b9ee26d7d5a614e5ee11e7813c68a7d938ce"}, + {file = "websockets-10.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c6e56606842bb24e16e36ae7eb308d866b4249cf0be8f63b212f287eeb76b124"}, + {file = "websockets-10.2-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0f73cb2526d6da268e86977b2c4b58f2195994e53070fe567d5487c6436047e6"}, + {file = "websockets-10.2-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0cd02f36d37e503aca88ab23cc0a1a0e92a263d37acf6331521eb38040dcf77b"}, + {file = "websockets-10.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:56d48eebe9e39ce0d68701bce3b21df923aa05dcc00f9fd8300de1df31a7c07c"}, + {file = "websockets-10.2.tar.gz", hash = "sha256:8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098"}, +] +xsdata = [ + {file = "xsdata-21.12-py3-none-any.whl", hash = "sha256:857ef5d1c1fdee09f7f1a0a0e8f2771c0469dcc60b28f9b2a7b2a0d2aba3a58f"}, + {file = "xsdata-21.12.tar.gz", hash = "sha256:baba44a2909fc928f783b0cdde4e1a96d5c632414588b9934aa8adf5f60002e8"}, +] +zipp = [ + {file = "zipp-3.7.0-py3-none-any.whl", hash = "sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375"}, + {file = "zipp-3.7.0.tar.gz", hash = "sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"}, +] diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/pyproject.toml b/pkgs/servers/monitoring/prometheus/dmarc-exporter/pyproject.toml new file mode 100644 index 00000000000..f3b95e154ee --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/pyproject.toml @@ -0,0 +1,14 @@ +[tool.poetry] +name = "dmarc-metrics-exporter-env" +version = "0.5.1" +description = "" +authors = [] + +[tool.poetry.dependencies] +python = "^3.7,<3.10" +dmarc-metrics-exporter = {git="https://github.com/jgosmann/dmarc-metrics-exporter.git", tag = "v0.5.1"} +bite-parser = "0.1.1" + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/update b/pkgs/servers/monitoring/prometheus/dmarc-exporter/update new file mode 100755 index 00000000000..77cfe9ff86d --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/update @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p poetry poetry2nix.cli +set -eu +poetry lock +poetry2nix lock diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 38976521c0f..1c24c065ed7 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -2,23 +2,28 @@ buildGoModule rec { pname = "gitlab-ci-pipelines-exporter"; - version = "0.4.9"; + version = "0.5.3"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; rev = "v${version}"; - sha256 = "13zs8140n4z56i0xkl6jvvmwy80l07dxyb23wxzd5avbdm8knypz"; + sha256 = "1i0ry93w2pk8m7i4fbdn1xvsmvjn83d6lr6l7yywid9d0kmkjz13"; }; - vendorSha256 = "1k620r3d1swhj7cfmqjh5n08da2a6w87fwrsajl0y324iyw2chsa"; + subPackages = [ "cmd/${pname}" ]; + ldflags = [ + "-X main.version=v${version}" + ]; + + vendorSha256 = "UszZaxql5sO4DSDVD/UIjeeDojCQEPF+ATL7O9MaTG8="; doCheck = true; meta = with lib; { description = "Prometheus / OpenMetrics exporter for GitLab CI pipelines insights"; homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter"; license = licenses.asl20; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut mvisonneau ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix new file mode 100644 index 00000000000..707c121cc50 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -0,0 +1,37 @@ +{ lib +, python3 +, nixosTests +}: + +python3.pkgs.buildPythonApplication rec { + pname = "prometheus-pve-exporter"; + version = "2.2.2"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "0vvsiw8nj8zkx6v42f260xbsdd92l0ac4vwpm7w38j3qwvanar7k"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + prometheus-client + proxmoxer + pyyaml + requests + werkzeug + ]; + + doCheck = false; + + pythonImportsCheck = [ "pve_exporter" ]; + + passthru.tests = { + inherit (nixosTests.prometheus-exporters) pve; + }; + + meta = with lib; { + description = "Exposes information gathered from Proxmox VE cluster for use by the Prometheus monitoring system"; + homepage = "https://github.com/prometheus-pve/prometheus-pve-exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ nukaduka ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 32c26a395e7..4b60c5a28d0 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.35.1"; + version = "1.36.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-S89Okd57QyMHb/QYUQbib2HLdH9qo0duNxcdaP8wKUg="; + sha256 = "sha256-n+LvWl0KMAay90GQg42ODcvxX9QbvQ1Ixo4PfJYEAWA="; }; vendorSha256 = "sha256-u9FfKOD6kiCFTjwQ7LHE9WC4j2vPm0ZCluL8pC4aQIc="; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 27eb3721c95..8f9e5884ae7 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus_varnish_exporter"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; rev = version; - sha256 = "1cp7c1w237r271m8b1y8pj5jy7j2iadp4vbislxfyp4kga9i4dcc"; + sha256 = "15w2ijz621caink2imlp1666j0ih5pmlj62cbzggyb34ncl37ifn"; }; - vendorSha256 = "1cslg29l9mmyhpdz14ca9m18iaz4hhznplz8fmi3wa3l8r7ih751"; + vendorSha256 = "00i9znb1pk5jpmyhxfg9zbw935fk3c1r0qrgf868xlcf9p8x2rrz"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 735bfdeafb1..d9a4465a10a 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -33,23 +33,18 @@ let }; }; in { - nextcloud20 = throw '' - Nextcloud v20 has been removed from `nixpkgs` as the support for it was dropped - by upstream in 2021-10. Please upgrade to at least Nextcloud v21 by declaring + nextcloud21 = throw '' + Nextcloud v21 has been removed from `nixpkgs` as the support for it was dropped + by upstream in 2022-02. Please upgrade to at least Nextcloud v22 by declaring - services.nextcloud.package = pkgs.nextcloud21; + services.nextcloud.package = pkgs.nextcloud22; in your NixOS config. - WARNING: if you were on Nextcloud 19 on NixOS 21.05 you have to upgrade to Nextcloud 20 - first on 21.05 because Nextcloud doesn't support upgrades accross multiple major versions! + WARNING: if you were on Nextcloud 20 on NixOS 21.11 you have to upgrade to Nextcloud 21 + first on 21.11 because Nextcloud doesn't support upgrades accross multiple major versions! ''; - nextcloud21 = generic { - version = "21.0.9"; - sha256 = "sha256-p6bvgTXmmjGN3TRQpG88f3YPksh0QzWG9j9KnEjcrqE="; - }; - nextcloud22 = generic { version = "22.2.5"; sha256 = "sha256-gb5N0u5tu4/nI2xIpjXwm2hiSDCrBhIDyN6gKGOsdS8="; diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 769c45ffc6c..035d906b2bd 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -43,10 +43,6 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - mkdir home - export HOME=$PWD/home - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 export FrameworkPathOverride=${mono}/lib/mono/4.7.1-api # disable default-source so nuget does not try to download from online-repo diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index 7cf9442f13b..8885179de4d 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "piping-server-rust"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "nwtgck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eDO2y/4660IAcD9vf1Vt6t3nv3Rc+zCRRFBbW/FeKIw="; + sha256 = "sha256-L15ofIM5a/qoJHGXmkuTsmQLLmERG/PxAJ4+z1nn7w4="; }; - cargoSha256 = "sha256-U68R543l28osPe0DjuERqB/G6ur/BZDpWMZIO9RObaM="; + cargoSha256 = "sha256-CcIM7T7P4LbPxPK1ZqoJRP0IsLMEwMZg9DcuRu0aJHM="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix index 82bbe7b3a7b..1f0395d2fb2 100644 --- a/pkgs/servers/pufferpanel/default.nix +++ b/pkgs/servers/pufferpanel/default.nix @@ -55,5 +55,6 @@ buildGoModule rec { homepage = "https://www.pufferpanel.com/"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ ckie ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pufferpanel.x86_64-darwin }; } diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index fe301637997..75e20ecef05 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -9,14 +9,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-2DZUQ11sAsIbI3hkU+6Hj+xHz3EbsTelisUCOlRBvvQ="; - arm64-linux_hash = "sha256-j5gUC50NfvF2/W/aYgCiMoW1jF9F30L7pnVaFfX1Fwk="; - x64-osx_hash = "sha256-iOaOzisG54+nstPNNUXOYwhEaM1Uh4wHPISVtEf8vTQ="; + x64-linux_hash = "sha256-4jzQ/bax323r4OzWwr9vq+6x0GasBZhRT+i6bDS/RMs="; + arm64-linux_hash = "sha256-IOFKlqey9biL8wCpbIxMnZZ5Svvrh6KMkNoZ7GBht3M="; + x64-osx_hash = "sha256-tdyEYY6qXNKjMPW652gtPAhTm/aNyTe+CgZ5aA9k2EM="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "4.0.4.5922"; + version = "4.0.5.5981"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index cb2c68d6c2d..2e5bd017216 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "0a2iwpmljkha6qlbw0373wph7pxz05qym5712vzbszw0z42f82l2"; + sha256 = "sha256-GKn8JRgYXLkm5gX5Tv6lMdS7oFan2TF7dLqWK+nEeYg="; }; - cargoSha256 = "0l3fhwgrdvjrlmiqdy90sfd8kb2s7y0lbfswlrr560ly0bi1lfbx"; + cargoSha256 = "sha256-r3Np9aAJRZUj0TezZhT5cJJkm8EBjV9yQpplcrNgzmU="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 2dc2d76c891..764c61356f3 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -24,14 +24,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.5.1"; + version = "3.5.2"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-/HakjY0/oGq3lt0kM5p9n3sZ4g/UDtUNyXNpl9zTFl8="; + sha256 = "sha256-dGmZxnrxuUj6HwFI5QkSy9FnGYQpsNPFbUKXoJWpDfM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index bed8da0488b..ebe79b92776 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.26"; + version = "0.25.28"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "153zd0yq39vmh00ydw42yw8dx18cy3as36xml228hq244cxypkwp"; + sha256 = "16d0yvsp9yp67q1clhjs77syd13bmfgbadxcc1x8yfrfvdy6v39l"; }; dontBuild = true; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a2d6d94d3b5..fcab3a8e560 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sonarr"; - version = "3.0.6.1342"; + version = "3.0.7.1477"; src = fetchurl { url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz"; - sha256 = "sha256-6RMthsf60FJLDHB72QJkPeF7vXmjBgcqKujO0IOjVIk="; + sha256 = "sha256-xB7kWWxx+ymBxyxBzwY7gZfw9kMHi2MSsrUp8GIOiws="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 74fddbd4982..a1db051e7b2 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.37.1"; + version = "0.37.4"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-rLnjWJPIf2SzWpaQxt/4zACihKptly/OJ+w0/uJBacY="; + sha256 = "sha256-cKX8idMmh9hQVPjO8rJWlp1nhtnzwwlLkelNw+LLBag="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-YqlOzHsdkRrBdQ/mWGs2JIq5JttdRhFeug9HRbl6qlw="; + vendorSha256 = "sha256-vaYCo+jvw3qcLQ63oA8tq6G6Gxq50VTxK6IMBcEZXqs="; doCheck = false; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 3f0ed926e4c..6cc0738454d 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.43.5"; + version = "11.43.9"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "sha256-Pgh2gqsZnDEOBs2t7PoRWXZ9hSPcGRL0YL4QSP8dLL8="; + sha256 = "sha256-DTpuL5caf4fmJMGq+1L3iyiSkLZYIUnejgJ/4LOk6kQ="; }; postPatch = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 0af47ccca83..0998ddb573d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -202,9 +202,9 @@ let in self: { postgresql_10 = self.callPackage generic { - version = "10.19"; + version = "10.20"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "sha256-brgwtCi2DoSuh+IENrzmecTZ0CAr567A5BsMZ9kTQjk="; + sha256 = "sha256-h94W1ZvP5C+mBcMSxZvl4pToo+astlXdetR8u5MKZZ8="; this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self; @@ -212,36 +212,36 @@ in self: { }; postgresql_11 = self.callPackage generic { - version = "11.14"; + version = "11.15"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "sha256-llx/S+lvtk+VgYUsWMTwXDgS1K2CPA8+K9/nd8Fi+Zk="; + sha256 = "sha256-yPWOjr1PRWf0+boQMus+meAlHYfL4+VktIVZDjeoeeM="; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.9"; + version = "12.10"; psqlSchema = "12"; - sha256 = "sha256-if2i3jPtBKmFSOQ/PuXxW4gr4XUF1jH+DdGlQKK1bc4="; + sha256 = "sha256-g90ZLmA0lRGSuahtwZzzcXqLghIOLxGgo2cjyCDSslc="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.5"; + version = "13.6"; psqlSchema = "13"; - sha256 = "sha256-m4EGelXtuqvEGKrO9FfdhHdkKCdJlWCwBhWm6mwT9rM="; + sha256 = "sha256-uvx/o9nU2o/nG4TGO6i9/oCSk1wwwKqFwkssCFCPZ/w="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; }; postgresql_14 = self.callPackage generic { - version = "14.1"; + version = "14.2"; psqlSchema = "14"; - sha256 = "sha256-TTwQHqeuOJgvBr3HN1i1Nyf7ZALs2TggBvpezHwspB8="; + sha256 = "sha256-LPeLLkaJEvgQHWldtTQM8xPC6faKYS+3FCdSToyal3o="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix new file mode 100644 index 00000000000..ce7dcbd7a48 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/rum.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "rum"; + version = "1.3.9"; + + src = fetchFromGitHub { + owner = "postgrespro"; + repo = "rum"; + rev = version; + sha256 = "sha256-xdCj9hzBg7VtAIHpIFpeeaK6U4aRrCsoQrPKdABSl+Y="; + }; + + buildInputs = [ postgresql ]; + + makeFlags = [ "USE_PGXS=1" ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.control + install -D -t $out/share/postgresql/extension *.sql + ''; + + meta = with lib; { + description = "Full text search index method for PostgreSQL"; + homepage = "https://github.com/postgrespro/rum"; + license = licenses.postgresql; + platforms = postgresql.meta.platforms; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index f3df8a99ca2..fec106f32ac 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -61,4 +61,6 @@ self: super: { pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { }; repmgr = super.callPackage ./ext/repmgr.nix { }; + + rum = super.callPackage ./ext/rum.nix { }; } diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index ab8f7f9a699..be1739f2b8a 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -24,7 +24,6 @@ , openssl , pcre , perl -, prometheus-cpp , python2 , re2 , zlib @@ -109,7 +108,6 @@ stdenv.mkDerivation rec { { f = "libssl"; p = openssl; } { f = "lz4"; p = lz4; } { f = "pcre"; p = pcre; } - { f = "prometheus-cpp"; p = prometheus-cpp; } { f = "re2"; p = re2; } ]} @@ -123,8 +121,9 @@ stdenv.mkDerivation rec { ln -s ${nlohmann_json.src}/single_include/nlohmann/json.hpp . popd - pushd prometheus-cpp/prometheus-cpp/3rdparty - replace_dep . "${civetweb.src}" civetweb + pushd prometheus-cpp + tar xf v0.9.0.tar.gz + replace_dep prometheus-cpp/3rdparty "${civetweb.src}" civetweb popd sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 0d564352c73..8decb2f4d29 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-kBxZFzny61xsLynD0sWz4dd8BzbdZkah0ATnHo3txRM="; + sha256 = "sha256-VUML5GwHrRYPd9lnOZuMA3T1SfdC0rVLP5m1yf+SA0A="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 8eb1a9e7a87..f4e7775c400 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.274"; + version = "2.5.276"; src = fetchurl { - url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz"; - sha256 = "sha256-l3mvlC/DIJ2W3xLdwSV2gCRDdNGcg6OUW4e1IOihlyQ="; + url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; + sha256 = "sha256-ulx3/yj5wxmHsep0+93xpy6VeQJkMXRjGd/xx2F1zII="; }; sourceRoot = "."; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 5d0ed06b5ae..1556250447a 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -11,7 +11,6 @@ with lib; - let luaEnv = lua.withPackages(p: with p; [ luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3 @@ -22,7 +21,7 @@ let ); in stdenv.mkDerivation rec { - version = "0.11.12"; # also update communityModules + version = "0.11.13"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "03an206bl3h2lqcgv1wfvc2bqjq6m9vjb2idw0vyvczm43c55kan"; + sha256 = "sha256-OcYbNGoJtRJbYEy5aeFCBsu8uGyBFW/8a6LWJSfPBDI="; }; # A note to all those merging automated updates: Please also update this @@ -44,8 +43,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "bd0a1f917d98"; - sha256 = "0figx0b0y5zfk5anf16h20y4crjmpb6bkg30vl7p0m594qnyqjcx"; + rev = "54fa2116bbf3"; + sha256 = "sha256-OKZ7tD75q8/GMXruUQ+r9l0BxzdbPHNf41fZ3fHVQVw="; }; nativeBuildInputs = [ makeWrapper ]; @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { ] ++ withExtraLibs; - configureFlags = [ "--ostype=linux" "--with-lua-include=${luaEnv}/include" @@ -89,9 +87,7 @@ stdenv.mkDerivation rec { passthru = { communityModules = withCommunityModules; - tests = { - main = nixosTests.prosody; - }; + tests = { inherit (nixosTests) prosody prosody-mysql; }; }; meta = { diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 7ec06e36599..03c9337f5c4 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -3,14 +3,14 @@ let package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package; in package.override rec { - version = "1.23.0"; + version = "1.24.0"; reconstructLock = true; src = pkgs.fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "0mf6ya5pw5gh0ld0j5dlsicx3ndhfrm3q683faqcm4ks7c5kjhax"; + sha256 = "epQXexhTT6xuB50eudRRzTZHGv0vX+hgMUZcm36red4="; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index 82b3e50e1d3..0047c3a6ace 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -4,13 +4,31 @@ let sources = { - "@babel/cli-7.16.8" = { + "@ampproject/remapping-2.0.3" = { + name = "_at_ampproject_slash_remapping"; + packageName = "@ampproject/remapping"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.0.3.tgz"; + sha512 = "DmIAguV77yFP0MGVFWknCMgSLAtsLR3VlRTteR6xgMpIfYtwaZuMvjGv5YlpiqN7S/5q87DHyuIx8oa15kiyag=="; + }; + }; + "@ampproject/remapping-2.1.2" = { + name = "_at_ampproject_slash_remapping"; + packageName = "@ampproject/remapping"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz"; + sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg=="; + }; + }; + "@babel/cli-7.17.0" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.16.8"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.16.8.tgz"; - sha512 = "FTKBbxyk5TclXOGmwYyqelqP5IF6hMxaeJskd85jbR5jBfYlwqgwAbJwnixi1ZBbTqKfFuAA95mdmUFeSRwyJA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.0.tgz"; + sha512 = "es10YH/ejXbg551vtnmEzIPe3MQRNOS644o3pf8vUr1tIeNzVNlP8BBvs1Eh7roh5A+k2fEHUas+ZptOWHA1fQ=="; }; }; "@babel/code-frame-7.16.7" = { @@ -22,31 +40,49 @@ let sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.16.8" = { + "@babel/compat-data-7.17.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.16.8"; + version = "7.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz"; + sha512 = "392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng=="; + }; + }; + "@babel/core-7.17.0" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz"; - sha512 = "m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.17.0.tgz"; + sha512 = "x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA=="; }; }; - "@babel/core-7.16.12" = { + "@babel/core-7.17.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.16.12"; + version = "7.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz"; - sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz"; + sha512 = "/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA=="; }; }; - "@babel/generator-7.16.8" = { + "@babel/generator-7.17.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.16.8"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"; - sha512 = "1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.0.tgz"; + sha512 = "I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw=="; + }; + }; + "@babel/generator-7.17.3" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.17.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz"; + sha512 = "+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg=="; }; }; "@babel/helper-annotate-as-pure-7.16.7" = { @@ -76,22 +112,31 @@ let sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; }; - "@babel/helper-create-class-features-plugin-7.16.10" = { + "@babel/helper-create-class-features-plugin-7.17.1" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.16.10"; + version = "7.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz"; + sha512 = "JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ=="; + }; + }; + "@babel/helper-create-class-features-plugin-7.17.6" = { + name = "_at_babel_slash_helper-create-class-features-plugin"; + packageName = "@babel/helper-create-class-features-plugin"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz"; - sha512 = "wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz"; + sha512 = "SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.16.7" = { + "@babel/helper-create-regexp-features-plugin-7.17.0" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.16.7"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz"; - sha512 = "fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz"; + sha512 = "awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA=="; }; }; "@babel/helper-define-polyfill-provider-0.3.1" = { @@ -175,6 +220,15 @@ let sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; }; }; + "@babel/helper-module-transforms-7.17.6" = { + name = "_at_babel_slash_helper-module-transforms"; + packageName = "@babel/helper-module-transforms"; + version = "7.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz"; + sha512 = "2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA=="; + }; + }; "@babel/helper-optimise-call-expression-7.16.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; @@ -265,13 +319,22 @@ let sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; - "@babel/helpers-7.16.7" = { + "@babel/helpers-7.17.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.16.7"; + version = "7.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.0.tgz"; + sha512 = "Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ=="; + }; + }; + "@babel/helpers-7.17.2" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz"; - sha512 = "9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.2.tgz"; + sha512 = "0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ=="; }; }; "@babel/highlight-7.16.10" = { @@ -283,13 +346,22 @@ let sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; }; }; - "@babel/parser-7.16.12" = { + "@babel/parser-7.17.0" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz"; + sha512 = "VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw=="; + }; + }; + "@babel/parser-7.17.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.16.12"; + version = "7.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz"; - sha512 = "VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz"; + sha512 = "7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { @@ -337,13 +409,22 @@ let sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; }; }; - "@babel/plugin-proposal-decorators-7.16.7" = { + "@babel/plugin-proposal-class-static-block-7.17.6" = { + name = "_at_babel_slash_plugin-proposal-class-static-block"; + packageName = "@babel/plugin-proposal-class-static-block"; + version = "7.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz"; + sha512 = "X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA=="; + }; + }; + "@babel/plugin-proposal-decorators-7.17.2" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.16.7"; + version = "7.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.7.tgz"; - sha512 = "DoEpnuXK14XV9btI1k8tzNGCutMclpj4yru8aXKoHlVmbO1s+2A+g2+h4JhcjrxkFJqzbymnLG6j/niOf3iFXQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.2.tgz"; + sha512 = "WH8Z95CwTq/W8rFbMqb9p3hicpt4RX4f0K659ax2VHxgOyT6qQmUaEVEjIh4WR9Eh9NymkVn5vwsrE68fAQNUw=="; }; }; "@babel/plugin-proposal-dynamic-import-7.16.7" = { @@ -409,6 +490,15 @@ let sha512 = "3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA=="; }; }; + "@babel/plugin-proposal-object-rest-spread-7.17.3" = { + name = "_at_babel_slash_plugin-proposal-object-rest-spread"; + packageName = "@babel/plugin-proposal-object-rest-spread"; + version = "7.17.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz"; + sha512 = "yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw=="; + }; + }; "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; @@ -490,13 +580,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.16.7" = { + "@babel/plugin-syntax-decorators-7.17.0" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.16.7"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.16.7.tgz"; - sha512 = "vQ+PxL+srA7g6Rx6I1e15m55gftknl2X8GCUW1JTlkTaXZLJOS0UcaY0eK9jYT7IYf4awn6qwyghVHLDz1WyMw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz"; + sha512 = "qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -679,6 +769,15 @@ let sha512 = "VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A=="; }; }; + "@babel/plugin-transform-destructuring-7.17.3" = { + name = "_at_babel_slash_plugin-transform-destructuring"; + packageName = "@babel/plugin-transform-destructuring"; + version = "7.17.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz"; + sha512 = "dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg=="; + }; + }; "@babel/plugin-transform-dotall-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; @@ -940,13 +1039,22 @@ let sha512 = "WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ=="; }; }; - "@babel/runtime-7.16.7" = { + "@babel/runtime-7.17.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.16.7"; + version = "7.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.0.tgz"; + sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ=="; + }; + }; + "@babel/runtime-7.17.2" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz"; - sha512 = "9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz"; + sha512 = "hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw=="; }; }; "@babel/template-7.16.7" = { @@ -958,22 +1066,31 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.16.10" = { + "@babel/traverse-7.17.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.16.10"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz"; - sha512 = "yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.0.tgz"; + sha512 = "fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg=="; }; }; - "@babel/types-7.16.8" = { + "@babel/traverse-7.17.3" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.17.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz"; + sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; + }; + }; + "@babel/types-7.17.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.16.8"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"; - sha512 = "smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz"; + sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -985,13 +1102,22 @@ let sha512 = "0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="; }; }; - "@dabh/diagnostics-2.0.2" = { + "@colors/colors-1.5.0" = { + name = "_at_colors_slash_colors"; + packageName = "@colors/colors"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"; + sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; + }; + }; + "@dabh/diagnostics-2.0.3" = { name = "_at_dabh_slash_diagnostics"; packageName = "@dabh/diagnostics"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; - sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; + url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz"; + sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; "@eslint/eslintrc-1.0.5" = { @@ -1003,6 +1129,15 @@ let sha512 = "BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ=="; }; }; + "@eslint/eslintrc-1.2.0" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz"; + sha512 = "igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w=="; + }; + }; "@humanwhocodes/config-array-0.9.3" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; @@ -1012,6 +1147,15 @@ let sha512 = "3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ=="; }; }; + "@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"; @@ -1039,103 +1183,256 @@ let sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; }; - "@jest/console-27.4.6" = { + "@jest/console-27.5.0" = { + name = "_at_jest_slash_console"; + packageName = "@jest/console"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/console/-/console-27.5.0.tgz"; + sha512 = "WUzX5neFb0IOQOy/7A2VhiGdxJKk85Xns2Oq29JaHmtnSel+BsjwyQZxzAs2Xxfd2i452fwdDG9ox/IWi81bdQ=="; + }; + }; + "@jest/console-27.5.1" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-27.4.6.tgz"; - sha512 = "jauXyacQD33n47A44KrlOVeiXHEXDqapSdfb9kTekOchH/Pd18kBIO1+xxJQRLuG+LUuljFCwTG92ra4NW7SpA=="; + url = "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz"; + sha512 = "kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg=="; }; }; - "@jest/core-27.4.7" = { + "@jest/core-27.5.0" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; - version = "27.4.7"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-27.4.7.tgz"; - sha512 = "n181PurSJkVMS+kClIFSX/LLvw9ExSb+4IMtD6YnfxZVerw9ANYtW0bPrm0MJu2pfe9SY9FJ9FtQ+MdZkrZwjg=="; + url = "https://registry.npmjs.org/@jest/core/-/core-27.5.0.tgz"; + sha512 = "DcUTkZyon+dRozTEjy38Bgt3PIU51GdUJuz3uHKg5maGtmCaYqPUGiM3Xddqi7eIMC7E3fTGIlHqH9i0pTOy6Q=="; }; }; - "@jest/environment-27.4.6" = { + "@jest/core-27.5.1" = { + name = "_at_jest_slash_core"; + packageName = "@jest/core"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz"; + sha512 = "AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ=="; + }; + }; + "@jest/environment-27.5.0" = { + name = "_at_jest_slash_environment"; + packageName = "@jest/environment"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/environment/-/environment-27.5.0.tgz"; + sha512 = "lg0JFsMaLKgpwzs0knOg21Z4OQwaJoBLutnmYzip4tyLTXP21VYWtYGpLXgx42fw/Mw05m1WDXWKgwR6WnsiTw=="; + }; + }; + "@jest/environment-27.5.1" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-27.4.6.tgz"; - sha512 = "E6t+RXPfATEEGVidr84WngLNWZ8ffCPky8RqqRK6u1Bn0LK92INe0MDttyPl/JOzaq92BmDzOeuqk09TvM22Sg=="; + url = "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz"; + sha512 = "/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA=="; }; }; - "@jest/fake-timers-27.4.6" = { + "@jest/fake-timers-27.5.0" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; - version = "27.4.6"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.0.tgz"; + sha512 = "e3WrlpqSHq3HAQ03JFjTn8YCrsyg640/sr1rjkM2rNv8z1ufjudpv4xq6DvvTJYB6FuUrfg0g+7bSKPet5QfCQ=="; + }; + }; + "@jest/fake-timers-27.5.1" = { + name = "_at_jest_slash_fake-timers"; + packageName = "@jest/fake-timers"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz"; + sha512 = "/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ=="; + }; + }; + "@jest/globals-27.5.0" = { + name = "_at_jest_slash_globals"; + packageName = "@jest/globals"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.6.tgz"; - sha512 = "mfaethuYF8scV8ntPpiVGIHQgS0XIALbpY2jt2l7wb/bvq4Q5pDLk4EP4D7SAvYT1QrPOPVZAtbdGAOOyIgs7A=="; + url = "https://registry.npmjs.org/@jest/globals/-/globals-27.5.0.tgz"; + sha512 = "wWpMnTiR65Q4JD7fr2BqN+ZDbi99mmILnEM6u7AaX4geASEIVvQsiB4RCvwZrIX5YZCsAjviJQVq9CYddLABkg=="; }; }; - "@jest/globals-27.4.6" = { + "@jest/globals-27.5.1" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; - version = "27.4.6"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz"; + sha512 = "ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q=="; + }; + }; + "@jest/reporters-27.5.0" = { + name = "_at_jest_slash_reporters"; + packageName = "@jest/reporters"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-27.4.6.tgz"; - sha512 = "kAiwMGZ7UxrgPzu8Yv9uvWmXXxsy0GciNejlHvfPIfWkSxChzv6bgTS3YqBkGuHcis+ouMFI2696n2t+XYIeFw=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.0.tgz"; + sha512 = "DG+BmVSx2uaJSTKz5z1eScgHTQ6/cZ5CCKSpmpr4sXQPwV2V5aUMOBDwXX1MnqNRhH7/Rq9K97ynnocvho5aMA=="; }; }; - "@jest/reporters-27.4.6" = { + "@jest/reporters-27.5.1" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.6.tgz"; - sha512 = "+Zo9gV81R14+PSq4wzee4GC2mhAN9i9a7qgJWL90Gpx7fHYkWpTBvwWNZUXvJByYR9tAVBdc8VxDWqfJyIUrIQ=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz"; + sha512 = "cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw=="; }; }; - "@jest/source-map-27.4.0" = { + "@jest/source-map-27.5.0" = { name = "_at_jest_slash_source-map"; packageName = "@jest/source-map"; - version = "27.4.0"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz"; - sha512 = "Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ=="; + url = "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.0.tgz"; + sha512 = "0xr7VZ+JNCRrlCyRMYhquUm8eU3kNdGDaIW4s3L625bNjk273v9ZhAm3YczIuzJzYH0pnjT+QSCiZQegWKjeow=="; }; }; - "@jest/test-result-27.4.6" = { + "@jest/source-map-27.5.1" = { + name = "_at_jest_slash_source-map"; + packageName = "@jest/source-map"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz"; + sha512 = "y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg=="; + }; + }; + "@jest/test-result-27.5.0" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; - version = "27.4.6"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.6.tgz"; - sha512 = "fi9IGj3fkOrlMmhQqa/t9xum8jaJOOAi/lZlm6JXSc55rJMXKHxNDN1oCP39B0/DhNOa2OMupF9BcKZnNtXMOQ=="; + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.0.tgz"; + sha512 = "Lxecvx5mN6WIeynIyW0dWDQm8UPGMHvTwxUPK+OsZaqBDMGaNDSZtw53VoVk7HyT6AcRblMR/pfa0XucmH4hGw=="; }; }; - "@jest/test-sequencer-27.4.6" = { + "@jest/test-result-27.5.1" = { + name = "_at_jest_slash_test-result"; + packageName = "@jest/test-result"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz"; + sha512 = "EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag=="; + }; + }; + "@jest/test-sequencer-27.5.0" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; - version = "27.4.6"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.6.tgz"; - sha512 = "3GL+nsf6E1PsyNsJuvPyIz+DwFuCtBdtvPpm/LMXVkBJbdFvQYCDpccYT56qq5BGniXWlE81n2qk1sdXfZebnw=="; + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.0.tgz"; + sha512 = "WzjcDflqbpWe+SnJPCvB2gB6haGfrkzAgzY6Pb1aq+EPoVAj2mwBaKN0ROWI4H87aSslCjq2M+BUQFNJ8VpnDA=="; }; }; - "@jest/transform-27.4.6" = { + "@jest/test-sequencer-27.5.1" = { + name = "_at_jest_slash_test-sequencer"; + packageName = "@jest/test-sequencer"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz"; + sha512 = "LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ=="; + }; + }; + "@jest/transform-27.5.0" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "27.4.6"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/transform/-/transform-27.5.0.tgz"; + sha512 = "yXUy/iO3TH1itxJ9BF7LLjuXt8TtgtjAl0PBQbUaCvRa+L0yYBob6uayW9dFRX/CDQweouLhvmXh44zRiaB+yA=="; + }; + }; + "@jest/transform-27.5.1" = { + name = "_at_jest_slash_transform"; + packageName = "@jest/transform"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz"; + sha512 = "ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw=="; + }; + }; + "@jest/types-27.5.0" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-27.4.6.tgz"; - sha512 = "9MsufmJC8t5JTpWEQJ0OcOOAXaH5ioaIX6uHVBLBMoCZPfKKQF+EqP8kACAvCZ0Y1h2Zr3uOccg8re+Dr5jxyw=="; + url = "https://registry.npmjs.org/@jest/types/-/types-27.5.0.tgz"; + sha512 = "oDHEp7gwSgA82RZ6pzUL3ugM2njP/lVB1MsxRZNOBk+CoNvh9SpH1lQixPFc/kDlV50v59csiW4HLixWmhmgPQ=="; }; }; - "@jest/types-27.4.2" = { + "@jest/types-27.5.1" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "27.4.2"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz"; - sha512 = "j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg=="; + url = "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz"; + sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; + }; + }; + "@jridgewell/resolve-uri-3.0.4" = { + name = "_at_jridgewell_slash_resolve-uri"; + packageName = "@jridgewell/resolve-uri"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz"; + sha512 = "cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg=="; + }; + }; + "@jridgewell/resolve-uri-3.0.5" = { + name = "_at_jridgewell_slash_resolve-uri"; + packageName = "@jridgewell/resolve-uri"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz"; + sha512 = "VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.10" = { + name = "_at_jridgewell_slash_sourcemap-codec"; + packageName = "@jridgewell/sourcemap-codec"; + version = "1.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz"; + sha512 = "Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.11" = { + name = "_at_jridgewell_slash_sourcemap-codec"; + packageName = "@jridgewell/sourcemap-codec"; + version = "1.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz"; + sha512 = "Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="; + }; + }; + "@jridgewell/trace-mapping-0.2.7" = { + name = "_at_jridgewell_slash_trace-mapping"; + packageName = "@jridgewell/trace-mapping"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.2.7.tgz"; + sha512 = "ZKfRhw6eK2vvdWqpU7DQq49+BZESqh5rmkYpNhuzkz01tapssl2sNNy6uMUIgrTtUWQDijomWJzJRCoevVrfgw=="; + }; + }; + "@jridgewell/trace-mapping-0.3.4" = { + name = "_at_jridgewell_slash_trace-mapping"; + packageName = "@jridgewell/trace-mapping"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz"; + sha512 = "vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ=="; }; }; "@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents.3" = { @@ -1426,6 +1723,15 @@ let sha512 = "gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ=="; }; }; + "@types/jest-27.4.1" = { + name = "_at_types_slash_jest"; + packageName = "@types/jest"; + version = "27.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz"; + sha512 = "23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw=="; + }; + }; "@types/js-yaml-4.0.5" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; @@ -1480,22 +1786,22 @@ let sha512 = "ICDoQMORMjOSqfNFXT4ENXfwwCir1BPblXNm0SPH7C4Q10ou+pvVagcFAJ+rrzf3A47tGU4K/KbzKu7wO9j45Q=="; }; }; - "@types/node-17.0.13" = { + "@types/node-17.0.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.13"; + version = "17.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.13.tgz"; - sha512 = "Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.15.tgz"; + sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; }; }; - "@types/node-17.0.14" = { + "@types/node-17.0.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.14"; + version = "17.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz"; - sha512 = "SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"; + sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; }; }; "@types/object-assign-deep-0.4.0" = { @@ -1516,6 +1822,15 @@ let sha512 = "QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w=="; }; }; + "@types/prettier-2.4.4" = { + name = "_at_types_slash_prettier"; + packageName = "@types/prettier"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.4.tgz"; + sha512 = "ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA=="; + }; + }; "@types/rimraf-3.0.2" = { name = "_at_types_slash_rimraf"; packageName = "@types/rimraf"; @@ -1543,13 +1858,13 @@ let sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; - "@types/ws-8.2.2" = { + "@types/ws-8.5.1" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.2.2"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz"; - sha512 = "NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.1.tgz"; + sha512 = "UxlLOfkuQnT2YSBCNq0x86SGOUxas6gAySFeDe2DcnEnA8655UIPoCDorWZCugcvKIL8IUI4oueUfJ1hhZSE2A=="; }; }; "@types/yargs-16.0.4" = { @@ -1570,31 +1885,40 @@ let sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; }; - "@typescript-eslint/eslint-plugin-5.10.1" = { + "@typescript-eslint/eslint-plugin-5.10.2" = { + name = "_at_typescript-eslint_slash_eslint-plugin"; + packageName = "@typescript-eslint/eslint-plugin"; + version = "5.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.2.tgz"; + sha512 = "4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q=="; + }; + }; + "@typescript-eslint/eslint-plugin-5.12.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.10.1"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.1.tgz"; - sha512 = "xN3CYqFlyE/qOcy978/L0xLR2HlcAGIyIK5sMOasxaaAPfQRj/MmMV6OC3I7NZO84oEUdWCOju34Z9W8E0pFDQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.1.tgz"; + sha512 = "M499lqa8rnNK7mUv74lSFFttuUsubIRdAbHcVaP93oFcKkEmHmLqy2n7jM9C8DVmFMYK61ExrZU6dLYhQZmUpw=="; }; }; - "@typescript-eslint/parser-5.10.1" = { + "@typescript-eslint/parser-5.10.2" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.10.1"; + version = "5.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.1.tgz"; - sha512 = "GReo3tjNBwR5RnRO0K2wDIDN31cM3MmDtgyQ85oAxAmC5K3j/g85IjP+cDfcqDsDDBf1HNKQAD0WqOYL8jXqUA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.2.tgz"; + sha512 = "JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg=="; }; }; - "@typescript-eslint/scope-manager-5.10.1" = { - name = "_at_typescript-eslint_slash_scope-manager"; - packageName = "@typescript-eslint/scope-manager"; - version = "5.10.1"; + "@typescript-eslint/parser-5.12.1" = { + name = "_at_typescript-eslint_slash_parser"; + packageName = "@typescript-eslint/parser"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.1.tgz"; - sha512 = "Lyvi559Gvpn94k7+ElXNMEnXu/iundV5uFmCUNnftbFrUbAJ1WBoaGgkbOBm07jVZa682oaBU37ao/NGGX4ZDg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.12.1.tgz"; + sha512 = "6LuVUbe7oSdHxUWoX/m40Ni8gsZMKCi31rlawBHt7VtW15iHzjbpj2WLiToG2758KjtCCiLRKZqfrOdl3cNKuw=="; }; }; "@typescript-eslint/scope-manager-5.10.2" = { @@ -1606,22 +1930,31 @@ let sha512 = "39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw=="; }; }; - "@typescript-eslint/type-utils-5.10.1" = { + "@typescript-eslint/scope-manager-5.12.1" = { + name = "_at_typescript-eslint_slash_scope-manager"; + packageName = "@typescript-eslint/scope-manager"; + version = "5.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.1.tgz"; + sha512 = "J0Wrh5xS6XNkd4TkOosxdpObzlYfXjAFIm9QxYLCPOcHVv1FyyFCPom66uIh8uBr0sZCrtS+n19tzufhwab8ZQ=="; + }; + }; + "@typescript-eslint/type-utils-5.10.2" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.10.1"; + version = "5.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.1.tgz"; - sha512 = "AfVJkV8uck/UIoDqhu+ptEdBoQATON9GXnhOpPLzkQRJcSChkvD//qsz9JVffl2goxX+ybs5klvacE9vmrQyCw=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.2.tgz"; + sha512 = "uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw=="; }; }; - "@typescript-eslint/types-5.10.1" = { - name = "_at_typescript-eslint_slash_types"; - packageName = "@typescript-eslint/types"; - version = "5.10.1"; + "@typescript-eslint/type-utils-5.12.1" = { + name = "_at_typescript-eslint_slash_type-utils"; + packageName = "@typescript-eslint/type-utils"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.1.tgz"; - sha512 = "ZvxQ2QMy49bIIBpTqFiOenucqUyjTQ0WNLhBM6X1fh1NNlYAC6Kxsx8bRTY3jdYsYg44a0Z/uEgQkohbR0H87Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.12.1.tgz"; + sha512 = "Gh8feEhsNLeCz6aYqynh61Vsdy+tiNNkQtc+bN3IvQvRqHkXGUhYkUi+ePKzP0Mb42se7FDb+y2SypTbpbR/Sg=="; }; }; "@typescript-eslint/types-5.10.2" = { @@ -1633,13 +1966,13 @@ let sha512 = "Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w=="; }; }; - "@typescript-eslint/typescript-estree-5.10.1" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "5.10.1"; + "@typescript-eslint/types-5.12.1" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.1.tgz"; - sha512 = "PwIGnH7jIueXv4opcwEbVGDATjGPO1dx9RkUl5LlHDSe+FXxPwFL5W/qYd5/NHr7f6lo/vvTrAzd0KlQtRusJQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.1.tgz"; + sha512 = "hfcbq4qVOHV1YRdhkDldhV9NpmmAu2vp6wuFODL71Y0Ixak+FLeEU4rnPxgmZMnGreGEghlEucs9UZn5KOfHJA=="; }; }; "@typescript-eslint/typescript-estree-5.10.2" = { @@ -1651,13 +1984,13 @@ let sha512 = "WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ=="; }; }; - "@typescript-eslint/utils-5.10.1" = { - name = "_at_typescript-eslint_slash_utils"; - packageName = "@typescript-eslint/utils"; - version = "5.10.1"; + "@typescript-eslint/typescript-estree-5.12.1" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.1.tgz"; - sha512 = "RRmlITiUbLuTRtn/gcPRi4202niF+q7ylFLCKu4c+O/PcpRvZ/nAUwQ2G00bZgpWkhrNLNnvhZLbDn8Ml0qsQw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.1.tgz"; + sha512 = "ahOdkIY9Mgbza7L9sIi205Pe1inCkZWAHE1TV1bpxlU4RZNPtXaDZfiiFWcL9jdxvW1hDYZJXrFm+vlMkXRbBw=="; }; }; "@typescript-eslint/utils-5.10.2" = { @@ -1669,13 +2002,13 @@ let sha512 = "vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg=="; }; }; - "@typescript-eslint/visitor-keys-5.10.1" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "5.10.1"; + "@typescript-eslint/utils-5.12.1" = { + name = "_at_typescript-eslint_slash_utils"; + packageName = "@typescript-eslint/utils"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.1.tgz"; - sha512 = "NjQ0Xinhy9IL979tpoTRuLKxMc0zJC7QVSdeerXs2/QvOy2yRkzX5dRb10X5woNUdJgU8G3nYRDlI33sq1K4YQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.1.tgz"; + sha512 = "Qq9FIuU0EVEsi8fS6pG+uurbhNTtoYr4fq8tKjBupsK5Bgbk2I32UGm0Sh+WOyjOPgo/5URbxxSNV6HYsxV4MQ=="; }; }; "@typescript-eslint/visitor-keys-5.10.2" = { @@ -1687,6 +2020,15 @@ let sha512 = "zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q=="; }; }; + "@typescript-eslint/visitor-keys-5.12.1" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "5.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.1.tgz"; + sha512 = "l1KSLfupuwrXx6wc0AuOmC7Ko5g14ZOQ86wJJqRbdLbXLK02pK/DPiDDqCc7BqqiiA04/eAA6ayL0bgOrAkH7A=="; + }; + }; "abab-2.0.5" = { name = "abab"; packageName = "abab"; @@ -1759,13 +2101,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.9.0" = { + "ajv-8.10.0" = { name = "ajv"; packageName = "ajv"; - version = "8.9.0"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; - sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz"; + sha512 = "bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw=="; }; }; "ansi-escapes-4.3.2" = { @@ -1903,22 +2245,31 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "axios-0.25.0" = { + "axios-0.26.0" = { name = "axios"; packageName = "axios"; - version = "0.25.0"; + version = "0.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz"; + sha512 = "lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og=="; + }; + }; + "babel-jest-27.5.0" = { + name = "babel-jest"; + packageName = "babel-jest"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz"; - sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.0.tgz"; + sha512 = "puhCyvBTNLevhbd1oyw6t3gWBicWoUARQYKCBB/B1moif17NbyhxbsfadqZIw8zfJJD+W7Vw0Nb20pEjLxkXqQ=="; }; }; - "babel-jest-27.4.6" = { + "babel-jest-27.5.1" = { name = "babel-jest"; packageName = "babel-jest"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.6.tgz"; - sha512 = "qZL0JT0HS1L+lOuH+xC2DVASR3nunZi/ozGhpgauJHgmI7f8rudxf6hUjEHympdQ/J64CdKmPkgfJ+A3U6QCrg=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz"; + sha512 = "cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -1939,13 +2290,22 @@ let sha512 = "Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA=="; }; }; - "babel-plugin-jest-hoist-27.4.0" = { + "babel-plugin-jest-hoist-27.5.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "27.4.0"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.0.tgz"; + sha512 = "ztwNkHl+g1GaoQcb8f2BER4C3LMvSXuF7KVqtUioXQgScSEnkl6lLgCILUYIR+CPTwL8H3F/PNLze64HPWF9JA=="; + }; + }; + "babel-plugin-jest-hoist-27.5.1" = { + name = "babel-plugin-jest-hoist"; + packageName = "babel-plugin-jest-hoist"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz"; - sha512 = "Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz"; + sha512 = "50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ=="; }; }; "babel-plugin-polyfill-corejs2-0.3.1" = { @@ -1957,13 +2317,13 @@ let sha512 = "v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="; }; }; - "babel-plugin-polyfill-corejs3-0.5.1" = { + "babel-plugin-polyfill-corejs3-0.5.2" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz"; - sha512 = "TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz"; + sha512 = "G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ=="; }; }; "babel-plugin-polyfill-regenerator-0.3.1" = { @@ -1984,13 +2344,22 @@ let sha512 = "M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ=="; }; }; - "babel-preset-jest-27.4.0" = { + "babel-preset-jest-27.5.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "27.4.0"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.0.tgz"; + sha512 = "7bfu1cJBlgK/nKfTvMlElzA3jpi6GzDWX3fntnyP2cQSzoi/KUz6ewGlcb3PSRYZGyv+uPnVHY0Im3JbsViqgA=="; + }; + }; + "babel-preset-jest-27.5.1" = { + name = "babel-preset-jest"; + packageName = "babel-preset-jest"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz"; - sha512 = "NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz"; + sha512 = "Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag=="; }; }; "balanced-match-1.0.2" = { @@ -2083,6 +2452,15 @@ let sha512 = "u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A=="; }; }; + "browserslist-4.19.3" = { + name = "browserslist"; + packageName = "browserslist"; + version = "4.19.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz"; + sha512 = "XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg=="; + }; + }; "bser-2.1.1" = { name = "bser"; packageName = "bser"; @@ -2155,13 +2533,22 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "caniuse-lite-1.0.30001304" = { + "caniuse-lite-1.0.30001307" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30001307"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001307.tgz"; + sha512 = "+MXEMczJ4FuxJAUp0jvAl6Df0NI/OfW1RWEE61eSmzS7hw6lz4IKutbhbXendwq8BljfFuHtu26VWsg4afQ7Ng=="; + }; + }; + "caniuse-lite-1.0.30001312" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001304"; + version = "1.0.30001312"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz"; - sha512 = "bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz"; + sha512 = "Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ=="; }; }; "chalk-2.4.2" = { @@ -2191,6 +2578,15 @@ let sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; }; }; + "charcodes-0.2.0" = { + name = "charcodes"; + packageName = "charcodes"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz"; + sha512 = "Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ=="; + }; + }; "chokidar-3.5.3" = { name = "chokidar"; packageName = "chokidar"; @@ -2317,15 +2713,6 @@ let sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; }; }; - "colors-1.4.0" = { - name = "colors"; - packageName = "colors"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; - }; - }; "colorspace-1.1.4" = { name = "colorspace"; packageName = "colorspace"; @@ -2407,22 +2794,31 @@ let sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; }; }; - "core-js-3.20.3" = { + "core-js-3.21.1" = { name = "core-js"; packageName = "core-js"; - version = "3.20.3"; + version = "3.21.1"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz"; + sha512 = "FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="; + }; + }; + "core-js-compat-3.21.0" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz"; - sha512 = "vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.0.tgz"; + sha512 = "OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A=="; }; }; - "core-js-compat-3.20.3" = { + "core-js-compat-3.21.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.20.3"; + version = "3.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.3.tgz"; - sha512 = "c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz"; + sha512 = "gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g=="; }; }; "core-util-is-1.0.3" = { @@ -2632,13 +3028,22 @@ let sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; }; }; - "diff-sequences-27.4.0" = { + "diff-sequences-27.5.0" = { name = "diff-sequences"; packageName = "diff-sequences"; - version = "27.4.0"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz"; - sha512 = "YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww=="; + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.0.tgz"; + sha512 = "ZsOBWnhXiH+Zn0DcBNX/tiQsqrREHs/6oQsEVy2VJJjrTblykPima11pyHMSA/7PGmD+fwclTnKVKL/qtNREDQ=="; + }; + }; + "diff-sequences-27.5.1" = { + name = "diff-sequences"; + packageName = "diff-sequences"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz"; + sha512 = "k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="; }; }; "dir-glob-3.0.1" = { @@ -2686,22 +3091,22 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.4.57" = { + "electron-to-chromium-1.4.65" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.57"; + version = "1.4.65"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz"; - sha512 = "FNC+P5K1n6pF+M0zIK+gFCoXcJhhzDViL3DRIGy2Fv5PohuSES1JHR7T+GlwxSxlzx4yYbsuzCZvHxcBSRCIOw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz"; + sha512 = "0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw=="; }; }; - "electron-to-chromium-1.4.59" = { + "electron-to-chromium-1.4.73" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.59"; + version = "1.4.73"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.59.tgz"; - sha512 = "AOJ3cAE0TWxz4fQ9zkND5hWrQg16nsZKVz9INOot1oV//u4wWu5xrj9CQMmPTYskkZRunSRc9sAnr4EkexXokg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.73.tgz"; + sha512 = "RlCffXkE/LliqfA5m29+dVDPB2r72y2D2egMMfIy3Le8ODrxjuZNVo4NIC2yPL01N4xb4nZQLwzi6Z5tGIGLnA=="; }; }; "emittery-0.8.1" = { @@ -2749,6 +3154,15 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -2803,6 +3217,15 @@ let sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; }; + "eslint-8.10.0" = { + name = "eslint"; + packageName = "eslint"; + version = "8.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz"; + sha512 = "tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw=="; + }; + }; "eslint-8.8.0" = { name = "eslint"; packageName = "eslint"; @@ -2821,13 +3244,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-26.0.0" = { + "eslint-plugin-jest-26.1.1" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "26.0.0"; + version = "26.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.0.0.tgz"; - sha512 = "Fvs0YgJ/nw9FTrnqTuMGVrkozkd07jkQzWm0ajqyHlfcsdkxGfAuv30fgfWHOnHiCr9+1YQ365CcDX7vrNhqQg=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.1.1.tgz"; + sha512 = "HRKOuPi5ADhza4ZBK5ufyNXy28bXXkib87w+pQqdvBhSTsamndh6sIAKPAUl8y0/n9jSWBdTPslrwtKWqkp8dA=="; }; }; "eslint-scope-5.1.1" = { @@ -2848,6 +3271,15 @@ let sha512 = "aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg=="; }; }; + "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"; @@ -2875,6 +3307,15 @@ let sha512 = "IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ=="; }; }; + "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=="; + }; + }; "espree-9.3.0" = { name = "espree"; packageName = "espree"; @@ -2884,6 +3325,15 @@ let sha512 = "d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ=="; }; }; + "espree-9.3.1" = { + name = "espree"; + packageName = "espree"; + version = "9.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz"; + sha512 = "bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ=="; + }; + }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -2974,13 +3424,22 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-27.4.6" = { + "expect-27.5.0" = { name = "expect"; packageName = "expect"; - version = "27.4.6"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-27.4.6.tgz"; - sha512 = "1M/0kAALIaj5LaG66sFJTbRsWTADnylly82cu4bspI0nl+pgP4E6Bh/aqdHlTUjul06K7xQnnrAoqfxVU0+/ag=="; + url = "https://registry.npmjs.org/expect/-/expect-27.5.0.tgz"; + sha512 = "z73GZ132cBqrapO0X6BeRjyBXqOt9YeRtnDteHJIQqp5s2pZ41Hz23VUbsVFMfkrsFLU9GwoIRS0ZzLuFK8M5w=="; + }; + }; + "expect-27.5.1" = { + name = "expect"; + packageName = "expect"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz"; + sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw=="; }; }; "fast-deep-equal-3.1.3" = { @@ -3127,13 +3586,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.14.7" = { + "follow-redirects-1.14.9" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.7"; + version = "1.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz"; - sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; + sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; }; }; "form-data-3.0.1" = { @@ -3316,13 +3775,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.12.0" = { + "globals-13.12.1" = { name = "globals"; packageName = "globals"; - version = "13.12.0"; + version = "13.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"; - sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; + url = "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz"; + sha512 = "317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw=="; }; }; "globby-11.1.0" = { @@ -3568,6 +4027,15 @@ let sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; "is-arrayish-0.3.2" = { name = "is-arrayish"; packageName = "is-arrayish"; @@ -3730,166 +4198,319 @@ let sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; }; }; - "istanbul-reports-3.1.3" = { + "istanbul-reports-3.1.4" = { name = "istanbul-reports"; packageName = "istanbul-reports"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz"; - sha512 = "x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg=="; + url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz"; + sha512 = "r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw=="; }; }; - "jest-27.4.7" = { + "jest-27.5.0" = { name = "jest"; packageName = "jest"; - version = "27.4.7"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest/-/jest-27.5.0.tgz"; + sha512 = "sCMZhL9zy0fiFc4H0cKlXq7BcghMSxm5ZnEyaPWTteArU5ix6JjOKyOXSUBGLTQCmt5kuX9zEvQ9BSshHOPB3A=="; + }; + }; + "jest-27.5.1" = { + name = "jest"; + packageName = "jest"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz"; + sha512 = "Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ=="; + }; + }; + "jest-changed-files-27.5.0" = { + name = "jest-changed-files"; + packageName = "jest-changed-files"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-27.4.7.tgz"; - sha512 = "8heYvsx7nV/m8m24Vk26Y87g73Ba6ueUd0MWed/NXMhSZIm62U/llVbS0PJe1SHunbyXjJ/BqG1z9bFjGUIvTg=="; + url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.0.tgz"; + sha512 = "BGWKI7E6ORqbF5usF1oA4ftbkhVZVrXr8jB0/BrU6TAn3kfOVwX2Zx6pKIXYutJ+qNEjT8Da/gGak0ajya/StA=="; }; }; - "jest-changed-files-27.4.2" = { + "jest-changed-files-27.5.1" = { name = "jest-changed-files"; packageName = "jest-changed-files"; - version = "27.4.2"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz"; + sha512 = "buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw=="; + }; + }; + "jest-circus-27.5.0" = { + name = "jest-circus"; + packageName = "jest-circus"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz"; - sha512 = "/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A=="; + url = "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.0.tgz"; + sha512 = "+NPd1OxpAHYKjbW8dgL0huFgmtZRKSUKee/UtRgZJEfAxCeA12d7sp0coh5EGDBpW4fCk1Pcia/2dG+j6BQvdw=="; }; }; - "jest-circus-27.4.6" = { + "jest-circus-27.5.1" = { name = "jest-circus"; packageName = "jest-circus"; - version = "27.4.6"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz"; + sha512 = "D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw=="; + }; + }; + "jest-cli-27.5.0" = { + name = "jest-cli"; + packageName = "jest-cli"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.6.tgz"; - sha512 = "UA7AI5HZrW4wRM72Ro80uRR2Fg+7nR0GESbSI/2M+ambbzVuA63mn5T1p3Z/wlhntzGpIG1xx78GP2YIkf6PhQ=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.0.tgz"; + sha512 = "9ANs79Goz1ULKtG7HDm/F//4E69v8EFOLXRIHmeC/eK1xTUeQGlU6XP0Zwst386sKaKB4O60qhWY/UaTBS2MLA=="; }; }; - "jest-cli-27.4.7" = { + "jest-cli-27.5.1" = { name = "jest-cli"; packageName = "jest-cli"; - version = "27.4.7"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.7.tgz"; - sha512 = "zREYhvjjqe1KsGV15mdnxjThKNDgza1fhDT+iUsXWLCq3sxe9w5xnvyctcYVT5PcdLSjv7Y5dCwTS3FCF1tiuw=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz"; + sha512 = "Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw=="; }; }; - "jest-config-27.4.7" = { + "jest-config-27.5.0" = { name = "jest-config"; packageName = "jest-config"; - version = "27.4.7"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-27.4.7.tgz"; - sha512 = "xz/o/KJJEedHMrIY9v2ParIoYSrSVY6IVeE4z5Z3i101GoA5XgfbJz+1C8EYPsv7u7f39dS8F9v46BHDhn0vlw=="; + url = "https://registry.npmjs.org/jest-config/-/jest-config-27.5.0.tgz"; + sha512 = "eOIpvpXFz5WHuIYZN1QmvBLEjsSk3w+IAC/2jBpZClbprF53Bj9meBMgAbE15DSkaaJBDFmhXXd1L2eCLaWxQw=="; }; }; - "jest-diff-27.4.6" = { + "jest-config-27.5.1" = { + name = "jest-config"; + packageName = "jest-config"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz"; + sha512 = "5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA=="; + }; + }; + "jest-diff-27.5.0" = { + name = "jest-diff"; + packageName = "jest-diff"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.0.tgz"; + sha512 = "zztvHDCq/QcAVv+o6rts0reupSOxyrX+KLQEOMWCW2trZgcBFgp/oTK7hJCGpXvEIqKrQzyQlaPKn9W04+IMQg=="; + }; + }; + "jest-diff-27.5.1" = { name = "jest-diff"; packageName = "jest-diff"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz"; - sha512 = "zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz"; + sha512 = "m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw=="; }; }; - "jest-docblock-27.4.0" = { + "jest-docblock-27.5.0" = { name = "jest-docblock"; packageName = "jest-docblock"; - version = "27.4.0"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.0.tgz"; + sha512 = "U4MtJgdZn2x+jpPzd7NAYvDmgJAA5h9QxVAwsyuH7IymGzY8VGHhAkHcIGOmtmdC61ORLxCbEhj6fCJsaCWzXA=="; + }; + }; + "jest-docblock-27.5.1" = { + name = "jest-docblock"; + packageName = "jest-docblock"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz"; + sha512 = "rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ=="; + }; + }; + "jest-each-27.5.0" = { + name = "jest-each"; + packageName = "jest-each"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz"; - sha512 = "7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg=="; + url = "https://registry.npmjs.org/jest-each/-/jest-each-27.5.0.tgz"; + sha512 = "2vpajSdDMZmAxjSP1f4BG9KKduwHtuaI0w66oqLUkfaGUU7Ix/W+d8BW0h3/QEJiew7hR0GSblqdFwTEEbhBdw=="; }; }; - "jest-each-27.4.6" = { + "jest-each-27.5.1" = { name = "jest-each"; packageName = "jest-each"; - version = "27.4.6"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz"; + sha512 = "1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ=="; + }; + }; + "jest-environment-jsdom-27.5.0" = { + name = "jest-environment-jsdom"; + packageName = "jest-environment-jsdom"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-27.4.6.tgz"; - sha512 = "n6QDq8y2Hsmn22tRkgAk+z6MCX7MeVlAzxmZDshfS2jLcaBlyhpF3tZSJLR+kXmh23GEvS0ojMR8i6ZeRvpQcA=="; + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.0.tgz"; + sha512 = "sX49N8rjp6HSHeGpNgLk6mtHRd1IPAnE/u7wLQkb6Tz/1E08Q++Y8Zk/IbpVdcFywbzH1icFqEuDuHJ6o+uXXg=="; }; }; - "jest-environment-jsdom-27.4.6" = { + "jest-environment-jsdom-27.5.1" = { name = "jest-environment-jsdom"; packageName = "jest-environment-jsdom"; - version = "27.4.6"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz"; + sha512 = "TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw=="; + }; + }; + "jest-environment-node-27.5.0" = { + name = "jest-environment-node"; + packageName = "jest-environment-node"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.6.tgz"; - sha512 = "o3dx5p/kHPbUlRvSNjypEcEtgs6LmvESMzgRFQE6c+Prwl2JLA4RZ7qAnxc5VM8kutsGRTB15jXeeSbJsKN9iA=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.0.tgz"; + sha512 = "7UzisMMfGyrURhS/eUa7p7mgaqN3ajHylsjOgfcn0caNeYRZq4LHKZLfAxrPM34DWLnBZcRupEJlpQsizdSUsw=="; }; }; - "jest-environment-node-27.4.6" = { + "jest-environment-node-27.5.1" = { name = "jest-environment-node"; packageName = "jest-environment-node"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.6.tgz"; - sha512 = "yfHlZ9m+kzTKZV0hVfhVu6GuDxKAYeFHrfulmy7Jxwsq4V7+ZK7f+c0XP/tbVDMQW7E4neG2u147hFkuVz0MlQ=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz"; + sha512 = "Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw=="; }; }; - "jest-get-type-27.4.0" = { + "jest-get-type-27.5.0" = { name = "jest-get-type"; packageName = "jest-get-type"; - version = "27.4.0"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.0.tgz"; + sha512 = "Vp6O8a52M/dahXRG/E0EJuWQROps2mDQ0sJYPgO8HskhdLwj9ajgngy2OAqZgV6e/RcU67WUHq6TgfvJb8flbA=="; + }; + }; + "jest-get-type-27.5.1" = { + name = "jest-get-type"; + packageName = "jest-get-type"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz"; + sha512 = "2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="; + }; + }; + "jest-haste-map-27.5.0" = { + name = "jest-haste-map"; + packageName = "jest-haste-map"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz"; - sha512 = "tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.0.tgz"; + sha512 = "0KfckSBEKV+D6e0toXmIj4zzp72EiBnvkC0L+xYxenkLhAdkp2/8tye4AgMzz7Fqb1r8SWtz7+s1UQLrxMBang=="; }; }; - "jest-haste-map-27.4.6" = { + "jest-haste-map-27.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "27.4.6"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz"; + sha512 = "7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng=="; + }; + }; + "jest-jasmine2-27.5.0" = { + name = "jest-jasmine2"; + packageName = "jest-jasmine2"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.6.tgz"; - sha512 = "0tNpgxg7BKurZeFkIOvGCkbmOHbLFf4LUQOxrQSMjvrQaQe3l6E8x6jYC1NuWkGo5WDdbr8FEzUxV2+LWNawKQ=="; + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.0.tgz"; + sha512 = "X7sT3HLNjjrBEepilxzPyNhNdyunaFBepo1L3T/fvYb9tb8Wb8qY576gwIa+SZcqYUqAA7/bT3EpZI4lAp0Qew=="; }; }; - "jest-jasmine2-27.4.6" = { + "jest-jasmine2-27.5.1" = { name = "jest-jasmine2"; packageName = "jest-jasmine2"; - version = "27.4.6"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz"; + sha512 = "jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ=="; + }; + }; + "jest-leak-detector-27.5.0" = { + name = "jest-leak-detector"; + packageName = "jest-leak-detector"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.6.tgz"; - sha512 = "uAGNXF644I/whzhsf7/qf74gqy9OuhvJ0XYp8SDecX2ooGeaPnmJMjXjKt0mqh1Rl5dtRGxJgNrHlBQIBfS5Nw=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.0.tgz"; + sha512 = "Ak3k+DD3ao5d4/zzJrxAQ5UV5wiCrp47jH94ZD4/vXSzQgE6WBVDfg83VtculLILO7Y6/Q/7yzKSrtN9Na8luA=="; }; }; - "jest-leak-detector-27.4.6" = { + "jest-leak-detector-27.5.1" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.6.tgz"; - sha512 = "kkaGixDf9R7CjHm2pOzfTxZTQQQ2gHTIWKY/JZSiYTc90bZp8kSZnUMS3uLAfwTZwc0tcMRoEX74e14LG1WapA=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz"; + sha512 = "POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ=="; }; }; - "jest-matcher-utils-27.4.6" = { + "jest-matcher-utils-27.5.0" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "27.4.6"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz"; - sha512 = "XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.0.tgz"; + sha512 = "5ruyzWMGb1ilCWD6ECwNdOhQBeIXAjHmHd5c3uO6quR7RIMHPRP2ucOaejz2j+0R0Ko4GanWM6SqXAeF8nYN5g=="; }; }; - "jest-message-util-27.4.6" = { + "jest-matcher-utils-27.5.1" = { + name = "jest-matcher-utils"; + packageName = "jest-matcher-utils"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz"; + sha512 = "z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw=="; + }; + }; + "jest-message-util-27.5.0" = { + name = "jest-message-util"; + packageName = "jest-message-util"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.0.tgz"; + sha512 = "lfbWRhTtmZMEHPAtl0SrvNzK1F4UnVNMHOliRQT2BJ4sBFzIb0gBCHA4ebWD4o6l1fUyvDPxM01K9OIMQTAdQw=="; + }; + }; + "jest-message-util-27.5.1" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "27.4.6"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz"; + sha512 = "rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g=="; + }; + }; + "jest-mock-27.5.0" = { + name = "jest-mock"; + packageName = "jest-mock"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.6.tgz"; - sha512 = "0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.0.tgz"; + sha512 = "PHluG6MJGng82/sxh8OiB9fnxzNn3cazceSHCAmAKs4g5rMhc3EZCrJXv+4w61rA2WGagMUj7QLLrA1SRlFpzQ=="; }; }; - "jest-mock-27.4.6" = { + "jest-mock-27.5.1" = { name = "jest-mock"; packageName = "jest-mock"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.6.tgz"; - sha512 = "kvojdYRkst8iVSZ1EJ+vc1RRD9llueBjKzXzeCytH3dMM7zvPV/ULcfI2nr0v0VUgm3Bjt3hBCQvOeaBz+ZTHw=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz"; + sha512 = "K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og=="; }; }; "jest-pnp-resolver-1.2.2" = { @@ -3901,103 +4522,202 @@ let sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="; }; }; - "jest-regex-util-27.4.0" = { + "jest-regex-util-27.5.0" = { name = "jest-regex-util"; packageName = "jest-regex-util"; - version = "27.4.0"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz"; - sha512 = "WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg=="; + url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.0.tgz"; + sha512 = "e9LqSd6HsDsqd7KS3rNyYwmQAaG9jq4U3LbnwVxN/y3nNlDzm2OFs596uo9zrUY+AV1opXq6ome78tRDUCRWfA=="; }; }; - "jest-resolve-27.4.6" = { + "jest-regex-util-27.5.1" = { + name = "jest-regex-util"; + packageName = "jest-regex-util"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz"; + sha512 = "4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="; + }; + }; + "jest-resolve-27.5.0" = { name = "jest-resolve"; packageName = "jest-resolve"; - version = "27.4.6"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.6.tgz"; - sha512 = "SFfITVApqtirbITKFAO7jOVN45UgFzcRdQanOFzjnbd+CACDoyeX7206JyU92l4cRr73+Qy/TlW51+4vHGt+zw=="; + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.0.tgz"; + sha512 = "PkDpYEGV/nFqThnIrlPtj8oTxyAV3iuuS6or7dZYyUWaHr/tyyVb5qfBmZS6FEr7ozBHgjrF1bgcgIefnlicbw=="; }; }; - "jest-resolve-dependencies-27.4.6" = { + "jest-resolve-27.5.1" = { + name = "jest-resolve"; + packageName = "jest-resolve"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz"; + sha512 = "FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw=="; + }; + }; + "jest-resolve-dependencies-27.5.0" = { + name = "jest-resolve-dependencies"; + packageName = "jest-resolve-dependencies"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.0.tgz"; + sha512 = "xQsy7CmrT4CJxdNUEdzZU2M/v6YmtQ/pkJM+sx7TA1siG1zfsZuo78PZvzglwRMQFr88f3Su4Om8OEBAic+SMw=="; + }; + }; + "jest-resolve-dependencies-27.5.1" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.6.tgz"; - sha512 = "W85uJZcFXEVZ7+MZqIPCscdjuctruNGXUZ3OHSXOfXR9ITgbUKeHj+uGcies+0SsvI5GtUfTw4dY7u9qjTvQOw=="; + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz"; + sha512 = "QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg=="; }; }; - "jest-runner-27.4.6" = { + "jest-runner-27.5.0" = { name = "jest-runner"; packageName = "jest-runner"; - version = "27.4.6"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.6.tgz"; - sha512 = "IDeFt2SG4DzqalYBZRgbbPmpwV3X0DcntjezPBERvnhwKGWTW7C5pbbA5lVkmvgteeNfdd/23gwqv3aiilpYPg=="; + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.0.tgz"; + sha512 = "RMzXhkJLLOKKgUPY2trpyVBijaFmswMtgoCCBk2PQVRHC6yo1vLd1/jmFP39s5OXXnt7rntuzKSYvxl+QUibqQ=="; }; }; - "jest-runtime-27.4.6" = { + "jest-runner-27.5.1" = { + name = "jest-runner"; + packageName = "jest-runner"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz"; + sha512 = "g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ=="; + }; + }; + "jest-runtime-27.5.0" = { + name = "jest-runtime"; + packageName = "jest-runtime"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.0.tgz"; + sha512 = "T7APxCPjN3p3ePcLuypbWtD0UZHyAdvIADZ9ABI/sFZ9t/Rf2xIUd6D7RzZIX+unewJRooVGWrgDIgeUuj0OUA=="; + }; + }; + "jest-runtime-27.5.1" = { name = "jest-runtime"; packageName = "jest-runtime"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.6.tgz"; - sha512 = "eXYeoR/MbIpVDrjqy5d6cGCFOYBFFDeKaNWqTp0h6E74dK0zLHzASQXJpl5a2/40euBmKnprNLJ0Kh0LCndnWQ=="; + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz"; + sha512 = "o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A=="; }; }; - "jest-serializer-27.4.0" = { + "jest-serializer-27.5.0" = { name = "jest-serializer"; packageName = "jest-serializer"; - version = "27.4.0"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.0.tgz"; + sha512 = "aSDFqQlVXtBH+Zb5dl9mCvTSFkabixk/9P9cpngL4yJKpmEi9USxfDhONFMzJrtftPvZw3PcltUVmtFZTB93rg=="; + }; + }; + "jest-serializer-27.5.1" = { + name = "jest-serializer"; + packageName = "jest-serializer"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz"; - sha512 = "RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ=="; + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz"; + sha512 = "jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w=="; }; }; - "jest-snapshot-27.4.6" = { + "jest-snapshot-27.5.0" = { name = "jest-snapshot"; packageName = "jest-snapshot"; - version = "27.4.6"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.6.tgz"; - sha512 = "fafUCDLQfzuNP9IRcEqaFAMzEe7u5BF7mude51wyWv7VRex60WznZIC7DfKTgSIlJa8aFzYmXclmN328aqSDmQ=="; + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.0.tgz"; + sha512 = "cAJj15uqWGkro0bfcv/EgusBnqNgCpRruFQZghsMYTq4Fm2lk/VhAf8DgRr8wvhR6Ue1hkeL8tn70Cw4t8x/5A=="; }; }; - "jest-util-27.4.2" = { + "jest-snapshot-27.5.1" = { + name = "jest-snapshot"; + packageName = "jest-snapshot"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz"; + sha512 = "yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA=="; + }; + }; + "jest-util-27.5.0" = { + name = "jest-util"; + packageName = "jest-util"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-util/-/jest-util-27.5.0.tgz"; + sha512 = "FUUqOx0gAzJy3ytatT1Ss372M1kmhczn8x7aE0++11oPGW1FyD/5NjYBI8w1KOXFm6IVjtaZm2szfJJL+CHs0g=="; + }; + }; + "jest-util-27.5.1" = { name = "jest-util"; packageName = "jest-util"; - version = "27.4.2"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz"; - sha512 = "YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz"; + sha512 = "Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw=="; }; }; - "jest-validate-27.4.6" = { + "jest-validate-27.5.0" = { name = "jest-validate"; packageName = "jest-validate"; - version = "27.4.6"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.0.tgz"; + sha512 = "2XZzQWNrY9Ypo11mm4ZeVjvr++CQG/45XnmA2aWwx155lTwy1JGFI8LpQ2dBCSAeO21ooqg/FCIvv9WwfnPClA=="; + }; + }; + "jest-validate-27.5.1" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz"; + sha512 = "thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ=="; + }; + }; + "jest-watcher-27.5.0" = { + name = "jest-watcher"; + packageName = "jest-watcher"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.6.tgz"; - sha512 = "872mEmCPVlBqbA5dToC57vA3yJaMRfIdpCoD3cyHWJOMx+SJwLNw0I71EkWs41oza/Er9Zno9XuTkRYCPDUJXQ=="; + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.0.tgz"; + sha512 = "MhIeIvEd6dnnspE0OfYrqHOAfZZdyFqx/k8U2nvVFSkLYf22qAFfyNWPVQYcwqKVNobcOhJoT0kV/nRHGbqK8A=="; }; }; - "jest-watcher-27.4.6" = { + "jest-watcher-27.5.1" = { name = "jest-watcher"; packageName = "jest-watcher"; - version = "27.4.6"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz"; + sha512 = "z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw=="; + }; + }; + "jest-worker-27.5.0" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.6.tgz"; - sha512 = "yKQ20OMBiCDigbD0quhQKLkBO+ObGN79MO4nT7YaCuQ5SM+dkBNWE8cZX0FjU6czwMvWw6StWbe+Wv4jJPJ+fw=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.0.tgz"; + sha512 = "8OEHiPNOPTfaWnJ2SUHM8fmgeGq37uuGsQBvGKQJl1f+6WIy6g7G3fE2ruI5294bUKUI9FaCWt5hDvO8HSwsSg=="; }; }; - "jest-worker-27.4.6" = { + "jest-worker-27.5.1" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz"; - sha512 = "gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"; + sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; }; }; "js-sdsl-2.1.4" = { @@ -4063,6 +4783,15 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; + "json-parse-even-better-errors-2.3.1" = { + name = "json-parse-even-better-errors"; + packageName = "json-parse-even-better-errors"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; + }; + }; "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -4162,6 +4891,15 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; + "lines-and-columns-1.2.4" = { + name = "lines-and-columns"; + packageName = "lines-and-columns"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; + }; + }; "locate-path-5.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -4198,13 +4936,13 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; - "logform-2.3.2" = { + "logform-2.4.0" = { name = "logform"; packageName = "logform"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.3.2.tgz"; - sha512 = "V6JiPThZzTsbVRspNO6TmHkR99oqYTs8fivMBYQkjZj6rxW92KxtDCPE6IkAk1DNBnYKNkjm4jYBm6JDUcyhOA=="; + url = "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz"; + sha512 = "CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw=="; }; }; "lru-cache-6.0.0" = { @@ -4342,6 +5080,15 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; + "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.5" = { name = "minimist"; packageName = "minimist"; @@ -4387,13 +5134,13 @@ let sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; - "mqtt-4.3.4" = { + "mqtt-4.3.6" = { name = "mqtt"; packageName = "mqtt"; - version = "4.3.4"; + version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.4.tgz"; - sha512 = "yAVDfVHz3Cjn6K68z54mf7fTni/AWsPhiEsRwZSvet2wO47R6NFUn2psWxYIph2JxWtL3ZKa/da8pjJKSaXPdQ=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.6.tgz"; + sha512 = "1dgQbkbh1Bba9iAGDNIrhSZ4nLDjbhmNHjOEvsmKI1Bb+2orj0gHwjqUKJ5CKUMKBYbkQYRM1fy+N1/2iZOj5w=="; }; }; "mqtt-packet-6.10.0" = { @@ -4477,13 +5224,13 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; - "node-abi-3.5.0" = { + "node-abi-3.8.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.5.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.5.0.tgz"; - sha512 = "LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz"; + sha512 = "tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw=="; }; }; "node-int64-0.4.0" = { @@ -4504,6 +5251,15 @@ let sha512 = "CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="; }; }; + "node-releases-2.0.2" = { + name = "node-releases"; + packageName = "node-releases"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz"; + sha512 = "XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="; + }; + }; "normalize-path-3.0.0" = { name = "normalize-path"; packageName = "normalize-path"; @@ -4684,6 +5440,15 @@ let sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; + "parse-json-5.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; + }; + }; "parse5-6.0.1" = { name = "parse5"; packageName = "parse5"; @@ -4819,13 +5584,22 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-27.4.6" = { + "pretty-format-27.5.0" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "27.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.0.tgz"; + sha512 = "xEi6BRPZ+J1AIS4BAtFC/+rh5jXlXObGZjx5+OSpM95vR/PGla78bFVHMy5GdZjP9wk3AHAMHROXq/r69zXltw=="; + }; + }; + "pretty-format-27.5.1" = { name = "pretty-format"; packageName = "pretty-format"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.6.tgz"; - sha512 = "NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz"; + sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; }; }; "process-nextick-args-2.0.1" = { @@ -4945,13 +5719,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-9.0.0" = { + "regenerate-unicode-properties-10.0.1" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "9.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz"; - sha512 = "3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz"; + sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="; }; }; "regenerator-runtime-0.13.9" = { @@ -4981,31 +5755,31 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-4.8.0" = { + "regexpu-core-5.0.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.8.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz"; - sha512 = "1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz"; + sha512 = "CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw=="; }; }; - "regjsgen-0.5.2" = { + "regjsgen-0.6.0" = { name = "regjsgen"; packageName = "regjsgen"; - version = "0.5.2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; - sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz"; + sha512 = "ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="; }; }; - "regjsparser-0.7.0" = { + "regjsparser-0.8.4" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.7.0"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz"; - sha512 = "A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz"; + sha512 = "J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA=="; }; }; "reinterval-1.1.0" = { @@ -5134,15 +5908,6 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; - "safe-stable-stringify-1.1.1" = { - name = "safe-stable-stringify"; - packageName = "safe-stable-stringify"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz"; - sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; - }; - }; "safe-stable-stringify-2.3.1" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; @@ -5278,13 +6043,13 @@ let sha512 = "iczxaIYeBFHTFrQPb9DVy2SKgYxC4Wo7Iucm7C17cCh2Ge/refnvHscUOxM85u57MfLoNOtjoEFUWt9gBexblA=="; }; }; - "signal-exit-3.0.6" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"; - sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "simple-concat-1.0.1" = { @@ -5854,13 +6619,13 @@ let sha512 = "pVr3hh6dkS3lPPaZz1fNpvcrqLdtEvXmXayN55czlamSgvEjh+57GUqfhAI1Xsuu/hNHUT1KNSx8LH2wBP/7SA=="; }; }; - "typedoc-plugin-markdown-3.11.12" = { + "typedoc-plugin-markdown-3.11.13" = { name = "typedoc-plugin-markdown"; packageName = "typedoc-plugin-markdown"; - version = "3.11.12"; + version = "3.11.13"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.11.12.tgz"; - sha512 = "gb/RuzgZ1zCnRUOqUg6firIqU7xDs9s7hq0vlU/gAsFfVCnpl3NTM9vPyPON75nnpfVFCxr/hmKQ01k1CYY/Qg=="; + url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.11.13.tgz"; + sha512 = "9Y7eWWmUF5i8LMfetPlOP+kTn5L3Q71fm/AUHZhxWYoAiugbybQujhjQk4h09uY2WghPP2BldOivtTxnOwj85A=="; }; }; "typedoc-plugin-no-inherit-1.3.1" = { @@ -5944,13 +6709,13 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; - "unix-dgram-2.0.3" = { + "unix-dgram-2.0.4" = { name = "unix-dgram"; packageName = "unix-dgram"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.3.tgz"; - sha512 = "Bay5CkSLcdypcBCsxvHEvaG3mftzT5FlUnRToPWEAVxwYI8NI/8zSJ/Gknlp86MPhV6hBA8I8TBsETj2tssoHQ=="; + url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.4.tgz"; + sha512 = "7tpK6x7ls7J7pDrrAU63h93R0dVhRbPwiRRCawR10cl+2e1VOvF3bHlVJc6WI1dl/8qk5He673QU+Ogv7bPNaw=="; }; }; "unpipe-1.0.0" = { @@ -6106,31 +6871,31 @@ let sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; }; - "winston-3.5.0" = { + "winston-3.6.0" = { name = "winston"; packageName = "winston"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.5.0.tgz"; - sha512 = "OQMbmLsIdVHvm2hSurrYZs+iZNIImXneYJ6pX7LseSMEq20HdTETXiNnNX3FDwN4LB/xDRZLF6JYOY+AI112Kw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.6.0.tgz"; + sha512 = "9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w=="; }; }; - "winston-syslog-2.4.4" = { + "winston-syslog-2.5.0" = { name = "winston-syslog"; packageName = "winston-syslog"; - version = "2.4.4"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-syslog/-/winston-syslog-2.4.4.tgz"; - sha512 = "zDjoKO932Yszvzq8WtbIFMXHwAT2MOxpWC9s6djw2tvjdRESWw3au6l+0xDMatMhNWVoVaVNkDXF+r/eyoBUVA=="; + url = "https://registry.npmjs.org/winston-syslog/-/winston-syslog-2.5.0.tgz"; + sha512 = "tTMwijNAuZov5xDv3EB/QojvELcigF2YtadgEqoPWlRiV1fTvvLPNGxCNRzi6u3FNOJeZ2Qxjmjqn7ZcUxvp8Q=="; }; }; - "winston-transport-4.4.2" = { + "winston-transport-4.5.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.2.tgz"; - sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"; + sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; }; }; "word-wrap-1.2.3" = { @@ -6187,13 +6952,22 @@ let sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; }; }; - "ws-8.4.2" = { + "ws-7.5.7" = { + name = "ws"; + packageName = "ws"; + version = "7.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"; + sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; + }; + }; + "ws-8.5.0" = { name = "ws"; packageName = "ws"; - version = "8.4.2"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz"; - sha512 = "Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA=="; + url = "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz"; + sha512 = "BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg=="; }; }; "xml-name-validator-3.0.0" = { @@ -6259,51 +7033,51 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "zigbee-herdsman-0.14.10" = { + "zigbee-herdsman-0.14.20" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.14.10"; + version = "0.14.20"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.10.tgz"; - sha512 = "exPtxyJij2fByFhrJpVro9DeL11D1OpjfvEPkEMaPF12C3/fMDdEjZZX66a2mU07KvhlTqynQ+wZFwsighrimg=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.20.tgz"; + sha512 = "YwvAHEfWtcCLilnoHcIpZ9DCPHSLwpy2iboC2zjJUGNQp0vUClJhjAxb6JdTnaHxrNB2FN6+b3Q6BS8QiTtg5g=="; }; }; - "zigbee-herdsman-converters-14.0.406" = { + "zigbee-herdsman-converters-14.0.438" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "14.0.406"; + version = "14.0.438"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.406.tgz"; - sha512 = "vc5xBAI4rfv4jWBQi0Gj4gFK4LftS9J/T/mytgfh73e4N+U3rmNaiA+3syovydsDB1G0PLphIWy5CLrMKLM6UA=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.438.tgz"; + sha512 = "abf5+j61VG1+P5R5BYmFHe/ddHNCf1dWzNcHB51qHKHrTGoVFtqh/J8y+i1zHaWoOxSTf09UZAbAxDxy8GmNwg=="; }; }; - "zigbee2mqtt-frontend-0.6.71" = { + "zigbee2mqtt-frontend-0.6.76" = { name = "zigbee2mqtt-frontend"; packageName = "zigbee2mqtt-frontend"; - version = "0.6.71"; + version = "0.6.76"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.71.tgz"; - sha512 = "+7cbMrbxhR5sPY7/trBoY6vzjFfNL4zlgfoOvE5pDmg4t5ZcJpf5VoCnK7c9ALEMQnBCPxTFfXjkivarQktrpA=="; + url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.76.tgz"; + sha512 = "c7U9Cl7rMLC+Ds1x7winHraMBQEFqWdFiRpncC5Xa28kz8drQtJXtewt0P/8w3NmtTk5W/z1ocpIk9q0RAEMRg=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.23.0"; + version = "1.24.0"; src = ./.; dependencies = [ + sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.0" + (sources."@babel/core-7.17.5" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" sources."semver-6.3.0" - sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.16.8" // { + (sources."@babel/generator-7.17.3" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -6315,8 +7089,8 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-create-class-features-plugin-7.17.6" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."debug-4.3.3" @@ -6331,7 +7105,7 @@ let sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -6342,22 +7116,22 @@ let sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.2" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.3" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" - sources."@babel/plugin-proposal-decorators-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" + sources."@babel/plugin-proposal-decorators-7.17.2" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.17.3" sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" sources."@babel/plugin-proposal-optional-chaining-7.16.7" sources."@babel/plugin-proposal-private-methods-7.16.11" @@ -6367,7 +7141,7 @@ let sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-decorators-7.16.7" + sources."@babel/plugin-syntax-decorators-7.17.0" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" @@ -6387,7 +7161,7 @@ let sources."@babel/plugin-transform-block-scoping-7.16.7" sources."@babel/plugin-transform-classes-7.16.7" sources."@babel/plugin-transform-computed-properties-7.16.7" - sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-destructuring-7.17.3" sources."@babel/plugin-transform-dotall-regex-7.16.7" sources."@babel/plugin-transform-duplicate-keys-7.16.7" sources."@babel/plugin-transform-exponentiation-operator-7.16.7" @@ -6421,28 +7195,29 @@ let }) sources."@babel/preset-modules-0.1.5" sources."@babel/preset-typescript-7.16.7" - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.2" sources."@babel/template-7.16.7" - (sources."@babel/traverse-7.16.10" // { + (sources."@babel/traverse-7.17.3" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.16.8" + sources."@babel/types-7.17.0" sources."@bcoe/v8-coverage-0.2.3" - sources."@dabh/diagnostics-2.0.2" - (sources."@eslint/eslintrc-1.0.5" // { + sources."@colors/colors-1.5.0" + sources."@dabh/diagnostics-2.0.3" + (sources."@eslint/eslintrc-1.2.0" // { dependencies = [ sources."ajv-6.12.6" sources."debug-4.3.3" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."ignore-4.0.6" sources."json-schema-traverse-0.4.1" sources."ms-2.1.2" ]; }) - (sources."@humanwhocodes/config-array-0.9.3" // { + (sources."@humanwhocodes/config-array-0.9.5" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -6456,7 +7231,7 @@ let ]; }) sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-27.4.6" // { + (sources."@jest/console-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6466,7 +7241,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-27.4.7" // { + (sources."@jest/core-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6476,10 +7251,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/environment-27.4.6" - sources."@jest/fake-timers-27.4.6" - sources."@jest/globals-27.4.6" - (sources."@jest/reporters-27.4.6" // { + sources."@jest/environment-27.5.1" + sources."@jest/fake-timers-27.5.1" + sources."@jest/globals-27.5.1" + (sources."@jest/reporters-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6489,10 +7264,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/source-map-27.4.0" - sources."@jest/test-result-27.4.6" - sources."@jest/test-sequencer-27.4.6" - (sources."@jest/transform-27.4.6" // { + sources."@jest/source-map-27.5.1" + sources."@jest/test-result-27.5.1" + sources."@jest/test-sequencer-27.5.1" + (sources."@jest/transform-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6502,7 +7277,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/types-27.4.2" // { + (sources."@jest/types-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6512,6 +7287,9 @@ let sources."supports-color-7.2.0" ]; }) + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -6530,46 +7308,46 @@ let 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/jest-27.4.0" + sources."@types/jest-27.4.1" sources."@types/js-yaml-4.0.5" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.13" + sources."@types/node-17.0.21" sources."@types/object-assign-deep-0.4.0" - sources."@types/prettier-2.4.3" + sources."@types/prettier-2.4.4" sources."@types/rimraf-3.0.2" sources."@types/stack-utils-2.0.1" - sources."@types/ws-8.2.2" + sources."@types/ws-8.5.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - (sources."@typescript-eslint/eslint-plugin-5.10.1" // { + (sources."@typescript-eslint/eslint-plugin-5.12.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - (sources."@typescript-eslint/parser-5.10.1" // { + (sources."@typescript-eslint/parser-5.12.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/scope-manager-5.10.1" - (sources."@typescript-eslint/type-utils-5.10.1" // { + sources."@typescript-eslint/scope-manager-5.12.1" + (sources."@typescript-eslint/type-utils-5.12.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/types-5.10.1" - (sources."@typescript-eslint/typescript-estree-5.10.1" // { + sources."@typescript-eslint/types-5.12.1" + (sources."@typescript-eslint/typescript-estree-5.12.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/utils-5.10.1" - sources."@typescript-eslint/visitor-keys-5.10.1" + sources."@typescript-eslint/utils-5.12.1" + sources."@typescript-eslint/visitor-keys-5.12.1" sources."abab-2.0.5" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { @@ -6585,7 +7363,7 @@ let sources."ms-2.1.2" ]; }) - sources."ajv-8.9.0" + sources."ajv-8.10.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -6598,7 +7376,7 @@ let sources."array-union-2.1.0" sources."async-3.2.3" sources."asynckit-0.4.0" - (sources."babel-jest-27.4.6" // { + (sources."babel-jest-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6610,16 +7388,16 @@ let }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" - sources."babel-plugin-jest-hoist-27.4.0" + sources."babel-plugin-jest-hoist-27.5.1" (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-preset-current-node-syntax-1.0.1" - sources."babel-preset-jest-27.4.0" + sources."babel-preset-jest-27.5.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bind-decorator-1.0.11" @@ -6628,16 +7406,17 @@ let sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.19.1" + sources."browserslist-4.19.3" sources."bser-2.1.1" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001304" + sources."caniuse-lite-1.0.30001312" sources."chalk-2.4.2" sources."char-regex-1.0.2" + sources."charcodes-0.2.0" sources."ci-info-3.3.0" sources."cjs-module-lexer-1.2.2" sources."cliui-7.0.4" @@ -6647,7 +7426,6 @@ let sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.9.0" - sources."colors-1.4.0" sources."colorspace-1.1.4" sources."combined-stream-1.0.8" sources."commist-1.1.0" @@ -6659,8 +7437,8 @@ let sources."safe-buffer-5.1.2" ]; }) - sources."core-js-3.20.3" - (sources."core-js-compat-3.20.3" // { + sources."core-js-3.21.1" + (sources."core-js-compat-3.21.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -6685,7 +7463,7 @@ let sources."depd-1.1.2" sources."destroy-1.0.4" sources."detect-newline-3.1.0" - sources."diff-sequences-27.4.0" + sources."diff-sequences-27.5.1" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { @@ -6695,12 +7473,17 @@ let }) sources."duplexify-4.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.57" + sources."electron-to-chromium-1.4.73" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" + (sources."error-ex-1.3.2" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -6713,7 +7496,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.8.0" // { + (sources."eslint-8.10.0" // { dependencies = [ sources."ajv-6.12.6" sources."ansi-styles-4.3.0" @@ -6722,10 +7505,10 @@ let sources."color-name-1.1.4" sources."debug-4.3.3" sources."escape-string-regexp-4.0.0" - sources."eslint-scope-7.1.0" + sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."has-flag-4.0.0" sources."json-schema-traverse-0.4.1" sources."ms-2.1.2" @@ -6733,15 +7516,15 @@ let ]; }) sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-26.0.0" + sources."eslint-plugin-jest-26.1.1" sources."eslint-scope-5.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.2.0" - sources."espree-9.3.0" + sources."eslint-visitor-keys-3.3.0" + sources."espree-9.3.1" sources."esprima-4.0.1" (sources."esquery-1.4.0" // { dependencies = [ @@ -6758,7 +7541,7 @@ let sources."etag-1.8.1" sources."execa-5.1.1" sources."exit-0.1.2" - sources."expect-27.4.6" + sources."expect-27.5.1" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" @@ -6855,20 +7638,20 @@ let sources."ms-2.1.2" ]; }) - sources."istanbul-reports-3.1.3" - (sources."jest-27.4.7" // { + sources."istanbul-reports-3.1.4" + (sources."jest-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-27.4.7" + sources."jest-cli-27.5.1" sources."supports-color-7.2.0" ]; }) - sources."jest-changed-files-27.4.2" - (sources."jest-circus-27.4.6" // { + sources."jest-changed-files-27.5.1" + (sources."jest-circus-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6878,7 +7661,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-config-27.4.7" // { + (sources."jest-config-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6888,7 +7671,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-diff-27.4.6" // { + (sources."jest-diff-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6898,8 +7681,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-docblock-27.4.0" - (sources."jest-each-27.4.6" // { + sources."jest-docblock-27.5.1" + (sources."jest-each-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6909,11 +7692,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-jsdom-27.4.6" - sources."jest-environment-node-27.4.6" - sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.6" - (sources."jest-jasmine2-27.4.6" // { + sources."jest-environment-jsdom-27.5.1" + sources."jest-environment-node-27.5.1" + sources."jest-get-type-27.5.1" + sources."jest-haste-map-27.5.1" + (sources."jest-jasmine2-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6923,8 +7706,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-leak-detector-27.4.6" - (sources."jest-matcher-utils-27.4.6" // { + sources."jest-leak-detector-27.5.1" + (sources."jest-matcher-utils-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6934,7 +7717,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-27.4.6" // { + (sources."jest-message-util-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6944,10 +7727,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-mock-27.4.6" + sources."jest-mock-27.5.1" sources."jest-pnp-resolver-1.2.2" - sources."jest-regex-util-27.4.0" - (sources."jest-resolve-27.4.6" // { + sources."jest-regex-util-27.5.1" + (sources."jest-resolve-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6957,8 +7740,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-27.4.6" - (sources."jest-runner-27.4.6" // { + sources."jest-resolve-dependencies-27.5.1" + (sources."jest-runner-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6968,7 +7751,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-27.4.6" // { + (sources."jest-runtime-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6978,8 +7761,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-serializer-27.4.0" - (sources."jest-snapshot-27.4.6" // { + sources."jest-serializer-27.5.1" + (sources."jest-snapshot-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6989,7 +7772,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-util-27.4.2" // { + (sources."jest-util-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6999,7 +7782,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-validate-27.4.6" // { + (sources."jest-validate-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."camelcase-6.3.0" @@ -7011,7 +7794,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-27.4.6" // { + (sources."jest-watcher-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7021,7 +7804,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-27.4.6" // { + (sources."jest-worker-27.5.1" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -7032,10 +7815,11 @@ let sources."js-yaml-4.1.0" (sources."jsdom-16.7.0" // { dependencies = [ - sources."ws-7.5.6" + sources."ws-7.5.7" ]; }) sources."jsesc-2.5.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.2.0" @@ -7043,14 +7827,14 @@ let sources."kuler-2.0.0" sources."leven-2.1.0" sources."levn-0.4.1" + sources."lines-and-columns-1.2.4" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.merge-4.6.2" - (sources."logform-2.3.2" // { + (sources."logform-2.4.0" // { dependencies = [ sources."ms-2.1.3" - sources."safe-stable-stringify-1.1.1" ]; }) sources."lru-cache-6.0.0" @@ -7067,15 +7851,15 @@ let sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."mkdir-recursive-0.4.0" sources."moment-2.29.1" - (sources."mqtt-4.3.4" // { + (sources."mqtt-4.3.6" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" - sources."ws-7.5.6" + sources."ws-7.5.7" ]; }) (sources."mqtt-packet-6.10.0" // { @@ -7088,7 +7872,7 @@ let sources."nan-2.15.0" sources."natural-compare-1.4.0" sources."node-int64-0.4.0" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" (sources."number-allocator-1.0.9" // { @@ -7110,6 +7894,7 @@ let sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" + sources."parse-json-5.2.0" sources."parse5-6.0.1" sources."parseurl-1.3.3" sources."path-exists-4.0.0" @@ -7122,7 +7907,7 @@ let sources."pirates-4.0.5" sources."pkg-dir-4.2.0" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.6" // { + (sources."pretty-format-27.5.1" // { dependencies = [ sources."ansi-styles-5.2.0" ]; @@ -7137,13 +7922,13 @@ let sources."react-is-17.0.2" sources."readable-stream-3.6.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regexpp-3.2.0" - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -7173,7 +7958,7 @@ let sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-swizzle-0.2.2" sources."sisteransi-1.0.5" sources."slash-3.0.0" @@ -7232,7 +8017,7 @@ let sources."unicode-match-property-value-ecmascript-2.0.0" sources."unicode-property-aliases-ecmascript-2.0.0" sources."universalify-0.1.2" - sources."unix-dgram-2.0.3" + sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -7250,9 +8035,9 @@ let sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.7.0" sources."which-2.0.2" - sources."winston-3.5.0" - sources."winston-syslog-2.4.4" - sources."winston-transport-4.4.2" + sources."winston-3.6.0" + sources."winston-syslog-2.5.0" + sources."winston-transport-4.5.0" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -7263,7 +8048,7 @@ let }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-8.4.2" + sources."ws-8.5.0" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" @@ -7271,17 +8056,18 @@ let sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" - (sources."zigbee-herdsman-0.14.10" // { + (sources."zigbee-herdsman-0.14.20" // { dependencies = [ - sources."@babel/cli-7.16.8" + sources."@ampproject/remapping-2.0.3" + sources."@babel/cli-7.17.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.0" + (sources."@babel/core-7.17.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.0" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" (sources."@babel/helper-compilation-targets-7.16.7" // { @@ -7289,8 +8075,8 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" @@ -7314,9 +8100,9 @@ let sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" @@ -7391,15 +8177,15 @@ let }) sources."@babel/preset-modules-0.1.5" sources."@babel/preset-typescript-7.16.7" - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" sources."@bcoe/v8-coverage-0.2.3" (sources."@eslint/eslintrc-1.0.5" // { dependencies = [ sources."argparse-2.0.1" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."ignore-4.0.6" sources."js-yaml-4.1.0" sources."strip-json-comments-3.1.1" @@ -7409,7 +8195,7 @@ let sources."@humanwhocodes/object-schema-1.2.1" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-27.4.6" // { + (sources."@jest/console-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7420,7 +8206,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-27.4.7" // { + (sources."@jest/core-27.5.0" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -7433,10 +8219,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/environment-27.4.6" - sources."@jest/fake-timers-27.4.6" - sources."@jest/globals-27.4.6" - (sources."@jest/reporters-27.4.6" // { + sources."@jest/environment-27.5.0" + sources."@jest/fake-timers-27.5.0" + sources."@jest/globals-27.5.0" + (sources."@jest/reporters-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7448,14 +8234,14 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/source-map-27.4.0" // { + (sources."@jest/source-map-27.5.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@jest/test-result-27.4.6" - sources."@jest/test-sequencer-27.4.6" - (sources."@jest/transform-27.4.6" // { + sources."@jest/test-result-27.5.0" + sources."@jest/test-sequencer-27.5.0" + (sources."@jest/transform-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7467,7 +8253,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/types-27.4.2" // { + (sources."@jest/types-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7477,6 +8263,9 @@ let sources."supports-color-7.2.0" ]; }) + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.2.7" sources."@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -7510,20 +8299,20 @@ let sources."@types/ms-0.7.31" sources."@types/mz-2.7.4" sources."@types/nedb-1.8.12" - sources."@types/node-17.0.13" + sources."@types/node-17.0.15" sources."@types/prettier-2.4.3" sources."@types/serialport-8.0.2" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/eslint-plugin-5.10.1" - sources."@typescript-eslint/parser-5.10.1" - sources."@typescript-eslint/scope-manager-5.10.1" - sources."@typescript-eslint/type-utils-5.10.1" - sources."@typescript-eslint/types-5.10.1" - sources."@typescript-eslint/typescript-estree-5.10.1" - sources."@typescript-eslint/utils-5.10.1" - sources."@typescript-eslint/visitor-keys-5.10.1" + sources."@typescript-eslint/eslint-plugin-5.10.2" + sources."@typescript-eslint/parser-5.10.2" + sources."@typescript-eslint/scope-manager-5.10.2" + sources."@typescript-eslint/type-utils-5.10.2" + sources."@typescript-eslint/types-5.10.2" + sources."@typescript-eslint/typescript-estree-5.10.2" + sources."@typescript-eslint/utils-5.10.2" + sources."@typescript-eslint/visitor-keys-5.10.2" sources."abab-2.0.5" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { @@ -7549,7 +8338,7 @@ let sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asynckit-0.4.0" - (sources."babel-jest-27.4.6" // { + (sources."babel-jest-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7562,16 +8351,16 @@ let }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" - sources."babel-plugin-jest-hoist-27.4.0" + sources."babel-plugin-jest-hoist-27.5.0" (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-preset-current-node-syntax-1.0.1" - sources."babel-preset-jest-27.4.0" + sources."babel-preset-jest-27.5.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" @@ -7591,7 +8380,7 @@ let sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001304" + sources."caniuse-lite-1.0.30001307" sources."chalk-2.4.2" sources."char-regex-1.0.2" sources."chokidar-3.5.3" @@ -7616,7 +8405,7 @@ let sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."convert-source-map-1.8.0" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -7643,7 +8432,7 @@ let sources."delegates-1.0.0" sources."detect-libc-2.0.0" sources."detect-newline-3.1.0" - sources."diff-sequences-27.4.0" + sources."diff-sequences-27.5.0" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { @@ -7651,7 +8440,7 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."electron-to-chromium-1.4.57" + sources."electron-to-chromium-1.4.65" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -7679,7 +8468,7 @@ let sources."eslint-scope-7.1.0" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" sources."strip-ansi-6.0.1" @@ -7711,7 +8500,7 @@ let sources."execa-5.1.1" sources."exit-0.1.2" sources."expand-template-2.0.3" - sources."expect-27.4.6" + sources."expect-27.5.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" @@ -7805,20 +8594,20 @@ let sources."source-map-0.6.1" ]; }) - sources."istanbul-reports-3.1.3" - (sources."jest-27.4.7" // { + sources."istanbul-reports-3.1.4" + (sources."jest-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-27.4.7" + sources."jest-cli-27.5.0" sources."supports-color-7.2.0" ]; }) - sources."jest-changed-files-27.4.2" - (sources."jest-circus-27.4.6" // { + sources."jest-changed-files-27.5.0" + (sources."jest-circus-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7829,7 +8618,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-config-27.4.7" // { + (sources."jest-config-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7840,7 +8629,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-diff-27.4.6" // { + (sources."jest-diff-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7850,8 +8639,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-docblock-27.4.0" - (sources."jest-each-27.4.6" // { + sources."jest-docblock-27.5.0" + (sources."jest-each-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7861,11 +8650,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-jsdom-27.4.6" - sources."jest-environment-node-27.4.6" - sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.6" - (sources."jest-jasmine2-27.4.6" // { + sources."jest-environment-jsdom-27.5.0" + sources."jest-environment-node-27.5.0" + sources."jest-get-type-27.5.0" + sources."jest-haste-map-27.5.0" + (sources."jest-jasmine2-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7875,8 +8664,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-leak-detector-27.4.6" - (sources."jest-matcher-utils-27.4.6" // { + sources."jest-leak-detector-27.5.0" + (sources."jest-matcher-utils-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7886,7 +8675,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-27.4.6" // { + (sources."jest-message-util-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7897,10 +8686,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-mock-27.4.6" + sources."jest-mock-27.5.0" sources."jest-pnp-resolver-1.2.2" - sources."jest-regex-util-27.4.0" - (sources."jest-resolve-27.4.6" // { + sources."jest-regex-util-27.5.0" + (sources."jest-resolve-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7911,8 +8700,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-27.4.6" - (sources."jest-runner-27.4.6" // { + sources."jest-resolve-dependencies-27.5.0" + (sources."jest-runner-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7922,7 +8711,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-27.4.6" // { + (sources."jest-runtime-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7933,8 +8722,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-serializer-27.4.0" - (sources."jest-snapshot-27.4.6" // { + sources."jest-serializer-27.5.0" + (sources."jest-snapshot-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7944,7 +8733,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-util-27.4.2" // { + (sources."jest-util-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7954,7 +8743,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-validate-27.4.6" // { + (sources."jest-validate-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."camelcase-6.3.0" @@ -7965,7 +8754,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-27.4.6" // { + (sources."jest-watcher-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7975,7 +8764,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-27.4.6" // { + (sources."jest-worker-27.5.0" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -8022,7 +8811,7 @@ let sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" sources."neo-async-2.6.2" - sources."node-abi-3.5.0" + sources."node-abi-3.8.0" sources."node-int64-0.4.0" sources."node-releases-2.0.1" sources."normalize-path-3.0.0" @@ -8053,7 +8842,7 @@ let sources."pkg-dir-4.2.0" sources."prebuild-install-7.0.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.6" // { + (sources."pretty-format-27.5.0" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" @@ -8070,13 +8859,13 @@ let sources."readable-stream-2.3.7" sources."readdirp-3.6.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regexpp-3.2.0" - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -8098,7 +8887,7 @@ let sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shiki-0.10.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" sources."sisteransi-1.0.5" @@ -8162,7 +8951,7 @@ let sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" sources."typedoc-0.22.11" - sources."typedoc-plugin-markdown-3.11.12" + sources."typedoc-plugin-markdown-3.11.13" sources."typedoc-plugin-no-inherit-1.3.1" sources."typedoc-plugin-sourcefile-url-1.0.6" sources."typescript-4.5.5" @@ -8222,17 +9011,17 @@ let sources."yargs-parser-20.2.9" ]; }) - (sources."zigbee-herdsman-converters-14.0.406" // { + (sources."zigbee-herdsman-converters-14.0.438" // { dependencies = [ + sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.0" + (sources."@babel/core-7.17.5" // { dependencies = [ sources."semver-6.3.0" - sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.16.8" // { + (sources."@babel/generator-7.17.3" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -8247,13 +9036,13 @@ let sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.2" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -8265,7 +9054,7 @@ let sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.3" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -8280,19 +9069,19 @@ let sources."@babel/plugin-syntax-top-level-await-7.14.5" sources."@babel/plugin-syntax-typescript-7.16.7" sources."@babel/template-7.16.7" - (sources."@babel/traverse-7.16.10" // { + (sources."@babel/traverse-7.17.3" // { dependencies = [ sources."globals-11.12.0" ]; }) - sources."@babel/types-7.16.8" + sources."@babel/types-7.17.0" sources."@bcoe/v8-coverage-0.2.3" - (sources."@eslint/eslintrc-1.0.5" // { + (sources."@eslint/eslintrc-1.2.0" // { dependencies = [ sources."ignore-4.0.6" ]; }) - sources."@humanwhocodes/config-array-0.9.3" + sources."@humanwhocodes/config-array-0.9.5" sources."@humanwhocodes/object-schema-1.2.1" (sources."@istanbuljs/load-nyc-config-1.1.0" // { dependencies = [ @@ -8302,17 +9091,20 @@ let ]; }) sources."@istanbuljs/schema-0.1.3" - sources."@jest/console-27.4.6" - sources."@jest/core-27.4.7" - sources."@jest/environment-27.4.6" - sources."@jest/fake-timers-27.4.6" - sources."@jest/globals-27.4.6" - sources."@jest/reporters-27.4.6" - sources."@jest/source-map-27.4.0" - sources."@jest/test-result-27.4.6" - sources."@jest/test-sequencer-27.4.6" - sources."@jest/transform-27.4.6" - sources."@jest/types-27.4.2" + sources."@jest/console-27.5.1" + sources."@jest/core-27.5.1" + sources."@jest/environment-27.5.1" + sources."@jest/fake-timers-27.5.1" + sources."@jest/globals-27.5.1" + sources."@jest/reporters-27.5.1" + sources."@jest/source-map-27.5.1" + sources."@jest/test-result-27.5.1" + sources."@jest/test-sequencer-27.5.1" + sources."@jest/transform-27.5.1" + sources."@jest/types-27.5.1" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -8328,21 +9120,21 @@ let sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.14" - sources."@types/prettier-2.4.3" + sources."@types/node-17.0.21" + sources."@types/prettier-2.4.4" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/scope-manager-5.10.2" - sources."@typescript-eslint/types-5.10.2" - sources."@typescript-eslint/typescript-estree-5.10.2" - (sources."@typescript-eslint/utils-5.10.2" // { + sources."@typescript-eslint/scope-manager-5.12.1" + sources."@typescript-eslint/types-5.12.1" + sources."@typescript-eslint/typescript-estree-5.12.1" + (sources."@typescript-eslint/utils-5.12.1" // { dependencies = [ sources."eslint-scope-5.1.1" sources."estraverse-4.3.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.10.2" + sources."@typescript-eslint/visitor-keys-5.12.1" sources."abab-2.0.5" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { @@ -8365,26 +9157,26 @@ let sources."argparse-2.0.1" sources."array-union-2.1.0" sources."asynckit-0.4.0" - sources."axios-0.25.0" - sources."babel-jest-27.4.6" + sources."axios-0.26.0" + sources."babel-jest-27.5.1" sources."babel-plugin-istanbul-6.1.1" - sources."babel-plugin-jest-hoist-27.4.0" + sources."babel-plugin-jest-hoist-27.5.1" sources."babel-preset-current-node-syntax-1.0.1" - sources."babel-preset-jest-27.4.0" + sources."babel-preset-jest-27.5.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.19.1" + sources."browserslist-4.19.3" sources."bser-2.1.1" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001304" + sources."caniuse-lite-1.0.30001312" sources."chalk-4.1.2" sources."char-regex-1.0.2" sources."ci-info-3.3.0" @@ -8416,7 +9208,7 @@ let sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" sources."detect-newline-3.1.0" - sources."diff-sequences-27.4.0" + sources."diff-sequences-27.5.1" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { @@ -8424,10 +9216,11 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."electron-to-chromium-1.4.59" + sources."electron-to-chromium-1.4.73" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" + sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" (sources."escodegen-2.0.0" // { @@ -8438,17 +9231,17 @@ let sources."type-check-0.3.2" ]; }) - sources."eslint-8.8.0" + sources."eslint-8.10.0" sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-26.0.0" - sources."eslint-scope-7.1.0" + sources."eslint-plugin-jest-26.1.1" + 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.2.0" - sources."espree-9.3.0" + sources."eslint-visitor-keys-3.3.0" + sources."espree-9.3.1" sources."esprima-4.0.1" sources."esquery-1.4.0" sources."esrecurse-4.3.0" @@ -8456,7 +9249,7 @@ let sources."esutils-2.0.3" sources."execa-5.1.1" sources."exit-0.1.2" - sources."expect-27.4.6" + sources."expect-27.5.1" sources."fast-deep-equal-3.1.3" (sources."fast-glob-3.2.11" // { dependencies = [ @@ -8472,7 +9265,7 @@ let sources."find-up-4.1.0" sources."flat-cache-3.0.4" sources."flatted-3.2.5" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."form-data-3.0.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" @@ -8485,7 +9278,7 @@ let sources."get-stream-6.0.1" sources."glob-7.2.0" sources."glob-parent-6.0.2" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."globby-11.1.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" @@ -8503,6 +9296,7 @@ let sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-arrayish-0.2.1" sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -8521,43 +9315,43 @@ let }) sources."istanbul-lib-report-3.0.0" sources."istanbul-lib-source-maps-4.0.1" - sources."istanbul-reports-3.1.3" - (sources."jest-27.4.7" // { + sources."istanbul-reports-3.1.4" + (sources."jest-27.5.1" // { dependencies = [ - sources."jest-cli-27.4.7" + sources."jest-cli-27.5.1" ]; }) - sources."jest-changed-files-27.4.2" - sources."jest-circus-27.4.6" - sources."jest-config-27.4.7" - sources."jest-diff-27.4.6" - sources."jest-docblock-27.4.0" - sources."jest-each-27.4.6" - sources."jest-environment-jsdom-27.4.6" - sources."jest-environment-node-27.4.6" - sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.6" - sources."jest-jasmine2-27.4.6" - sources."jest-leak-detector-27.4.6" - sources."jest-matcher-utils-27.4.6" - sources."jest-message-util-27.4.6" - sources."jest-mock-27.4.6" + sources."jest-changed-files-27.5.1" + sources."jest-circus-27.5.1" + sources."jest-config-27.5.1" + sources."jest-diff-27.5.1" + sources."jest-docblock-27.5.1" + sources."jest-each-27.5.1" + sources."jest-environment-jsdom-27.5.1" + sources."jest-environment-node-27.5.1" + sources."jest-get-type-27.5.1" + sources."jest-haste-map-27.5.1" + sources."jest-jasmine2-27.5.1" + sources."jest-leak-detector-27.5.1" + sources."jest-matcher-utils-27.5.1" + sources."jest-message-util-27.5.1" + sources."jest-mock-27.5.1" sources."jest-pnp-resolver-1.2.2" - sources."jest-regex-util-27.4.0" - sources."jest-resolve-27.4.6" - sources."jest-resolve-dependencies-27.4.6" - sources."jest-runner-27.4.6" - sources."jest-runtime-27.4.6" - sources."jest-serializer-27.4.0" - sources."jest-snapshot-27.4.6" - sources."jest-util-27.4.2" - (sources."jest-validate-27.4.6" // { + sources."jest-regex-util-27.5.1" + sources."jest-resolve-27.5.1" + sources."jest-resolve-dependencies-27.5.1" + sources."jest-runner-27.5.1" + sources."jest-runtime-27.5.1" + sources."jest-serializer-27.5.1" + sources."jest-snapshot-27.5.1" + sources."jest-util-27.5.1" + (sources."jest-validate-27.5.1" // { dependencies = [ sources."camelcase-6.3.0" ]; }) - sources."jest-watcher-27.4.6" - (sources."jest-worker-27.4.6" // { + sources."jest-watcher-27.5.1" + (sources."jest-worker-27.5.1" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -8566,12 +9360,14 @@ let sources."js-yaml-4.1.0" sources."jsdom-16.7.0" sources."jsesc-2.5.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.2.0" sources."kleur-3.0.3" sources."leven-3.1.0" sources."levn-0.4.1" + sources."lines-and-columns-1.2.4" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.merge-4.6.2" @@ -8588,12 +9384,12 @@ let sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."ms-2.1.2" sources."natural-compare-1.4.0" sources."node-int64-0.4.0" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nwsapi-2.2.0" @@ -8604,6 +9400,7 @@ let sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" + sources."parse-json-5.2.0" sources."parse5-6.0.1" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -8615,7 +9412,7 @@ let sources."pirates-4.0.5" sources."pkg-dir-4.2.0" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.6" // { + (sources."pretty-format-27.5.1" // { dependencies = [ sources."ansi-styles-5.2.0" ]; @@ -8645,7 +9442,7 @@ let sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."source-map-0.6.1" @@ -8704,24 +9501,25 @@ let sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" - (sources."zigbee-herdsman-0.14.10" // { + (sources."zigbee-herdsman-0.14.20" // { dependencies = [ - sources."@babel/cli-7.16.8" + sources."@ampproject/remapping-2.0.3" + sources."@babel/cli-7.17.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.0" + (sources."@babel/core-7.17.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.0" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" (sources."@babel/helper-compilation-targets-7.16.7" // { @@ -8729,8 +9527,8 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" @@ -8754,9 +9552,9 @@ let sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" @@ -8831,15 +9629,15 @@ let }) sources."@babel/preset-modules-0.1.5" sources."@babel/preset-typescript-7.16.7" - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" sources."@bcoe/v8-coverage-0.2.3" (sources."@eslint/eslintrc-1.0.5" // { dependencies = [ sources."argparse-2.0.1" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."ignore-4.0.6" sources."js-yaml-4.1.0" sources."strip-json-comments-3.1.1" @@ -8849,7 +9647,7 @@ let sources."@humanwhocodes/object-schema-1.2.1" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-27.4.6" // { + (sources."@jest/console-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8860,7 +9658,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-27.4.7" // { + (sources."@jest/core-27.5.0" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -8873,10 +9671,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/environment-27.4.6" - sources."@jest/fake-timers-27.4.6" - sources."@jest/globals-27.4.6" - (sources."@jest/reporters-27.4.6" // { + sources."@jest/environment-27.5.0" + sources."@jest/fake-timers-27.5.0" + sources."@jest/globals-27.5.0" + (sources."@jest/reporters-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8888,14 +9686,14 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/source-map-27.4.0" // { + (sources."@jest/source-map-27.5.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@jest/test-result-27.4.6" - sources."@jest/test-sequencer-27.4.6" - (sources."@jest/transform-27.4.6" // { + sources."@jest/test-result-27.5.0" + sources."@jest/test-sequencer-27.5.0" + (sources."@jest/transform-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8907,7 +9705,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/types-27.4.2" // { + (sources."@jest/types-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8917,6 +9715,9 @@ let sources."supports-color-7.2.0" ]; }) + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.2.7" sources."@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -8950,20 +9751,20 @@ let sources."@types/ms-0.7.31" sources."@types/mz-2.7.4" sources."@types/nedb-1.8.12" - sources."@types/node-17.0.13" + sources."@types/node-17.0.15" sources."@types/prettier-2.4.3" sources."@types/serialport-8.0.2" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/eslint-plugin-5.10.1" - sources."@typescript-eslint/parser-5.10.1" - sources."@typescript-eslint/scope-manager-5.10.1" - sources."@typescript-eslint/type-utils-5.10.1" - sources."@typescript-eslint/types-5.10.1" - sources."@typescript-eslint/typescript-estree-5.10.1" - sources."@typescript-eslint/utils-5.10.1" - sources."@typescript-eslint/visitor-keys-5.10.1" + sources."@typescript-eslint/eslint-plugin-5.10.2" + sources."@typescript-eslint/parser-5.10.2" + sources."@typescript-eslint/scope-manager-5.10.2" + sources."@typescript-eslint/type-utils-5.10.2" + sources."@typescript-eslint/types-5.10.2" + sources."@typescript-eslint/typescript-estree-5.10.2" + sources."@typescript-eslint/utils-5.10.2" + sources."@typescript-eslint/visitor-keys-5.10.2" sources."abab-2.0.5" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { @@ -8989,7 +9790,7 @@ let sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asynckit-0.4.0" - (sources."babel-jest-27.4.6" // { + (sources."babel-jest-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9002,16 +9803,16 @@ let }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" - sources."babel-plugin-jest-hoist-27.4.0" + sources."babel-plugin-jest-hoist-27.5.0" (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-preset-current-node-syntax-1.0.1" - sources."babel-preset-jest-27.4.0" + sources."babel-preset-jest-27.5.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" @@ -9031,7 +9832,7 @@ let sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001304" + sources."caniuse-lite-1.0.30001307" sources."chalk-2.4.2" sources."char-regex-1.0.2" sources."chokidar-3.5.3" @@ -9056,7 +9857,7 @@ let sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."convert-source-map-1.8.0" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -9083,7 +9884,7 @@ let sources."delegates-1.0.0" sources."detect-libc-2.0.0" sources."detect-newline-3.1.0" - sources."diff-sequences-27.4.0" + sources."diff-sequences-27.5.0" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { @@ -9091,7 +9892,7 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."electron-to-chromium-1.4.57" + sources."electron-to-chromium-1.4.65" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -9119,7 +9920,7 @@ let sources."eslint-scope-7.1.0" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" sources."strip-ansi-6.0.1" @@ -9151,7 +9952,7 @@ let sources."execa-5.1.1" sources."exit-0.1.2" sources."expand-template-2.0.3" - sources."expect-27.4.6" + sources."expect-27.5.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" @@ -9245,20 +10046,20 @@ let sources."source-map-0.6.1" ]; }) - sources."istanbul-reports-3.1.3" - (sources."jest-27.4.7" // { + sources."istanbul-reports-3.1.4" + (sources."jest-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-27.4.7" + sources."jest-cli-27.5.0" sources."supports-color-7.2.0" ]; }) - sources."jest-changed-files-27.4.2" - (sources."jest-circus-27.4.6" // { + sources."jest-changed-files-27.5.0" + (sources."jest-circus-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9269,7 +10070,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-config-27.4.7" // { + (sources."jest-config-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9280,7 +10081,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-diff-27.4.6" // { + (sources."jest-diff-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9290,8 +10091,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-docblock-27.4.0" - (sources."jest-each-27.4.6" // { + sources."jest-docblock-27.5.0" + (sources."jest-each-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9301,11 +10102,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-jsdom-27.4.6" - sources."jest-environment-node-27.4.6" - sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.6" - (sources."jest-jasmine2-27.4.6" // { + sources."jest-environment-jsdom-27.5.0" + sources."jest-environment-node-27.5.0" + sources."jest-get-type-27.5.0" + sources."jest-haste-map-27.5.0" + (sources."jest-jasmine2-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9315,8 +10116,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-leak-detector-27.4.6" - (sources."jest-matcher-utils-27.4.6" // { + sources."jest-leak-detector-27.5.0" + (sources."jest-matcher-utils-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9326,7 +10127,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-27.4.6" // { + (sources."jest-message-util-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9337,10 +10138,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-mock-27.4.6" + sources."jest-mock-27.5.0" sources."jest-pnp-resolver-1.2.2" - sources."jest-regex-util-27.4.0" - (sources."jest-resolve-27.4.6" // { + sources."jest-regex-util-27.5.0" + (sources."jest-resolve-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9351,8 +10152,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-27.4.6" - (sources."jest-runner-27.4.6" // { + sources."jest-resolve-dependencies-27.5.0" + (sources."jest-runner-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9362,7 +10163,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-27.4.6" // { + (sources."jest-runtime-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9373,8 +10174,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-serializer-27.4.0" - (sources."jest-snapshot-27.4.6" // { + sources."jest-serializer-27.5.0" + (sources."jest-snapshot-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9384,7 +10185,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-util-27.4.2" // { + (sources."jest-util-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9394,7 +10195,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-validate-27.4.6" // { + (sources."jest-validate-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."camelcase-6.3.0" @@ -9405,7 +10206,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-27.4.6" // { + (sources."jest-watcher-27.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9415,7 +10216,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-27.4.6" // { + (sources."jest-worker-27.5.0" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -9462,7 +10263,7 @@ let sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" sources."neo-async-2.6.2" - sources."node-abi-3.5.0" + sources."node-abi-3.8.0" sources."node-int64-0.4.0" sources."node-releases-2.0.1" sources."normalize-path-3.0.0" @@ -9493,7 +10294,7 @@ let sources."pkg-dir-4.2.0" sources."prebuild-install-7.0.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.6" // { + (sources."pretty-format-27.5.0" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" @@ -9510,13 +10311,13 @@ let sources."readable-stream-2.3.7" sources."readdirp-3.6.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regexpp-3.2.0" - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -9538,7 +10339,7 @@ let sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shiki-0.10.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" sources."sisteransi-1.0.5" @@ -9602,7 +10403,7 @@ let sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" sources."typedoc-0.22.11" - sources."typedoc-plugin-markdown-3.11.12" + sources."typedoc-plugin-markdown-3.11.13" sources."typedoc-plugin-no-inherit-1.3.1" sources."typedoc-plugin-sourcefile-url-1.0.6" sources."typescript-4.5.5" @@ -9664,7 +10465,7 @@ let }) ]; }) - sources."zigbee2mqtt-frontend-0.6.71" + sources."zigbee2mqtt-frontend-0.6.76" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/shells/bash/bash-5.1-patches.nix b/pkgs/shells/bash/bash-5.1-patches.nix index e6e9461bcbe..41eb9271058 100644 --- a/pkgs/shells/bash/bash-5.1-patches.nix +++ b/pkgs/shells/bash/bash-5.1-patches.nix @@ -13,4 +13,8 @@ patch: [ (patch "010" "0amfmvbzsand7bdypylkjdpcp88fa3cplfshn7vyzv2ff2rdgj52") (patch "011" "0yq24abb4fzfxqnwl20b330sxl9lr9ds0nc4yi30f81l94b1y6aq") (patch "012" "165bff97ffih49vfs4mkr5w3z5gn1w6zfyrf773iajkw6v48kw8h") +(patch "013" "1bfmgv3lagbk3aq9a831d29xv7jz4sjq7jhn9hq89limyinvdb67") +(patch "014" "1l43dw4kpddn7l41i8wmj406z9abxky1wb3rk8krcys33g4f0kka") +(patch "015" "1w40vzadzx019v0zhs4q6yqycrk04x1k8xs6qb73vk7ny4p6jdqv") +(patch "016" "0krqqljz4bkp9wrdnwfx51bxkb8rkwf8ivc93as1znx5fr7i96c8") ] diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 622521781c1..e320b920cfa 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -134,7 +134,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -144,11 +144,9 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok="; + sha256 = "sha256-tbSKuEhrGe9xajL39GuIuepTVhVfDpZ+6Z9Ak2RUE8U="; }; - patches = [ ./tests-pcre2-update.patch ]; # should be included in >= 3.4 - # Fix FHS paths in tests postPatch = '' # src/fish_tests.cpp @@ -182,6 +180,10 @@ let rm tests/pexpects/exit.py rm tests/pexpects/job_summary.py rm tests/pexpects/signals.py + '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # pexpect tests are flaky on aarch64-linux + # See https://github.com/fish-shell/fish-shell/issues/8789 + rm tests/pexpects/exit_handlers.py ''; nativeBuildInputs = [ diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index ab244d282ec..98b41f6cc18 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -19,6 +19,8 @@ lib.makeScope newScope (self: with self; { fzf-fish = callPackage ./fzf-fish.nix { }; + hydro = callPackage ./hydro.nix { }; + pisces = callPackage ./pisces.nix { }; pure = callPackage ./pure.nix { }; diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/shells/fish/plugins/hydro.nix new file mode 100644 index 00000000000..efc85cfcd0b --- /dev/null +++ b/pkgs/shells/fish/plugins/hydro.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "hydro"; + version = "d4875065ceea226f58ead97dd9b2417937344d6e"; + + src = fetchFromGitHub { + owner = "jorgebucaran"; + repo = "hydro"; + rev = version; + sha256 = "sha256-nXeDnqqOuZyrqGTPEQtYlFvrFvy1bZVMF4CA37b0lsE="; + }; + + meta = with lib; { + description = "Ultra-pure, lag-free prompt with async Git status."; + homepage = "https://github.com/jorgebucaran/hydro`"; + license = licenses.mit; + maintainers = with maintainers; [ mrhedgehog ]; + }; +} diff --git a/pkgs/shells/fish/tests-pcre2-update.patch b/pkgs/shells/fish/tests-pcre2-update.patch deleted file mode 100644 index 5e0c327c540..00000000000 --- a/pkgs/shells/fish/tests-pcre2-update.patch +++ /dev/null @@ -1,7 +0,0 @@ -Adapted formating to 3.3.1 from -https://github.com/fish-shell/fish-shell/commit/ec8844d834cc9fe626e9fc326c6f5410341d532a ---- a/src/fish_tests.cpp -+++ b/src/fish_tests.cpp -@@ -5726,2 +5725,0 @@ -- {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"}, -- {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"}, diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index 55a28ceb889..c3f5d3516cb 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -2,19 +2,17 @@ buildGoModule rec { pname = "hilbish"; - version = "0.7.1"; + version = "1.0.4"; src = fetchFromGitHub { owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - sha256 = "sha256-YQNLv6/4I5WM/xhlWIjThgO23tN+ZCyJVZVatnIUllc="; + sha256 = "sha256-JVAyE6iSfRres2YalQF3CWK5Jtn5HoW6p6RHVbwzoVQ="; fetchSubmodules = true; }; - vendorSha256 = "sha256-xzB6sqBnDuvqTFMmLcXdSj6UFWYzA54PxUBKrFKhyQk="; - - buildInputs = [ readline ]; + vendorSha256 = "sha256-Bmst1oJMuSXGvL8Syw6v2BqrbO5McHKkTufFs6iuxzs="; ldflags = [ "-s" @@ -28,7 +26,7 @@ buildGoModule rec { cp .hilbishrc.lua $out/share/hilbish/ cp -r docs -t $out/share/hilbish cp -r libs -t $out/share/hilbish/ - cp preload.lua $out/share/hilbish/ + cp -r prelude/ $out/share/hilbish/ # segfaults and it's already been generated upstream # we copy the docs over with the above cp command diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 1befd289757..4357ca605b1 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -7,20 +7,11 @@ stdenv.mkDerivation rec { pname = "tcsh"; - version = "6.23.02"; + version = "6.24.00"; src = fetchurl { - urls = [ - "https://astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" - "https://astron.com/pub/tcsh/${pname}-${version}.tar.gz" - "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" - "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" - "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz" - "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" - "ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz" - "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" - ]; - hash = "sha256-wD+AQFE2cxswkdpzWoHN2EgAhRAySrMl8jWv9wnkRus="; + url = "mirror://tcsh/${pname}-${version}.tar.gz"; + hash = "sha256-YL4sUEvY8fpuQksZVkldfnztUqKslNtf0n9La/yPdPA="; }; buildInputs = [ @@ -28,6 +19,7 @@ stdenv.mkDerivation rec { ]; patches = lib.optional stdenv.hostPlatform.isMusl + # Use system malloc (fetchpatch { name = "sysmalloc.patch"; url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 71f95472bb4..5a2c0d050ce 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -13,7 +13,7 @@ , buildPackages }: let - version = "5.8"; + version = "5.8.1"; in stdenv.mkDerivation { @@ -22,19 +22,12 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; + sha256 = "sha256-tpc1ILrOYAtHeSACabHl155fUFrElSBYwRrVu/DdmRk="; }; patches = [ # fix location of timezone data for TZ= completion ./tz_completion.patch - # This commit will be released with the next version of zsh - (fetchpatch { - name = "fix-git-stash-drop-completions.patch"; - url = "https://github.com/zsh-users/zsh/commit/754658aff38e1bdf487c58bec6174cbecd019d11.patch"; - sha256 = "sha256-ud/rLD+SqvyTzT6vwOr+MWH+LY5o5KACrU1TpmL15Lo="; - excludes = [ "ChangeLog" ]; - }) ]; nativeBuildInputs = [ autoreconfHook perl groff texinfo ] diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 07d72a6b436..538fbc0a522 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-Vn8NzpvJ1W/+UUuhr1plLqskVBUOFJHvy+hxKE3DmIs="; + sha256 = "sha256-GEuBYN6HVAjiAbusVuEA7zBG9fIVZHLV628Jt6Cv5cM="; }; buildInputs = [ zsh coreutils txt2tags procps ] diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 83ef9ea65e1..1907745fe8d 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2022-01-18"; + version = "2022-03-14"; pname = "oh-my-zsh"; - rev = "22c11da108764336d92d03d3113c1f486cdb5911"; + rev = "345976874550efa09fa7e9cdbe1215ce27d1541b"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "Tnwy+3lCWjzDhjXtgLIiX3SxpJG6shxmmPFyeWkO2R0="; + sha256 = "AxKt84XDqmkwBlUeWsE6Tm0aRxvv0HXRdBf/OXjIyHo="; }; installPhase = '' diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 44caa6838e8..40cedd713ab 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -19,16 +19,9 @@ let allowlist = config.allowlistedLicenses or config.whitelistedLicenses or []; blocklist = config.blocklistedLicenses or config.blacklistedLicenses or []; - onlyLicenses = list: - lib.lists.all (license: - let l = lib.licenses.${license.shortName or "BROKEN"} or false; in - if license == l then true else - throw ''‘${showLicense license}’ is not an attribute of lib.licenses'' - ) list; - areLicenseListsValid = if lib.mutuallyExclusive allowlist blocklist then - assert onlyLicenses allowlist; assert onlyLicenses blocklist; true + true else throw "allowlistedLicenses and blocklistedLicenses are not mutually exclusive."; diff --git a/pkgs/test/make-wrapper/default.nix b/pkgs/test/make-wrapper/default.nix index 6e70945ee19..62ccd272adf 100644 --- a/pkgs/test/make-wrapper/default.nix +++ b/pkgs/test/make-wrapper/default.nix @@ -64,6 +64,7 @@ runCommand "make-wrapper-test" (mkWrapperBinary { name = "test-run-and-set"; args = [ "--run" "export VAR=foo" "--set" "VAR" "bar" ]; }) (mkWrapperBinary { name = "test-args"; args = [ "--add-flags" "abc" ]; wrapped = wrappedBinaryArgs; }) (mkWrapperBinary { name = "test-prefix"; args = [ "--prefix" "VAR" ":" "abc" ]; }) + (mkWrapperBinary { name = "test-prefix-noglob"; args = [ "--prefix" "VAR" ":" "./*" ]; }) (mkWrapperBinary { name = "test-suffix"; args = [ "--suffix" "VAR" ":" "abc" ]; }) (mkWrapperBinary { name = "test-prefix-and-suffix"; args = [ "--prefix" "VAR" ":" "foo" "--suffix" "VAR" ":" "bar" ]; }) (mkWrapperBinary { name = "test-prefix-multi"; args = [ "--prefix" "VAR" ":" "abc:foo:foo" ]; }) @@ -112,6 +113,8 @@ runCommand "make-wrapper-test" # Only append the value once when given multiple times in a parameter # to makeWrapper + mkTest "test-prefix" "VAR=abc" + # --prefix doesn't expand globs + + mkTest "VAR=f?oo test-prefix-noglob" "VAR=./*:f?oo" # --suffix works diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index 255d4c34e58..e8a959f6b44 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchgit +, fetchFromGitHub , xorgproto , libX11 , libXft @@ -12,7 +12,16 @@ , giflib , pkg-config }: -let +stdenv.mkDerivation rec { + pname = "skippy-xd"; + version = "unstable-2015-03-01"; + src = fetchFromGitHub { + owner = "richardgv"; + repo = "skippy-xd"; + rev = "397216ca67074c71314f5e9a6e3f1710ccabc29e"; + sha256 = "sha256-iP6g3iS1aPPkauBLHbgZH/l+TXbWyIJ2TmbrSiNTkn0="; + }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 @@ -23,26 +32,15 @@ let libXinerama libjpeg giflib - pkg-config ]; -in -stdenv.mkDerivation rec { - version = "unstable-2015-03-01"; - pname = "skippy-xd"; - inherit buildInputs; - src = fetchgit { - url = "https://github.com/richardgv/skippy-xd/"; - rev = "397216ca67"; - sha256 = "0zcjacilmsv69rv85j6nfr6pxy8z36w1sjz0dbjg6s5m4kga1zl8"; - }; makeFlags = [ "PREFIX=$(out)" ]; preInstall = '' sed -e "s@/etc/xdg@$out&@" -i Makefile ''; - meta = { + meta = with lib; { description = "Expose-style compositing-based standalone window switcher"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index bf4fdb97385..94f793f47fd 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.109"; + version = "3.0.112"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-YlJGYt/depabhMPQtS1dwmFSxoThUEXOWi7KSWx7cRo="; + sha256 = "sha256-gzZFxZMLq0TS8bxnQTTEno6OdAu/5tqr0Tl1cF8Rm3c="; }; - vendorSha256 = "sha256-c7LsCNcxdHwDBEknXJt9AyrmFcem8YtUYy06vNDBdDY="; + vendorSha256 = "sha256-FQvBq8+80h7m271gjraV445ayWcpkemOtVswfmHzUM0="; subPackages = [ "main" ]; - ldFlags = [ "-s" "-w" "-X github.com/aliyun/aliyun-cli/cli.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/aliyun/aliyun-cli/cli.Version=${version}" ]; postInstall = '' mv $out/bin/main $out/bin/aliyun @@ -25,7 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Tool to manage and use Alibaba Cloud resources through a command line interface"; homepage = "https://github.com/aliyun/aliyun-cli"; - changelog = "https://github.com/aliyun/aliyun-cli/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/aliyun/aliyun-cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ornxka ]; }; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 2a2d55dc195..08fb92e4ea6 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -25,15 +25,7 @@ let rev = "7083e5c204e139dc41f646e0ad85286b5e7c0c23"; sha256 = "sha256-aiCc/CXoTem0a9wI/AMBRK3g2BXJi7LpnUY/BxBEKVM="; }; - propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt]; - }); - - prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { - version = "2.0.10"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; - }; + propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [ py.pkgs.awscrt ]; }); }; }; @@ -41,13 +33,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.4.9"; # N.B: if you change this, change botocore to a matching version too + version = "2.4.19"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-ihmbw+gS7zZz/nebrmpEr9MR+dVabc70DBPPSrm3eeE="; + sha256 = "sha256-ZOSZBZT4d5jv5lg8KkGoOJqAvStUsGZbiXp3dpsrOpo="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index 8a6bb559041..bf86a5c02ec 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -1,19 +1,44 @@ { lib, buildGoModule, fetchFromGitHub }: +let + skipTests = { + access = "Access"; + create = "Create"; + delete = "Delete"; + list = "List"; + read = "Read"; + replace = "Replace"; + resolver = "Resolve"; + revoke = "Revoke"; + update = "Update"; + }; + + skipTestsCommand = + builtins.foldl' (acc: goFileName: + let testName = builtins.getAttr goFileName skipTests; in + '' + ${acc} + substituteInPlace pkg/berglas/${goFileName}_test.go \ + --replace "TestClient_${testName}_storage" "SkipClient_${testName}_storage" \ + --replace "TestClient_${testName}_secretManager" "SkipClient_${testName}_secretManager" + '' + ) "" (builtins.attrNames skipTests); +in + buildGoModule rec { pname = "berglas"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = "v${version}"; - sha256 = "0y393g36h35zzqyf5b10j6qq2jhvz83j17cmasnv6wbyrb3vnn0n"; + sha256 = "sha256-aLsrrK+z080qn7L2zggA8yD+QqLaSRJLTjWQnFKFogQ="; }; - vendorSha256 = null; + vendorSha256 = "sha256-HjZT0jezJzoEvXuzrjoTv/zSex+xDuGoP1h82CIlX14="; - doCheck = false; + postPatch = skipTestsCommand; meta = with lib; { description = "A tool for managing secrets on Google Cloud"; diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 4c6c6971fc9..fda6113b598 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -1,21 +1,54 @@ -{ lib, stdenv, fetchurl, libxslt, docbook_xsl, libcap }: +{ lib +, stdenv +, fetchFromGitHub +, docbook_xsl +, libxslt +, meson +, ninja +, pkg-config +, bash-completion +, libcap +, libselinux +}: stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.5.0"; + version = "0.6.1"; - src = fetchurl { - url = "https://github.com/containers/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Fv2vM3mdYxBONH4BM/kJGW/pDQxQUV0BC8tCLrWgCBg="; + src = fetchFromGitHub { + owner = "containers"; + repo = "bubblewrap"; + rev = "v${version}"; + sha256 = "sha256-YmK/Tq9/JTJr5gLNKEH5t6TvvXlNSTDz5Ui7d3ewv2s="; }; - nativeBuildInputs = [ libxslt docbook_xsl ]; - buildInputs = [ libcap ]; + postPatch = '' + substituteInPlace tests/libtest.sh \ + --replace "/var/tmp" "$TMPDIR" + ''; + + nativeBuildInputs = [ + docbook_xsl + libxslt + meson + ninja + pkg-config + ]; + + buildInputs = [ + bash-completion + libcap + libselinux + ]; + + # incompatible with Nix sandbox + doCheck = false; meta = with lib; { description = "Unprivileged sandboxing tool"; homepage = "https://github.com/containers/bubblewrap"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/cf-vault/default.nix b/pkgs/tools/admin/cf-vault/default.nix new file mode 100644 index 00000000000..455ed270379 --- /dev/null +++ b/pkgs/tools/admin/cf-vault/default.nix @@ -0,0 +1,23 @@ +{buildGoModule, fetchFromGitHub, lib}: +buildGoModule rec { + pname = "cf-vault"; + version = "0.0.11"; + + src = fetchFromGitHub { + owner = "jacobbednarz"; + repo = pname; + rev = version; + sha256 = "sha256-Imd9qeT4xg5ujVPLHSSqoteSPl9t97q3Oc4C/vzHphg="; + }; + + vendorSha256 = "sha256-PkmbVg5HnsUaSL/Kp3YJVdyzpjgvr/p9mKNmOubwXQA="; + + meta = with lib; { + description = '' + A tool for managing your Cloudflare credentials, securely.. + ''; + homepage = "https://github.com/jacobbednarz/cf-vault/"; + license = licenses.mit; + maintainers = with maintainers; [ viraptor ]; + }; +} diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix index f7ba90ac2ad..d17366b38a8 100644 --- a/pkgs/tools/admin/colmena/default.nix +++ b/pkgs/tools/admin/colmena/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "colmena"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "colmena"; rev = "v${version}"; - sha256 = "sha256-5UU8iBzwO7xM8B+LulnFkJFv5j5lu7mfq0XMmOCaKcQ="; + sha256 = "sha256-VsqFiqZUjGpDZfw6ws1rvqm/NGUfFBXHa0N8ZkBaMh8="; }; - cargoSha256 = "sha256-wMC2GAVVxkwrgJtOIJL0P+Uxh+ouW4VwLDrXJlD10AA="; + cargoSha256 = "sha256-NVvPh0+53YIm5Kb/lNyXb7M3bbADBVdsTaPptyb37lw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/tools/admin/ejson2env/default.nix new file mode 100644 index 00000000000..cb82a689e94 --- /dev/null +++ b/pkgs/tools/admin/ejson2env/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "ejson2env"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "Shopify"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-1nfMmjYKRo5vjOwLb3fX9SQ0CDHme1DAz0AGGpV4piI="; + }; + + vendorSha256 = "sha256-lais54Gm4UGJN8D+iFbP8utTfDr+v8qXZKLdpNKzJi8="; + + meta = with lib; { + description = "A tool to simplify storing secrets that should be accessible in the shell environment in your git repo."; + homepage = "https://github.com/Shopify/ejson2env"; + maintainers = with maintainers; [ viraptor ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 03cc557003d..035dfe183e6 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.85.0"; + version = "0.87.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-gkwFW9ikpdA5ErNGmkMMTRvWmRVw28vZF/SixsWnzNg="; + sha256 = "sha256-909cInKo6X8yzpXlumDYIi8yCYLqr1CVcsGgYSd2pnQ="; }; - vendorSha256 = "sha256-as3Q8umRES/XncIZbV4UKZSGvzqHF7ClKBWvnGdkYeg="; + vendorSha256 = "sha256-3pEKG5YW83YMSkAjiJQDW1eQbMl6SkokHTXn+kJ/3l4="; doCheck = false; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index d6b1933a57c..6cb52ccd135 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.49.3"; + version = "1.51.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ANykklex/T7JwZ/G3dB4UPkYx5jSE5AnztGsWHGfL8I="; + sha256 = "sha256-Nx9lASZOEetkADVEs2JxPRi9SCrb4SLnEpLpzcpp/Is="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 03a77f624be..95f5ee789f2 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.23"; + version = "0.24"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-00HWby1LwKEz4BgwD3yv0IMW9mzkTj4FMFgYAn7kLac="; + sha256 = "sha256-nlSJ6JxC5MTS/ltSB9qnhtoRjDL1A5NlXWM/2A4duGU="; }; - vendorSha256 = "sha256-oA8/9LjMRM1RXKKDWhcbt2qr/4T7YgOq92U2mF9E+sw="; + vendorSha256 = "sha256-Cr9etq9E16vj2AL9OkIQom/gATjj9QT9+keUR1WQJR0="; ldflags = [ "-s" "-w" "-X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev}" diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 71274be69ae..f53315613e7 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.9"; + version = "0.10.12"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-FNlbAxU1FiLl74h+BmpAB3+vZ+RgdlpkehsDLhpZ4EE="; + sha256 = "sha256-nFxudeJJ5BkfZxSnRquyATHyHwI+7xwfQxiY8cedtis="; }; vendorSha256 = "sha256-f35Asf9l6ZfixpjMGzesTsxmANreilMxH2CULMH3b2o="; diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 4d48110e967..c060f600d32 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -3,42 +3,18 @@ , fetchFromGitHub }: -let - py = python3.override { - packageOverrides = self: super: { - # until https://github.com/ags-slc/localzone/issues/1 gets resolved - dnspython = super.dnspython.overridePythonAttrs(oldAttrs: rec { - pname = "dnspython"; - version = "1.16.0"; - # since name is defined from the previous derivation, need to override - # name explicity for correct version to show in drvName - name = "${pname}-${version}"; - - src = super.fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "00cfamn97w2vhq3id87f10mjna8ag5yz5dw0cy5s0sa3ipiyii9n"; - }; - }); - - localzone = super.localzone.overridePythonAttrs(oldAttrs: rec { - meta = oldAttrs.meta // { broken = false; }; - }); - }; - }; -in - with py.pkgs; +with python3.pkgs; buildPythonApplication rec { pname = "lexicon"; - version = "3.9.0"; + version = "3.9.4"; format = "pyproject"; src = fetchFromGitHub { owner = "AnalogJ"; repo = pname; rev = "v${version}"; - hash = "sha256-qJFHwFzFjZVdQv4YfrlR2cMQHsEtpQbvg/DMo6C5/z0="; + hash = "sha256-TySgIxBEl2RolndAkEN4vCIDKaI48vrh2ocd+CTn7Ow="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 496f478be8a..b1c14d6c8aa 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,11 +1,11 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage rec { - version = "0.9.79"; + version = "0.9.98"; src = fetchzip { url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz"; - sha256 = "17f34ifzdrkbap2hhd0y0rdcn8j0svxzsqw0qhcp3h68z3098hdv"; + sha256 = "0bvd6fin05dkh6x5qx2f58c0zsmxpdlwb8wqm0y04bax1mhm1bsf"; }; packageJSON = ./package.json; diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 4a0f5bf6137..3b08a4ccbc5 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.9.79", + "version": "0.9.98", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -41,7 +41,7 @@ "compression": "^1.7.4", "cookie-session": "^1.4.0", "express": "^4.17.0", - "express-handlebars": "^3.1.0", + "express-handlebars": "^5.3.5", "express-ws": "^4.0.0", "ipcheck": "^0.1.0", "minimist": "^1.2.5", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index 219114d50fe..55b08db09a9 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@alloc/quick-lru@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" + integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== + "@babel/code-frame@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" @@ -9,10 +14,10 @@ dependencies: "@babel/highlight" "^7.16.7" -"@babel/generator@^7.17.0", "@babel/generator@^7.4.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e" - integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw== +"@babel/generator@^7.17.3", "@babel/generator@^7.4.0": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200" + integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg== dependencies: "@babel/types" "^7.17.0" jsesc "^2.5.1" @@ -69,10 +74,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.16.7", "@babel/parser@^7.17.0", "@babel/parser@^7.4.3": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c" - integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw== +"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.4.3": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0" + integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA== "@babel/template@^7.16.7", "@babel/template@^7.4.0": version "7.16.7" @@ -84,17 +89,17 @@ "@babel/types" "^7.16.7" "@babel/traverse@^7.4.3": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30" - integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg== + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" + integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== dependencies: "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.0" + "@babel/generator" "^7.17.3" "@babel/helper-environment-visitor" "^7.16.7" "@babel/helper-function-name" "^7.16.7" "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.0" + "@babel/parser" "^7.17.3" "@babel/types" "^7.17.0" debug "^4.1.0" globals "^11.1.0" @@ -115,35 +120,35 @@ google-protobuf "3.14.0" parsimmon "1.16.0" -"@sendgrid/client@^7.6.1": - version "7.6.1" - resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.1.tgz#de17fe9f04af3bdb69aca44fc407316de87cea3b" - integrity sha512-q4U5OhcbJjs+lLVv/LhZSc28feiVCFMgvG9aYcRI5X4tKArnrrGDWb5HMITR9vaAtX42TXhyPFjHr1fk/Q1loQ== +"@sendgrid/client@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.2.tgz#5d08949120dad679f34260f1b875b4f57a8d688e" + integrity sha512-Yw3i3vPBBwfiIi+4i7+1f1rwQoLlLsu3qW16d1UuRp6RgX6H6yHYb2/PfqwNyCC0qzqIWGUKPWwYe5ggcr5Guw== dependencies: - "@sendgrid/helpers" "^7.6.0" - axios "^0.21.4" + "@sendgrid/helpers" "^7.6.2" + axios "^0.26.0" -"@sendgrid/helpers@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.6.0.tgz#b381bfab391bcd66c771811b22bb6bb2d5c1dfc6" - integrity sha512-0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA== +"@sendgrid/helpers@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.6.2.tgz#e4abdd4e259611ed549ae8e0f4a46cd4f587e5d1" + integrity sha512-kGW0kM2AOHfXjcvB6Lgwa/nMv8IALu0KyNY9X4HSa3MtLohymuhbG9HgjrOh66+BkbsfA03H3bcT0+sPVJ0GKQ== dependencies: deepmerge "^4.2.2" "@sendgrid/mail@*": - version "7.6.1" - resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.1.tgz#f7bbfc93781b0b6126549bf4b3649805295b02aa" - integrity sha512-F+HXpDLIU4PGZyZznOiFLDGJDwLn2qh7/wD5MvwurrldDx5DaGQHrYBKHopceOl15FVuq9ElU9VIxQJF8SMvTg== + version "7.6.2" + resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.2.tgz#118650afbb58be82e3178fa172869d929d937118" + integrity sha512-IHHZFvgU95aqb11AevQvAfautj2pb8iW8UCiUJ2ae9pRF37e6EkBmU9NgdFjbQ/8Xhhm+KDVDzn/JLxDN/GiBw== dependencies: - "@sendgrid/client" "^7.6.1" - "@sendgrid/helpers" "^7.6.0" + "@sendgrid/client" "^7.6.2" + "@sendgrid/helpers" "^7.6.2" "@tootallnate/once@2": version "2.0.0" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@types/geojson@^7946.0.7": +"@types/geojson@^7946.0.8": version "7946.0.8" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== @@ -155,15 +160,15 @@ dependencies: "@types/node" "*" -"@types/node@*": - version "17.0.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz#a8ddf6e0c2341718d74ee3dc413a13a042c45a0c" - integrity sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw== +"@types/node@*", "@types/node@^17.0.10": + version "17.0.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" + integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== -"@types/node@^14.14.14", "@types/node@^14.14.28": - version "14.18.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.11.tgz#9bd810a959e1728d78df0f68b5c825b8ea7156f4" - integrity sha512-zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg== +"@types/node@^14.14.14": + version "14.18.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" + integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A== "@types/webidl-conversions@*": version "6.1.1" @@ -431,7 +436,7 @@ abstract-logging@^2.0.0: resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839" integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA== -accepts@~1.3.5, accepts@~1.3.7: +accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -578,9 +583,9 @@ ansi-regex@^2.0.0: integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" + integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== ansi-styles@^2.2.1: version "2.2.1" @@ -779,7 +784,7 @@ arrify@^2.0.0: resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== -asap@^2.0.0, asap@~2.0.3, asap@~2.0.6: +asap@^2.0.0, asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= @@ -853,7 +858,7 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -axios@0.21.4, axios@^0.21.1, axios@^0.21.4: +axios@0.21.4, axios@^0.21.1: version "0.21.4" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== @@ -874,6 +879,13 @@ axios@^0.25.0: dependencies: follow-redirects "^1.14.7" +axios@^0.26.0: + version "0.26.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" + integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== + dependencies: + follow-redirects "^1.14.8" + babel-cli@^6.16.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" @@ -1474,20 +1486,20 @@ bn.js@^4.0.0: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -body-parser@1.19.1, body-parser@^1.19.0: - version "1.19.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4" - integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA== +body-parser@1.19.2, body-parser@^1.19.0: + version "1.19.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" + integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== dependencies: - bytes "3.1.1" + bytes "3.1.2" content-type "~1.0.4" debug "2.6.9" depd "~1.1.2" http-errors "1.8.1" iconv-lite "0.4.24" on-finished "~2.3.0" - qs "6.9.6" - raw-body "2.4.2" + qs "6.9.7" + raw-body "2.4.3" type-is "~1.6.18" brace-expansion@^1.0.0, brace-expansion@^1.1.7: @@ -1598,10 +1610,10 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= -bytes@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" - integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== cache-base@^1.0.1: version "1.0.1" @@ -2080,10 +2092,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" - integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== +cookie@0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" + integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== cookies@0.8.0: version "0.8.0" @@ -2237,9 +2249,9 @@ dateformat@~3.0.3: integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== dayjs@^1.8.29: - version "1.10.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" - integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== + version "1.10.8" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.8.tgz#267df4bc6276fcb33c04a6735287e3f429abec41" + integrity sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow== ddata@~0.1.25: version "0.1.28" @@ -2318,13 +2330,6 @@ defer-promise@^1.0.0: resolved "https://registry.yarnpkg.com/defer-promise/-/defer-promise-1.0.2.tgz#b79521c59cadadaed2d305385d30f8b05cbf9196" integrity sha512-5a0iWJvnon50nLLqHPW83pX45BLb4MmlSa1sIg05NBhZoK5EZGz1s8qoZ3888dVGGOT0Ni01NdETuAgdJUZknA== -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -2357,6 +2362,11 @@ denque@^1.4.1, denque@^1.5.0: resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf" integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw== +denque@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/denque/-/denque-2.0.1.tgz#bcef4c1b80dc32efe97515744f21a4229ab8934a" + integrity sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ== + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -2592,16 +2602,14 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -express-handlebars@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-3.1.0.tgz#c177ee9a81f6a2abada6b550b77b3e30c6bc0796" - integrity sha512-7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg== +express-handlebars@^5.3.5: + version "5.3.5" + resolved "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-5.3.5.tgz#a04a1e670aa97d5b3a8080de8336f79228593540" + integrity sha512-r9pzDc94ZNJ7FVvtsxLfPybmN0eFAUnR61oimNPRpD0D7nkLcezrkpZzoXS5TI75wYHRbflPLTU39B62pwB4DA== dependencies: - glob "^7.1.3" - graceful-fs "^4.1.2" - handlebars "^4.1.2" - object.assign "^4.1.0" - promise "^8.0.2" + glob "^7.2.0" + graceful-fs "^4.2.8" + handlebars "^4.7.7" express-ws@4.0.0: version "4.0.0" @@ -2611,16 +2619,16 @@ express-ws@4.0.0: ws "^5.2.0" express@^4.17.0: - version "4.17.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3" - integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg== + version "4.17.3" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" + integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== dependencies: - accepts "~1.3.7" + accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.19.1" + body-parser "1.19.2" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.1" + cookie "0.4.2" cookie-signature "1.0.6" debug "2.6.9" depd "~1.1.2" @@ -2635,7 +2643,7 @@ express@^4.17.0: parseurl "~1.3.3" path-to-regexp "0.1.7" proxy-addr "~2.0.7" - qs "6.9.6" + qs "6.9.7" range-parser "~1.2.1" safe-buffer "5.2.1" send "0.17.2" @@ -2900,10 +2908,10 @@ flagged-respawn@^1.0.1: resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== -follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.7: - version "1.14.8" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" - integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== +follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.7, follow-redirects@^1.14.8: + version "1.14.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -3106,7 +3114,7 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -3171,10 +3179,10 @@ globals@^9.18.0: resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== -google-auth-library@^7.0.2: - version "7.12.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.12.0.tgz#7965db6bc20cb31f2df05a08a296bbed6af69426" - integrity sha512-RS/whvFPMoF1hQNxnoVET3DWKPBt1Xgqe2rY0k+Jn7TNhoHlwdnSe7Rlcbo2Nub3Mt2lUVz26X65aDQrWp6x8w== +google-auth-library@^7.0.2, google-auth-library@^7.14.0: + version "7.14.0" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.0.tgz#9d6a20592f7b4d4c463cd3e93934c4b1711d5dc6" + integrity sha512-or8r7qUqGVI3W8lVSdPh0ZpeFyQHeE73g5c0p+bLNTTUFXJ+GSeDQmZRZ2p4H8cF/RJYa4PNvi/A1ar1uVNLFA== dependencies: arrify "^2.0.0" base64-js "^1.3.0" @@ -3199,26 +3207,26 @@ google-protobuf@3.14.0: integrity sha512-bwa8dBuMpOxg7COyqkW6muQuvNnWgVN8TX/epDRGW5m0jcrmq2QJyCyiV8ZE2/6LaIIqJtiv9bYokFhfpy/o6w== googleapis-common@^5.0.2: - version "5.0.5" - resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.5.tgz#4c7160be1ed7e4cc8cdbcdb6eac8a4b3a61dd782" - integrity sha512-o2dgoW4x4fLIAN+IVAOccz3mEH8Lj1LP9c9BSSvkNJEn+U7UZh0WSr4fdH08x5VH7+sstIpd1lOYFZD0g7j4pw== + version "5.1.0" + resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.1.0.tgz#845a79471c787e522e03c50d415467140e9e356a" + integrity sha512-RXrif+Gzhq1QAzfjxulbGvAY3FPj8zq/CYcvgjzDbaBNCD6bUl+86I7mUs4DKWHGruuK26ijjR/eDpWIDgNROA== dependencies: extend "^3.0.2" gaxios "^4.0.0" - google-auth-library "^7.0.2" + google-auth-library "^7.14.0" qs "^6.7.0" url-template "^2.0.8" uuid "^8.0.0" googleapis@*: - version "95.0.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-95.0.0.tgz#63f6e28e78874044585f1e86c100a308a44fb385" - integrity sha512-ZpFZW7FDwcjQa2+xZNS2SC5sK2s46iWKA5QSFVJSK3RELQec4PYHhzKwzbeCzt4urnjYp6udPif95zXTFxbtRA== + version "96.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-96.0.0.tgz#95bdf0e57bc912581ba7bc10eb202301f2b05dc1" + integrity sha512-tEQtcukxA4sW1OXh35teJbui+BIjMTghH6i0tvUctyXgMDO0Upu3+hrytrw9JqZJxtXReM3Wr5+g4U7veqHpBQ== dependencies: google-auth-library "^7.0.2" googleapis-common "^5.0.2" -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.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.8: version "4.2.9" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== @@ -3349,7 +3357,7 @@ handlebars@^3.0.0, handlebars@^3.0.3: optionalDependencies: uglify-js "^2.6" -handlebars@^4.1.2: +handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== @@ -3392,9 +3400,9 @@ has-flag@^4.0.0: integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== has-symbols@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has-value@^0.3.1: version "0.3.1" @@ -4294,9 +4302,9 @@ ldapauth-fork@*: lru-cache "^6.0.0" ldapjs@^2.2.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz#04136815fb1f21d692ac87fab5961a04d86e8b04" - integrity sha512-kf0tHHLrpwKaBAQOhYHXgdeh2PkFuCCxWgLb1MRn67ZQVo787D2pij3mmHVZx193GIdM8xcfi8HF6AIYYnj0fQ== + version "2.3.2" + resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.2.tgz#a599d081519f70462941cc33a50e9354c32f35b7" + integrity sha512-FU+GR/qbQ96WUZ2DUb7FzaEybYvv3240wTVPcbsdELB3o4cK92zGVjntsh68siVkLeCmlCcsd/cIQzyGXSS7LA== dependencies: abstract-logging "^2.0.0" asn1 "^0.2.4" @@ -4454,11 +4462,6 @@ lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -4526,16 +4529,16 @@ map-visit@^1.0.0: object-visit "^1.0.0" mariadb@*: - version "2.5.5" - resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.5.tgz#a9aff9f1e57231a415a21254489439beb501c803" - integrity sha512-6dklvcKWuuaV1JjAwnE2ezR+jTt7JrZHftgeHHBmjB0wgfaUpdxol1DPWclwMcCrsO9yoM0FuCOiCcCgXc//9Q== + version "3.0.0" + resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.0.0.tgz#0738b14036be097991172b22c0ce1d43e261c014" + integrity sha512-1uIqD6AWLP5ojMY67XP4+4uRLe9L92HD1ZGU8fidi8cGdYIC+Ghx1JliAtf7lc/tGjOh6J400f/1M4BXVtZFvA== dependencies: - "@types/geojson" "^7946.0.7" - "@types/node" "^14.14.28" - denque "^1.5.0" + "@alloc/quick-lru" "^5.2.0" + "@types/geojson" "^7946.0.8" + "@types/node" "^17.0.10" + denque "^2.0.1" iconv-lite "^0.6.3" - long "^4.0.0" - moment-timezone "^0.5.33" + moment-timezone "^0.5.34" please-upgrade-node "^3.2.0" marked@~0.3.6: @@ -4639,11 +4642,16 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": +mime-db@1.51.0: version "1.51.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== +"mime-db@>= 1.43.0 < 2": + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.34" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" @@ -4683,10 +4691,10 @@ minimalistic-assert@^1.0.0: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -"minimatch@2 || 3", minimatch@^3.0.4, minimatch@~3.0.4: - version "3.0.5" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3" - integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== +"minimatch@2 || 3", minimatch@^3.0.4: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" @@ -4697,6 +4705,13 @@ minimatch@^2.0.1: dependencies: brace-expansion "^1.0.0" +minimatch@~3.0.4: + version "3.0.8" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1" + integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q== + dependencies: + brace-expansion "^1.1.7" + minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" @@ -4739,7 +4754,7 @@ modern-syslog@*: dependencies: nan "^2.13.2" -moment-timezone@^0.5.33: +moment-timezone@^0.5.34: version "0.5.34" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c" integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg== @@ -5102,11 +5117,6 @@ object-inspect@^1.9.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - object-to-spawn-args@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/object-to-spawn-args/-/object-to-spawn-args-1.1.1.tgz#77da8827f073d011c9e1b173f895781470246785" @@ -5138,16 +5148,6 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" - object.defaults@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" @@ -5672,9 +5672,9 @@ please-upgrade-node@^3.2.0: semver-compare "^1.0.0" plivo@*: - version "4.27.0" - resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.27.0.tgz#af41278962b858bccf2bc04a9e28fd6008a0bd9a" - integrity sha512-bmtc/GSQsxBW5aarr8z8lS07vl4HWtgTZTb8W5/dfsm9Z3dG3VDswkFIeu+n0ZkJ+FEbVGPkCV4EJ7jfRA+2Cw== + version "4.28.0" + resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.28.0.tgz#917813c55b45d33d291ee55dc7cfd868d53130c5" + integrity sha512-FQCc5TG5QUlNq1r0OlLvAHgJo15M+ou+dt7bWheataObxUxPqpga316zCOYR/sGzVzREPSB/ThpT9/cZeUcYgg== dependencies: "@types/node" "^14.14.14" axios "^0.21.1" @@ -5764,13 +5764,6 @@ promise.prototype.finally@^1.0.1: dependencies: asap "~2.0.3" -promise@^8.0.2: - version "8.1.0" - resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" - integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== - dependencies: - asap "~2.0.6" - proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -5821,10 +5814,10 @@ qlobber@^3.0.2, qlobber@^3.1.0: resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz#b8c8e067496de17bdbf3cd843cf53ece09c8d211" integrity sha512-B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug== -qs@6.9.6: - version "6.9.6" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" - integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== +qs@6.9.7: + version "6.9.7" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" + integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: version "6.10.3" @@ -5881,12 +5874,12 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" - integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ== +raw-body@2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" + integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== dependencies: - bytes "3.1.1" + bytes "3.1.2" http-errors "1.8.1" iconv-lite "0.4.24" unpipe "1.0.0" @@ -6615,9 +6608,9 @@ sqlstring@2.3.1: integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= ssh2@*: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.6.0.tgz#61aebc3a6910fe488f9c85cd8355bdf8d4724e05" - integrity sha512-lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q== + version "1.7.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.7.0.tgz#7aa30f2a5266f0ffd93944621b4eb1f403330fd4" + integrity sha512-u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g== dependencies: asn1 "^0.2.4" bcrypt-pbkdf "^1.0.2" @@ -7026,9 +7019,9 @@ tweetnacl@^1.0.1: integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== twilio@*: - version "3.74.0" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.74.0.tgz#df912476543b7004cd765d566449c27174289091" - integrity sha512-r79CWIug+x2/1uGOdAzGESvUvycxPCvVJ9rm4y1TsAocshTh+f5+ipULxyT3T5q4wJNT+k2OEiUBkKFA+cpQ/A== + version "3.75.1" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.75.1.tgz#7b9880e31a98c326f17dad3f1778f2a00805d351" + integrity sha512-q9h8AzJekL2etE4hPiZ3IOz9V6MkrY5d5cLvTra+Xe+jtDjQgarKbMUOYFhVHb/zXycf9qqW+Qk9de0ekgLwrQ== dependencies: axios "^0.25.0" dayjs "^1.8.29" @@ -7039,7 +7032,7 @@ twilio@*: qs "^6.9.4" rootpath "^0.1.2" scmp "^2.1.0" - url-parse "^1.5.3" + url-parse "^1.5.6" xmlbuilder "^13.0.2" type-check@~0.3.2: @@ -7073,9 +7066,9 @@ uglify-js@^2.6: uglify-to-browserify "~1.0.0" uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.15.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.1.tgz#9403dc6fa5695a6172a91bc983ea39f0f7c9086d" - integrity sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ== + version "3.15.3" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz#9aa82ca22419ba4c0137642ba0df800cb06e0471" + integrity sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg== uglify-to-browserify@~1.0.0: version "1.0.2" @@ -7172,10 +7165,10 @@ url-join@^4.0.1: resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== -url-parse@^1.5.3: - version "1.5.4" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz#e4f645a7e2a0852cc8a66b14b292a3e9a11a97fd" - integrity sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg== +url-parse@^1.5.3, url-parse@^1.5.6: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" @@ -7329,9 +7322,9 @@ weak-daemon@1.0.3: integrity sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ== weak-map@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz#79691584d98607f5070bd3b70a40e6bb22e401eb" - integrity sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes= + version "1.0.8" + resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz#394c18a9e8262e790544ed8b55c6a4ddad1cb1a3" + integrity sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw== web-push@*: version "3.4.5" diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix index c9d5925b658..84a2393cf7c 100644 --- a/pkgs/tools/admin/meshcentral/yarn.nix +++ b/pkgs/tools/admin/meshcentral/yarn.nix @@ -2,6 +2,14 @@ offline_cache = linkFarm "offline" packages; packages = [ { + name = "_alloc_quick_lru___quick_lru_5.2.0.tgz"; + path = fetchurl { + name = "_alloc_quick_lru___quick_lru_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz"; + sha512 = "UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="; + }; + } + { name = "_babel_code_frame___code_frame_7.16.7.tgz"; path = fetchurl { name = "_babel_code_frame___code_frame_7.16.7.tgz"; @@ -10,11 +18,11 @@ }; } { - name = "_babel_generator___generator_7.17.0.tgz"; + name = "_babel_generator___generator_7.17.3.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz"; - sha512 = "I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw=="; + name = "_babel_generator___generator_7.17.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz"; + sha512 = "+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg=="; }; } { @@ -74,11 +82,11 @@ }; } { - name = "_babel_parser___parser_7.17.0.tgz"; + name = "_babel_parser___parser_7.17.3.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz"; - sha512 = "VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw=="; + name = "_babel_parser___parser_7.17.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz"; + sha512 = "7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA=="; }; } { @@ -90,11 +98,11 @@ }; } { - name = "_babel_traverse___traverse_7.17.0.tgz"; + name = "_babel_traverse___traverse_7.17.3.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz"; - sha512 = "fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg=="; + name = "_babel_traverse___traverse_7.17.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz"; + sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; }; } { @@ -114,27 +122,27 @@ }; } { - name = "_sendgrid_client___client_7.6.1.tgz"; + name = "_sendgrid_client___client_7.6.2.tgz"; path = fetchurl { - name = "_sendgrid_client___client_7.6.1.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.1.tgz"; - sha512 = "q4U5OhcbJjs+lLVv/LhZSc28feiVCFMgvG9aYcRI5X4tKArnrrGDWb5HMITR9vaAtX42TXhyPFjHr1fk/Q1loQ=="; + name = "_sendgrid_client___client_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.2.tgz"; + sha512 = "Yw3i3vPBBwfiIi+4i7+1f1rwQoLlLsu3qW16d1UuRp6RgX6H6yHYb2/PfqwNyCC0qzqIWGUKPWwYe5ggcr5Guw=="; }; } { - name = "_sendgrid_helpers___helpers_7.6.0.tgz"; + name = "_sendgrid_helpers___helpers_7.6.2.tgz"; path = fetchurl { - name = "_sendgrid_helpers___helpers_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.6.0.tgz"; - sha512 = "0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA=="; + name = "_sendgrid_helpers___helpers_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-7.6.2.tgz"; + sha512 = "kGW0kM2AOHfXjcvB6Lgwa/nMv8IALu0KyNY9X4HSa3MtLohymuhbG9HgjrOh66+BkbsfA03H3bcT0+sPVJ0GKQ=="; }; } { - name = "_sendgrid_mail___mail_7.6.1.tgz"; + name = "_sendgrid_mail___mail_7.6.2.tgz"; path = fetchurl { - name = "_sendgrid_mail___mail_7.6.1.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.1.tgz"; - sha512 = "F+HXpDLIU4PGZyZznOiFLDGJDwLn2qh7/wD5MvwurrldDx5DaGQHrYBKHopceOl15FVuq9ElU9VIxQJF8SMvTg=="; + name = "_sendgrid_mail___mail_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.2.tgz"; + sha512 = "IHHZFvgU95aqb11AevQvAfautj2pb8iW8UCiUJ2ae9pRF37e6EkBmU9NgdFjbQ/8Xhhm+KDVDzn/JLxDN/GiBw=="; }; } { @@ -162,19 +170,19 @@ }; } { - name = "_types_node___node_17.0.17.tgz"; + name = "_types_node___node_17.0.21.tgz"; path = fetchurl { - name = "_types_node___node_17.0.17.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz"; - sha512 = "e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw=="; + name = "_types_node___node_17.0.21.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz"; + sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; }; } { - name = "_types_node___node_14.18.11.tgz"; + name = "_types_node___node_14.18.12.tgz"; path = fetchurl { - name = "_types_node___node_14.18.11.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.11.tgz"; - sha512 = "zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg=="; + name = "_types_node___node_14.18.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz"; + sha512 = "q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="; }; } { @@ -610,11 +618,11 @@ }; } { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; + name = "ansi_regex___ansi_regex_4.1.1.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + name = "ansi_regex___ansi_regex_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz"; + sha512 = "ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="; }; } { @@ -946,6 +954,14 @@ }; } { + name = "axios___axios_0.26.1.tgz"; + path = fetchurl { + name = "axios___axios_0.26.1.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz"; + sha512 = "fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA=="; + }; + } + { name = "babel_cli___babel_cli_6.26.0.tgz"; path = fetchurl { name = "babel_cli___babel_cli_6.26.0.tgz"; @@ -1490,11 +1506,11 @@ }; } { - name = "body_parser___body_parser_1.19.1.tgz"; + name = "body_parser___body_parser_1.19.2.tgz"; path = fetchurl { - name = "body_parser___body_parser_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz"; - sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; + name = "body_parser___body_parser_1.19.2.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; }; } { @@ -1618,11 +1634,11 @@ }; } { - name = "bytes___bytes_3.1.1.tgz"; + name = "bytes___bytes_3.1.2.tgz"; path = fetchurl { - name = "bytes___bytes_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz"; - sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; + name = "bytes___bytes_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz"; + sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; } { @@ -2090,11 +2106,11 @@ }; } { - name = "cookie___cookie_0.4.1.tgz"; + name = "cookie___cookie_0.4.2.tgz"; path = fetchurl { - name = "cookie___cookie_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz"; - sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + name = "cookie___cookie_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz"; + sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; }; } { @@ -2266,11 +2282,11 @@ }; } { - name = "dayjs___dayjs_1.10.7.tgz"; + name = "dayjs___dayjs_1.10.8.tgz"; path = fetchurl { - name = "dayjs___dayjs_1.10.7.tgz"; - url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz"; - sha512 = "P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="; + name = "dayjs___dayjs_1.10.8.tgz"; + url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.8.tgz"; + sha512 = "wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="; }; } { @@ -2370,14 +2386,6 @@ }; } { - name = "define_properties___define_properties_1.1.3.tgz"; - path = fetchurl { - name = "define_properties___define_properties_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; - }; - } - { name = "define_property___define_property_0.2.5.tgz"; path = fetchurl { name = "define_property___define_property_0.2.5.tgz"; @@ -2418,6 +2426,14 @@ }; } { + name = "denque___denque_2.0.1.tgz"; + path = fetchurl { + name = "denque___denque_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/denque/-/denque-2.0.1.tgz"; + sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ=="; + }; + } + { name = "depd___depd_1.1.2.tgz"; path = fetchurl { name = "depd___depd_1.1.2.tgz"; @@ -2698,11 +2714,11 @@ }; } { - name = "express_handlebars___express_handlebars_3.1.0.tgz"; + name = "express_handlebars___express_handlebars_5.3.5.tgz"; path = fetchurl { - name = "express_handlebars___express_handlebars_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-3.1.0.tgz"; - sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg=="; + name = "express_handlebars___express_handlebars_5.3.5.tgz"; + url = "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-5.3.5.tgz"; + sha512 = "r9pzDc94ZNJ7FVvtsxLfPybmN0eFAUnR61oimNPRpD0D7nkLcezrkpZzoXS5TI75wYHRbflPLTU39B62pwB4DA=="; }; } { @@ -2714,11 +2730,11 @@ }; } { - name = "express___express_4.17.2.tgz"; + name = "express___express_4.17.3.tgz"; path = fetchurl { - name = "express___express_4.17.2.tgz"; - url = "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz"; - sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; + name = "express___express_4.17.3.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz"; + sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; }; } { @@ -2994,11 +3010,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.8.tgz"; + name = "follow_redirects___follow_redirects_1.14.9.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.8.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz"; - sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="; + name = "follow_redirects___follow_redirects_1.14.9.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz"; + sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; }; } { @@ -3290,11 +3306,11 @@ }; } { - name = "google_auth_library___google_auth_library_7.12.0.tgz"; + name = "google_auth_library___google_auth_library_7.14.0.tgz"; path = fetchurl { - name = "google_auth_library___google_auth_library_7.12.0.tgz"; - url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.12.0.tgz"; - sha512 = "RS/whvFPMoF1hQNxnoVET3DWKPBt1Xgqe2rY0k+Jn7TNhoHlwdnSe7Rlcbo2Nub3Mt2lUVz26X65aDQrWp6x8w=="; + name = "google_auth_library___google_auth_library_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.0.tgz"; + sha512 = "or8r7qUqGVI3W8lVSdPh0ZpeFyQHeE73g5c0p+bLNTTUFXJ+GSeDQmZRZ2p4H8cF/RJYa4PNvi/A1ar1uVNLFA=="; }; } { @@ -3314,19 +3330,19 @@ }; } { - name = "googleapis_common___googleapis_common_5.0.5.tgz"; + name = "googleapis_common___googleapis_common_5.1.0.tgz"; path = fetchurl { - name = "googleapis_common___googleapis_common_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.0.5.tgz"; - sha512 = "o2dgoW4x4fLIAN+IVAOccz3mEH8Lj1LP9c9BSSvkNJEn+U7UZh0WSr4fdH08x5VH7+sstIpd1lOYFZD0g7j4pw=="; + name = "googleapis_common___googleapis_common_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-5.1.0.tgz"; + sha512 = "RXrif+Gzhq1QAzfjxulbGvAY3FPj8zq/CYcvgjzDbaBNCD6bUl+86I7mUs4DKWHGruuK26ijjR/eDpWIDgNROA=="; }; } { - name = "googleapis___googleapis_95.0.0.tgz"; + name = "googleapis___googleapis_96.0.0.tgz"; path = fetchurl { - name = "googleapis___googleapis_95.0.0.tgz"; - url = "https://registry.yarnpkg.com/googleapis/-/googleapis-95.0.0.tgz"; - sha512 = "ZpFZW7FDwcjQa2+xZNS2SC5sK2s46iWKA5QSFVJSK3RELQec4PYHhzKwzbeCzt4urnjYp6udPif95zXTFxbtRA=="; + name = "googleapis___googleapis_96.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-96.0.0.tgz"; + sha512 = "tEQtcukxA4sW1OXh35teJbui+BIjMTghH6i0tvUctyXgMDO0Upu3+hrytrw9JqZJxtXReM3Wr5+g4U7veqHpBQ=="; }; } { @@ -3498,11 +3514,11 @@ }; } { - name = "has_symbols___has_symbols_1.0.2.tgz"; + name = "has_symbols___has_symbols_1.0.3.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + name = "has_symbols___has_symbols_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; } { @@ -4514,11 +4530,11 @@ }; } { - name = "ldapjs___ldapjs_2.3.1.tgz"; + name = "ldapjs___ldapjs_2.3.2.tgz"; path = fetchurl { - name = "ldapjs___ldapjs_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz"; - sha512 = "kf0tHHLrpwKaBAQOhYHXgdeh2PkFuCCxWgLb1MRn67ZQVo787D2pij3mmHVZx193GIdM8xcfi8HF6AIYYnj0fQ=="; + name = "ldapjs___ldapjs_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.2.tgz"; + sha512 = "FU+GR/qbQ96WUZ2DUb7FzaEybYvv3240wTVPcbsdELB3o4cK92zGVjntsh68siVkLeCmlCcsd/cIQzyGXSS7LA=="; }; } { @@ -4706,14 +4722,6 @@ }; } { - name = "long___long_4.0.0.tgz"; - path = fetchurl { - name = "long___long_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz"; - sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; - }; - } - { name = "longest___longest_1.0.1.tgz"; path = fetchurl { name = "longest___longest_1.0.1.tgz"; @@ -4794,11 +4802,11 @@ }; } { - name = "mariadb___mariadb_2.5.5.tgz"; + name = "mariadb___mariadb_3.0.0.tgz"; path = fetchurl { - name = "mariadb___mariadb_2.5.5.tgz"; - url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.5.tgz"; - sha512 = "6dklvcKWuuaV1JjAwnE2ezR+jTt7JrZHftgeHHBmjB0wgfaUpdxol1DPWclwMcCrsO9yoM0FuCOiCcCgXc//9Q=="; + name = "mariadb___mariadb_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mariadb/-/mariadb-3.0.0.tgz"; + sha512 = "1uIqD6AWLP5ojMY67XP4+4uRLe9L92HD1ZGU8fidi8cGdYIC+Ghx1JliAtf7lc/tGjOh6J400f/1M4BXVtZFvA=="; }; } { @@ -4906,6 +4914,14 @@ }; } { + name = "mime_db___mime_db_1.52.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.52.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; + }; + } + { name = "mime_types___mime_types_2.1.34.tgz"; path = fetchurl { name = "mime_types___mime_types_2.1.34.tgz"; @@ -4946,11 +4962,11 @@ }; } { - name = "minimatch___minimatch_3.0.5.tgz"; + name = "minimatch___minimatch_3.1.2.tgz"; path = fetchurl { - name = "minimatch___minimatch_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz"; - sha512 = "tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw=="; + name = "minimatch___minimatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; } { @@ -4962,6 +4978,14 @@ }; } { + name = "minimatch___minimatch_3.0.8.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz"; + sha512 = "6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q=="; + }; + } + { name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { name = "minimist___minimist_1.2.5.tgz"; @@ -5402,14 +5426,6 @@ }; } { - name = "object_keys___object_keys_1.1.1.tgz"; - path = fetchurl { - name = "object_keys___object_keys_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - } - { name = "object_to_spawn_args___object_to_spawn_args_1.1.1.tgz"; path = fetchurl { name = "object_to_spawn_args___object_to_spawn_args_1.1.1.tgz"; @@ -5442,14 +5458,6 @@ }; } { - name = "object.assign___object.assign_4.1.2.tgz"; - path = fetchurl { - name = "object.assign___object.assign_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; - sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; - }; - } - { name = "object.defaults___object.defaults_1.1.0.tgz"; path = fetchurl { name = "object.defaults___object.defaults_1.1.0.tgz"; @@ -6050,11 +6058,11 @@ }; } { - name = "plivo___plivo_4.27.0.tgz"; + name = "plivo___plivo_4.28.0.tgz"; path = fetchurl { - name = "plivo___plivo_4.27.0.tgz"; - url = "https://registry.yarnpkg.com/plivo/-/plivo-4.27.0.tgz"; - sha512 = "bmtc/GSQsxBW5aarr8z8lS07vl4HWtgTZTb8W5/dfsm9Z3dG3VDswkFIeu+n0ZkJ+FEbVGPkCV4EJ7jfRA+2Cw=="; + name = "plivo___plivo_4.28.0.tgz"; + url = "https://registry.yarnpkg.com/plivo/-/plivo-4.28.0.tgz"; + sha512 = "FQCc5TG5QUlNq1r0OlLvAHgJo15M+ou+dt7bWheataObxUxPqpga316zCOYR/sGzVzREPSB/ThpT9/cZeUcYgg=="; }; } { @@ -6170,14 +6178,6 @@ }; } { - name = "promise___promise_8.1.0.tgz"; - path = fetchurl { - name = "promise___promise_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz"; - sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; - }; - } - { name = "proxy_addr___proxy_addr_2.0.7.tgz"; path = fetchurl { name = "proxy_addr___proxy_addr_2.0.7.tgz"; @@ -6242,11 +6242,11 @@ }; } { - name = "qs___qs_6.9.6.tgz"; + name = "qs___qs_6.9.7.tgz"; path = fetchurl { - name = "qs___qs_6.9.6.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + name = "qs___qs_6.9.7.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz"; + sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; }; } { @@ -6322,11 +6322,11 @@ }; } { - name = "raw_body___raw_body_2.4.2.tgz"; + name = "raw_body___raw_body_2.4.3.tgz"; path = fetchurl { - name = "raw_body___raw_body_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz"; - sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; + name = "raw_body___raw_body_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz"; + sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; } { @@ -7130,11 +7130,11 @@ }; } { - name = "ssh2___ssh2_1.6.0.tgz"; + name = "ssh2___ssh2_1.7.0.tgz"; path = fetchurl { - name = "ssh2___ssh2_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.6.0.tgz"; - sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q=="; + name = "ssh2___ssh2_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.7.0.tgz"; + sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g=="; }; } { @@ -7610,11 +7610,11 @@ }; } { - name = "twilio___twilio_3.74.0.tgz"; + name = "twilio___twilio_3.75.1.tgz"; path = fetchurl { - name = "twilio___twilio_3.74.0.tgz"; - url = "https://registry.yarnpkg.com/twilio/-/twilio-3.74.0.tgz"; - sha512 = "r79CWIug+x2/1uGOdAzGESvUvycxPCvVJ9rm4y1TsAocshTh+f5+ipULxyT3T5q4wJNT+k2OEiUBkKFA+cpQ/A=="; + name = "twilio___twilio_3.75.1.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-3.75.1.tgz"; + sha512 = "q9h8AzJekL2etE4hPiZ3IOz9V6MkrY5d5cLvTra+Xe+jtDjQgarKbMUOYFhVHb/zXycf9qqW+Qk9de0ekgLwrQ=="; }; } { @@ -7650,11 +7650,11 @@ }; } { - name = "uglify_js___uglify_js_3.15.1.tgz"; + name = "uglify_js___uglify_js_3.15.3.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.15.1.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.1.tgz"; - sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; + name = "uglify_js___uglify_js_3.15.3.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz"; + sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; }; } { @@ -7786,11 +7786,11 @@ }; } { - name = "url_parse___url_parse_1.5.4.tgz"; + name = "url_parse___url_parse_1.5.10.tgz"; path = fetchurl { - name = "url_parse___url_parse_1.5.4.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz"; - sha512 = "ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg=="; + name = "url_parse___url_parse_1.5.10.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; } { @@ -7978,11 +7978,11 @@ }; } { - name = "weak_map___weak_map_1.0.5.tgz"; + name = "weak_map___weak_map_1.0.8.tgz"; path = fetchurl { - name = "weak_map___weak_map_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz"; - sha1 = "eWkVhNmGB/UHC9O3CkDmuyLkAes="; + name = "weak_map___weak_map_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.8.tgz"; + sha512 = "lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw=="; }; } { diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index d94abe504d2..21d115407f6 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -23,14 +23,14 @@ with py.pkgs; buildPythonApplication rec { pname = "oci-cli"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; rev = "v${version}"; - hash = "sha256-udvYfYFUulGfnc1gzjG3UxOc68JuecpPJ1/s57qvX0k="; + hash = "sha256-ADjHPRG3QzSWR7FvcTIJdcBYmzZK+SWipdY1giNtaME="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 9bb3ef46d92..7491cff2ab6 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,40 +1,64 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.22.1"; + version = "3.25.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-linux-x64.tar.gz"; - sha256 = "0yxjlkvyxap4c7ny5x0ch0j4d5360qapb670f6im7vnaqhc00by0"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-linux-x64.tar.gz"; + sha256 = "0p2cz6hg2xf28pj2w0avi6hz855llm9kg7v422cf0m1b94s4dsbi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-linux-amd64.tar.gz"; - sha256 = "02k3ars9i8pfby3070rnnldfcb5hbh32kd5xnbmgd0202yg5y3pd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-linux-amd64.tar.gz"; + sha256 = "0qywihi3k8505qgpr1j5gmqzyalqrrmxxz1k48ipdank48dkxs8g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-linux-amd64.tar.gz"; - sha256 = "0c61m2q7944a29dkcqcv5fv9jn2bz8mdfhnd33z8qaybhw2804rd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-linux-amd64.tar.gz"; + sha256 = "12vwwmvjsb9fwjkazvcblizdk5xx0l4499r0rg5lr97h5c1j28al"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-linux-amd64.tar.gz"; - sha256 = "0k5bpg6lmhj3cxsg43dkyw9jlwyllwwdhml3brkyfgb307cypl9b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-linux-amd64.tar.gz"; + sha256 = "0nkz7mcsgv1lbq0gdfs6nix4bmsn4zspn9jgji10jlawrk5l1ps4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-linux-amd64.tar.gz"; - sha256 = "161g5gsr64idz17ffixbjrm0gnbpvpsf440yr26ci4bzdk0s81gh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-linux-amd64.tar.gz"; + sha256 = "0bcmj8z86dqchc9rgnvjy7q0k2pmmd1c155nm4ik1j87ccclia0p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-linux-amd64.tar.gz"; + sha256 = "08dvkkf153zkpjr2fz6wdrk4rqzmpfhj8nsmly7crr7d3xjhwqsc"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-linux-amd64.tar.gz"; + sha256 = "1fm0qhbs0ih1rgr2r46fz9fc6vrl1iwk9fd9q5plra93fxjdjdc4"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-linux-amd64.tar.gz"; + sha256 = "06z4h7hpm17zil1vkghlndl4l6fhc6qlgvj95sxx4n1mxdpf7w5l"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.3.1-linux-amd64.tar.gz"; + sha256 = "0m89na1gqrb41h1dg5j876g5hp0mfk4g7ij7i4md1szk9fp4820k"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-linux-amd64.tar.gz"; + sha256 = "1s9s6a5w18zj0y78ar49mbicz8hjmqmzmw2agnwqwk9zhj35jvz8"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-linux-amd64.tar.gz"; + sha256 = "1l97awwfd5hyw1q8wjcdz81blybzqklv9wk9pv1319j0251ddzz3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-linux-amd64.tar.gz"; sha256 = "0yfbiv6q2rfm27gwc4vsg2112m1vll5rkk1zwpg510dzvrnjqqn6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.5.0-linux-amd64.tar.gz"; - sha256 = "1pi98naks37cc0nsrjfrnsknskwzsfj5ia01nhaj44caxzvnd8mh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.6.0-linux-amd64.tar.gz"; + sha256 = "0q3mj48kddl1cb80s03x5vksx8xa006qlzfkarbc3sa2qqlgqiqr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-linux-amd64.tar.gz"; - sha256 = "19y5gm5s7ps0cwdv8j7lnlx1r4c94qf6cdc28z725wpyyq1grc38"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.11.1-linux-amd64.tar.gz"; + sha256 = "1djm9dh1445yn7hnl3m1hm6cw9cj7m9syv08xjjclwc3dj9k7qw5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-amd64.tar.gz"; @@ -45,24 +69,32 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-linux-amd64.tar.gz"; - sha256 = "074ihk1c3g580grbipy0acryjsmaz8n65siyc7yz4gcgcwqwb5mj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-linux-amd64.tar.gz"; + sha256 = "08r3zks93jcpih6zxjmnpvqjsxvfkj3av5a2iwxb87snmsz0jixz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-linux-amd64.tar.gz"; + sha256 = "0lhfxqd600rjbdw16jpj5fysdm324kangi85qpwrd6273aylyv09"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-linux-amd64.tar.gz"; + sha256 = "1lni4wzmdhjbchjjx9z5iqawv4x1bixl3s541h39cr4x3y36m66m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-linux-amd64.tar.gz"; - sha256 = "0ffbsnpgr6wz9xj5yq6m55xj4mqji7hir6dylyjcpdkrxnigyiss"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-linux-amd64.tar.gz"; + sha256 = "1zzrzsa07af7x4vwv7zgwkdrfmlhw30dcc7hqj92q4mn6valbn5q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-linux-amd64.tar.gz"; - sha256 = "14kz4ywhwb0lcsf3nbr9c884x83jdlbxmcg3g9jaq7r739fawpi9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-linux-amd64.tar.gz"; + sha256 = "0cnwgr358lbrw6ssz8s7m87yniy7q2zhd6pmjhl8x41j1cljwyfa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-linux-amd64.tar.gz"; sha256 = "0qv3a4d6hnpga7lli7xnbwiig56h080hxrxjr8jbqsy9ymsqb39a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-linux-amd64.tar.gz"; - sha256 = "02xgkwfsfkqv38cjyc62rlsldbdd5j801gmlh9pf3qjdjj5d1fl3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-linux-amd64.tar.gz"; + sha256 = "1ngpaw5fdlv7hxjnns6ajzj8dqrj3gzkabr5h5hq5dws23x2c999"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-amd64.tar.gz"; @@ -77,62 +109,114 @@ sha256 = "0lj01hyjyq3qazkryvvxkx6nwai3bac9shqxb6hcqv4pfdjzzxhr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.7.0-linux-amd64.tar.gz"; - sha256 = "0xaa2gaqgx5lf1vfg0s8y0nr6ygjcy7dbksf0jszizn08ifgpy8h"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; - sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-linux-amd64.tar.gz"; + sha256 = "111q7jxkjni1091m3kp9c2n1zqlkiy7lrfsrqk4bzpcf67krk9vj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-linux-amd64.tar.gz"; sha256 = "05nfdwgfzi5f3hgj2g6dccaidqf9a9xzlv5vp3cd1rsxd159yk9j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-amd64.tar.gz"; - sha256 = "1ixmsxawp0qbyjs37c74gcvj2icpbda6znl17yp9bhiyvnrdvxn7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-linux-amd64.tar.gz"; + sha256 = "18f30j0lmf2mrzynrrm068irlm972hc43vkp0205vkb1gvzf872m"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-linux-amd64.tar.gz"; + sha256 = "1l4njlk616ksw29vg5jg6cmn9n31iw8f0h65iwv8f5pbvw64m3n0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-linux-amd64.tar.gz"; + sha256 = "1b558l11r8a8xj5h2rk1lf761a83jzcbip7zvdg17f7rbyfilw56"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-linux-amd64.tar.gz"; + sha256 = "0k1l6qf85ffbi62r7xs9clgf1g8mch5afrrjagqqb7dwi8sh34xa"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-linux-amd64.tar.gz"; + sha256 = "1y67dlrkhrp7x2n0bbx7d8in9h4kwjqjdj4jkdbk1i3mfd46wh0k"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-linux-amd64.tar.gz"; + sha256 = "0ayb1r9snjqgmczkvz4kjbswr0a98lmpapll4nws9q0rjj2w48y7"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-linux-amd64.tar.gz"; + sha256 = "08vfycws8gw92q43611dixnww4d80pqqjf6a3xh6zfpfn990vy97"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.1.0-linux-amd64.tar.gz"; - sha256 = "0b44kfvl01b5cmf9ii6zzcj28i1dd4dx4angdah3hghbsc5hypby"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-linux-amd64.tar.gz"; + sha256 = "1c7qgzhmd2ifbmfznklaiqsf5mv9wir0iacw58gwyjalkvzb4v4l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-linux-amd64.tar.gz"; sha256 = "0hl5liyga4iz7j3wy3qicx43d4mijnqayrnmpa5rws29lambgrql"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.0-linux-amd64.tar.gz"; + sha256 = "12qdhdbighj76ab3wz965jhybxxq4f2rlwyk9m3w8w4f2aprp0cm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; + sha256 = "14qsnjafhd8ppachxr7j9541p5rbf1cakqlr7mra86fli1r49z9p"; + } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-darwin-x64.tar.gz"; - sha256 = "0b68pfrd83x02rs2saybxycpkirjciilp4a94ps3788y1plinyih"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-darwin-x64.tar.gz"; + sha256 = "0xfirm2pf765q1sx3h2by6s6d9gra95zq8cahljsj46dxm5gc7n9"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "0cpzgbzascmgnzjigmsjs618lv4xnyv1vl1hwab6laryp5832c4h"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-darwin-amd64.tar.gz"; + sha256 = "0wm7vvbm747iqzhd8lnpq5zirlkcwcka6c3j9x59c7iwq8a3cba5"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-darwin-amd64.tar.gz"; + sha256 = "0xp45n9mhg2x9bsxr5i9nx94vwfzvamnc427hi3p2738h2h3vika"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-darwin-amd64.tar.gz"; + sha256 = "0vsjiy7sf5brdf1d83n9pb6kpfrphllfndq1f6pfsh7nq7s0xpil"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-darwin-amd64.tar.gz"; - sha256 = "02s2lyd8rlz86rjraxk5g3g55qhih38kmvq0k2gwkdb2d11npf6r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "0kmy5hf869pp40x7jlzxx6ghl0k4bn6yhh94x82ndz9syin5q21z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-darwin-amd64.tar.gz"; - sha256 = "1a26schi28ci0zbm85yx4hlhwlwx0j0kk6d6nk9x1zldc3qzhw4y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-darwin-amd64.tar.gz"; + sha256 = "1fggvxi0salfhi81z9pgchm6pqcw5wh0m5hwgws22clk75x3h4pg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-darwin-amd64.tar.gz"; - sha256 = "04sblbjnxvxhxvzvsgjm83p6qahswwb2mvlylfpgq74ay86l6hki"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-darwin-amd64.tar.gz"; + sha256 = "1w0iwjny4vxplfi6kkdvglgalwwl5krk9hgfaiw7f1q43nkqw0bd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "0cri2vqvqh4aghs4j66ykw8f4vm2fg1106xkq4q269ilxdd5ia8l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.3.1-darwin-amd64.tar.gz"; + sha256 = "0fjynq1ilfv6njjyyadhpc9ks8izwif3nf8mnb7wfxchxn7gqbsi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-darwin-amd64.tar.gz"; + sha256 = "1k6pndyk6kh4db3cp92hj1vbglicx81yqxw1bis94d3cr95xr2pv"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "0is1dfv0c65sgk2hy5zng9f2jfxkvlp1pjy4ljyic039pvi80137"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-darwin-amd64.tar.gz"; sha256 = "1kgk48k4898zxsnhfg6z949m3mgicdm2zfg8ba7z1lbidzc6g3sq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.5.0-darwin-amd64.tar.gz"; - sha256 = "16dllbbmih9dm728wq86cpq2gkbyhlmpiwyh3r20jzhclrx4mgcw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.6.0-darwin-amd64.tar.gz"; + sha256 = "16abnsllcf7ap6gvxr1b68cc7k476vhdbg8wrjabx9h9b81lwhbm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-darwin-amd64.tar.gz"; - sha256 = "115lcaqkliaxqg27hb1j773299kgs44d3l7p2da9kzla3sk7dps0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.11.1-darwin-amd64.tar.gz"; + sha256 = "11wnk0ssqzfcvks5qvc2yi6iv9nxxxxqwmnjyavdzp5s5vvpi5zm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-amd64.tar.gz"; @@ -143,24 +227,32 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-darwin-amd64.tar.gz"; - sha256 = "046j20xl3ibfyqkcra242a5rpix14n4w3h9w9x618fbznk24bcxb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-darwin-amd64.tar.gz"; + sha256 = "1d9q2q9br44kkpr7swn2qfg4xvbfb2wixbigixg3vjwz9n0bm4p8"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-darwin-amd64.tar.gz"; + sha256 = "1200pb1ix308r5m6514s1b97q567f902c1zc1sfprr1r9psz3x16"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-darwin-amd64.tar.gz"; + sha256 = "0i49x5s7sw69y19qmsrbrwhmjv7g07qrs5a3l1l8bsqawif5r65z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-darwin-amd64.tar.gz"; - sha256 = "100rqkz0g1w0fhvgvgys9r6a7bqphzizn28lg7pbbkrwjh7s0bxq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-darwin-amd64.tar.gz"; + sha256 = "0mqciml9rzzfpjy7wdqqak1yym2yzilnsjyrpm255q38z77f5nkr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-darwin-amd64.tar.gz"; - sha256 = "15aj3vpafrb6hfrmi46pf6z3wj4y84dljsfzrvd6b5v0svmlr90d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-darwin-amd64.tar.gz"; + sha256 = "1616fbs348r539kcmvwxlhzzgdszgb0j2wy7lamqvnm8xw4l53ii"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-darwin-amd64.tar.gz"; sha256 = "1xminhpv7b4nnvfdy5ahlcfrkan1fsmn0sp6gzkp5y4kkjd4a6vy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-darwin-amd64.tar.gz"; - sha256 = "1dpr4h35zby8say0kcvin5y5k4yryx06p3qcx16zrlsjaz6lj84k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-darwin-amd64.tar.gz"; + sha256 = "14ab1qsq22c8wyl7k7slxag9g44v3c63qjr8ip5qylbdsxsh7pp7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-amd64.tar.gz"; @@ -175,62 +267,114 @@ sha256 = "0fhhc2k0g8mpxzcgci4jl3m59q3n8w3nka94l0n7r9cvs81099n6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.7.0-darwin-amd64.tar.gz"; - sha256 = "0fbc60l3v7mar0g16mbwgqckp9i4kckwlacv165kkwrkvj8nrbym"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; - sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-darwin-amd64.tar.gz"; + sha256 = "13qxwzfsy0hmvgazry0q3qna0jk7llharcvdwz302fj4ad98s71j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-darwin-amd64.tar.gz"; sha256 = "0q19sh7l1mjl40i5vdsrjfldncxnicalmlgv3yjkw5xpxkgr98z0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-amd64.tar.gz"; - sha256 = "1dy4n03xvirg6fihiid786d88qlkyqkvk4fq6ggnxc92620x7342"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "11k6vbsr2lszipjvpnpspqvj8b0j330cfpmkr5ipws9b02aqpw1c"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-darwin-amd64.tar.gz"; + sha256 = "1cr31yz4nmabncnim6vk8wfqihqrmsjpqgm4gmk8rsn0a21r9iry"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-darwin-amd64.tar.gz"; + sha256 = "0dp4jvi3bbbggg7s9lmx8qqdh9nd7iff8r827s2f6js98yakhw9g"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-darwin-amd64.tar.gz"; + sha256 = "0nzcf84dbiw3chmnwb7d2nl82kkn1scrrjiid1ni75cgwk200m04"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.1.0-darwin-amd64.tar.gz"; - sha256 = "1f2m3zdxbdn7gb0xb3f0rgj7h54nay1wyrn3bk2nzvrdv5c3bhcm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-darwin-amd64.tar.gz"; + sha256 = "1xprdbxf8fza4zc2myf9mv3hl79hda0h34fz4yqfawg4spa0q128"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "1jzirnaxy6y862khqf29i25r8qyrpac2kmacs9ny118l77xp33il"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-darwin-amd64.tar.gz"; + sha256 = "0rfl4hxl72n6d15klykhwzxiyscci9jyy20vprqqs5z5d825xal4"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-darwin-amd64.tar.gz"; + sha256 = "00sq1v8wkjzxw96y3gal15lqdz2ncbwa7lix3b4izy7c6rd3qfa6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-darwin-amd64.tar.gz"; sha256 = "1wkyjxgrp3llvis3yjdnw65chscmxxcwigkr71i2crj28db8fhwx"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.0-darwin-amd64.tar.gz"; + sha256 = "154za5bvq1bgyzn5cfz3n0la1gy27lmjafgs42mgyy511jz4m60l"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; + sha256 = "11wm9c125154brisncm9cgb41nbjl9q9h4bq6z0ym8v681qq0fc4"; + } ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-linux-arm64.tar.gz"; - sha256 = "0551zp5n77jzh8k3jbqq75zj734faryxxdd2fvw881cxf95v39aj"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-linux-arm64.tar.gz"; + sha256 = "16vm2kdc53kf6ljb62fx74sl2asj2hg9xnksz582w88xp0mhipw2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-linux-arm64.tar.gz"; - sha256 = "0rlbcxympplq1gwikxalz3c686kpy2vrsc2phfnm45vvrkl22k8j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-linux-arm64.tar.gz"; + sha256 = "19byg31lcnh7gk2xqf5601d0xj93p0b9svz6zxvv713d9ny36839"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-linux-arm64.tar.gz"; - sha256 = "0639dl0hj2l33mc4vqbcyywpkfn30fikmiw10zjikcdg1jxzj4nd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-linux-arm64.tar.gz"; + sha256 = "00f38gmdk6yjbqlmfnjqlk7x9sn8c27svabivq93hr0dc8bv2hzy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-linux-arm64.tar.gz"; - sha256 = "15lxfilkgh9ansy9n2yv693fms3x718lrxz0g2nxi32hz9hq0ysl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-linux-arm64.tar.gz"; + sha256 = "13gwhfl11grpv0kqdk3hd1z4mdqxj9czl9cvzkfc7idipim2wi19"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-linux-arm64.tar.gz"; - sha256 = "08wasnpm5j1rrpsgdlw2h2rx5m7fl4vrm2js5a1vsaxx35374a6h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-linux-arm64.tar.gz"; + sha256 = "09475k0qqiwxzgb3xm70wx6w3gr8figrsb7iqbyficfar71mvbf7"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-linux-arm64.tar.gz"; + sha256 = "1w9mdg3jr5skdljxvm16qnssq94cnwpk24r76rbmh16wxb1l0z6x"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-linux-arm64.tar.gz"; + sha256 = "0pxfijmbgwl1srfqhny1wps3qhmjnmi3p5ixffza1a5phffnjzwd"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-linux-arm64.tar.gz"; + sha256 = "17bjngcxjhh4m9zc8rbb2ixqq2dhr405y4xnsxhwyld8lnnrqm7w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.3.1-linux-arm64.tar.gz"; + sha256 = "0a6bmiz6ys1h6n59mw3w7b2g8rhbnr0rb40rwidazvkni0s03yha"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-linux-arm64.tar.gz"; + sha256 = "1q4hzzsxraw6f7z2dlqbrlrkambqixyj9bq3fk4napgv6hl77qnh"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-linux-arm64.tar.gz"; + sha256 = "15acmblgl5xdwrm6ikq420h8g88rvqlj34jdrngc47rlimmdh3l6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-linux-arm64.tar.gz"; sha256 = "1wwv6v9srzsdlcxv92kwv4drkx8w1h5xcvcwqqn6gi2mvsf3kj9n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.5.0-linux-arm64.tar.gz"; - sha256 = "1s77az1b965lca69gqmmx8zfh63rf8vm2bkbzgfkj320zwbfbgj2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.6.0-linux-arm64.tar.gz"; + sha256 = "1qia1myzcrjiq16sy4vd24wzqgww46wkdi9gq94j1g2ih75pc9k2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-linux-arm64.tar.gz"; - sha256 = "1hik4456fdln7hxiw02856v02v0m33zsyiad40c9wg4n772ybchy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.11.1-linux-arm64.tar.gz"; + sha256 = "0vn6kgdwd63c62kaq3b09m3yipg43yh12s0a9zhi48p4wplsgf9s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-arm64.tar.gz"; @@ -241,24 +385,32 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-linux-arm64.tar.gz"; - sha256 = "0r53qwf1w68bnqii20b44q1xlgxggsisnlr46463nxm0jb0wwyn9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-linux-arm64.tar.gz"; + sha256 = "1dy76gsig4gyjg7xzkgb200dlhfvbq2i0zc0002c5vsykc4mji1d"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-linux-arm64.tar.gz"; + sha256 = "02gzj3zww0hmdq42d8b65wc12md9r7mygwymcix0f9lwza9gf4l2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-linux-arm64.tar.gz"; - sha256 = "1zr9vcr6qiql90bysapmrlafl7xmlv49bgp197w4w2290i5q7f6n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-linux-arm64.tar.gz"; + sha256 = "0p8lr9iw1h9ax90aivya513bw1dipm7yycqm5094wgx08r2yfvlm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-linux-arm64.tar.gz"; - sha256 = "06ii12cl7wsfs9pwjkwz01szacg686vfzc6i253l6xvmmiqp6q0j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-linux-arm64.tar.gz"; + sha256 = "0z0ch08xqbyjmizwvgx9jysnp6g3kjjbwh11gbc6vgxacqcajgz3"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-linux-arm64.tar.gz"; + sha256 = "1v3pdsdpqzgbsg181g9w0rn3sw1xirljvgvkw0081i9hxvhwq9zq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-linux-arm64.tar.gz"; sha256 = "14xqlgy0wy223hg9wp1rc4hbj1pvxrqnzxzv901dqjf5434n6aa0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-linux-arm64.tar.gz"; - sha256 = "12lnh8hk02w1n28v6i46kxxpkzw1j9zp84ha5p6bnarza6g4wxnk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-linux-arm64.tar.gz"; + sha256 = "1y3nzdnh6fil12r0040h6kyyf01dgxjghpp55z49hin3k6yclnq3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-arm64.tar.gz"; @@ -273,59 +425,114 @@ sha256 = "17iaf72dzy108v1njan21n72a5gzxbycq396hjh293a141kppn1m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.7.0-linux-arm64.tar.gz"; - sha256 = "1xh93187s86x4pjm4j9djh2mfqqxrmkal761fhj2bldkgki2rkq8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-linux-arm64.tar.gz"; + sha256 = "0dh28hhg2lbvbgw2yadw0ig68z2pcg51h38v74yczblm24k97jvq"; } - # pulumi-resource-packet skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-linux-arm64.tar.gz"; sha256 = "0j2c23ii4dn9yhpw6nymij65gv82y1xp4gi8lgxxf41b1i9bpb2i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-arm64.tar.gz"; - sha256 = "12iv8vjnal2ym70rxmdnvi02x6md7fxi8jbzhzfw526pzqs1dc47"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-linux-arm64.tar.gz"; + sha256 = "11k721ri7q36ss3kjvw07ki3snv35li167az6f8zp8h7fdhsrcn7"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-linux-arm64.tar.gz"; + sha256 = "1hdf0zwlrc5i3k0vkqc2x8zz0zvwc1idnnai58d4k7f5qr89hg6z"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-linux-arm64.tar.gz"; + sha256 = "0rr2cngqnibbz6d99xswjg7wybgd5xwm8fi6dkqwj51yyrz0izrz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-linux-arm64.tar.gz"; + sha256 = "06gdrjnk5jdnzc3jvzxl7iwf6gyyp9bqk1jrljxpkzr0ck8yz01l"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-linux-arm64.tar.gz"; + sha256 = "1hih41dvdpxwh145kghp5xwpv5fn8r0wni8jh12qv5nl6apaa75p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-linux-arm64.tar.gz"; + sha256 = "1275cikf75lnf3d4k4ld0by1r8hr6gq6mih09fsfg98b8f7n16kq"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-linux-arm64.tar.gz"; + sha256 = "19iv4jp74j87p1hnqc205i9gl45c4jqc025lwgylgplfmmz9iagy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.1.0-linux-arm64.tar.gz"; - sha256 = "15ambcwhrvv30ykkz9pizfrl4pri7iwvgs6s8f5416vgdj0k26fc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-linux-arm64.tar.gz"; + sha256 = "12ak3ki97shnzki9gvzc52cprpi3wsqmh4dhhv4ly6m39sj3wgxx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-linux-arm64.tar.gz"; sha256 = "1f7h6xl3jk9y29ffjxv9r4a748fwip17x7pazs62zwc3h10a65ac"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.0-linux-arm64.tar.gz"; + sha256 = "00902vymkc841lpdmgh80a1lipb5bjphiivy7d9xw9cldar35nz3"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; + sha256 = "0fd3hgvkr3ch2r5hpmi7h70w4hkbjdyc7z534h151pyc5ssxw8bd"; + } ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-darwin-arm64.tar.gz"; - sha256 = "00jzqrnw6khbw5hsaqwi73hx9h3yxdhy2n3jn3h76az27wfjkhkz"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-darwin-arm64.tar.gz"; + sha256 = "1hg6i58vb4hlrp3s08m26wivhr7dg902nd8g19rmyfvkhvdjkax5"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "0z0v4i2k451fi1xz2k4w9cli8g3mc4d7a9b1gkgcs2wpgrfnifly"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-darwin-arm64.tar.gz"; + sha256 = "0l4mqwap83rk82fnx7djc66mwnllmb49vzhr3kdavdmd5rbw5pd4"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-darwin-arm64.tar.gz"; + sha256 = "1q9d00dp61dv4i31c7z3nk9lqpxgyb0w180xfhg4s02vsk9yc8yf"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-darwin-arm64.tar.gz"; + sha256 = "1wpsjm191drz8687gv2d4snv8fdrivw3lqklj5cr67jngwiqhirq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-darwin-arm64.tar.gz"; - sha256 = "116f1psg3wdl81apxlhgz6w1ykhlqxwqk6ahp82mca1h2qc7bg0h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-darwin-arm64.tar.gz"; + sha256 = "1ni5nlfiqpxid3s416avzgx30wjayi51j0v87hkvpmy38m4p1w18"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-darwin-arm64.tar.gz"; - sha256 = "1rzds5wrq51mzs7sgzwna016qcay3dzp5ys25cxmr47025kyv84p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-darwin-arm64.tar.gz"; + sha256 = "1b46cksimynk4f7idp37xn95j0is15zfrxwbs4hv9b3rxayg8s30"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-darwin-arm64.tar.gz"; - sha256 = "1lqmjkqqq3rlsixv2kam50d5m95c81mn23y3dblbkh8d6qpwkfdp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-darwin-arm64.tar.gz"; + sha256 = "1ajanl6xgi00qc8a1apzfy45gaqxd7038hc3kmqgkrgzv8b943w4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "18h8k6wz1givlkrd2fh6mpyc6syzsqr3a29c36cbly103nvr43jy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.3.1-darwin-arm64.tar.gz"; + sha256 = "0hlcfyxmjcq3axg35fx1dj081il60rqs7na0wx573gf028g6jj9v"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-darwin-arm64.tar.gz"; + sha256 = "13xbscyg7s5cbrrsy5xcl63z31y6aa30r2d8gwchdgla3kqafjmm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "0848db2hv0r5brjdfq1k45bkx7iz0xpwbkmmhg47ymr3g0bhr8db"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-darwin-arm64.tar.gz"; sha256 = "16nnb6ql4j2207dgwmrhgx8mg19asf2n450lrmwvdzyvcy5zjm7p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.5.0-darwin-arm64.tar.gz"; - sha256 = "1z74a9j7ih444lsg4zy3wf8vqqk67jf4cis14x6vpzbpyqpdsyvz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.6.0-darwin-arm64.tar.gz"; + sha256 = "0irhy7vda2abcdzj6g73xh0p3kpxn1xi8agkfq4r9zpqrjp86pcr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-darwin-arm64.tar.gz"; - sha256 = "1agi0dpck35rqsvxikdcl6xl2fpha2l4144mzgyslki4q86rqmhs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.11.1-darwin-arm64.tar.gz"; + sha256 = "0nl47s8v47jvr4w3v5s2fnwhm56yb3knfb1za7ncynybgw8hizv0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-arm64.tar.gz"; @@ -336,24 +543,32 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-darwin-arm64.tar.gz"; - sha256 = "1w5nhmc6bzfw0ihv5mwn316sj7w27psknnyffqm1pyw6drp0z58v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-darwin-arm64.tar.gz"; + sha256 = "0jbgcw62hmhm5k8q4k948595nm2qslz7wic66iy0jr6ylhpm7hcz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-darwin-arm64.tar.gz"; + sha256 = "0rh9b19aqw15wzmijyyk7dv38cgf4abp6pk5abx4bp0277vl2a76"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-darwin-arm64.tar.gz"; + sha256 = "167f7c7mpyjym0sw71adz5ffd7g8zmn87923xmjlrsz3wm6ybsq7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-darwin-arm64.tar.gz"; - sha256 = "13w91xxma00zi7llk0hnqi10m90a5b2zhb08j6l0dn7x5a33dqay"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-darwin-arm64.tar.gz"; + sha256 = "0dc7cpgvb20s6qyyfm2i4hc4rbg8zdv0j92wc397pacd6i6jhvgn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-darwin-arm64.tar.gz"; - sha256 = "0sgg8bnsi5yyfv8gwzy8jw3f0fmkvizrgzh4jyc802qqc449p1ix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-darwin-arm64.tar.gz"; + sha256 = "0avmwnxj1m8j3jj5w1ims64lxqgig4z8yxpi76000xrv74w625b2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-darwin-arm64.tar.gz"; sha256 = "0n0303423gkwi3b6dwzaqmzsbn2rh4vki6n54mmgd44a3cxbhkak"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-darwin-arm64.tar.gz"; - sha256 = "1rq2wxw0kch7xrk0sr1l6fyz1sslyvk44l3jilzbm7mgi0d77w23"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-darwin-arm64.tar.gz"; + sha256 = "1n2dh350pwhcvk8vs9mh3g6dijxrg2vh03h9x9fq7qhpgzgxq6km"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-arm64.tar.gz"; @@ -368,26 +583,57 @@ sha256 = "0kym9f36h8b7s1smlmgazbzv8jjfpwxk6wv036bhx2xm3ysc7rgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.7.0-darwin-arm64.tar.gz"; - sha256 = "0w7gbdzs47ndvfig8qcnn5mar22plxjjsx0d4dgyhf1k391fz1jh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-darwin-arm64.tar.gz"; + sha256 = "0xqxk9xp49s0l5cxxz9wg26fg4fj57h4yjpvs4xs8fpaqa1saynd"; } - # pulumi-resource-packet skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-darwin-arm64.tar.gz"; sha256 = "1i5ipmidg0yspayxyglbjaihajhj1bsk46saxkncfrkvqnh4iq50"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-arm64.tar.gz"; - sha256 = "0jrihnwfh5wvc95nipqv7ak77kq9xj0pk5hlapv9w2ls5pwykv0r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "1dx39lm57sc9j715z62v74fw1gpnr8sn71d6a38gib83iiyagl3s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.1.0-darwin-arm64.tar.gz"; - sha256 = "1zc8jhrf7vm2p9mjldvgcnfrzh53zvinpikhsc8b206j3pm6gmbl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-darwin-arm64.tar.gz"; + sha256 = "02x584440hw25nbkj880dd113ywdm280frfadyz2psy1sqfi949h"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-darwin-arm64.tar.gz"; + sha256 = "1nl18z6i2p7dmc4f2i7wfw7ss76kmhb3jc4gfyirzp0qr2v8bs8p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-darwin-arm64.tar.gz"; + sha256 = "0i6hzqfvsjiyb1bzv70pwr1716scy60w7f8jkv3ayrxddaw7iwwg"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-darwin-arm64.tar.gz"; + sha256 = "0bn8i1271mm3hqqqlidipsfdalxgc2fx8l4apdjin6k1zrnm44p1"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-darwin-arm64.tar.gz"; + sha256 = "08dhxd39w7wjpqjfy59vxfipjl45psd6yh53h2g025y8hh80gcrs"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-darwin-arm64.tar.gz"; + sha256 = "0aqicfci56i3i9vkpm0ikg3amkzf7is6r9p2477dqm7gjphl9wmy"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-darwin-arm64.tar.gz"; + sha256 = "1m177hv8bfgsgcch8vbzwkb797i09l7lpfpai27cnljfk03vdhwr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-darwin-arm64.tar.gz"; sha256 = "1915f5d24vfrwgzvs5nkj5p05fjgqjyxpm54ym2wshl9s4fjb6sp"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.0-darwin-arm64.tar.gz"; + sha256 = "0xzh9n69prbaf0795dzmyp4jbzmgqvg4sl2sad3l3mkbgghx4cll"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; + sha256 = "1qaccfqw24g862ij2p49m78hnymg0j2nghshszqrg45v0d0qnknm"; + } ]; }; } diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index c2b0818e5b9..91634301c27 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -10,36 +10,51 @@ fi # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.22.1" +VERSION="3.25.1" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. declare -a pulumi_repos pulumi_repos=( + "aiven" + "akamai" + "alicloud" + "artifactory" "auth0" "aws" "azure" + "azuread" + "azuredevops" "cloudflare" "consul" "datadog" "digitalocean" "docker" "equinix-metal" + "fastly" "gcp" "github" "gitlab" + "google-native" "hcloud" "kubernetes" "linode" "mailgun" "mysql" "openstack" - "packet" "postgresql" "random" + "snowflake" + "spotinst" + "sumologic" + "tailscale" + "tls" "vault" + "venafi" "vsphere" + "wavefront" + "yandex" ) # Contains latest release ${VERSION} from diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 673f7796f8c..347f6d6f7cf 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.7.13"; + version = "1.8.0"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XYhOBEpHVAJ/PHovMylme56le33IUM5C9HEZAm/gG3I="; + sha256 = "sha256-5Dvmlzhu7xqJAcAdyjPJ/iMooK7N+Qv8J93uEySYb/s="; }; - vendorSha256 = "sha256-OP39ZuWBz/lutuYGbYLVEtjIirXq89QTdltq2v0NWRE="; + vendorSha256 = "sha256-KgoSJcVUtE4ryJLtQXNCdl51sgO94vyb682OdL5CYw8="; subPackages = [ "cmd/stripe" diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index f3a1c6d10c3..cf261187c52 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.38.0"; + version = "0.41.6"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YJQ0gWhhcB+jkVzu1KP+QMOiiCOyQnSuQ4rSfVGMOCU="; + sha256 = "sha256-Ebs0IVdcll7bTNjoZalD5Ye0GFXJeas1nPseYLzZxOk="; # 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 { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-dT+MPuMQoA8Spx8CkF3OBhWdXXssg62ZHIZBrokUkp4="; + vendorSha256 = "sha256-/WGkQfCUDmolGdzNxIZKzZnXWnqO2vvizBLJgO+s4Ak="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 7f7d6ed51d6..c0e021cfa32 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.24.1"; + version = "0.24.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/XkHvXzF7SG5niIknd+wh1Uc0ZbfrklgTkZigjz3aNY="; + sha256 = "sha256-8ozoSorVoYt5C4F2FgEwGYQErBVnoTt2FhxiC3/SGsA="; }; - vendorSha256 = "sha256-C3JpjDXQ6sUnz9ixO3w2aP3G122nYHezYrNW/FZqlJQ="; + vendorSha256 = "sha256-HM4SxCvvHz7MZsHa8+Orx1KKCRhyZH28JlN9wW+/xIw="; excludedPackages = "misc"; diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix index 38e76064b18..c845d890ce5 100644 --- a/pkgs/tools/admin/winbox/default.nix +++ b/pkgs/tools/admin/winbox/default.nix @@ -14,15 +14,15 @@ let inherit (lib) last splitString; pname = "winbox"; - version = "3.34"; + version = "3.35"; name = "${pname}-${version}"; executable = fetchurl (if use64 then { url = "https://download.mikrotik.com/winbox/${version}/${pname}64.exe"; - sha256 = "1zr5qvdnr98xhwlhjikdnx3l5zyx6qnvxqy9p2hrayi0w4w5wmba"; + sha256 = "0jigjs4paci6h897hl1046ks5f812jfb2ihnp78lbah0294shjnj"; } else { url = "https://download.mikrotik.com/winbox/${version}/${pname}.exe"; - sha256 = "1d5zif0f4xfiipjs281xwa3f3blfxbgzqppv3gg3rh5ivxwvaf6g"; + sha256 = "1a3cjhvh2z4n767aqqkv3a7wlda34ssgx9acigdcszgvbksbav1f"; }); # This is from the winbox AUR package: # https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 7f892a44da5..5e92553b636 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -8,7 +8,18 @@ stdenv.mkDerivation rec { owner = "jinfeihan57"; repo = pname; rev = "v${version}"; - sha256 = "sha256-19F4hPV0nKVuFZNbOcXrcA1uW6Y3HQolaHVIYXGmh18="; + sha256 = { + free = "sha256-DrBuf2VPdcprHI6pMSmL7psm2ofOrUf0Oj0qwMjXzkk="; + unfree = "sha256-19F4hPV0nKVuFZNbOcXrcA1uW6Y3HQolaHVIYXGmh18="; + }.${if enableUnfree then "unfree" else "free"}; + # remove the unRAR related code from the src drv + # > the license requires that you agree to these use restrictions, + # > or you must remove the software (source and binary) from your hard disks + # https://fedoraproject.org/wiki/Licensing:Unrar + extraPostFetch = lib.optionalString (!enableUnfree) '' + rm -r $out/CPP/7zip/Compress/Rar* + find $out -name makefile'*' -exec sed -i '/Rar/d' {} + + ''; }; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional @@ -25,11 +36,6 @@ stdenv.mkDerivation rec { substituteInPlace makefile.machine \ --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \ --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' - '' + lib.optionalString (!enableUnfree) '' - # Remove non-free RAR source code - # (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar) - rm -r CPP/7zip/Compress/Rar* - find . -name makefile'*' -exec sed -i '/Rar/d' {} + ''; makeFlags = [ "DEST_HOME=${placeholder "out"}" ]; @@ -46,13 +52,20 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; - meta = { + passthru.updateScript = ./update.sh; + + meta = with lib; { homepage = "https://github.com/jinfeihan57/p7zip"; description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)"; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.raskin ]; + license = with licenses; + # p7zip code is largely lgpl2Plus + # CPP/7zip/Compress/LzfseDecoder.cpp is bsd3 + [ lgpl2Plus /* and */ bsd3 ] ++ + # and CPP/7zip/Compress/Rar* are unfree with the unRAR license restriction + # the unRAR compression code is disabled by default + lib.optionals enableUnfree [ unfree ]; + maintainers = with maintainers; [ raskin jk ]; + platforms = platforms.unix; mainProgram = "7z"; - # RAR code is under non-free UnRAR license, but we remove it - license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/tools/archivers/p7zip/update.sh b/pkgs/tools/archivers/p7zip/update.sh new file mode 100755 index 00000000000..0d4b91e56e8 --- /dev/null +++ b/pkgs/tools/archivers/p7zip/update.sh @@ -0,0 +1,47 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils gnused curl jq +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +DRV_DIR="$PWD" + +OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +NEW_VERSION="$(curl https://api.github.com/repos/jinfeihan57/p7zip/releases/latest | jq .tag_name -r | tr -d 'v')" + +echo "comparing versions $OLD_VERSION => $NEW_VERSION" +if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "Already up to date! Doing nothing" + exit 0 +fi + +NIXPKGS_ROOT="$(realpath "$DRV_DIR/../../../..")" + +echo "getting free source hash" +OLD_FREE_HASH="$(nix-instantiate --eval --strict -E "with import $NIXPKGS_ROOT {}; p7zip.src.drvAttrs.outputHash" | tr -d '"')" +echo "getting unfree source hash" +OLD_UNFREE_HASH="$(nix-instantiate --eval --strict -E "with import $NIXPKGS_ROOT {}; (p7zip.override { enableUnfree = true; }).src.drvAttrs.outputHash" | tr -d '"')" + + +NEW_FREE_HASH=$(nix-prefetch -f "$NIXPKGS_ROOT" -E "p7zip.src" --rev "v$NEW_VERSION") + +NEW_UNFREE_OUT=$(nix-prefetch -f "$NIXPKGS_ROOT" -E "(p7zip.override { enableUnfree = true; }).src" --rev "v$NEW_VERSION" --output raw --print-path) +# first line of raw output is the hash +NEW_UNFREE_HASH="$(echo "$NEW_UNFREE_OUT" | sed -n 1p)" +# second line of raw output is the src path +NEW_UNFREE_SRC="$(echo "$NEW_UNFREE_OUT" | sed -n 2p)" +# make sure to nuke the unfree src from the updater's machine +# > the license requires that you agree to these use restrictions, or you must remove the software (source and binary) from your hard disks +# https://fedoraproject.org/wiki/Licensing:Unrar +nix-store --delete "$NEW_UNFREE_SRC" + + +echo "updating version" +sed -i "s/version = \"$OLD_VERSION\";/version = \"$NEW_VERSION\";/" "$DRV_DIR/default.nix" + +echo "updating free hash" +sed -i "s@free = \"$OLD_FREE_HASH\";@free = \"$NEW_FREE_HASH\";@" "$DRV_DIR/default.nix" +echo "updating unfree hash" +sed -i "s@unfree = \"$OLD_UNFREE_HASH\";@unfree = \"$NEW_UNFREE_HASH\";@" "$DRV_DIR/default.nix" + +echo "done" diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 3fa4089b866..b988a135e45 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "6.1.5"; + version = "6.1.6"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "sha256-TlZxfYZ83/egAIt/Haaqeax6j5dM8TTUmowWtXe87Uo="; + sha256 = "sha256-Z/SriRwGIhjCut+qycjKtci/1eltq/ylbI+qPSCagB0="; }; postPatch = '' diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 87b8940026a..17f4d884848 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.02.13"; + version = "2022.02.21"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-iPeGcEDGvltXqJY50B+yDKYKRF4Oz9GQifn7Pqe8dG8="; + hash = "sha256-oGGtJhVugqTvXD34Q2f8L5qoYoyyT5JjuBhqh4VYAAo="; }; meta = with lib; { diff --git a/pkgs/tools/audio/audiowaveform/default.nix b/pkgs/tools/audio/audiowaveform/default.nix index ab56a9890b0..15981b0fc6e 100644 --- a/pkgs/tools/audio/audiowaveform/default.nix +++ b/pkgs/tools/audio/audiowaveform/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "audiowaveform"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "bbc"; repo = "audiowaveform"; rev = version; - sha256 = "sha256-WODAgiwZ7UfoukTcujXE5atw/Z03+Vo6aR2jubPwQeU="; + sha256 = "sha256-ZkkGRohcydi2C1S7J0+yGWsqK7ivxQmFuq1NGNiPPNY="; }; nativeBuildInputs = [ cmake gtest ]; diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/tools/audio/midimonster/default.nix new file mode 100644 index 00000000000..3792d997aa0 --- /dev/null +++ b/pkgs/tools/audio/midimonster/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchurl +, zlib +, fetchFromGitHub +, gnumake +, gcc +, pkg-config +, lua5_4 +, openssl +, jack1 +, python3 +, alsa-lib +, ncurses +, libevdev +}: + +stdenv.mkDerivation rec { + pname = "midimonster"; + version = "0.6.0"; + + buildInputs = [pkg-config gnumake gcc lua5_4 openssl jack1 python3 alsa-lib ncurses libevdev]; + + src = fetchFromGitHub { + repo = "midimonster"; + owner = "cbdevnet"; + rev = "f16f7db86662fcdbf45b6373257c90c824b0b4b0"; + sha256 = "131zs4j9asq9xl72cbyi463xpkj064ca1s7i77q5jrwqysgy52sp"; +}; + + doCheck = true; + enableParallelBuilding = true; + + outputs = ["out" "man"]; + + buildPhase = '' + PLUGINS=$out/lib/midimonster make all + ''; + + installPhase = '' + PREFIX=$out make install + + mkdir -p "$man/share/man/man1" + cp assets/midimonster.1 "$man/share/man/man1" + + mkdir -p "$out/share/icons/hicolor/scalable/apps" + cp assets/MIDIMonster.svg "$out/share/icons/hicolor/scalable/apps/" + ''; + + meta = with lib; { + homepage = "https://midimonster.net"; + description = "Multi-protocol translation tool"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [keldu]; + }; +} diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 4ee8644d712..a7b0212a7b0 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, espeak-ng }: # USAGE: @@ -30,14 +31,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.5.0"; + version = "0.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-9fNYNhHS9wqrk2bZnrkkGU1OaDu/16RA8fz+Zj9xsyQ="; + sha256 = "sha256-YzMR/Tl1UvjdSqV/h4lYR6DuarEqEIM7RReqYznFU4Q="; }; postPatch = let @@ -48,7 +49,7 @@ python.pkgs.buildPythonApplication rec { "numba" "numpy" "umap-learn" - "torch" + "unidic-lite" ]; in '' sed -r -i \ @@ -65,6 +66,7 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ anyascii coqpit + coqui-trainer flask fsspec gdown @@ -92,29 +94,19 @@ python.pkgs.buildPythonApplication rec { ]; postInstall = '' - cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server + cp -r TTS/server/templates/ $out/${python.sitePackages}/TTS/server # cython modules are not installed for some reasons ( cd TTS/tts/utils/monotonic_align - ${python3.interpreter} setup.py install --prefix=$out + ${python.interpreter} setup.py install --prefix=$out ) ''; - checkInputs = with python3.pkgs; [ - pytest-sugar + checkInputs = with python.pkgs; [ + espeak-ng pytestCheckHook ]; - disabledTests = [ - # RuntimeError: fft: ATen not compiled with MKL support - "test_torch_stft" - "test_stft_loss" - "test_multiscale_stft_loss" - # Requires network acccess to download models - "test_synthesize" - "test_run_all_models" - ]; - preCheck = '' # use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules. mv TTS{,.old} @@ -125,22 +117,49 @@ python.pkgs.buildPythonApplication rec { for file in $(grep -rl 'python TTS/bin' tests); do substituteInPlace "$file" \ - --replace "python TTS/bin" "${python3.interpreter} $out/lib/${python3.libPrefix}/site-packages/TTS/bin" + --replace "python TTS/bin" "${python.interpreter} $out/lib/${python.libPrefix}/site-packages/TTS/bin" done ''; + disabledTests = [ + # Requires network acccess to download models + "test_synthesize" + "test_run_all_models" + # Mismatch between phonemes + "test_text_to_ids_phonemes_with_eos_bos_and_blank" + # Takes too long + "test_parametrized_wavernn_dataset" + ]; + disabledTestPaths = [ - # requires tensorflow - "tests/vocoder_tests/test_vocoder_tf_pqmf.py" - "tests/vocoder_tests/test_vocoder_tf_melgan_generator.py" - "tests/tts_tests/test_tacotron2_tf_model.py" - # RuntimeError: fft: ATen not compiled with MKL support + # phonemes mismatch between espeak-ng and gruuts phonemizer + "tests/text_tests/test_phonemizer.py" + # no training, it takes too long + "tests/aux_tests/test_speaker_encoder_train.py" + "tests/tts_tests/test_align_tts_train.py" + "tests/tts_tests/test_fast_pitch_speaker_emb_train.py" + "tests/tts_tests/test_fast_pitch_train.py" + "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_speedy_speech_train.py" + "tests/tts_tests/test_tacotron2_d-vectors_train.py" + "tests/tts_tests/test_tacotron2_speaker_emb_train.py" + "tests/tts_tests/test_tacotron2_train.py" + "tests/tts_tests/test_tacotron2_train_fsspec_path.py" + "tests/tts_tests/test_tacotron_train.py" + "tests/tts_tests/test_vits_d-vectors_train.py" + "tests/tts_tests/test_vits_multilingual_speaker_emb_train.py" + "tests/tts_tests/test_vits_multilingual_train-d_vectors.py" + "tests/tts_tests/test_vits_speaker_emb_train.py" "tests/tts_tests/test_vits_train.py" + "tests/vocoder_tests/test_wavegrad_train.py" + "tests/vocoder_tests/test_parallel_wavegan_train.py" "tests/vocoder_tests/test_fullband_melgan_train.py" "tests/vocoder_tests/test_hifigan_train.py" - "tests/vocoder_tests/test_melgan_train.py" "tests/vocoder_tests/test_multiband_melgan_train.py" - "tests/vocoder_tests/test_parallel_wavegan_train.py" + "tests/vocoder_tests/test_melgan_train.py" + "tests/vocoder_tests/test_wavernn_train.py" ]; meta = with lib; { @@ -148,6 +167,6 @@ python.pkgs.buildPythonApplication rec { changelog = "https://github.com/coqui-ai/TTS/releases/tag/v${version}"; description = "Deep learning toolkit for Text-to-Speech, battle-tested in research and production"; license = licenses.mpl20; - maintainers = with maintainers; [ hexa mic92 ]; + maintainers = teams.tts.members; }; } diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index aebcc608c76..3837c55655e 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "autorestic"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JOiFsH9r92Gac7DH7h/4Q6hwXBtqLwHNQpW3gKBybHo="; + sha256 = "sha256-NhKAxybPLBR1Kaw2d4xI8WKS4cG0yAMHbUBDWgr5T0A="; }; vendorSha256 = "sha256-WzmgV0wUsGfMVeho6M8wXJKD9adaAKRYmaJYaAcXwFc="; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index b04263a7168..d9f336c86d4 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "btrbk"; - version = "0.32.0"; + version = "0.32.1"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; - sha256 = "HmvNtIgFfeaiFuSRobWlcJqusPSYtqAqx+79+CeNVDQ="; + sha256 = "flQf1KTybPImDoD+iNe+P+u1rOiYxXjQoltuGPWuX3g="; }; nativeBuildInputs = [ asciidoctor makeWrapper ]; diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index 3c16fb1e0ed..d2a9bd2563e 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -1,20 +1,20 @@ { lib -, stdenv , buildDotnetModule , fetchFromGitHub -, autoPatchelfHook , dotnetCorePackages +, testVersion +, discordchatexporter-cli }: buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.32"; + version = "2.33.2"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "xRoF/HJ4ekHL/Uk6ISQP+65nChRT+n9xLTYcZMJxyvo="; + sha256 = "wOSa6O3O4QlGL5ecnR14ldXPYV5mDoPDlJjcwN5Lrek="; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; @@ -23,15 +23,24 @@ buildDotnetModule rec { projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; nugetDeps = ./deps.nix; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; + postFixup = '' + ln -s $out/bin/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli + ''; + + passthru = { + updateScript = ./updater.sh; + tests.version = testVersion { + package = discordchatexporter-cli; + version = "v${version}"; + }; + }; meta = with lib; { description = "A tool to export Discord chat logs to a file"; homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; license = licenses.gpl3Plus; + changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md"; maintainers = [ maintainers.ivar ]; platforms = [ "x86_64-linux" ]; }; - passthru.updateScript = ./updater.sh; } diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index a360d0099fd..92bf39b58ef 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,6 +1,6 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "CliFx"; version = "2.2.1"; sha256 = "1yxxl3jgl6sadar1g9175s62fag5f30lqpgrf58djll3509rbgw5"; }) - (fetchNuGet { pname = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) + (fetchNuGet { pname = "CliFx"; version = "2.2.2"; sha256 = "13g5xlrbyhnbwkyzic5jlhxl0kpvkfrdmb5h2rdf9yp4gp5p9mwg"; }) + (fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.0"; sha256 = "1rbgkm1hsamqhviw2c62g6iafiwkxcnz66qbybpd32qgz1124cx4"; }) (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.0"; sha256 = "0zm0l97jfbfy90zj0cbi7v3qbhxhfay1g8f2cw0gp829xz4yk9jr"; }) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 1eac3f04325..09f17b9a2be 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-9H57NlvyEEOX2F3ooWWqDAo7MnS9J+XrYv/cIyNo6+Y="; + sha256 = "sha256-lyCTKjimVZkpXKVeDNn0e9E6FkDp7fUl3cYnn5W5A7o="; }; - vendorSha256 = "sha256-c8WohMyaOicPq2q+DkgNBBulMEJCZFNFe+xECUEpelI="; + vendorSha256 = "sha256-p+hK662WoO98J/uE3B9X1GvpnyMGu21sAg8GcyTlWZM="; doCheck = false; diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index 9f2a52d64dc..699343b8728 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -2,19 +2,20 @@ buildGoModule rec { pname = "restic-rest-server"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "restic"; repo = "rest-server"; rev = "v${version}"; - sha256 = "1msa6mah76zfif5wp0129jjk2jlq5ff38p9p6d241mw45i1xjfy7"; + hash = "sha256-ninPODztNzvB2js9cuNAuExQLK/OGOu80ZNW0BPrdds="; }; - vendorSha256 = "04w63sx7p0fm9xq0m7xab808az7lgw7i3p8basndszky8kgvxhmg"; + vendorSha256 = "sha256-8x5qYvIX/C5BaewrTNVbIIadL+7XegbRUZiEDWmJM+c="; preCheck = '' - substituteInPlace handlers_test.go --replace "TestJoin" "SkipTestJoin" + substituteInPlace cmd/rest-server/main_test.go \ + --replace "/tmp/restic" "/build/restic" ''; meta = with lib; { diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 9e0752b5482..aa049682b83 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-01-12"; + version = "unstable-2022-03-09"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "7b15324de1095f3e2e423e9c53da076d208b52d5"; - sha256 = "0glpq0n1xv7ck28v0gahl1fak9dhyp04id8d1l8yxvnriyw19zxa"; + rev = "3e2e3d468eed1d5ebbb4c6309d2eaebd081912c5"; + sha256 = "1sb0dj2whlp3dxgf642z7yx7s8va5ah82zi6r4qni7l64qy1n554"; }; postPatch = '' @@ -60,11 +60,13 @@ stdenv.mkDerivation { smoke-test = nixosTests.bcachefs; }; + enableParallelBuilding = true; + meta = with lib; { description = "Tool for managing bcachefs filesystems"; homepage = "https://bcachefs.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ davidak chiiruno ]; + maintainers = with maintainers; [ davidak Madouura ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 936555f93a4..c51cc12da36 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchurl , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto , zstd -, acl, attr, e2fsprogs, libuuid, lzo, systemd, zlib +, acl, attr, e2fsprogs, libuuid, lzo, udev, zlib , runCommand, btrfs-progs }: stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.16"; + version = "5.16.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0cqqlcq9bywfi3cpg5ivxiv7p9v6z1r6k4nnmin24mj1kp8krarq"; + sha256 = "sha256-PaTaU2HPhr3dqA7bTE8w6gdstOvsKZBPoIr8kw754ag="; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { python3 python3.pkgs.setuptools ]; - buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ systemd ]; + buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ]; # for python cross-compiling _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index d630c7d43f6..6fbc0b9b45f 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo , shared ? !stdenv.hostPlatform.isStatic +, e2fsprogs, runCommand }: stdenv.mkDerivation rec { @@ -65,6 +66,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + simple-filesystem = runCommand "e2fsprogs-create-fs" {} '' + mkdir -p $out + truncate -s10M $out/disc + ${e2fsprogs}/bin/mkfs.ext4 $out/disc | tee $out/success + ${e2fsprogs}/bin/e2fsck -n $out/disc | tee $out/success + [ -e $out/success ] + ''; + }; meta = with lib; { homepage = "http://e2fsprogs.sourceforge.net/"; changelog = "http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}"; diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index fbeac15a38e..9b96f1c0a8e 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,17 +1,17 @@ { lib, rustPlatform, fetchFromGitea, testVersion, garage }: rustPlatform.buildRustPackage rec { pname = "garage"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitea { domain = "git.deuxfleurs.fr"; owner = "Deuxfleurs"; repo = "garage"; rev = "v${version}"; - sha256 = "sha256-NNjqDOkMMRyXce+Z7RQpuffCuVhA1U3qH30rSv939ks="; + sha256 = "sha256-BEFxPU4yPtctN7H+EcxJpXnf4tyqBseskls0ZA9748k="; }; - cargoSha256 = "sha256-eKJxRcC43D8qVLORer34tlmsWhELTbcJbZLyf0MB618="; + cargoSha256 = "sha256-/mOH7VOfIHEydnJUUSts44aGb8tS1/Faxiu4pQDeobY="; passthru = { tests.version = testVersion { package = garage; }; diff --git a/pkgs/tools/filesystems/ioztat/default.nix b/pkgs/tools/filesystems/ioztat/default.nix index e87b96482c6..b28f0a36661 100644 --- a/pkgs/tools/filesystems/ioztat/default.nix +++ b/pkgs/tools/filesystems/ioztat/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ioztat"; - version = "1.1.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "jimsalterjrs"; repo = "ioztat"; rev = "v${version}"; - sha256 = "wDRcFlXmXTc1J9MQZqILfPp5jUhX6wW4nOnqspIWVjQ="; + sha256 = "sha256-8svMijgVxSuquPFO2Q2HeqGLdMkwhiujS1DSxC/LRRk="; }; nativeBuildInputs = [ installShellFiles ]; @@ -24,12 +24,15 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - cp ioztat $out/bin + runHook preInstall + + install -vDt $out/bin -m 0555 ioztat if [ -f ioztat.8 ]; then installManPage ioztat.8 fi + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/filesystems/lfs/default.nix b/pkgs/tools/filesystems/lfs/default.nix index 73ccd29ad51..1009125adc6 100644 --- a/pkgs/tools/filesystems/lfs/default.nix +++ b/pkgs/tools/filesystems/lfs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "lfs"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q8ekLh0pw+kMIE2SP3cBgrMTfMjY5zRWR58mq5bbB8U="; + sha256 = "sha256-ySaPR6it/1xEf+Rnypnz5AklxWZZ8NeXpjId4ZSMIs8="; }; - cargoSha256 = "sha256-eZM48OyYgEJl71I2iu52hKwjDrbSelR4JH/se79bBDs="; + cargoSha256 = "sha256-FLbFDJXVpWycII8mdNDphh8QVXFFnxtFgloweW+BZA0="; meta = with lib; { description = "Get information on your mounted disks"; diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 0cafb0c83f0..949b8c92f84 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.37"; + version = "4.0.38"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-eZsZfiPke2ElliiBCyd5Dvt6H+NgN+8dqKJ7CuT6g0I="; + sha256 = "sha256-e5RIX0huffCMymiwChZKE8049MY8uGhNGIdZ7nvF5yk="; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index aefa2c3f789..4a0ef0e9a73 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "2.2.0-dev-20220120"; + version = "3.1.0-dev-20220314"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-0f17CAANxomtx1fvhj+mI6k4IqwIimmcTSTXZGbbWDY="; + sha256 = "sha256-j/ozkIoRM+G7fi0qBG8UGKPtrn6DR6KNK0Hc53dxsMw="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { desktopItems = [(makeDesktopItem { name = "agi"; desktopName = "Android GPU Inspector"; - exec = "$out/bin/agi"; + exec = "agi"; icon = "agi"; categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ]; })]; diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index a982d329f90..cecc52b9df2 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { gccStdenv.mkDerivation rec { pname = "astc-encoder"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-5E26QzphF5HwVTH+92S4rT3IUAp9ravT/wxsmaH9IAM="; + sha256 = "sha256-blOfc/H64UErjPjkdZQNp2H/Hw57RbQRFBcUo/C2b0Q="; }; nativeBuildInputs = [ cmake ]; @@ -46,6 +46,12 @@ gccStdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" ]; + # Set a fixed build year to display within help output (otherwise, it would be 1980) + postPatch = '' + substituteInPlace Source/cmake_core.cmake \ + --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2022")' + ''; + # Link binaries into environment and provide 'astcenc' link postInstall = '' mv $out/astcenc $out/bin diff --git a/pkgs/tools/graphics/pngoptimizer/default.nix b/pkgs/tools/graphics/pngoptimizer/default.nix new file mode 100644 index 00000000000..c75ba0fb101 --- /dev/null +++ b/pkgs/tools/graphics/pngoptimizer/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, gtk3, pkg-config }: + +stdenv.mkDerivation rec { + pname = "pngoptimizer"; + version = "2.7"; + + src = fetchFromGitHub { + owner = "hadrien-psydk"; + repo = "pngoptimizer"; + rev = "v${version}"; + sha256 = "1hbgf91vzx46grslfdx86smdvm6gs6lq9hpa3bax9xfbsknxi0i7"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 ]; + + makeFlags = [ "CONFIG=release" "DESTDIR=$(out)" ]; + + postInstall = '' + mv $out/usr/bin $out/bin + mv $out/usr/share $out/share + rmdir $out/usr + ''; + + meta = with lib; { + homepage = "https://psydk.org/pngoptimizer"; + description = "PNG optimizer and converter"; + # https://github.com/hadrien-psydk/pngoptimizer#license-information + license = with licenses; [ gpl2Only lgpl21Only zlib ]; + maintainers = with maintainers; [ smitop ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix index b48c0a6d16a..7486a885a54 100644 --- a/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { desktopItems = [(makeDesktopItem { name = pname; desktopName = "Snapdragon Profiler"; - exec = "$out/bin/snapdragon-profiler"; + exec = "snapdragon-profiler"; icon = "snapdragon-profiler"; comment = meta.description; categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ]; diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 52ef4230fd3..ab3724fb746 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - sha256 = "sha256-EsOq081wfnuFT0OKqLyi3R105brZwuHJwzEx00c2LGg="; + sha256 = "sha256-NG5UbUv//03PVs5QoLVDkgA6Fc3SWKtbgIpcvcb7rW0="; }; - cargoSha256 = "sha256-sBU3GoqUH9cS1Kn0MCysCG9kQsWQqteVui1AHW9bfs0="; + cargoSha256 = "sha256-CdPTtn0NTcEAQvLTh4vdG053oZNNMmbP5IxmMU4YGAw="; postInstall = '' mv $out/bin/svgbob_cli $out/bin/svgbob diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index f00da6045a3..123d634d65f 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.14"; + version = "5.0.15"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Trpye+jTu+l8ieUK6IX+ZqNe4H2DvoJ10juiMkEGRKM="; + sha256 = "sha256-+9MmYyMP6oqtToTsvcCMlNnKU0ZZtHYtI4YFXb7DuXU="; }; prePatch = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index 7d3ef954b27..adc46f3cb30 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.0.9"; + version = "5.0.10"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-wPfod0BNvNy1gwSJyu7N0sS61StnmXLrMNFgmHk9A0M="; + sha256 = "sha256-KZ3RZ/1Pt+/eNjJ8KSSgwl1MuB1OdGGb0Kwz6hpkxPY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 7f75748df57..85ce543ecdf 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.11"; + version = "5.0.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-PBKTc6yxCaLYZxfR7158rTkR7GsDCapjCKBuLxNu4dU="; + sha256 = "sha256-0+jKBA1IaeqV6epnJBgGwnDdAUxdMH6RyOKGmsw0M/o="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 42a7ffd0100..b7b74de4358 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.11"; + version = "5.0.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-8Yj4ueLyfPlvjI3HLH5qudY5BEQaBkM5rNgqjH1ihV8="; + sha256 = "sha256-Xjk/Z+1V6Az85N5I+Icoj0kOPJVL7hxyQvqlsp50Ybk="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index eaec4463ca5..194513dddee 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.12"; + version = "5.0.13"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-wSYYVQMuydtxMQ/v9b6bBMesyfKlsqUqpqf/y74Q4zc="; + sha256 = "sha256-2kY38XwQYEAtJ3KtSsfkySY79arsFCzXsCAVpE8TpSk="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 2357c73b764..7a612f6810d 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-vjKQ0h85gvlE+inHuzkIBLgluwA6c/XADtyMi6nQNc8="; + sha256 = "sha256-b8vxPzTmvmvWkO5H/yf+Kg9xPQ/53tR9jQsD11KjzJw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 8f53508a043..2c59c2539af 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.6"; + version = "5.0.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-6znDtU/yVAJByhCanW7KVg5Tk615aCLbFbxDMESVOlY="; + sha256 = "sha256-ZZwPjELIJczF3AJxQqJcwA6J8vGuPdit/0dEHS+g7J0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 24e06028a45..a300892e5df 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.10"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-KSnbwXMyAnya0Os/xrmjzK/wD6/dpM48rs1nS9SL5hs="; + sha256 = "sha256-T3gGErvB1DtEdHSC1oKzmttTLBBn3jXcvZFWnpoPz4E="; }; preConfigure = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index ecbe4d5c67b..3743d6cb9fc 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.11"; + version = "5.0.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-kEqooOSLMp2LF911M1q67GYRGx421V6iExXOQk1pcl0="; + sha256 = "sha256-8ETSRBTznd4AKzYbSW/zIMZXV+yuHXLhfTJV3DJ2ahc="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index fd91a9bafb4..7531fa074c1 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.0.8"; + version = "5.0.9"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-8ad7A6MHkVfQEVMrbuAv2sJlc7t3rlz4EFqaMe51YSw="; + sha256 = "sha256-FEpBpEfq9qRLQ+j+313ua3zhZnphdaYy9jPKyb8oUG8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index dc601aca806..d723f613136 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-XpQ/5OLNEcJTu1LvGBM6arGZrBl6XSIWx9MDKH9WIt4="; + sha256 = "sha256-aCZqcPqokkxBWx9kPBfxbslW1RZBIoZ63e7fPItl5yg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index d9517ce214d..6401785e97b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.0.8"; + version = "5.0.9"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - sha256 = "sha256-UdhTIVRLEqzxh9aafqwLhA8EOKiO/tD5QksdVd0rvqI="; + sha256 = "sha256-lsWMQygIdHcEuHCEvi5d0PGI1jJ42C+9ji/w0L/eadM="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 44a44b3af2b..049e369e296 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ibus-mozc"; - version = "2.26.4423.100"; + version = "2.26.4660.102"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "7654223979067e3c5ae52ea238d43880c5508f85"; - sha256 = "aZVuhj4I9ZCsVR9dOplOd9zinYMgYw5SF5wG3IxBTO0="; + rev = "063c41f1d7c1a877f44c1f8caad6be1897350336"; + sha256 = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI="; fetchSubmodules = true; }; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 50b9dba51d3..0f4dde0a416 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , substituteAll , fetchurl +, fetchpatch , fetchFromGitHub , autoreconfHook , gettext @@ -9,12 +10,14 @@ , vala , wrapGAppsHook , dbus +, systemd , dconf ? null , glib , gdk-pixbuf , gobject-introspection , gtk2 , gtk3 +, gtk4 , gtk-doc , runCommand , isocodes @@ -60,16 +63,22 @@ in stdenv.mkDerivation rec { pname = "ibus"; - version = "1.5.24"; + version = "1.5.26"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "sha256-1qx06MlEUjSS067FdQG1Bdi4ZAh3hPcNjUX5PIiC3Sk="; + sha256 = "7Vuj4Gyd+dLUoCkR4SPkfGPwVQPRo2pHk0pRAsmtjxc="; }; patches = [ + # Fixes systemd unit installation path https://github.com/ibus/ibus/pull/2388 + (fetchpatch { + url = "https://github.com/ibus/ibus/commit/33b4b3932bfea476a841f8df99e20049b83f4b0e.patch"; + sha256 = "kh8SBR+cqsov/B0A2YXLJVq1F171qoSRUKbBPHjPRHI="; + }) + (substituteAll { src = ./fix-paths.patch; pythonInterpreter = python3Runtime.interpreter; @@ -94,6 +103,7 @@ stdenv.mkDerivation rec { (enableFeature enablePython2Library "python-library") (enableFeature enablePython2Library "python2") # XXX: python2 library does not work anyway (enableFeature enableUI "ui") + "--enable-gtk4" "--enable-install-tests" "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji" "--with-emoji-annotation-dir=${cldr-emoji-annotation}/share/unicode/cldr/common/annotations" @@ -123,12 +133,14 @@ stdenv.mkDerivation rec { buildInputs = [ dbus + systemd dconf gdk-pixbuf gobject-introspection python3.pkgs.pygobject3 # for pygobject overrides gtk2 gtk3 + gtk4 isocodes json-glib libnotify diff --git a/pkgs/tools/inputmethods/ibus/fix-paths.patch b/pkgs/tools/inputmethods/ibus/fix-paths.patch index 60269c6c241..340ec22130f 100644 --- a/pkgs/tools/inputmethods/ibus/fix-paths.patch +++ b/pkgs/tools/inputmethods/ibus/fix-paths.patch @@ -1,6 +1,8 @@ +diff --git a/configure.ac b/configure.ac +index a3cdb2da..cade9466 100644 --- a/configure.ac +++ b/configure.ac -@@ -429,11 +429,11 @@ +@@ -469,11 +469,11 @@ PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED], if test "x$enable_pygobject" = "xyes"; then PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED]) @@ -14,7 +16,7 @@ AC_SUBST(py2overridesdir) fi fi -@@ -462,7 +462,7 @@ +@@ -502,7 +502,7 @@ if test x"$enable_python_library" = x"yes"; then PYTHON2_VERSION=`$PYTHON2 -c "import sys; sys.stdout.write(sys.version[[:3]])"` PYTHON2_LIBDIR="$PYTHON2_PREFIX/lib/python$PYTHON2_VERSION" python2dir="$PYTHON2_LIBDIR/site-packages" @@ -23,9 +25,11 @@ AC_SUBST(pkgpython2dir) else enable_python_library="no (disabled, use --enable-python-library to enable)" +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index 5360f033..6d5e726f 100644 --- a/data/dconf/Makefile.am +++ b/data/dconf/Makefile.am -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ man_5dir = $(mandir)/man5 install-data-hook: if test -z "$(DESTDIR)"; then \ @@ -34,12 +38,14 @@ fi EXTRA_DIST = \ +diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in +index 474ce8a8..ee30808e 100644 --- a/setup/ibus-setup.in +++ b/setup/ibus-setup.in -@@ -27,5 +27,5 @@ +@@ -27,5 +27,5 @@ export IBUS_PREFIX=@prefix@ export IBUS_DATAROOTDIR=@datarootdir@ export IBUS_LOCALEDIR=@localedir@ export IBUS_LIBEXECDIR=${libexecdir} --exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py $@ -+exec @pythonInterpreter@ @prefix@/share/ibus/setup/main.py $@ +-exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py "$@" ++exec @pythonInterpreter@ @prefix@/share/ibus/setup/main.py "$@" diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix index 82664c3700e..1ac061034d7 100644 --- a/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/pkgs/tools/inputmethods/input-remapper/default.nix @@ -18,12 +18,17 @@ , buildPythonApplication , procps , gtksourceview4 +, nixosTests # Change the default log level to debug for easier debugging of package issues , withDebugLogLevel ? false # Xmodmap is an optional dependency # If you use Xmodmap to set keyboard mappings (or your DE does) # it is required to correctly map keys , withXmodmap ? true + # Some tests are flakey under high CPU load and could cause intermittent + # failures when building. Override this to true to run tests anyway + # See upstream issue: https://github.com/sezanzeb/input-remapper/issues/306 +, withDoCheck ? false # Version and rev and hash are package arguments to allow overriding # while ensuring the values in prePatch and src match # https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7 @@ -65,7 +70,7 @@ buildPythonApplication { substituteInPlace inputremapper/logger.py --replace "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)" ''); - doCheck = true; + doCheck = withDoCheck; checkInputs = [ psutil ]; @@ -146,6 +151,8 @@ buildPythonApplication { install -m755 -D -t $out/bin/ bin/input-remapper* ''; + passthru.tests = nixosTests.input-remapper; + meta = with lib; { description = "An easy to use tool to change the mapping of your input device buttons"; homepage = "https://github.com/sezanzeb/input-remapper"; diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index a6c2ca77c5a..3ee53c0f592 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.29.6"; + version = "2.30.0"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-INHLH3wv1Rr3RLECAN2CQvctIjWdksxdfVfBkWnx+Is="; + sha256 = "sha256-aIhJXmzLY2Sw9mFe2AmLkXb+YRnFu1pMnFeDF+zfHRE="; }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 2c7c2282b41..ad4158c10d5 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.44.3"; + version = "3.2.53"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-p3ctULrzXPt9dNs8Ckb7cqdOBpp4qOmEwu0dEVq8lEw="; + sha256 = "sha256-LWkgQsvP7XmupBDSAnbwewWRT+ZaALyDFw3w7iz66X0="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 99461f6b1fa..787e4248d46 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.12.1"; + version = "2.13.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-0v7BD/8Hpl6SLsfWWFC+XCH7Pe2RcziMM6nRTPsOBec="; + sha256 = "sha256-Ui9zj/PI8vYkbT8M13dZ1N4sxhM8fo8ZVeOP9Oa35xg="; }; - vendorSha256 = "sha256-QWOVcdFlUFS1kjLmwo2zY3s/sVSRxkeOVBWPyUYjbss="; + vendorSha256 = "sha256-6+T0UQDrCnoRZkMajyw50eH/AFIUzCgxCkWVmTfycD0="; doCheck = false; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 4e278b8cc62..e8bbb9540a1 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "clipster"; - version = "2.0.2"; + version = "2.1.1"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = version; - sha256 = "0582r8840dk4k4jj1zq6kmyh7z9drcng099bj7f4wvr468nb9z1p"; + sha256 = "sha256-MLLkFsBBQtb7RFQN+uoEmuCn5bnbkYsqoyWGZtTCI2U="; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 005e1f4d02a..a60624a904b 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.28.1"; + version = "1.29.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloudsql-proxy"; rev = "v${version}"; - sha256 = "sha256-mQYzc5OPYEsxBeSRiPHvYvh8grPOgB5sWB9EBrY3a6A="; + sha256 = "sha256-V/dNS/tbPPkVpgaCkGa5pfH/vj8y7mO9OQDLhgWbRCE="; }; subPackages = [ "cmd/cloud_sql_proxy" ]; - vendorSha256 = "sha256-+vuhOrUvA6W6y/6oEvJtsYixyvRzFPzpbw0Qn0AnYRI="; + vendorSha256 = "sha256-6td7rDye0sBUhDn9YARvdCgdfS/8z+VY1wYcEcUzHBs="; checkFlags = [ "-short" ]; diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index 097605026ee..35076a28327 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -12,6 +12,7 @@ , docbook_xml_dtd_412 , libxslt , glib +, withGtk4 ? false , gtk3 , gtk4 , pkg-config @@ -49,13 +50,21 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ colord - gtk3 + ] ++ (if withGtk4 then [ gtk4 + ] else [ + gtk3 + ]); + + mesonFlags = [ + "-Dgtk4=${lib.boolToString withGtk4}" + "-Dgtk3=${lib.boolToString (!withGtk4)}" ]; meta = with lib; { homepage = "https://www.freedesktop.org/software/colord/intro.html"; license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 36e82903a7e..783af7fda71 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -53,6 +53,7 @@ let pname = "intelmetool"; meta.description = "Dump interesting things about Management Engine"; buildInputs = [ pciutils zlib ]; + meta.platforms = [ "x86_64-linux" "i686-linux" ]; }; cbfstool = generic { pname = "cbfstool"; @@ -77,6 +78,7 @@ let pname = "inteltool"; meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)"; buildInputs = [ pciutils zlib ]; + meta.platforms = [ "x86_64-linux" "i686-linux" ]; }; amdfwtool = generic { pname = "amdfwtool"; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index f74f7855d02..7f1655b9843 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "205"; + version = "207"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-Smx9trogh7E6jsH0K+FXAocN8znnMXXnN6N/QzXkdJQ="; + sha256 = "sha256-0PWnaOQV4Pj0hFMpn98xYhZDexctkweIE2ZM3ppYfvg="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 2fbdc9f700d..72a62471430 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.2.5"; + version = "2022.2.6"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-ZHxPiQEqFmW9tYv5SaHutOuBh7gsmN4Ux4+sMAJRIk4="; + sha256 = "sha256-AoSFtEg7GpUBdIrFCYlOMBRc2nBBtiFEkxoZnKC/xyQ="; }; postPatch = '' diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 8c8b8c7b2b4..3746c4b4657 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "findutils"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { url = "mirror://gnu/findutils/${pname}-${version}.tar.xz"; - sha256 = "0r3i72hnw0a30khlczi9k2c51aamaj6kfmp5mk3844nrjxz7n4jp"; + sha256 = "sha256-or+4wJ1DZ3DtxZ9Q+kg+eFsWGjt7nVR1c8sIBl/UYv4="; }; postPatch = '' diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix index 6105b07c345..95d9f911273 100644 --- a/pkgs/tools/misc/gaphor/default.nix +++ b/pkgs/tools/misc/gaphor/default.nix @@ -1,44 +1,55 @@ { lib , buildPythonApplication , fetchPypi -, poetry-core +, copyDesktopItems , gobject-introspection -, pango -, gtksourceview4 +, poetry-core , wrapGAppsHook -, makeDesktopItem -, copyDesktopItems +, gtksourceview4 +, pango , gaphas , generic +, jedi , pycairo , pygobject3 -, python , tinycss2 +, gtk3 +, librsvg +, makeDesktopItem +, python }: buildPythonApplication rec { pname = "gaphor"; - version = "2.6.5"; + version = "2.8.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IFsbWx5lblKsnEibVihM6ZPRoydXC+JM1gdZEUUTKxw="; + sha256 = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0="; }; nativeBuildInputs = [ - poetry-core copyDesktopItems gobject-introspection wrapGAppsHook + copyDesktopItems + gobject-introspection + poetry-core + wrapGAppsHook ]; # Setting gobject-introspection on booth nativeBuildInputs and # buildInputs because of #56943. This recognizes pango, avoiding # a "ValueError: Namespace PangoCairo not available". - buildInputs = [ gobject-introspection gtksourceview4 pango ]; + buildInputs = [ + gobject-introspection + gtksourceview4 + pango + ]; propagatedBuildInputs = [ gaphas generic + jedi pycairo pygobject3 tinycss2 @@ -52,10 +63,20 @@ buildPythonApplication rec { desktopName = "Gaphor"; }; + # We need to wrap it manually to resolve all icons + dontWrapGApps = true; + postInstall = '' install -Dm644 $out/${python.sitePackages}/gaphor/ui/icons/hicolor/scalable/apps/org.gaphor.Gaphor.svg $out/share/pixmaps/gaphor.svg ''; + preFixup = '' + wrapProgram $out/bin/gaphor \ + ''${gappsWrapperArgs[@]} \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + ''; + meta = with lib; { description = "Simple modeling tool written in Python"; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 6ba61207043..492e8a83a2f 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.5.0"; + version = "1.6.3"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H7LgADzES5Zi5+lcooix+WCjDxqkThIIGvwa8IiHDHo="; + sha256 = "sha256-ZNE+DfQdIlxA6sXMI8DAIQ3x+kcgXoGApUuoPncRfpc="; }; - vendorSha256 = "sha256-4Hb+SmmPk4+c4QoOJADinKGD1xd0RYzn2wniuBxatAw="; + vendorSha256 = "sha256-Kwa2hzsuw3BNLubcqd7Vmpg49P78Yjt3LboLotoGWYM="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/gtkterm/default.nix b/pkgs/tools/misc/gtkterm/default.nix new file mode 100644 index 00000000000..08e5385288b --- /dev/null +++ b/pkgs/tools/misc/gtkterm/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, gtk3, vte, libgudev, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "gtkterm"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "Jeija"; + repo = "gtkterm"; + rev = "${version}"; + sha256 = "0s2cx8w1n8d37pl80gll5h6dyvbqrfcam8l4wmvnqqww9jml6577"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + vte + libgudev + ]; + + meta = with lib; { + description = "A simple, graphical serial port terminal emulator"; + homepage = "https://github.com/Jeija/gtkterm"; + license = licenses.gpl3Plus; + longDescription = '' + GTKTerm is a simple, graphical serial port terminal emulator for + Linux and possibly other POSIX-compliant operating systems. It + can be used to communicate with all kinds of devices with a + serial interface, such as embedded computers, microcontrollers, + modems, GPS receivers, CNC machines and more. + ''; + maintainers = with maintainers; [ wentasah ]; + platforms = platforms.linux; + mainProgram = "gtkterm"; + }; +} diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 684d62b464f..1a5cc30264f 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.12.0"; + version = "1.13.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Vs754nvtYV5d736xsZ2foawfxMc25bUfMhm8Vxqxw6U="; + sha256 = "sha256-1TWaLw1JxUE8RjPVVTldCbMSArNb+uhXM865iuJaJUo="; }; - cargoSha256 = "sha256-X9WFnKP2+GM8V1kyd5VxpwBXql8Be5mugBVGrYdSsaM="; + cargoSha256 = "sha256-kzDjxWMXie6qjherzdXvHxrS4i8FAXcKiuk/+wbMkAA="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/kakoune-cr/default.nix b/pkgs/tools/misc/kakoune-cr/default.nix new file mode 100644 index 00000000000..78504c1fc79 --- /dev/null +++ b/pkgs/tools/misc/kakoune-cr/default.nix @@ -0,0 +1,49 @@ +{ lib, crystal, fetchFromGitHub, fetchurl, jq }: +let + icon = fetchurl { + url = "https://github.com/mawww/kakoune/raw/master/doc/kakoune_logo.svg"; + hash = "sha256-JxhIEmjiGrisaarA1sX1AfzNjHNIm9xjyPs/nG1uL/U="; + }; +in +crystal.buildCrystalPackage rec { + pname = "kakoune.cr"; + version = "unstable-2021-11-12"; + + src = fetchFromGitHub { + owner = "alexherbo2"; + repo = "kakoune.cr"; + rev = "43d4276e1d173839f335ff60f205b89705892e00"; + hash = "sha256-xFrxbnZl/49vGKdkESPa6LpK0ckq4Jv5GNLL/G0qA1w="; + }; + + propagatedUserEnvPkgs = [ jq ]; + + format = "shards"; + shardsFile = ./shards.nix; + lockFile = ./shard.lock; + + preConfigure = '' + substituteInPlace src/kakoune/version.cr --replace \ + '`git describe --tags --always`' \ + '"${version}"' + ''; + + postInstall = '' + install -Dm555 share/kcr/commands/*/kcr-* -t $out/bin + install -Dm444 share/kcr/applications/kcr.desktop -t $out/share/applications + install -Dm444 ${icon} $out/share/icons/hicolor/scalable/apps/kcr.svg + cp -r share/kcr $out/share/ + ''; + + installCheckPhase = '' + $out/bin/kcr --help + ''; + + meta = with lib; { + homepage = "https://github.com/alexherbo2/kakoune.cr"; + description = "A command-line tool for Kakoune"; + license = licenses.unlicense; + maintainers = with maintainers; [ malvo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/kakoune-cr/shard.lock b/pkgs/tools/misc/kakoune-cr/shard.lock new file mode 100644 index 00000000000..79981b8460d --- /dev/null +++ b/pkgs/tools/misc/kakoune-cr/shard.lock @@ -0,0 +1,10 @@ +version: 2.0 +shards: + fifo: + git: https://github.com/alexherbo2/fifo.cr.git + version: 0.1.0+git.commit.37a2cc2718af0f8a1c50071106d7a5ca3a0d3da2 + + rsub: + git: https://github.com/alexherbo2/rsub.cr.git + version: 0.1.0+git.commit.43c6b9836ee281328bccfdf8c669bab26448e3b3 + diff --git a/pkgs/tools/misc/kakoune-cr/shards.nix b/pkgs/tools/misc/kakoune-cr/shards.nix new file mode 100644 index 00000000000..b4160f403c7 --- /dev/null +++ b/pkgs/tools/misc/kakoune-cr/shards.nix @@ -0,0 +1,14 @@ +{ + fifo = { + owner = "alexherbo2"; + repo = "fifo.cr"; + rev = "37a2cc2718af0f8a1c50071106d7a5ca3a0d3da2"; + sha256 = "0syh2819dzsfb562z645sajfh7xplhh3mxdachjnzlsdfqkxw85r"; + }; + rsub = { + owner = "alexherbo2"; + repo = "rsub.cr"; + rev = "43c6b9836ee281328bccfdf8c669bab26448e3b3"; + sha256 = "144p83y3d02jy4gapify53x3i4i51yva6ajbvgi8rx0zj2ajgr0d"; + }; +} diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index cd30674b31a..0a6888bb342 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kepubify"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "pgaskin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pe4jNBoPjrkvsdeFjH4TNwacp0qkf+v+SjIAZqV1GWE="; + sha256 = "sha256-H6W+C5twXit7Z9hLIJKAftbnvYDA9HAb9tR6yeQGRKI="; }; - vendorSha256 = "sha256-eiFG6lgsY5hf+XT3Kf5uA4Ai8vBbPsh1T4ObV+rj30Y="; + vendorSha256 = "sha256-QOMLwDDvrDQAaK4M4QhBFTGD1CzblkDoA3ZqtCoRHtQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index ce3a5acd4c9..3a7338221ba 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,38 +1,49 @@ -{ lib, stdenv, fetchurl, fetchpatch, perl, finger_bsd -, abook ? null -, gnupg ? null -, goobook ? null -, khard ? null -, mu ? null +{ lib +, stdenv +, fetchurl +, fetchpatch +, perl +, bsd-finger +, withAbook ? true, abook +, withGnupg ? true, gnupg +, withGoobook ? true, goobook +, withKhard ? true, khard +, withMu ? true, mu }: let - perl' = perl.withPackages (p: with p; [ ConvertASN1 perlldap AuthenSASL ]); + perl' = perl.withPackages (p: with p; [ + AuthenSASL + ConvertASN1 + perlldap + ]); in stdenv.mkDerivation rec { pname = "lbdb"; version = "0.48.1"; + src = fetchurl { url = "https://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; }; - buildInputs = [ goobook perl' ] - ++ lib.optional (!stdenv.isDarwin) finger_bsd - ++ lib.optional (abook != null) abook - ++ lib.optional (gnupg != null) gnupg - ++ lib.optional (goobook != null) goobook - ++ lib.optional (khard != null) khard - ++ lib.optional (mu != null) mu; + buildInputs = [ perl' ] + ++ lib.optional (!stdenv.isDarwin) bsd-finger + ++ lib.optional withAbook abook + ++ lib.optional withGnupg gnupg + ++ lib.optional withGoobook goobook + ++ lib.optional withKhard khard + ++ lib.optional withMu mu; configureFlags = [ ] - ++ lib.optional (abook != null) "--with-abook" - ++ lib.optional (gnupg != null) "--with-gpg" - ++ lib.optional (goobook != null) "--with-goobook" - ++ lib.optional (khard != null) "--with-khard" - ++ lib.optional (mu != null) "--with-mu"; + ++ lib.optional withAbook "--with-abook" + ++ lib.optional withGnupg "--with-gpg" + ++ lib.optional withGoobook "--with-goobook" + ++ lib.optional withKhard "--with-khard" + ++ lib.optional withMu "--with-mu"; - patches = [ ./add-methods-to-rc.patch + patches = [ + ./add-methods-to-rc.patch # fix undefined exec_prefix. Remove with the next release (fetchpatch { url = "https://github.com/RolandRosenfeld/lbdb/commit/60b7bae255011f59212d96adfbded459d6a27129.patch"; @@ -43,9 +54,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.spinnaker.de/lbdb/"; + description = "The Little Brother's Database"; license = licenses.gpl2; + maintainers = with maintainers; [ kaiha bfortz ]; platforms = platforms.all; - description = "The Little Brother's Database"; - maintainers = [ maintainers.kaiha maintainers.bfortz ]; }; } diff --git a/pkgs/tools/misc/license-generator/default.nix b/pkgs/tools/misc/license-generator/default.nix new file mode 100644 index 00000000000..b880c66f971 --- /dev/null +++ b/pkgs/tools/misc/license-generator/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "license-generator"; + version = "0.8.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-ZVhsbaJJ9WBcQPx2yikIAQJeBXwC6ZAJkfCRmokNV3I="; + }; + + cargoSha256 = "sha256-Yh9q/aYHXUF2eIFpJ7ccgeyIO5mQMgRDCNr+ZyS166Y="; + + meta = with lib; { + description = "Command-line tool for generating license files"; + homepage = "https://github.com/azu/license-generator"; + license = licenses.mit; + maintainers = with maintainers; [ loicreynier ]; + }; +} diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index d495c912f59..7263e4de336 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "man-db"; - version = "2.9.4"; + version = "2.10.1"; src = fetchurl { url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; - sha256 = "sha256-tmyZ7frRatkoyIn4fPdjgCY8FgkyPCgLOp5pY/2xZ1Y="; + sha256 = "sha256-L/2PLoASL+cuYMdAyFHmo+FcmnkhGF60dSwcZygkvtY="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 3b12175fb56..c2425cf94ca 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -46,14 +46,13 @@ stdenv.mkDerivation rec { libX11 libssh2 openssl - perl slang zip ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; - configureFlags = [ "--enable-vfs-smb" ]; + configureFlags = [ "--enable-vfs-smb" "PERL=${perl}/bin/perl" ]; postPatch = '' substituteInPlace src/filemanager/ext.c \ diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 321b139ca15..c62bcbe0bc7 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -15,13 +15,13 @@ python3.pkgs.buildPythonPackage rec { pname = "nautilus-open-any-terminal"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "Stunkymonkey"; repo = pname; rev = version; - sha256 = "sha256-cc6Lh5XeAuU5Os4eJ0QcL6XJYB6DqxeUGaOf6m1OnpY="; + sha256 = "sha256-g5B+tp131vmjShBCGrKR5ZQCjtJY823/kPacZ0S9E80="; }; patches = [ ./hardcode-gsettings.patch ]; diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index a9c2a43734e..a3b010b13fb 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "8.5.0"; + version = "8.7.2"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "sha256-6IUNJ3DE+nRc+bmpDO7l1gXlD6UDGggTSYRMFT57v/Q="; + hash = "sha256-oO7JsPMwWd4z8TCEWZgF0PShyMN56SW6z+jclNHdwj0="; }; nativeBuildInputs = [ go redo-apenwarr ]; diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 4bfc390335d..57a21a2822d 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.45.1"; + version = "0.46.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-HoDQK/WyvDQgYBr6WPJ+bZE3GTx74SGgSj1P6i8AfL0="; + sha256 = "sha256-VD/gN9lUwzhRTfr8rAQld+4sN+deYhUlNvCphtZncDU="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-e33EV1DGpR3XL70sjfCSMeuOSyh334+AkHnE+vqHrh0="; + vendorSha256 = "sha256-ojNDDPCo6TGp8BYio/pYykXSLjC5Qplw0WFD9UIiYM4="; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 72aea5c44d9..851d4f2dc18 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.45.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-uwQR38L81galqrOEF2qWxKi1UelaUmpkeg0WbkcbYfs="; + sha256 = "sha256-ibaA9oCSsId9A4ul5sfM+L8ExBl+Wv7rhGnb6TZ4WJw="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-wzGv46wcPjpxiQsiNZQGC4DMHcMrWOEmacC5E0F2YCs="; + vendorSha256 = "sha256-Okmsd/skfBmkyLv9oPFH0QvewFZFPpUH2ahWxHt7cy8="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/pandoc-acro/default.nix b/pkgs/tools/misc/pandoc-acro/default.nix new file mode 100644 index 00000000000..1a2aff12ec7 --- /dev/null +++ b/pkgs/tools/misc/pandoc-acro/default.nix @@ -0,0 +1,69 @@ +{ buildPythonApplication +, fetchPypi +, pandocfilters +, panflute +, lib +, pandoc +, pandoc-acro +, texlive +, runCommand +}: + +let + pname = "pandoc-acro"; + version = "0.10.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-JMfSQXX+BCGdFQYPFB+r08WRnhT3aXfnBNINROxCUA0="; + }; +in +buildPythonApplication { + inherit pname version src; + + propagatedBuildInputs = [ + pandocfilters + panflute + ]; + + # Something in the tests does not typecheck, but the tool works well. + doCheck = false; + + passthru.tests.example-doc = + let + env = { + nativeBuildInputs = [ + pandoc + pandoc-acro + (texlive.combine { + inherit (texlive) + scheme-tetex + acro + translations + ; + }) + ]; + }; + in + runCommand "pandoc-acro-example-docs" env '' + set -euo pipefail + exampleFile="${pname}-${version}/tests/example.md" + metadataFile="${pname}-${version}/tests/metadata.yaml" + tar --extract "--file=${src}" "$exampleFile" "$metadataFile" + mkdir $out + + pandoc -F pandoc-acro "$exampleFile" "--metadata-file=$metadataFile" \ + -T pdf -o $out/example.pdf + pandoc -F pandoc-acro "$exampleFile" "--metadata-file=$metadataFile" \ + -T txt -o $out/example.txt + + ! grep -q "\+afaik" $out/example.txt + ''; + + meta = with lib; { + homepage = "https://pypi.org/project/pandoc-acro/"; + description = "Pandoc filter which manages acronyms in Pandoc flavored Markdown sources"; + license = licenses.bsd2; + maintainers = with maintainers; [ tfc ]; + }; +} diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 6afaf0fbb34..8be9c0eecee 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,63 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, maven, jdk8_headless }: +{ lib, stdenv, fetchurl }: let - version = "1.2021.12"; - - src = fetchFromGitHub { - owner = "plantuml"; - repo = "plantuml-server"; - rev = "v${version}"; - sha256 = "sha256:016mrs4djbaid1ma5922dvq372pphbzzmjzsjalj2dqp60538xll"; - }; - - # perform fake build to make a fixed-output derivation out of the files downloaded from maven central - deps = stdenv.mkDerivation { - name = "plantuml-server-${version}-deps"; - inherit src; - nativeBuildInputs = [ jdk8_headless maven ]; - buildPhase = '' - runHook preBuild - - while mvn package -Dmaven.repo.local=$out/.m2; [ $? = 1 ]; do - echo "timeout, restart maven to continue downloading" - done - - runHook postBuild - ''; - # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256:12w1iw9c5j7y9hhaip07j3aszjiiakkww1v3zszlj15fj8jgqyf2"; - }; + version = "1.2022.2"; in - stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; - inherit src; - - nativeBuildInputs = [ jdk8_headless maven ]; - - buildPhase = '' - runHook preBuild - - # 'maven.repo.local' must be writable so copy it out of nix store - cp -R $src repo - chmod +w -R repo - cd repo - mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 - - runHook postBuild - ''; + src = fetchurl { + url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; + sha256 = "sha256-h4ulXzZ5L+VPhk2CnZQNxfnEJzWT3B9TNvDEWt4o9Hk="; + }; + dontUnpack = true; installPhase = '' - runHook preInstall - mkdir -p "$out/webapps" - cp "target/plantuml.war" "$out/webapps/plantuml.war" - - runHook postInstall + cp "$src" "$out/webapps/plantuml.war" ''; meta = with lib; { diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 42b673e5b18..8c4fa097ea4 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2022.1"; + version = "1.2022.2"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-oEOhf7nLVGJqoK/pyTWzF+s3OYsGcEy5pIj8obSrkRY="; + sha256 = "sha256-4LPR8gdpfebq5U/umxcFfqe7i6qJHLqhOAu7DfYzTY8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/precice-config-visualizer/default.nix b/pkgs/tools/misc/precice-config-visualizer/default.nix new file mode 100644 index 00000000000..7605f49b153 --- /dev/null +++ b/pkgs/tools/misc/precice-config-visualizer/default.nix @@ -0,0 +1,23 @@ +{ lib, python3Packages, fetchFromGitHub}: + +python3Packages.buildPythonApplication rec { + pname = "config-visualizer"; + version = "unstable-2022-02-23"; + + src = fetchFromGitHub { + owner = "precice"; + repo = pname; + rev = "60f2165f25352c8261f370dc4ceb64a8b422d4ec"; + sha256 = "sha256:0mqzp2qdvbqbxaczlvc9xxxdz6hclraznbmc08ldx11xwy8yknfr"; + }; + + propagatedBuildInputs = with python3Packages; [ lxml pydot ]; + doCheck = false; + + meta = with lib; { + description = "Small python tool for visualizing the preCICE xml configuration "; + homepage = "https://github.com/precice/config-visualizer"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/pkgs/tools/misc/pridecat/default.nix b/pkgs/tools/misc/pridecat/default.nix new file mode 100644 index 00000000000..d7bf2b86d6d --- /dev/null +++ b/pkgs/tools/misc/pridecat/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "pridecat"; + version = "unstable-2020-06-19"; + + src = fetchFromGitHub { + owner = "lunasorcery"; + repo = "pridecat"; + rev = "92396b11459e7a4b5e8ff511e99d18d7a1589c96"; + sha256 = "sha256-PyGLbbsh9lFXhzB1Xn8VQ9zilivycGFEIc7i8KXOxj8="; + }; + + # fixes the install path in the Makefile + patches = [ ./fix_install.patch ]; + + meta = with lib; { + description = "Like cat, but more colorful"; + homepage = "https://github.com/lunasorcery/pridecat"; + license = licenses.cc-by-nc-sa-40; + maintainers = with maintainers; [ lunarequest ]; + }; +} diff --git a/pkgs/tools/misc/pridecat/fix_install.patch b/pkgs/tools/misc/pridecat/fix_install.patch new file mode 100644 index 00000000000..3d05721ccab --- /dev/null +++ b/pkgs/tools/misc/pridecat/fix_install.patch @@ -0,0 +1,20 @@ +diff --git a/Makefile b/Makefile +index 815c27e..1556807 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,5 @@ + CXX ?= clang ++out ?= /usr/local + + all: pridecat + +@@ -6,7 +7,8 @@ pridecat: main.cpp + $(CXX) main.cpp -o pridecat -std=c++11 -lstdc++ -Wall -Wextra -O3 + + install: pridecat +- cp pridecat /usr/local/bin/pridecat ++ mkdir -p ${out}/bin ++ cp pridecat ${out}/bin/pridecat + + uninstall: + rm -f /usr/local/bin/pridecat diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index 667ce3cabe4..c99f2a46083 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.5.1"; + version = "1.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AIizbD2jaZ5SY0K/hwpHdGE20KEhWC53LWUiVYs9Oiw="; + sha256 = "sha256-HBeH9vzzfY7pG88xyoL+NJ78LMGphCAfyZiOxFSJnnc="; }; passthru = { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Safe and secure software updates for embedded Linux"; homepage = "https://rauc.io"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ emantor ]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/misc/sanctity/default.nix b/pkgs/tools/misc/sanctity/default.nix new file mode 100644 index 00000000000..c0e85340c85 --- /dev/null +++ b/pkgs/tools/misc/sanctity/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitea }: + +rustPlatform.buildRustPackage rec { + pname = "sanctity"; + version = "1.2.1"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "papojari"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-rK4em0maJQS50zPfnuFSxRoXUuFCaw9ZOfmgf70Sdac="; + }; + + cargoSha256 = "sha256-IQp/sSVgKY1j6N+UcifEi74dg/PkZJoeqLekeLc/vMU="; + + meta = with lib; { + description = "Test the 16 terminal colors in all combinations"; + homepage = "https://codeberg.org/papojari/sanctity"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ papojari ]; + }; +} diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index e7e0e420810..884d5317cb8 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, ncurses, utmp, pam ? null }: +{ lib, stdenv, fetchurl, autoreconfHook, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { pname = "screen"; @@ -16,13 +16,6 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { - url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; - sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; - stripLen = 1; - }); - nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix index 85bc57d3556..c85b884c50d 100644 --- a/pkgs/tools/misc/sfeed/default.nix +++ b/pkgs/tools/misc/sfeed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "sfeed"; - version = "1.2"; + version = "1.3"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "sha256-cx+mIVrY9tB5k1YnAHkpGahXVG6S+JBshJKkzEbcKZI="; + sha256 = "sha256-XOBzvVOOv84LzFNiLOnmJWm552igGLNFB2i3eMeWaW8="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/shellspec/default.nix b/pkgs/tools/misc/shellspec/default.nix new file mode 100644 index 00000000000..27eead6e1c3 --- /dev/null +++ b/pkgs/tools/misc/shellspec/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "shellspec"; + version = "0.28.1"; + + src = fetchFromGitHub { + owner = "shellspec"; + repo = pname; + rev = version; + sha256 = "1ib5qp29f2fmivwnv6hq35qhvdxz42xgjlkvy0i3qn758riyqf46"; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + checkPhase = '' + ./shellspec --no-banner --task fixture:stat:prepare + ./shellspec --no-banner spec --jobs "$(nproc)" + ''; + + # "Building" the script happens in Docker + dontBuild = true; + + meta = with lib; { + description = + "A full-featured BDD unit testing framework for bash, ksh, zsh, dash and all POSIX shells"; + homepage = "https://shellspec.info/"; + changelog = + "https://github.com/shellspec/shellspec/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/smug/default.nix b/pkgs/tools/misc/smug/default.nix new file mode 100644 index 00000000000..afa21afa666 --- /dev/null +++ b/pkgs/tools/misc/smug/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "smug"; + version = "0.2.7"; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "ivaaaan"; + repo = "smug"; + rev = "3399f02a6e01324f5bb881f6b049c9e8d94733ee"; + sha256 = "178125835dhnaq9k42yv4pfxpyhgb5179wrxkimb59fy0nk8jzx8"; + }; + + vendorSha256 = "1rba5rpvlr8dyhj145b5i57pm4skfpj3vm7vydkn79k6ak6x985x"; + + meta = with lib; { + homepage = "https://github.com/ivaaaan/smug"; + description = "Smug - tmux session manager"; + license = licenses.mit; + maintainers = with maintainers; [ juboba ]; + }; +} diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 3d2042978f8..1e0b50d6f85 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchurl, makeWrapper -, dpkg, patchelf +{ stdenv, lib, fetchurl +, dpkg, patchelf, wrapGAppsHook +, hicolor-icon-theme , gtk3, glib, systemd , xorg, nss, nspr , atk, at-spi2-atk, dbus @@ -30,7 +31,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-CUOdpR8RExMLeOX8469egENotMNuPU4z8S1IGqA21z0="; }; - nativeBuildInputs = [ makeWrapper dpkg ]; + nativeBuildInputs = [ wrapGAppsHook dpkg ]; + buildInputs = [ glib hicolor-icon-theme ]; unpackPhase = '' mkdir pkg @@ -39,8 +41,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir $out - mv opt/StarUML $out/bin + mkdir -p $out/bin + mv opt $out + + mv usr/share $out + rm -rf $out/share/doc + + substituteInPlace $out/share/applications/staruml.desktop \ + --replace "/opt/StarUML/staruml" "$out/bin/staruml" mkdir -p $out/lib ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ @@ -48,9 +56,15 @@ stdenv.mkDerivation rec { patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/staruml - wrapProgram $out/bin/staruml \ - --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} + $out/opt/StarUML/staruml + + ln -s $out/opt/StarUML/staruml $out/bin/staruml + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH ':' $out/lib:${LD_LIBRARY_PATH} + ) ''; meta = with lib; { diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 554822ba8de..cfdb2b79c6d 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-xLw3y9DYkei0MoErsMpSDhEK73lK9b13st+DqHvvhys="; + sha256 = "sha256-+QtZmrPE3R98UVSwrC8xoehNKwd0Exg+AZ2BJxBIrfY="; }; - vendorSha256 = "sha256-hqjjwYBVnuw7Bt2901tPIkfvYLy955IdeMbeSWTjtL0="; + vendorSha256 = "sha256-rRp8pR2cpW88o0KPwuvgSkE263S5oGK/4df4CQSOlRo="; proxyVendor = true; # tests are failing for no obvious reasons diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index b49cfa44c18..36983368d6d 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "tio"; - version = "1.32"; + version = "1.35"; src = fetchFromGitHub { owner = "tio"; repo = "tio"; rev = "v${version}"; - hash = "sha256-m8GgS7bv1S7KXoP7tYaTaXnjF1lBz4s0ThHqOU5tmFM="; + hash = "sha256-JXY6C2gYG7UmTrYIvHjn/8mL70uvXTsXbNoFr09qhcw="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ meson ninja ]; meta = with lib; { description = "Serial console TTY"; diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index d8ba0861120..4b521ed9dda 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }: +{ lib, stdenv, fetchurl, libffi, coreutils }: stdenv.mkDerivation rec { pname = "txr"; - version = "273"; + version = "274"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg="; + sha256 = "sha256-bWgz0kmPLN0V0rkFRiCqxkBjhN8FV9fL+Vu8GSw9Ja4="; }; - nativeBuildInputs = [ bison flex ]; buildInputs = [ libffi ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix index 47c504cd1a7..7737c67faa2 100644 --- a/pkgs/tools/misc/up/default.nix +++ b/pkgs/tools/misc/up/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "1q8wfsfl3rz698ck5q5s5z6iw9k134fxxvwipcp2b052n998rcrx"; - doCheck = false; - meta = with lib; { description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview"; homepage = "https://github.com/akavel/up"; diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix new file mode 100644 index 00000000000..5066145b72a --- /dev/null +++ b/pkgs/tools/misc/vtm/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: +stdenv.mkDerivation rec { + pname = "vtm"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "netxs-group"; + repo = "vtm"; + rev = "v${version}"; + sha256 = "sha256-Z6PSx7TwarQx0Mc3fSRPwV7yIPJK3xtW4k0LJ6RPYRY="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "../src" ]; + + meta = { + homepage = "https://vtm.netxs.online/"; + description = "Terminal multiplexer with window manager and session sharing"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ahuzik ]; + }; +} diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index e936ca584b7..de746f39b47 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wakatime"; - version = "1.37.0"; + version = "1.38.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-1JOsE8u4+LlWL9nU/fXIqVME1VsgxZV84lJXNTY2pZg="; + sha256 = "sha256-nlv0NOvUi/yf2lQytdfRE7YwcSpRHQRlI0zzeKAA760="; }; vendorSha256 = "sha256-WKay4/bsy8jCOTQ2jHQPMBNfIuTI3QzdmhG1aOHNK0Y="; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 4673ab41654..6b15488f5c6 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -70,13 +70,13 @@ buildPythonPackage rec { homepage = "https://ytdl-org.github.io/youtube-dl/"; description = "Command-line tool to download videos from YouTube.com and other sites"; longDescription = '' - youtube-dl is a small, Python-based command-line program - to download videos from YouTube.com and a few more sites. - youtube-dl is released to the public domain, which means - you can modify it, redistribute it or use it however you like. + youtube-dl is a small, Python-based command-line program to download + videos from YouTube.com and a few more sites. youtube-dl is released to + the public domain, which means you can modify it, redistribute it or use + it however you like. ''; license = licenses.publicDomain; + maintainers = with maintainers; [ bluescreen303 fpletz ma27 ]; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 AndersonTorres fpletz ma27 ]; }; } diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index b73b41acd88..89ca84395d5 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, brotli , ffmpeg , rtmpdump , phantomjs2 @@ -11,7 +12,6 @@ , ffmpegSupport ? true , rtmpSupport ? true , phantomjsSupport ? false -, hlsEncryptedSupport ? true , withAlias ? false # Provides bin/youtube-dl for backcompat }: @@ -20,16 +20,15 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.2.4"; + version = "2022.3.8.2"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-gbUO18+c/MBC2PWhrS0c17E8SLNsB/rxiAaW6sCn3bU="; + sha256 = "sha256-aFRleMGObOh0ULU3adXVt/WiPlIJeEl222x8y/eVSyE="; }; - propagatedBuildInputs = [ websockets mutagen ] - ++ lib.optional hlsEncryptedSupport pycryptodomex; + propagatedBuildInputs = [ brotli mutagen pycryptodomex websockets ]; # Ensure these utilities are available in $PATH: # - ffmpeg: post-processing & transcoding support @@ -52,7 +51,7 @@ buildPythonPackage rec { doCheck = false; postInstall = lib.optionalString withAlias '' - ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" + ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" ''; meta = with lib; { @@ -68,6 +67,6 @@ buildPythonPackage rec { you can modify it, redistribute it or use it however you like. ''; license = licenses.unlicense; - maintainers = with maintainers; [ mkg20001 ]; + maintainers = with maintainers; [ mkg20001 SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 20d338989cf..7fc1c6e335a 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -8,24 +8,26 @@ , openssl , DiskArbitration , Foundation +, mandown , zellij , testVersion }: rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-MTSM8fYAcNcmjg6bkOEN+U5+WilaEy52EJOfyoIy3Zg="; + sha256 = "sha256-8PgEsRh2nBOIvKeX9SJ853NN8Szb4geKwv2qvTtkMxk="; }; - cargoSha256 = "sha256-2QEDrxTz7I9hF+WfVKkGLXHWZjQ5by/zuO16NGOJSKk="; + cargoSha256 = "sha256-YaqaXn1Ol5RfwAzWi7767vt1je+wqWFtfgxMOSIy9UI="; nativeBuildInputs = [ + mandown installShellFiles pkg-config ]; @@ -43,6 +45,9 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' + mandown docs/MANPAGE.md > zellij.1 + installManPage zellij.1 + installShellCompletion --cmd $pname \ --bash <($out/bin/zellij setup --generate-completion bash) \ --fish <($out/bin/zellij setup --generate-completion fish) \ diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 7b8e6e07dcc..867943783ba 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.16.0"; + version = "3.17.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-V3FqiAvHnd3q3yhrhDaeka22R+mBqFdPjGqY4FGCx9M="; + sha256 = "sha256-AFy0Ob6caU3yGC9s5Til5sYZ3A4qiEeU96OfeMlR/Q4="; }; - vendorSha256 = "sha256-0hor9Sldl8HhlKfYhWhb79wnZSMn5/Hg0Ux937qQkT4="; + vendorSha256 = "sha256-6qfHoP7TOmRZLIiijRfQxyct+486TXQ18cdH8pdhwmQ="; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix index 54ea08ceaef..10765befd4d 100644 --- a/pkgs/tools/networking/arping/default.nix +++ b/pkgs/tools/networking/arping/default.nix @@ -1,25 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libnet, libpcap }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libnet +, libpcap +}: stdenv.mkDerivation rec { - version = "2.22"; pname = "arping"; - - buildInputs = [ libnet libpcap ]; + version = "2.23"; src = fetchFromGitHub { owner = "ThomasHabets"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-yFSLhhyz6i7xyJR8Ax8FnHFGNe/HE40YirkkeefBqC4="; + hash = "sha256-Yn0EFb23VJvcVluQhwGHg9cdnZ8LKlBEds7cq8Irftc="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + libnet + libpcap + ]; meta = with lib; { description = "Broadcasts a who-has ARP packet on the network and prints answers"; homepage = "https://github.com/ThomasHabets/arping"; - license = with licenses; [ gpl2 ]; - maintainers = [ maintainers.michalrus ]; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ michalrus ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index a071b5b4a3a..b5c5b5389fc 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "boringtun"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "0b57c7z87xwrirmq9aa9jswqyj5bavkifmq7a9hgfphcmwcskmdb"; + sha256 = "sha256-fZchh02CsVC5sdnR3blojslsKi7OxFcblHMuyuHsH/4="; }; - cargoSha256 = "1xn6scc8nrb9xk89hsp9v67jvyww23rjaq5fcagpbqdwf5dvg4ja"; + cargoSha256 = "sha256-iJbzvhRPVDHXqianQ6UbmYEfmZCS/obxFZV/PsJMhD0="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index f22817c3b3a..3745856a8c0 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.7.4"; + version = "0.7.5"; src = let @@ -12,11 +12,13 @@ stdenv.mkDerivation rec { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; x86_64-darwin = "darwin_amd64"; + aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-5owLce0A7AwKDXB/JsUJZeHJHhrHT4/kA6XG+ZwhuyU="; - aarch64-linux = "sha256-WDFIr+GOip70Di5u9fRu2lVWPMJe9urYTcuc2hTMD7g="; - x86_64-darwin = "sha256-FGsY7+bC7n3fu1SsLl92FPytj8MgL4nT95CC6GM6vss="; + x86_64-linux = "sha256-wqNeeEQhR8cj7Gpbzp7UQV0j+w0peo41uKqgK9BoLH4="; + aarch64-linux = "sha256-HK/6eMBWUW1IbYE5RpInhcQuIw16X9vQEZmOBje9Yzk="; + x86_64-darwin = "sha256-ghgkPlEN9DHFviQzcGS/+oG+9Qqy2AfJ2IEyiSMJwwY="; + aarch64-darwin = "sha256-F4iOCxAm8s34KktuS5PRPkIg9A0179H6zlOM3OuTyUw="; }; in fetchzip { @@ -60,7 +62,6 @@ stdenv.mkDerivation rec { and does not require an agent to be installed on every end host. ''; license = licenses.mpl20; - maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ jk techknowlogick ]; }; } diff --git a/pkgs/tools/networking/boundary/update.sh b/pkgs/tools/networking/boundary/update.sh index 43733930710..0533c07967c 100755 --- a/pkgs/tools/networking/boundary/update.sh +++ b/pkgs/tools/networking/boundary/update.sh @@ -31,9 +31,11 @@ BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/ha BOUNDARY_LINUX_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_amd64") BOUNDARY_DARWIN_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_amd64") BOUNDARY_LINUX_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_arm64") +BOUNDARY_DARWIN_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_arm64") sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV" replace_sha "x86_64-linux" "$BOUNDARY_LINUX_X64_SHA256" replace_sha "x86_64-darwin" "$BOUNDARY_DARWIN_X64_SHA256" replace_sha "aarch64-linux" "$BOUNDARY_LINUX_AARCH64_SHA256" +replace_sha "aarch64-darwin" "$BOUNDARY_DARWIN_AARCH64_SHA256" diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index ff65420a981..f18dad8c0c1 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20220401"; + version = "20220404"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H6lH4LG7MhxQsGVs3CSVX9FEywONDrS5bsjzw5b5k/U="; + sha256 = "sha256-yQuGaj5HukO+OENCpVMkoXv2AztygjrDPXgHaVBFyZ8="; }; - vendorSha256 = "sha256-3ndpmERtaLHuTMMUcq+OenBxgW3+qy/bZCiWRgI0L84="; + vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index 4f8d946fa36..12e429b7bcb 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -1,26 +1,47 @@ -{ lib, stdenv, fetchurl }: - -# !!! Duplication: this package is almost exactly the same as `bsd-finger'. +{ lib +, stdenv +, fetchurl +, buildClient ? true +}: stdenv.mkDerivation rec { - pname = "bsd-finger"; + srcName = "bsd-finger"; + pname = srcName + lib.optionalString (!buildClient) "d"; version = "0.17"; src = fetchurl { - url = "mirror://metalab/system/network/finger/bsd-finger-${version}.tar.gz"; - sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; + url = "mirror://ibiblioPubLinux/system/network/finger/${srcName}-${version}.tar.gz"; + hash = "sha256-hIhdZo0RfvUOAccDSkXYND10fOxiEuQOjQgVG8GOE/o="; }; + # outputs = [ "out" "man" ]; + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - patches = [ ./ubuntu-0.17-9.patch ]; + patches = [ + ./ubuntu-0.17-9.patch + ]; - preBuild = "cd finger"; + preBuild = let + srcdir = if buildClient then "finger" else "fingerd"; + in '' + cd ${srcdir} + ''; - preInstall = "mkdir -p $out/man/man1 $out/bin "; + preInstall = let + bindir = if buildClient then "bin" else "sbin"; + mandir = if buildClient then "man/man1" else "man/man8"; + in '' + mkdir -p $out/${bindir} $out/${mandir} + ''; meta = with lib; { + description = + if buildClient + then "User information lookup program" + else "Remote user information server"; platforms = platforms.linux; license = licenses.bsdOriginal; }; } +# TODO: multiple outputs (manpage) diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 2f885d7a859..fb30ad59dff 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkip"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cQY77csZ7UPi09vUOdn3AKrLzGMI2BE16gfL1wDXxZA="; + sha256 = "sha256-h8YZGTjEEQb68TrwMDnAqCJWkNPSuWSAJKcOMLXwXio="; }; vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc="; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 06ef6675ceb..2f757edbdb1 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cmst"; - version = "2022.01.05"; + version = "2022.03.13"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = "${pname}-${version}"; - sha256 = "0d05vrsjm30q22wpxicnxhjzrjq5kxjhpb6262m46sgkr8yipfhr"; + sha256 = "sha256-PIS77yYM7tR+0vpTDh9Li/dnaWHUQW+w1NLRb5g+sz8="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index b746bf557c1..ba17f10e96c 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,13 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, dbus, nettle, fetchpatch -, libidn, libnetfilter_conntrack, buildPackages }: +{ lib, stdenv, fetchurl, pkg-config, nettle, fetchpatch +, libidn, libnetfilter_conntrack, buildPackages +, dbusSupport ? stdenv.isLinux +, dbus +}: with lib; let copts = concatStringsSep " " ([ "-DHAVE_IDN" "-DHAVE_DNSSEC" - ] ++ optionals stdenv.isLinux [ + ] ++ optionals dbusSupport [ "-DHAVE_DBUS" + ] ++ optionals stdenv.isLinux [ "-DHAVE_CONNTRACK" ]); in @@ -52,11 +56,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \ --replace "/usr/local/sbin" "$out/bin" '' + optionalString stdenv.isLinux '' - install -Dm644 dbus/dnsmasq.conf $out/share/dbus-1/system.d/dnsmasq.conf 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 '' + install -Dm644 dbus/dnsmasq.conf $out/share/dbus-1/system.d/dnsmasq.conf mkdir -p $out/share/dbus-1/system-services cat <<END > $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service [D-BUS Service] @@ -69,7 +74,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle libidn ] - ++ optionals stdenv.isLinux [ dbus libnetfilter_conntrack ]; + ++ optionals dbusSupport [ dbus ] + ++ optionals stdenv.isLinux [ libnetfilter_conntrack ]; meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 4e88b652e31..d6ec3c3f75d 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.41.2"; + version = "0.41.4"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bo6OxHNZYA1cP2iP/QnaN80DcwBGIVCQXH/mc75hFUY="; + sha256 = "sha256-aVYjYEAEANAMGv7frZWfYWLzX7rcI8phpjvrENK8cc4="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 2f406f97b34..324b220857e 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoModule rec { pname = "flannel"; - version = "0.16.3"; + version = "0.17.0"; rev = "v${version}"; vendorSha256 = null; @@ -13,7 +13,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-Akh1IlpLG9AZBtcZnOUfRnIvan8C9W1Dg9PqT7/VhYA="; + sha256 = "sha256-YM/cGmtHDTzgu6Bfy52oP8E1HmLNuBHNgEpz/qTj7rg="; }; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 1ef3c13172b..e7d2752a94f 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.39.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tqdrYrIWbmRn+5iAZKd9GlcmFNQnh3yNxZ95As7+v5Q="; + sha256 = "sha256-W+88Fq9oYDBLCNp+6rc9jACJzky7FCZg/xLDowGGdm0="; }; - vendorSha256 = "sha256-NPnchl+N6DeqMhsOIw2MYD/i2IZzHS9ZqbUOeulgb90="; + vendorSha256 = "sha256-iBjMFOERWQ1aPn+2gEoI9og2ov2LlBVV1sLAZlvqZPM="; doCheck = false; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index df159d29232..8789ae6fa16 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "2.34.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-xyakq5DXwzONEP6EvDpAuzCrTDWcs+7asDlq9Vf4c1k="; + sha256 = "sha256-gyaAtFJubvDiz5b7lk6vmPHIqr9ccWK3N2iy4LvYiMg="; }; - vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; + vendorSha256 = "sha256-RSsvFD3RvYKxdwPDGG3YHVUzKLgwReZkoVabH5KWXMA="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/tools/networking/goflow/default.nix b/pkgs/tools/networking/goflow/default.nix new file mode 100644 index 00000000000..bc0f0bf923a --- /dev/null +++ b/pkgs/tools/networking/goflow/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "goflow"; + version = "3.4.3"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dUoiuoM87Bh3ndzHG/YnwnRWnVbtPDuVdICEXcezCp8="; + }; + + vendorSha256 = "sha256-fOlfVI8v7KqNSRhAPlZBSHKfZRlCbCgjnMV/6bsqDhg="; + + meta = with lib; { + description = "A NetFlow/IPFIX/sFlow collector in Go"; + homepage = "https://github.com/cloudflare/goflow"; + license = licenses.bsd3; + maintainers = with maintainers; [ heph2 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index afc57cb723f..47b7a601d43 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-1vo8ZvcH/5O1vSfOaecKiWTXtweFSLUYaNR9ffOUP+Q="; + sha256 = "sha256-3EAV2Fx/74EbRZgDt2MAHYCbB6klHcGGT+25oHtErvs="; }; buildInputs = [ openssl zlib ] @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # TODO: make it work on bsd as well makeFlags = [ - "PREFIX=\${out}" + "PREFIX=${placeholder "out"}" ("TARGET=" + (if stdenv.isSunOS then "solaris" else if stdenv.isLinux then "linux-glibc" else if stdenv.isDarwin then "osx" @@ -65,7 +65,8 @@ stdenv.mkDerivation rec { hardware. ''; homepage = "https://haproxy.org"; - license = licenses.gpl2; + changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/CHANGELOG"; + license = with licenses; [ gpl2Plus lgpl21Only ]; maintainers = with maintainers; [ fuzzy-id ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index edf91dd311d..d59e58981e7 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = null; - doCheck = false; - meta = with lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; homepage = "https://github.com/rakyll/hey"; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index f3488ae402b..a6c6ddfe5bb 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,19 +1,20 @@ { lib , fetchFromGitHub , installShellFiles -, python3Packages +, python3 , pandoc }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "httpie"; - version = "3.0.2"; + version = "3.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "httpie"; repo = "httpie"; rev = version; - sha256 = "sha256-s3IFzEUQmPBocgspVGx1nINkUamsi7tzwW37IqdBMxo="; + hash = "sha256-x7Zucb2i8D4Xbn77eBzSxOAcc2fGg5MFKFiyJhytQ0s="; }; nativeBuildInputs = [ @@ -21,7 +22,7 @@ python3Packages.buildPythonApplication rec { pandoc ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ charset-normalizer defusedxml multidict @@ -31,10 +32,11 @@ python3Packages.buildPythonApplication rec { setuptools ]; - checkInputs = with python3Packages; [ + checkInputs = with python3.pkgs; [ mock pytest pytest-httpbin + pytest-lazy-fixture pytestCheckHook responses ]; @@ -65,7 +67,9 @@ python3Packages.buildPythonApplication rec { "httpie.encoding.detect_encoding" ]; - pythonImportsCheck = [ "httpie" ]; + pythonImportsCheck = [ + "httpie" + ]; meta = with lib; { description = "A command line HTTP client whose goal is to make CLI human-friendly"; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 8bdd18c8eab..01328f66a4d 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -10,13 +10,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.40.0"; + version = "2.41.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-Cld5TP2YoLzm73q7uP/pwqEeUsT5uMPAUx9HABOVeZA="; + sha256 = "sha256-fQqbZYb0brGmGf7Yc/2Zd5BZ+YOkGYC3o9uhShYdAE4="; }; buildInputs = with lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index f32a4249c00..9ec491f1c57 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iperf"; - version = "3.10.1"; + version = "3.11"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; - sha256 = "0nkisr2215w68ivadg3sx3q50iwamznwigs63lclb8jlrih9gg03"; + sha256 = "0pvy1cj92phpbldw0bdc0ds70n8irqcyn1ybyis0a6nnz84v936y"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 3458e5c6e54..c58989aade4 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "2.0.1"; # only even minor versions are stable + version = "2.0.2"; # only even minor versions are stable src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-9Qu5qVTjFDFrQDOhddyAdJa7nBdUEQvZKiHBZanoTFc="; + sha256 = "sha256-jSghO9yOK7hwo4OzCsHlPVTh66Q9L4blFRsItmqmzzI="; }; patches = [ ./dont-create-var.patch ]; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 532c8c14ab5..faccef57697 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { hash = "sha256-wMWzj+qLRaSvzUNkh/Knb9VSUJLQN4gTputVQsIScTk="; }; + separateDebugInfo = true; + postPatch = '' sed -i -e '/chown root:mail/d' \ -e 's/chmod [24]755/chmod 0755/' \ diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index c14b8c68479..00cd85a4273 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,20 +1,25 @@ -{ lib, stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: +{ lib, stdenv, fetchgit, autoreconfHook, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext, nixosTests }: -let version = "1.3.0"; in - -stdenv.mkDerivation { +let pname = "minidlna"; - inherit version; + version = "1.3.1"; +in +stdenv.mkDerivation { + inherit pname version; - src = fetchurl { - url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz"; - sha256 = "0qrw5ny82p5ybccw4pp9jma8nwl28z927v0j2561m0289imv1na7"; + # tarball for 1.3.1 is missing + src = fetchgit { + url = "https://git.code.sf.net/p/${pname}/git"; + rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-nbvz/QHSZBTZEqX/utOoOF5vorhrxGqIBA9qfpIZzyU="; }; preConfigure = '' export makeFlags="INSTALLPREFIX=$out" ''; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ]; postInstall = '' @@ -23,6 +28,8 @@ stdenv.mkDerivation { cp minidlnad.8 $out/share/man/man8 ''; + passthru.tests = { inherit (nixosTests) minidlna; }; + meta = with lib; { description = "Media server software"; longDescription = '' diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index cee280c8ec9..c90ba9cfc64 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-02-26T03-58-31Z"; + version = "2022-03-13T22-34-00Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-9JA9xwg+U8BQa66xPVghaGZQO5+efwG8/CqAXm2kg3Q="; + sha256 = "sha256-NIhowfkG2bFIcCNXUQ3cETHsR5/NLvIHQ9LeftgSyd0="; }; - vendorSha256 = "sha256-mk0ga3o6LeZ4uwV3vlP6qyFXLiORwNQLhXoCxSmvXsU="; + vendorSha256 = "sha256-Wdw9mZ3UupoJ4yDwS4f3mOmCn+7TvHmx4aRu+96pHM4="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix index 1d350ee4403..4b14caf9b67 100644 --- a/pkgs/tools/networking/mqttui/default.nix +++ b/pkgs/tools/networking/mqttui/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Uts9hKhnFNYdQhxeUoTOehCcfgqQwStSoGWixgY3dPU="; + sha256 = "sha256-kGOQIoE+0lCBm9zQwPMFfYnLJgR79hSKECerWyOFsjI="; }; - cargoSha256 = "sha256-YxXniyuQEM+vrCbflqCLlnXpH3ClAd9O496SFVKRvBs="; + cargoSha256 = "sha256-vm4IR/yQlQDn9LN9Ifr4vJvM6cCqgjRU2vdAHVEsWnI="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix index fce2eb484d9..617f4de0472 100644 --- a/pkgs/tools/networking/mubeng/default.nix +++ b/pkgs/tools/networking/mubeng/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mubeng"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uCE2Ku4OFz9Qfk7lxKjTU/KnrmRFqfunykPboPY2s0g="; + sha256 = "sha256-qEIPu4miZpWL19N36DsKMbckXbHDTTZjp2ccZrV3LFc="; }; vendorSha256 = "sha256-sAcDyGNOSm+BnsYyrR2x1vkGo6ZEykhkF7L9lzPrD+o="; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 95c2f970999..13179389484 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, which }: +{ lib, stdenv, fetchurl, pkg-config, glib, which, nixosTests }: stdenv.mkDerivation rec { pname = "nbd"; @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + 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. diff --git a/pkgs/tools/networking/networkmanager/0.9.8/default.nix b/pkgs/tools/networking/networkmanager/0.9.8/default.nix deleted file mode 100644 index 757c886fdf3..00000000000 --- a/pkgs/tools/networking/networkmanager/0.9.8/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, dbus-glib -, udev, libnl, libuuid, gnutls, dhcp -, libgcrypt, perl, libgudev, avahi, ppp, kmod }: - -stdenv.mkDerivation rec { - pname = "networkmanager"; - version = "0.9.8.10"; - - src = fetchurl { - url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; - sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86"; - }; - - preConfigure = '' - substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl - substituteInPlace src/nm-device.c \ - --replace @avahi@ ${avahi} \ - --replace @kmod@ ${kmod} - substituteInPlace src/ppp-manager/nm-ppp-manager.c \ - --replace @ppp@ ${ppp} \ - --replace @kmod@ ${kmod} - ''; - - # Right now we hardcode quite a few paths at build time. Probably we should - # patch networkmanager to allow passing these path in config file. This will - # remove unneeded build-time dependencies. - configureFlags = [ - "--with-distro=exherbo" - "--with-dhclient=${dhcp}/sbin/dhclient" - "--with-dhcpcd=no" - "--with-iptables=no" - "--with-udev-dir=\${out}/lib/udev" - "--with-resolvconf=no" - "--sysconfdir=/etc" "--localstatedir=/var" - "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" - "--with-crypto=gnutls" "--disable-more-warnings" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-kernel-firmware-dir=/run/current-system/firmware" - "--disable-ppp" - ]; - - buildInputs = [ udev libnl libuuid gnutls libgcrypt libgudev ]; - - propagatedBuildInputs = [ dbus-glib ]; - - nativeBuildInputs = [ intltool pkg-config ]; - - patches = - [ ./libnl-3.2.25.patch - ./nixos-purity.patch - ]; - - preInstall = - '' - installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" ) - ''; - - meta = with lib; { - homepage = "http://projects.gnome.org/NetworkManager/"; - description = "Network configuration and management tool"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch b/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch deleted file mode 100644 index 17c2966b706..00000000000 --- a/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c -index ba8053e..5ac39d3 100644 ---- a/src/nm-netlink-monitor.c -+++ b/src/nm-netlink-monitor.c -@@ -177,40 +177,15 @@ link_msg_handler (struct nl_object *obj, void *arg) - static int - event_msg_recv (struct nl_msg *msg, void *arg) - { -- struct nl_sock *nlh = arg; -- struct nlmsghdr *hdr = nlmsg_hdr (msg); - struct ucred *creds = nlmsg_get_creds (msg); -- const struct sockaddr_nl *snl; -- guint32 local_port; -- gboolean accept_msg = FALSE; -- -- /* Only messages sent from the kernel */ -- if (!creds || creds->uid != 0) { -- nm_log_dbg (LOGD_HW, "ignoring netlink message from UID %d", -- creds ? creds->uid : -1); -- return NL_SKIP; -- } -- -- snl = nlmsg_get_src (msg); -- g_assert (snl); -- -- /* Accept any messages from the kernel */ -- if (hdr->nlmsg_pid == 0 || snl->nl_pid == 0) -- accept_msg = TRUE; - -- /* And any multicast message directed to our netlink PID, since multicast -- * currently requires CAP_ADMIN to use. -- */ -- local_port = nl_socket_get_local_port (nlh); -- if ((hdr->nlmsg_pid == local_port) && snl->nl_groups) -- accept_msg = TRUE; -- -- if (accept_msg == FALSE) { -- nm_log_dbg (LOGD_HW, "ignoring netlink message from PID %d (local PID %d, multicast %d)", -- hdr->nlmsg_pid, -- local_port, -- (hdr->nlmsg_flags & NLM_F_MULTI)); -- return NL_SKIP; -+ if (!creds || creds->pid || creds->uid || creds->gid) { -+ if (creds) -+ nm_log_dbg (LOGD_HW, "netlink: received non-kernel message (pid %d uid %d gid %d)", -+ creds->pid, creds->uid, creds->gid); -+ else -+ nm_log_dbg (LOGD_HW, "netlink: received message without credentials"); -+ return NL_STOP; - } - - return NL_OK; -@@ -285,7 +260,7 @@ nlh_setup (struct nl_sock *nlh, - { - int err; - -- nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, cb_data); -+ nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, NULL); - - if (valid_func) - nl_socket_modify_cb (nlh, NL_CB_VALID, NL_CB_CUSTOM, valid_func, cb_data); diff --git a/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch b/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch deleted file mode 100644 index 9ebc080ba96..00000000000 --- a/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c -index 0932139..5b5aee8 100644 ---- a/src/dhcp-manager/nm-dhcp-dhclient.c -+++ b/src/dhcp-manager/nm-dhcp-dhclient.c -@@ -68,10 +68,6 @@ const char * - nm_dhcp_dhclient_get_path (const char *try_first) - { - static const char *dhclient_paths[] = { -- "/sbin/dhclient", -- "/usr/sbin/dhclient", -- "/usr/pkg/sbin/dhclient", -- "/usr/local/sbin/dhclient", - NULL - }; - const char **path = dhclient_paths; -diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c -index 237661f..48bc33f 100644 ---- a/src/dhcp-manager/nm-dhcp-dhcpcd.c -+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c -@@ -51,10 +51,6 @@ const char * - nm_dhcp_dhcpcd_get_path (const char *try_first) - { - static const char *dhcpcd_paths[] = { -- "/sbin/dhcpcd", -- "/usr/sbin/dhcpcd", -- "/usr/pkg/sbin/dhcpcd", -- "/usr/local/sbin/dhcpcd", - NULL - }; - const char **path = dhcpcd_paths; -diff --git a/src/nm-device.c b/src/nm-device.c -index 1dc94ee..e60f3c8 100644 ---- a/src/nm-device.c -+++ b/src/nm-device.c -@@ -1321,8 +1321,7 @@ aipd_start (NMDevice *self, NMDeviceStateReason *reason) - char *argv[6], *cmdline; - const char **aipd_binary = NULL; - static const char *aipd_paths[] = { -- "/usr/sbin/avahi-autoipd", -- "/usr/local/sbin/avahi-autoipd", -+ "@avahi@/sbin/avahi-autoipd", - NULL - }; - int i = 0; -@@ -2555,7 +2554,7 @@ share_init (void) - } - - for (iter = modules; *iter; iter++) { -- char *argv[3] = { "/sbin/modprobe", *iter, NULL }; -+ char *argv[3] = { "@kmod@/bin/modprobe", *iter, NULL }; - char *envp[1] = { NULL }; - GError *error = NULL; - -diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c -index 59698c3..7dba0f7 100644 ---- a/src/ppp-manager/nm-ppp-manager.c -+++ b/src/ppp-manager/nm-ppp-manager.c -@@ -661,9 +661,7 @@ static inline const char * - nm_find_pppd (void) - { - static const char *pppd_binary_paths[] = { -- "/usr/local/sbin/pppd", -- "/usr/sbin/pppd", -- "/sbin/pppd", -+ "@ppp@/sbin/pppd", - NULL - }; - -@@ -988,7 +986,7 @@ nm_ppp_manager_start (NMPPPManager *manager, - - /* Make sure /dev/ppp exists (bgo #533064) */ - if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) -- ignored = system ("/sbin/modprobe ppp_generic"); -+ ignored = system ("@kmod@/bin/modprobe ppp_generic"); - - connection = nm_act_request_get_connection (req); - g_assert (connection); diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 67cd874d6fd..f3ea9f677c0 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.34.0"; + version = "1.36.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-gZeV0ImQdiBPVnJCGljxsdnjk1Nu6Hu4RLkR5iQ78L0="; + sha256 = "1aqc8z8zv1sds439ilihwqczwg9iqzki0f007fd2x0s17fz5r1db"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch index 8c7c4b2fa4d..75d2b7c7541 100644 --- a/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules -index e398cb9f2f..a43d61864f 100644 +index 148acade5c..6395fbfbe5 100644 --- a/data/84-nm-drivers.rules +++ b/data/84-nm-drivers.rules -@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end" +@@ -7,6 +7,6 @@ ACTION!="add|change|move", GOTO="nm_drivers_end" # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" DRIVERS=="?*", GOTO="nm_drivers_end" @@ -24,19 +24,19 @@ index e23b3a5282..c7246a3b61 100644 ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index 21863b9533..c9b709659d 100644 +index a11486d54b..de8e9022c6 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -13994,14 +13994,14 @@ nm_device_start_ip_check(NMDevice *self) - gw = nm_ip4_config_best_default_route_get(priv->ip_config_4); +@@ -13571,14 +13571,14 @@ nm_device_start_ip_check(NMDevice *self) + gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET); if (gw) { _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); - ping_binary = nm_utils_find_helper("ping", "/usr/bin/ping", NULL); + ping_binary = "@iputils@/bin/ping"; log_domain = LOGD_IP4; } - } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) { - gw = nm_ip6_config_best_default_route_get(priv->ip_config_6); + } else if (priv->ip_data_6.state == NM_DEVICE_IP_STATE_READY) { + gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET6); if (gw) { _nm_utils_inet6_ntop(&NMP_OBJECT_CAST_IP6_ROUTE(gw)->gateway, buf); - ping_binary = nm_utils_find_helper("ping6", "/usr/bin/ping6", NULL); @@ -65,10 +65,10 @@ index 21a01e0b04..091c98428f 100644 '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c -index 6435dcc482..214d01194e 100644 +index 9ad030df76..8d800fb1c0 100644 --- a/src/libnm-platform/nm-platform-utils.c +++ b/src/libnm-platform/nm-platform-utils.c -@@ -2097,7 +2097,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char * +@@ -2207,7 +2207,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char * /* construct the argument list */ argv = g_ptr_array_sized_new(4); @@ -78,13 +78,13 @@ index 6435dcc482..214d01194e 100644 g_ptr_array_add(argv, (char *) arg1); diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c -index 72691e34c2..95495b6585 100644 +index e2c0c394bd..1a507aa0d4 100644 --- a/src/libnmc-base/nm-vpn-helpers.c +++ b/src/libnmc-base/nm-vpn-helpers.c @@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host, gs_free const char **output_v = NULL; - const char *const * iter; - const char * path; + const char *const *iter; + const char *path; - const char *const DEFAULT_PATHS[] = { - "/sbin/", - "/usr/sbin/", diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 9cee2fbdab0..c039b47d169 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -15,6 +15,8 @@ , mobile-broadband-provider-info , gobject-introspection , gtk3 +, withGtk4 ? false +, gtk4 , withGnome ? true , gcr , glib @@ -56,6 +58,8 @@ stdenv.mkDerivation rec { networkmanager isocodes mobile-broadband-provider-info + ] ++ lib.optionals withGtk4 [ + gtk4 ] ++ lib.optionals withGnome [ # advanced certificate chooser gcr @@ -63,6 +67,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgcr=${lib.boolToString withGnome}" + "-Dlibnma_gtk4=${lib.boolToString withGtk4}" ]; postPatch = '' diff --git a/pkgs/tools/networking/opendrop/default.nix b/pkgs/tools/networking/opendrop/default.nix new file mode 100644 index 00000000000..6a893721510 --- /dev/null +++ b/pkgs/tools/networking/opendrop/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonApplication +, fetchPypi +, fleep +, libarchive-c +, pillow +, requests-toolbelt +, setuptools +, zeroconf }: + +buildPythonApplication rec { + pname = "opendrop"; + version = "0.13.0"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-FE1oGpL6C9iBhI8Zj71Pm9qkObJvSeU2gaBZwK1bTQc="; + }; + + propagatedBuildInputs = [ + fleep + libarchive-c + pillow + requests-toolbelt + setuptools + zeroconf + ]; + + # There are tests, but getting the following error: + # nix_run_setup: error: argument action: invalid choice: 'test' (choose from 'receive', 'find', 'send') + # Opendrop works as intended though + doCheck = false; + + meta = with lib; { + description = "An open Apple AirDrop implementation written in Python"; + homepage = "https://owlink.org/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix index e636950cd98..25b42066419 100644 --- a/pkgs/tools/networking/opensnitch/daemon.nix +++ b/pkgs/tools/networking/opensnitch/daemon.nix @@ -48,7 +48,12 @@ buildGoModule rec { postBuild = '' mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd - mkdir -p $out/lib/systemd/system + mkdir -p $out/etc/opensnitchd $out/lib/systemd/system + cp system-fw.json $out/etc/opensnitchd/ + substitute default-config.json $out/etc/default-config.json \ + --replace "/var/log/opensnitchd.log" "/dev/stdout" \ + --replace "iptables" "nftables" \ + --replace "ebpf" "proc" substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index e8cad75698f..36125a5893b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -19,12 +19,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "8.8p1"; + version = "8.9p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "1s8z6f7mi1pwsl79cqai8cr350m5lf2ifcxff57wx6mvm478k425"; + sha256 = "1ry5prcax0134v6srkgznpl9ch5snkgq7yvjqvd8c5mbnxa7cjgx"; }; extraPatches = [ @@ -33,9 +33,9 @@ in # HPN Patch from FreeBSD ports (fetchpatch { name = "ssh-hpn.patch"; - url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/a981593e/security/openssh-portable/files/extra-patch-hpn"; + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ae66cffc19f357cbd51d5841c9b110a9ffd63e32/security/openssh-portable/files/extra-patch-hpn"; stripLen = 1; - sha256 = "sha256-+JvpPxktZAjhxLLK1lF4ijG9VlSWkqbRwotaLe6en64="; + sha256 = "sha256-p3CmMqTgrqFZUo4ZuqaPLczAhjmPufkCvptVW5dI+MI="; }) ]; diff --git a/pkgs/tools/networking/owl/default.nix b/pkgs/tools/networking/owl/default.nix new file mode 100644 index 00000000000..5a726c25a02 --- /dev/null +++ b/pkgs/tools/networking/owl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libev, libnl, libpcap }: + +stdenv.mkDerivation rec { + pname = "owl"; + version = "unstable-2022-01-30"; + + src = fetchFromGitHub { + owner = "seemoo-lab"; + repo = "owl"; + rev = "8e4e840b212ae5a09a8a99484be3ab18bad22fa7"; + sha256 = "sha256-kFk+JFLGWGBu5FPH3qp/Bxa6t04f1kpeHz3H8GNF3fg="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libev libnl libpcap ]; + + meta = with lib; { + description = "An open Apple Wireless Direct Link (AWDL) implementation written in C"; + homepage = "https://owlink.org/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 8d8069bec29..dd165fa1384 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtk-gnutella"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "gtk-gnutella"; repo = "gtk-gnutella"; rev = "v${version}"; - sha256 = "sha256-Hk5KPXSJ2s0J/stW3Qgvu6p6RG5VCvuWx1UlMR+3JO4="; + sha256 = "sha256-LbSUdU+a9G8qL7gCZVJQ6UQMATpOMtktY6FeOkUuaYI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 112b78dcae8..9b5846d6f76 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -4,11 +4,11 @@ with python3Packages; buildPythonApplication rec { pname = "pirate-get"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0pr703fwinr2f4rba86zp57mpf5j2jgvp5n50rc5vy5g7yfwsddm"; + sha256 = "sha256-VtnVyJqrdGXTqcyzpHCOMUI9G7/BkXzihDrBrsxl7Eg="; }; propagatedBuildInputs = [ colorama veryprettytable pyperclip ]; diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index f417bb496f4..150a1fa899f 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "qrcp"; - version = "0.8.4"; + version = "0.9.1"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - sha256 = "1m1xbb3x526j2v8m5m46km9zzj3dk9fvm5wckyqb8kxm4md12y50"; + sha256 = "sha256-oXtFkjCnbfjV15XWkmmJmhG82GyaY4FAcF5NrGnxHm0="; }; vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4"; @@ -24,9 +24,10 @@ buildGoModule rec { ]; postInstall = '' - installShellCompletion --bash --cmd qrcp <($out/bin/qrcp completion bash) - installShellCompletion --fish --cmd qrcp <($out/bin/qrcp completion fish) - installShellCompletion --zsh --cmd qrcp <($out/bin/qrcp completion zsh) + installShellCompletion --cmd qrcp \ + --bash <($out/bin/qrcp completion bash) \ + --fish <($out/bin/qrcp completion fish) \ + --zsh <($out/bin/qrcp completion zsh) ''; meta = with lib; { @@ -39,6 +40,6 @@ buildGoModule rec { complete. ''; license = licenses.mit; - maintainers = with maintainers; [ fgaz ]; + maintainers = with maintainers; [ fgaz SuperSandro2000 ]; }; } diff --git a/pkgs/tools/networking/rdap/default.nix b/pkgs/tools/networking/rdap/default.nix new file mode 100644 index 00000000000..22966d7afae --- /dev/null +++ b/pkgs/tools/networking/rdap/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "rdap"; + version = "2019-10-17"; + vendorSha256 = "sha256-j7sE62NqbN8UrU1mM9WYGYu/tkqw56sNKQ125QQXAmo="; + + src = fetchFromGitHub { + owner = "openrdap"; + repo = "rdap"; + rev = "af93e7ef17b78dee3e346814731377d5ef7b89f3"; + sha256 = "sha256-7MR4izJommdvxDZSRxguwqJWu6KXw/X73RJxSmUD7oQ="; + }; + + doCheck = false; + + ldflags = [ "-s" "-w" "-X \"github.com/openrdap/rdap.version=OpenRDAP ${version}\"" ]; + + meta = with lib; { + homepage = "https://www.openrdap.org/"; + description = "Command line client for the Registration Data Access Protocol (RDAP)"; + license = licenses.mit; + maintainers = with maintainers; [ sebastianblunt ]; + }; +} diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 31ff649e5fc..ed61740a684 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, libiconv }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, CoreServices, libiconv }: rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; @@ -15,7 +15,14 @@ rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; + + cargoBuildFlags = [ + "--features=aead-cipher-extra,local-dns,local-http-native-tls,local-redir,local-tun" + ]; # all of these rely on connecting to www.example.com:80 checkFlags = [ diff --git a/pkgs/tools/networking/snet/default.nix b/pkgs/tools/networking/snet/default.nix new file mode 100644 index 00000000000..f458521468c --- /dev/null +++ b/pkgs/tools/networking/snet/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "snet"; + version = "unstable-2021-11-26"; + + src = fetchFromGitHub { + owner = "monsterxx03"; + repo = "snet"; + rev = "89089b55277ce3e21e2ed79a9d307f2ecc62c6db"; + sha256 = "sha256-lTbygQRABv+Dp4i7nDgXYqi4pwU2rtLNfpgtBgsq+7Y="; + }; + + vendorSha256 = "sha256-dubmCLeD8Fwe1msfLN+5WzdbFkfTRnZDU3F49gjWTS4="; + + meta = with lib; { + description = "Transparent proxy works on linux desktop, MacOS, router"; + homepage = "https://github.com/monsterxx03/snet"; + license = licenses.mit; + maintainers = with maintainers; [ azuwis ]; + }; +} diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix index 48ffb550c20..fdedff083b1 100644 --- a/pkgs/tools/networking/sniffglue/default.nix +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s+2YzfSy7+o0VZZ4j/Cfd6F5GvBytthmDJqrPw+7SU0="; + sha256 = "sha256-8SkwdPaKHf0ZE/MeM4yOe2CpQvZzIHf5d06iM7KPAT8="; }; - cargoSha256 = "sha256-4G1OGY7/vE8NKBFeuOZzqyZ0DQN4hy/HBO9qrEtBYlM="; + cargoSha256 = "sha256-UGvFLW48sakNuV3eXBpCxaHOrveQPXkynOayMK6qs4g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index c52bdb0802d..255455811a6 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -23,6 +23,11 @@ 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" ]; diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/tools/networking/sockperf/default.nix index 598fb482c38..48eea919b14 100644 --- a/pkgs/tools/networking/sockperf/default.nix +++ b/pkgs/tools/networking/sockperf/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "sockperf"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "Mellanox"; repo = "sockperf"; rev = version; - sha256 = "MtpV21lCEAv7ARxk0dAxoOxxlqDM+skdQnPlqOvksjw="; + sha256 = "sha256-S5ZSGctOOnMD+AqlSAkRHMW8O1Rt8/952fali0kv/EU="; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index d38200a53da..9f0dfe7c388 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.4.9"; + version = "2.5.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BtyPy6ow3flHl4jM9cfF+y3JCtLYx2c+a8f7ol3nQj4="; + sha256 = "sha256-RzZlr0mscJgOGWOn4RU9SOr/WkKOrY39cIUKFKxis6Y="; }; - vendorSha256 = "sha256-lgbTfIsfYFSToCaDppMGaxfE1Bmk52eShQ+40g2VNw0="; + vendorSha256 = "sha256-P98giu0a5FLBsE87XVTurYNGnNk8JUfz1awY49OBj9M="; modRoot = "./v2"; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 17e8d9b9fba..31ff5235aac 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.35.1"; + version = "0.35.2"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eEvSELCzpAm9Me46U54MQEQiAPCFlBa5iG2AZMn5BbE="; + sha256 = "sha256-QCCDZ0zsAqV7tvlBeyTpN5iz/jBc50oBgrmUB/R5wCY="; }; - vendorSha256 = "sha256-aYY3rGm2Wvd5v1QrfhN0jWzAO9JYu4j5ZHk9UyEPjH8="; + vendorSha256 = "sha256-h4sNfV8B+WGgfVPDmWVNek7fQo5qZ3+VGkx4VSw4QF8="; subPackages = [ "cmd/tendermint" ]; diff --git a/pkgs/tools/networking/tinyssh/default.nix b/pkgs/tools/networking/tinyssh/default.nix index bc0c19f331d..ddd2d460f73 100644 --- a/pkgs/tools/networking/tinyssh/default.nix +++ b/pkgs/tools/networking/tinyssh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tinyssh"; - version = "20220222"; + version = "20220305"; src = fetchFromGitHub { owner = "janmojzis"; repo = "tinyssh"; rev = version; - sha256 = "sha256-wSi8D82TOXZdUcfrvZJNd6oePvKWQepRW1r7A2fWApA="; + sha256 = "sha256-d49saN0I22DZixx5AdvQmx3WM7yzQH5lOKnKbzhlls0="; }; preConfigure = '' diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 5365e696fad..7e9bcc1a70c 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "mirror://metalab/system/network/misc/wakelan-${version}.tar.gz"; - sha256 = "0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x"; + url = "mirror://ibiblioPubLinux/system/network/misc/${pname}-${version}.tar.gz"; + hash = "sha256-PfXrj4d2SHmatiPPFxjsxvhusML1HTRNjoYEQtzFzW8="; }; preInstall = '' @@ -15,15 +15,12 @@ stdenv.mkDerivation rec { meta = { description = "Send a wake-on-lan packet"; - - longDescription = - '' WakeLan sends a properly formatted UDP packet across the - network which will cause a wake-on-lan enabled computer to - power on. - ''; - + longDescription = '' + WakeLan sends a properly formatted UDP packet across the + network which will cause a wake-on-lan enabled computer to + power on. + ''; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.viric ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 423363b56c2..e0fdbdff0b3 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "wget"; - version = "1.21.2"; + version = "1.21.3"; src = fetchurl { url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; - sha256 = "sha256-FyejMKhqyss+V2Fc4mj18pl4v3rexKvmow03Age8kbM="; + sha256 = "sha256-29L7XkcUnUdS0Oqg2saMxJzyDUbfT44yb/yPGLKvTqU="; }; patches = [ diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 3d742a2a90c..7e9e20dd3b8 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.11"; + version = "5.5.12"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "sha256-+fNld+stSniuQV2zx+Qd4s2ZSwNLmnve/tXg36MC2nM="; + sha256 = "sha256-UJy71VKEKPYfRXZB2lJiy6Ua6BkGW9Uz0zXciZC4oJE="; }; nativeBuildInputs = [ perl gettext pkg-config ]; diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 46b6e649b5c..028c50a352c 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "sha256-nYHfmksZnIZGMSSFDhW7ajvv1F5h3aJo8IXw6yYOEw0="; + sha256 = "sha256-DjyVcjU2dVku5ademm6DygMnzWHB7iMqPfU56BBjAwU="; }; nativeBuildInputs = [ gettext installShellFiles ]; diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index c8483927b7f..15d232dbfbb 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "0.6.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - sha256 = "sha256-WgVEI+io05sUIMxdsYOWOJOVNeTDpDiDeTTbxoDFHZU="; + sha256 = "sha256-vkFKYnSmhPPXtc3AH7iRtqRRqxhj0o5WySqPT+klDWU="; }; - cargoSha256 = "sha256-AO/LTW9ogDRPns2uPXOvkXJUfeeI+beT7qUGi8IHiwk="; + cargoSha256 = "sha256-MsXaanznE4UtZMj54EDq86aJ2t4xT8O5ziTpa/KCwBw="; passthru.tests = { version = testVersion { package = alejandra; }; @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "The Uncompromising Nix Code Formatter"; homepage = "https://github.com/kamadorueda/alejandra"; + changelog = "https://github.com/kamadorueda/alejandra/blob/${version}/CHANGELOG.md"; license = licenses.unlicense; maintainers = with maintainers; [ _0x4A6F kamadorueda ]; }; diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index a0700e43c5b..0f78600a050 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,41 +1,164 @@ -{ mkDerivation, ansi-terminal, async, attoparsec, base, containers -, cassava, directory, HUnit, mtl, nix-derivation, process, relude, lib -, stm, terminal-size, text, time, unix, wcwidth, fetchFromGitHub -, lock-file, data-default, expect, runtimeShell +# This file has been autogenerate with cabal2nix. +# Update via ./update.sh" +{ + mkDerivation, + ansi-terminal, + async, + attoparsec, + base, + bytestring, + cassava, + containers, + data-default, + directory, + expect, + extra, + fetchzip, + filepath, + generic-optics, + HUnit, + installShellFiles, + lib, + lock-file, + MemoTrie, + mtl, + nix-derivation, + optics, + process, + random, + relude, + runtimeShell, + safe, + stm, + streamly, + terminal-size, + text, + time, + unix, + vector, + wcwidth, + word8, }: -mkDerivation rec { +mkDerivation { pname = "nix-output-monitor"; - version = "1.0.4.0"; - src = fetchFromGitHub { - owner = "maralorn"; - repo = "nix-output-monitor"; - hash = "sha256-3EQgjrDX8C3qG6danuPRl2gnPlX1qZjxjrROrKitsS0="; - rev = "v${version}"; + version = "1.1.2.0"; + src = fetchzip { + url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.2.0.tar.gz"; + sha256 = "03qhy4xzika41pxlmvpz3psgy54va72ipn9v1lv33l6369ikrhl1"; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal async attoparsec base cassava containers directory mtl - nix-derivation relude stm terminal-size text time unix wcwidth lock-file + ansi-terminal + async + attoparsec + base + bytestring + cassava + containers data-default + directory + extra + filepath + generic-optics + lock-file + MemoTrie + mtl + nix-derivation + optics + random + relude + safe + stm + streamly + terminal-size + text + time + unix + vector + wcwidth + word8 ]; executableHaskellDepends = [ - ansi-terminal async attoparsec base containers directory mtl - nix-derivation relude stm text time unix + ansi-terminal + async + attoparsec + base + bytestring + cassava + containers + data-default + directory + extra + filepath + generic-optics + lock-file + MemoTrie + mtl + nix-derivation + optics + random + relude + safe + stm + streamly + terminal-size + text + time + unix + vector + wcwidth + word8 ]; testHaskellDepends = [ - ansi-terminal async attoparsec base containers directory HUnit mtl - nix-derivation process relude stm text time unix + ansi-terminal + async + attoparsec + base + bytestring + cassava + containers + data-default + directory + extra + filepath + generic-optics + HUnit + lock-file + MemoTrie + mtl + nix-derivation + optics + process + random + relude + safe + stm + streamly + terminal-size + text + time + unix + vector + wcwidth + word8 ]; + homepage = "https://github.com/maralorn/nix-output-monitor"; + description = "Parses output of nix-build to show additional information"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [maralorn]; + passthru.updateScript = ./update.sh; + testTarget = "unit-tests"; + buildTools = [installShellFiles]; postInstall = '' cat > $out/bin/nom-build << EOF #!${runtimeShell} ${expect}/bin/unbuffer nix-build "\$@" 2>&1 | exec $out/bin/nom EOF chmod a+x $out/bin/nom-build + installShellCompletion --zsh --name _nom-build ${builtins.toFile "completion.zsh" '' + #compdef nom-build + compdef nom-build=nix-build + ''} ''; - homepage = "https://github.com/maralorn/nix-output-monitor"; - description = "Parses output of nix-build to show additional information"; - license = lib.licenses.agpl3Plus; - maintainers = [ lib.maintainers.maralorn ]; } diff --git a/pkgs/tools/nix/nix-output-monitor/update.sh b/pkgs/tools/nix/nix-output-monitor/update.sh new file mode 100755 index 00000000000..ad5da000030 --- /dev/null +++ b/pkgs/tools/nix/nix-output-monitor/update.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p cabal2nix curl jq alejandra +# +# This script will update the nix-output-monitor derivation to the latest version using +# cabal2nix. + +set -eo pipefail + +# This is the directory of this update.sh script. +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +derivation_file="${script_dir}/default.nix" + +# This is the latest released version of nix-output-monitor on GitHub. +new_version=$(curl --silent "https://api.github.com/repos/maralorn/nix-output-monitor/releases" | jq '.[0].tag_name' --raw-output) + +echo "Updating nix-output-monitor to version $new_version." +echo "Running cabal2nix and outputting to ${derivation_file}..." + +cat > "$derivation_file" << EOF +# This file has been autogenerate with cabal2nix. +# Update via ./update.sh" +EOF + +cabal2nix \ + --extra-arguments expect \ + --extra-arguments runtimeShell\ + --extra-arguments installShellFiles\ + --maintainer maralorn \ + "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/${new_version}.tar.gz" \ + | head -n-1 >> "$derivation_file" + +cat >> "$derivation_file" << EOF + passthru.updateScript = ./update.sh; + testTarget = "unit-tests"; + buildTools = [ installShellFiles ]; + postInstall = '' + cat > \$out/bin/nom-build << EOF + #!\${runtimeShell} + \${expect}/bin/unbuffer nix-build "\\\$@" 2>&1 | exec \$out/bin/nom + EOF + chmod a+x \$out/bin/nom-build + installShellCompletion --zsh --name _nom-build \${builtins.toFile "completion.zsh" '' + #compdef nom-build + compdef nom-build=nix-build + ''} + ''; +} +EOF + +alejandra "${derivation_file}" | cat + +echo "Finished." diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index 17c9f690d0a..a61aff2107d 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-KrUb71/wEQnAD2VVkufw12kXrz35sU5fNciSJsMyGrc="; + sha256 = "sha256-cKzGg3fAXKqnBZES3YUMbv1ZAcLqo6AdrXKXSFSAnis="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-JewI+23eNrMHfSUwsA3CaeTvG61/ZOFFLpm7rKZKsoU="; + cargoSha256 = "sha256-OLrxqbTIhHMNPEnSAUbTqoYnaZi/BxbWUCxaTo9Zyww="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index d15cbe8a9cc..a1f783a7fe4 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.10.2"; + version = "0.11.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-U6qElZkray4kjScv9X4I5m2z1ZWQzqcPYAuPzpyRpW0="; + sha256 = "sha256-43PqIM61MXY35BSprRNPTMyVUEVD15sq4+6PHS/P2o0="; }; - cargoSha256 = "sha256-0J02Uz184zx5xZYhqUmyaAFCQ0aogwy0fQTXbteBdV8="; + cargoSha256 = "sha256-ue93L8pyjKR+bxNdltQcsHSPJ3Iz+4gpeskIhhR2/wI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 0c791bbf80f..49a6d645060 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-KWLZdFpRwtdP17x71IU2MGFwd1SNnTRcgTUoW1p5Px4="; + sha256 = "sha256-oYnqrNqbn/OsJd0Lh6rQ2pt7FrLOp5p3MoavC56dWQc="; }; - cargoSha256 = "sha256-CTaEWANx3s7YCm8pqGWuvGqR362YtVjmbnc9V3kC8pI="; + cargoSha256 = "sha256-LtDIzqHzzur+GxxvUHciNQCRmxqdmaXSG4ncMV3Rx3c="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 0e22a24c099..dedb57960b3 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "disnix"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-${version}/disnix-${version}.tar.gz"; - sha256 = "13rjw1va7l8w7ir73xqxq4zb3ig2iwhiwxhp5dbfv0z3gnqizghq"; + url = "https://github.com/svanderburg/disnix/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; + sha256 = "0mc0wy8fca60w0d56cljq2cw1xigbp2dklb43fxa5xph94j3i49a"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 639d1978210..05a9e45c956 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "disnixos"; - version = "0.9.1"; + version = "0.9.3"; src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-${version}/disnixos-${version}.tar.gz"; - sha256 = "1n2psq1b8bg340i2i0yf5xy2rf78fwqd3wj342wcmq09cv2v8d1b"; + url = "https://github.com/svanderburg/disnixos/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; + sha256 = "0nm7g184xh6xzjz4a40a7kgfnpmq043x6v0cynpffa6wd9jv89s9"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 678f0a9be8b..f07aade89ca 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, netcat # Optional packages -, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null +, systemd ? null, ejabberd ? null, mariadb ? null, postgresql ? null, subversion ? null , mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null , nginx ? null, s6-rc ? null, xinetd ? null @@ -26,7 +26,7 @@ , getopt }: -assert enableMySQLDatabase -> mysql != null; +assert enableMySQLDatabase -> mariadb != null; assert enablePostgreSQLDatabase -> postgresql != null; assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { buildInputs = [ getopt netcat ] ++ lib.optional stdenv.isLinux systemd ++ lib.optional enableEjabberdDump ejabberd - ++ lib.optional enableMySQLDatabase mysql.out + ++ lib.optional enableMySQLDatabase mariadb.out ++ lib.optional enablePostgreSQLDatabase postgresql ++ lib.optional enableSubversionRepository subversion ++ lib.optionals enableMongoDatabase [ mongodb mongodb-tools ] diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 3de0bb399d8..7176d7f608e 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.65.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-vGXK4pOkff4yGaRZE+FFFIqEizUeCID+lxiE/TWt0Bs="; + sha256 = "sha256-fQyNm51roz6wn9QAE8/ZIrutyWP45xiKVHzn8n0LcwE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/tools/package-management/microdnf/default.nix index 03324a44710..6a3d5808c73 100644 --- a/pkgs/tools/package-management/microdnf/default.nix +++ b/pkgs/tools/package-management/microdnf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microdnf"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-Ip1XcE8fPXhdgVaR4VPH+ElP6JbnK4JekZuWyT5ot/M="; + sha256 = "sha256-yKIhXjeiCOq5JsAquaPnYAJZk53FioOKGIAT2xYfLO8="; }; nativeBuildInputs = [ pkg-config cmake gettext help2man ]; diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 016f07a7d33..4bdf7c4c7a3 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -21,16 +21,25 @@ let }) ]; }); + + spdlog' = spdlog.overrideAttrs (oldAttrs: { + # Required for header files. See alse: + # https://github.com/gabime/spdlog/pull/1241 (current solution) + # https://github.com/gabime/spdlog/issues/1897 (previous solution) + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DSPDLOG_FMT_EXTERNAL=OFF" + ]; + }); in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.18.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; - rev = version; - sha256 = "1gr9r257l300hafp8zm61bn58rysdk9i4wv1879q96b6n6v8hwa6"; + rev = "mamba-" + version; + sha256 = "0zsl0rhsx87vvwcwc1xn7gqgbxffprr8dyc9rkr6kcr4rjgy9yzp"; }; nativeBuildInputs = [ cmake ]; @@ -43,17 +52,11 @@ stdenv.mkDerivation rec { libyamlcpp libsolv' reproc - spdlog + spdlog' termcolor ghc_filesystem ]; - postPatch = '' - # See https://github.com/gabime/spdlog/issues/1897 - sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt - echo 'target_link_libraries(micromamba PRIVATE -lspdlog -lfmt)' >> micromamba/CMakeLists.txt - ''; - cmakeFlags = [ "-DBUILD_LIBMAMBA=ON" "-DBUILD_SHARED=ON" diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index e0f2a192c23..3f5a73821cb 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-du"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; rev = "v${version}"; - sha256 = "0v6hixj81aa6g3sddny46i0yqaaqv6krp5xadj0xz1g77cb8xy2w"; + sha256 = "sha256-NnoCoiYTXci7f9MXsxEhoYHwPsaAAuK2wSrDye2+SYM="; }; - cargoSha256 = "11jaks6adsvrvxlqqw3glvn4ff7xh9j35ayfrl89rb4achvqp7xn"; + cargoSha256 = "sha256-X5181gZtvnUHZAqMjNARRVFq12LuLJfPP5ZOWxBRxXk="; doCheck = true; checkInputs = [ nix graphviz ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { nlohmann_json ] ++ lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; meta = with lib; { description = "A tool to determine which gc-roots take space in your nix store"; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index dfcf11045cb..1023d23432c 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256:0flnqn1vkr55sipii82vwjfkhv4p835d01f6yhlpbalxwy2kr14r"; + hash = "sha256-SCwvFlBYUlxCucjMO4GHhEQWZFZt0lRKJncm6hvDx9I="; }; buildInputs = [ boost diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 10449a331f9..57ebcfec26d 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -4,23 +4,21 @@ rustPlatform.buildRustPackage rec { pname = "nix-index"; - version = "0.1.2"; + version = "unstable-2022-03-07"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; - rev = "v${version}"; - sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8"; + rev = "f09548f66790d2d7d53f07ad2af62993d7cabb08"; + sha256 = "sha256-xIJCzEHQJ2kHRbT4Ejrb5R5e/VqjKrklV7XneZIiyUg="; }; - cargoSha256 = "161lz96a52s53rhhkxxhcg41bsmh8w6rv6nl8gwqmg3biszy7hah"; + cargoSha256 = "sha256-2Yhnacsx8EWsfZfcfKhV687cblyFDmsfdqGZoK6Lulo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl ] ++ lib.optional stdenv.isDarwin Security; - doCheck = !stdenv.isDarwin; - postInstall = '' mkdir -p $out/etc/profile.d cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 842ef5de328..2161ea3c309 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -101,15 +101,17 @@ stdenv.mkDerivation { lowdown ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [ libcpuid - ] ++ lib.optional (atLeast27) [ - nlohmann_json ] ++ lib.optionals withLibseccomp [ libseccomp ] ++ lib.optionals withAWS [ aws-sdk-cpp ]; - propagatedBuildInputs = [ boehmgc ]; + propagatedBuildInputs = [ + boehmgc + ] ++ lib.optional (atLeast27) [ + nlohmann_json + ]; NIX_LDFLAGS = lib.optionals (!atLeast24) [ # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba @@ -205,7 +207,7 @@ stdenv.mkDerivation { }; passthru = { - inherit boehmgc; + inherit aws-sdk-cpp boehmgc; perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { inherit src version; }); }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e080a57dc65..8eb8fef8298 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -24,6 +24,9 @@ let customMemoryManagement = false; }).overrideDerivation (args: { patches = (args.patches or [ ]) ++ [ ./patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch ]; + + # only a stripped down version is build which takes a lot less resources to build + requiredSystemFeatures = null; }); common = args: @@ -62,16 +65,21 @@ in lib.makeExtensible (self: { sha256 = "sha256-E9iQ7f+9Z6xFcUvvfksTEfn8LsDfzmwrcRBC//5B3V0="; }; - stable = self.nix_2_6; + nix_2_7 = common { + version = "2.7.0"; + sha256 = "sha256-m8tqCS6uHveDon5GSro5yZor9H+sHeh+v/veF1IGw24="; + }; + + stable = self.nix_2_7; unstable = lib.lowPrio (common rec { - version = "2.7"; - suffix = "pre20220221_${lib.substring 0 7 src.rev}"; + version = "2.8"; + suffix = "pre20220311_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "caf51729450d4c57d48ddbef8e855e9bf65f8792"; - sha256 = "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw="; + rev = "d5322698a2abbc6d141e1d244e17b0d226a2f18b"; + sha256 = "sha256-7rQSktGC8+DmeyGOnzFMy1QwAYnw4JJphv+lEwFCwfU="; }; }); }) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index e9db7f63fba..4e59333ed79 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -47,6 +47,9 @@ buildPythonApplication rec { hash = "sha256:1dizf9j3z7zk4lxvnszwx63xzd9r68f2iva5sszzf8s8na831dvd"; }) ]; + postPatch = '' + substituteInPlace pyproject.toml --replace "pdm-pep517>=0.9,<0.10" "pdm-pep517" + ''; propagatedBuildInputs = [ blinker diff --git a/pkgs/tools/security/aiodnsbrute/default.nix b/pkgs/tools/security/aiodnsbrute/default.nix index 77f03e4174f..f1d170e7d59 100644 --- a/pkgs/tools/security/aiodnsbrute/default.nix +++ b/pkgs/tools/security/aiodnsbrute/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "aiodnsbrute"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "blark"; repo = pname; rev = "v${version}"; - sha256 = "0fs8544kx7vwvc97zpg4rs3lmvnb4vwika5g952rv3bfx4rv3bpg"; + sha256 = "sha256-cEpk71VoQJZfKeAZummkk7yjtXKSMndgo0VleYiMlWE="; }; # https://github.com/blark/aiodnsbrute/pull/8 diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix index 5fb88ca9921..c2196cea686 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/tools/security/amber/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { # Renaming it to amber-secret because another package named amber exists pname = "amber-secret"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "fpco"; repo = "amber"; rev = "v${version}"; - sha256 = "sha256-+vipQl/HWoYnOPkQLjeIedpnnqPVYaUWhks9eCgMOxQ="; + sha256 = "sha256-kPDNTwsfI+8nOgsLv2aONrLGSRZhw5YzNntJ2tbE0oI="; }; - cargoSha256 = "sha256-xWEQvCyd8auE0q9rBt9iDgU8Dscf4pq/gsAINH2eQY4="; + cargoSha256 = "sha256-fTdTgbeOQXEpLHq9tHiPLkttvaxS/WJ86h3jRdrfbJM="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/security/authz0/default.nix b/pkgs/tools/security/authz0/default.nix new file mode 100644 index 00000000000..850e6321300 --- /dev/null +++ b/pkgs/tools/security/authz0/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "authz0"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "hahwul"; + repo = pname; + rev = "v${version}"; + hash = "sha256-8WtvUeHP7fJ1/G+UB1QLCSSNx7XA+vREcwJxoMeQsgM="; + }; + + vendorSha256 = "sha256-EQhvHu/LXZtVQ+MzjB96K0MUM4THiRDe1FkAATfGhdw="; + + meta = with lib; { + description = "Automated authorization test tool"; + homepage = "https://github.com/hahwul/authz0"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix index 9f29826808d..74e9b05b237 100644 --- a/pkgs/tools/security/cariddi/default.nix +++ b/pkgs/tools/security/cariddi/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cariddi"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "edoardottt"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PXQljC9rwlxXQ96fII3EjD4NXu61EMkYvMWqkcJZ4vU="; + sha256 = "sha256-/ez2biYU8NnVny8v5Mu9pLq0oqzcIenpyEb3qkPd9v8="; }; - vendorSha256 = "sha256-zNUdglsfy6lEV54afCAoigxa3rR0qf/e3+B4PvVRIa4="; + vendorSha256 = "sha256-zJ39tAq+ooROMHG1vC2m2rbq+wttxqYxAd2hLg5GtJM="; meta = with lib; { description = "Crawler for URLs and endpoints"; diff --git a/pkgs/tools/security/cdk-go/default.nix b/pkgs/tools/security/cdk-go/default.nix index 14f7e05140e..88fd089cb68 100644 --- a/pkgs/tools/security/cdk-go/default.nix +++ b/pkgs/tools/security/cdk-go/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cdk-go"; - version = "1.0.4"; + version = "1.0.6"; src = fetchFromGitHub { owner = "cdk-team"; repo = "CDK"; rev = "v${version}"; - sha256 = "1zz9jaz5nlvs52nqlaisivrnz7lz8g48qii0n2s1783a5jpkk9ml"; + sha256 = "sha256-XzUSiE03ZbP75ewwBJFwZE0aKNlOFprezeD26japLD8="; }; - vendorSha256 = "0sn709mbhfymwwfdqc5xpdz2lgimqx3xycfmq24vbfmlh8wqcs7l"; + vendorSha256 = "sha256-mP49DmOHvS8ewQG7I1J5OEmAOkHEFJfAsEPeiaRBpWc="; # At least one test is outdated doCheck = false; diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 8959d6627de..822566b8d04 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -3,38 +3,18 @@ , python3 }: -let - py = python3.override { - packageOverrides = self: super: { - - # pycfmodel is pinned, https://github.com/Skyscanner/cfripper/issues/204 - pycfmodel = super.pycfmodel.overridePythonAttrs (oldAttrs: rec { - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "Skyscanner"; - repo = "pycfmodel"; - rev = version; - hash = "sha256-BlnLf0C/wxPXhoAH0SRB22eGWbbZ05L20rNy6qfOI+A="; - }; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.3.3"; + version = "1.5.2"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-y3h/atfFl/wDmr+YBdsWrCez4PQBEcl3xNDyTwXZIp4="; + hash = "sha256-tl0g08nnY1CZ4SNcMFPARIRquiO9SCen9VWeNalLHds="; }; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ boto3 cfn-flip click @@ -45,7 +25,7 @@ buildPythonApplication rec { setuptools ]; - checkInputs = with py.pkgs; [ + checkInputs = with python3.pkgs; [ moto pytestCheckHook ]; diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 5bfc16718bf..63d36e99032 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-37jahAGgQn7HwwdRTlAS/oJQ3BxTkMViI6iJMBYFgjI="; + sha256 = "sha256-jAkTIO+tmb1vjS2eRWU9Fau7qzPCBlXJCk00iwNpULE="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,19 +16,36 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-d3aOX4iMlhlxgYbqCHCIFKXunVha0Fw4ZBmy4OA6EhI="; + vendorSha256 = "sha256-E9zeRlPIIoXo/EfagHC3aDnW747SdsPiqIA384D7NQI="; - excludedPackages = "\\(sample\\|webhook\\|help\\)"; + subPackages = [ + "cmd/cosign" + "cmd/cosign/webhook" + "cmd/sget" + ]; tags = [] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ]; - ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/pkg/version.GitVersion=v${version}" ]; + ldflags = [ + "-s" + "-w" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" + "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" + ]; - postPatch = '' - rm pkg/cosign/tuf/client_test.go # Require network access - rm internal/pkg/cosign/fulcio/signer_test.go # Require network access - rm internal/pkg/cosign/rekor/signer_test.go # Require network access + postBuild = '' + # cmd/cosign/webhook should be called cosigned + mv $GOPATH/bin/{webhook,cosigned} + ''; + + preCheck = '' + # test all paths + unset subPackages + + rm cmd/cosign/cli/fulcio/fulcioroots/fulcioroots_test.go # Require network access rm pkg/cosign/kubernetes/webhook/validator_test.go # Require network access + rm pkg/cosign/tlog_test.go # Require network access + rm pkg/cosign/tuf/client_test.go # Require network access ''; postInstall = '' diff --git a/pkgs/tools/security/dismap/default.nix b/pkgs/tools/security/dismap/default.nix index c6dcd1051e5..57f3795db80 100644 --- a/pkgs/tools/security/dismap/default.nix +++ b/pkgs/tools/security/dismap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dismap"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "zhzyker"; repo = pname; rev = "v${version}"; - sha256 = "0d5r6n92ndlr48f4z6lxwrx7bdh5mmibdjcyab4j2h49lf37c1qd"; + sha256 = "sha256-WaQdDcBvv4mHdPFAB+spC64YeT3jlfyMYNsTjBILjwA="; }; - vendorSha256 = "00hwhc86rj806arvqfhfarmxs1drcdp91xkr12whqhsi9ddc254d"; + vendorSha256 = "sha256-GnchyE2TswvjYlehhMYesZruTTwyTorfR+17K0RXXFY="; meta = with lib; { description = "Asset discovery and identification tools"; diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 9ba91d18653..c316ab35b6d 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.0.8"; + version = "1.1.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "v${version}"; - sha256 = "sha256-+ZLnQtN5MnWnOpLHkaZMhhsFWgGhnhalkXLakJf1wKU="; + sha256 = "sha256-tcUVJ/qcQGivcAjWkcfv1fZxc9F5cYn1stpCHDoJRps="; }; - vendorSha256 = "sha256-RtYAggUWQ8b2qf5ly7BSRc+8npbLiWdM4h0Krdp4Py4="; + vendorSha256 = "sha256-hGV44Rx5kX2ZVBsTyeWm5SzpXzlTFNidt7bwzntboQo="; meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix index 848ee536380..eb5fd03416f 100644 --- a/pkgs/tools/security/expliot/default.nix +++ b/pkgs/tools/security/expliot/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { owner = "expliot_framework"; repo = pname; rev = version; - sha256 = "sha256-7Cuj3YKKwDxP2KKueJR9ZO5Bduv+lw0Y87Rw4b0jbGY="; + hash = "sha256-7Cuj3YKKwDxP2KKueJR9ZO5Bduv+lw0Y87Rw4b0jbGY="; }; propagatedBuildInputs = [ @@ -51,7 +51,10 @@ buildPythonApplication rec { postPatch = '' # https://gitlab.com/expliot_framework/expliot/-/merge_requests/113 substituteInPlace setup.py \ - --replace "pynetdicom>=1.5.1,<2" "pynetdicom>=2,<3" + --replace "pynetdicom>=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" ''; # Project has no tests diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index bcf456dcf96..4338576c75e 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-02-25"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-KGUDtJxmx5/F77McUK/9ecHLPKblm97n2yl7ntyTzvQ="; + sha256 = "sha256-whV7zg7njGGjUpxsXZiNwVfHgrlop2RLZnCsBWQ+HkY="; + }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix new file mode 100644 index 00000000000..ecfc496ce8e --- /dev/null +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, openssl +, pkg-config +, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "feroxbuster"; + version = "2.6.1"; + + src = fetchFromGitHub { + owner = "epi052"; + repo = pname; + rev = "v${version}"; + hash = "sha256-RY9bFuALRaVXDrC0eIx0inPjRqNpRKNZf3mCrKIdGL8="; + }; + + cargoSha256 = "sha256-0Zawlx/lhF7K8nOsHYKO84pnctVMpm3RfnAFCOltOqE="; + + OPENSSL_NO_VENDOR = true; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + # Tests require network access + doCheck = false; + + meta = with lib; { + description = "Fast, simple, recursive content discovery tool"; + homepage = "https://github.com/epi052/feroxbuster"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix deleted file mode 100644 index 6b930adcc26..00000000000 --- a/pkgs/tools/security/fprot/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - - pname = "f-prot"; - version = "6.2.1"; - - src = fetchurl { - url = "http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz"; - sha256 = "0qlsrkanf0inplwv1i6hqbimdg91syf5ggd1vahsm9lhivmnr0v5"; - }; - - installPhase = '' - mkdir -p $out/bin - cp fpscan $out/bin - - mkdir -p $out/opt/f-prot - cp fpupdate $out/opt/f-prot - cp product.data.default $out/opt/f-prot/product.data - cp license.key $out/opt/f-prot/ - cp f-prot.conf.default $out/opt/f-prot/f-prot.conf - ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate - - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate - - mkdir -p $out/share/man/ - mkdir -p $out/share/man/man1 - cp doc/man/fpscan.1 $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp doc/man/f-prot.conf.5 $out/share/man/man5 - mkdir -p $out/share/man/man8 - cp doc/man/fpupdate.8 $out/share/man/man8 - ''; - - meta = with lib; { - homepage = "http://www.f-prot.com"; - description = "A popular proprietary antivirus program"; - license = licenses.unfree; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 59dc202e694..8113289a9c4 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gau"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GkPAv6JrgzlblSw4oIvPvNSboOmvZCMKyFwAMD3W0fQ="; + sha256 = "sha256-8op515+0wDxxU1e08gJ6lg/8NhQScFb4b3mCzBV/VNw="; }; vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ="; diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index ff70782dabe..a574c347629 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D6leHpGZNQ9Xt4PSU0Dwte6N3bMge7itkZtcUl0mIrQ="; + sha256 = "sha256-z3YGRDgBGpr2hixIayih4wxGWPtYL0EPAuTYVPByzQc="; }; - vendorSha256 = "sha256-JZOalUOIeV51Nttm6xeBos+/8fleSBpUiXa8ekVuYJA="; + vendorSha256 = "sha256-J1xX+r+Mph1QkqjK87tqGDkYvPZp0lHgdRhd88WZi1c="; ldflags = [ "-s" diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index ef7a5cf85e7..e80804cd002 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0dz9x0r5021bhk1kjh29m1q13xbslwb8yn9qzcp7b9m1lrnvi2ap"; + sha256 = "sha256-80aOyvsdf5rXtR/R23rr8XzridLvqKBc8vObTUBUAq4="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -34,19 +34,9 @@ stdenv.mkDerivation rec { ./tests-add-test-cases-for-import-without-uid.patch ./allow-import-of-previously-known-keys-even-without-UI.patch ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch - ] ++ lib.optional stdenv.isDarwin [ - # Remove an innocent warning printed on systems without procfs - # https://dev.gnupg.org/T5656 - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/890be5f6af88e7913d177af87a50129049e681bb/gnupg/2.3.3-proc-error.patch"; - sha256 = "sha256-oiTa7Nf+AEmhZ683CJEaCb559PXJ6RpSSgRLpxz4CKU="; - }) ]; postPatch = '' - sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 - # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update - sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am - sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in + sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 '' + lib.optionalString (stdenv.isLinux && pcsclite != null) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; diff --git a/pkgs/tools/security/gomapenum/default.nix b/pkgs/tools/security/gomapenum/default.nix index ecfc74cac54..a0989337849 100644 --- a/pkgs/tools/security/gomapenum/default.nix +++ b/pkgs/tools/security/gomapenum/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gomapenum"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "nodauf"; repo = "GoMapEnum"; rev = "v${version}"; - sha256 = "sha256-AjHqD9r4ZU5NCqXEovvQuV4eeMLBy2jO/uqZQiCTyNI="; + sha256 = "sha256-a0JpHk5pUe+MkcmJl871JwkOfFDg3S4yOzFIeXCReLE="; }; - vendorSha256 = "sha256-65NF814w1IUgSDuLLIqfbsf22va4AUC2E05ZgmuOHGY="; + vendorSha256 = "sha256-5C0dDY/42H8oHNdQaKYiuqpi2QqqgHC7VMO/0kFAofY="; postInstall = '' mv $out/bin/src $out/bin/$pname diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index cc35a24151a..a6ed2168670 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grype"; - version = "0.33.1"; + version = "0.34.2"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5QjyGIpxnrwTnEmi0D16vPKodg3+SKiINFONwU2OzC0="; + sha256 = "sha256-tMkMGM45/LcFllEgQ3UTl6FsLJmdsU8SLcLH/8+zMA4="; # 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; @@ -27,7 +27,7 @@ buildGoModule rec { ''; }; - vendorSha256 = "sha256-CPMfQv9oiLbIMkZe/t482LzssoNTcNVJdr2o2wJecSA="; + vendorSha256 = "sha256-WrUZFlN7dPbyN9InjX/Y9J+iYKu5v2/SHmRgDP5BJi8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 1e57679b4ad..0d87780cee4 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.1.5"; + version = "1.2.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-XA099gBp52g0RUbbFSE8uFa7gh56bO8H66KaFAtK1RU="; + sha256 = "sha256-zNK/OBDo6cL0uZHosulusdOviYZMD2TCusE+0Mn330g="; }; - vendorSha256 = "sha256-Qx0QaPKpEq4U+G3qdfMN4EVyY5zI2SyzcK/U6o6loHE="; + vendorSha256 = "sha256-a6Tpz4jPQbtiWt6OyDKy+xbRx6EBwADyqTkvBnyusdQ="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index eae06ea6491..e5b805b89cc 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-5meBBBijX49EQc9VejySwiIKsyCBEKGKIXvH7en6XuU="; + hash = "sha256-z8u6j6YLBHmgZKSGh/rFDDSnWZrBgWsqfKP3vhaukbY="; }; deps = stdenv.mkDerivation { @@ -40,7 +40,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-t+CkjoZqWqphxbg/4E3/7U8nKoV0AlITyRScLN8x6yY="; + outputHash = "sha256-kiNtA63sINX7VRsq4JKAiZYzymHe1TrNetZsE6S9KVM="; }; in stdenv.mkDerivation { inherit pname version src; diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/tools/security/knockpy/default.nix index 5b4a2cbc33b..d9b708bc380 100644 --- a/pkgs/tools/security/knockpy/default.nix +++ b/pkgs/tools/security/knockpy/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = version; - hash = "sha256-QPOIpgJt+09zRvSavRxuVEN+GGk4Z1CYCXti37YaO7o="; + hash = "sha256-aM78If4/zW/0CqVjZHDbHrrWDuU1VSVhX7dfy9FR098="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix index 7904235b86a..a9f2c241d21 100644 --- a/pkgs/tools/security/krunner-pass/default.nix +++ b/pkgs/tools/security/krunner-pass/default.nix @@ -1,9 +1,17 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, extra-cmake-modules -, kauth, krunner -, pass, pass-otp ? null }: +{ mkDerivation +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, extra-cmake-modules +, kauth +, krunner +, pass +}: mkDerivation rec { pname = "krunner-pass"; + # when upgrading the version, check if cmakeFlags is still needed version = "1.3.0"; src = fetchFromGitHub { @@ -13,9 +21,10 @@ mkDerivation rec { sha256 = "032fs2174ls545kjixbhzyd65wgxkw4s5vg8b20irc5c9ak3pxm0"; }; - buildInputs = [ - kauth krunner - pass pass-otp + buildInputs = [ + kauth + krunner + (pass.withExtensions (p: with p; [ pass-otp ])) ]; nativeBuildInputs = [ cmake extra-cmake-modules ]; @@ -33,6 +42,9 @@ mkDerivation rec { ''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"'' ]; + # there are *lots* of pointless warnings in v1.3.0 + cmakeFlags = [ "-Wno-dev" ]; + meta = with lib; { description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; homepage = "https://github.com/akermu/krunner-pass"; diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index ca0b1305d09..e881fad4a92 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.148"; + version = "2.0.149"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-Wn/yVGAAdAaIsHUDWWqVyAlOTYIXpbwIktX9h4LN+fQ="; + hash = "sha256-m6tJjC5BXxFC+bSOHbKXXGZQlJIM0+fIA+JYWBntgk8="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-xbOUggbu/4bNT07bD3TU/7CIDvgi6OtZLQzSqQykwRY="; + vendorSha256 = "sha256-vplHaaT7x0ZSpvityJF5aGKDARvGPBT9DMltOpUkOMo="; ldflags = [ "-s" diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index d93f0135c20..2042ec30fff 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-sfAmyx9MgzCVA1Da7hl6/sKxhS9ptaNLeSB8wmJIKDs="; + sha256 = "sha256-ih154MtLWBUdo7+ugu6tg5O/XSjlgFC00wgWC71VeaE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index aff1c8c625b..bdecd4e0a94 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.31" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.32" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 64f7ec00c28..6855f10bb48 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 2bed5461f9e43e2608a90c3331045b62e8dba26a - ref: refs/tags/6.1.31 + revision: f7cd9896b753377c4c663188b6c26500b7850f41 + ref: refs/tags/6.1.32 specs: - metasploit-framework (6.1.31) + metasploit-framework (6.1.32) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.75) + metasploit-payloads (= 2.0.77) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt @@ -128,13 +128,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.559.0) - aws-sdk-core (3.127.0) + aws-partitions (1.563.0) + aws-sdk-core (3.128.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.300.0) + aws-sdk-ec2 (1.302.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.68.0) @@ -173,8 +173,8 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.10.0) eventmachine (1.2.7) - faker (2.19.0) - i18n (>= 1.6, < 2) + faker (2.20.0) + i18n (>= 1.8.11, < 2) faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -251,7 +251,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.75) + metasploit-payloads (2.0.77) metasploit_data_models (5.0.4) activerecord (~> 6.0) activesupport (~> 6.0) @@ -379,7 +379,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.0.4) + ruby_smb (3.0.5) bindata openssl-ccm openssl-cmac diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index e7f20acf8a1..11215cd3dde 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.31"; + version = "6.1.32"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-WrrpejXhpGu8/d8TBjXBi9qaYZAFTjZr7S2WYz+RTFw="; + sha256 = "sha256-UoH+tp3I9YTXXNXDaYne1E9Zpoj9fbr7mnIQws6TXJs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index ced2ecf9bcd..0104412d350 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15pi27wp50h829757xhp22fx57nvlfm5cjy2iz11b7zvdx19j7fw"; + sha256 = "0l4f97kmsz1niicj52bm88ggbq3lvn41w0cckfwksh4yikjh20wv"; type = "gem"; }; - version = "1.559.0"; + version = "1.563.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq"; + sha256 = "0xpqx000gq1j0n211c9bch5b2rc48a54kxk87m6y8z844c0wlqk7"; type = "gem"; }; - version = "3.127.0"; + version = "3.128.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mi99zacz537wsiks9yb6zy8xkqsbrg9j7c4kzrgd8zk55p247wd"; + sha256 = "13x9rwkykyw873prd2k9pqwrjkf9jsqih9aksbf9fn8hfnsv6db8"; type = "gem"; }; - version = "1.300.0"; + version = "1.302.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -334,10 +334,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hb9wfxyb4ss2vl2mrj1zgdk7dh4yaxghq22gbx62yxj5yb9w4zw"; + sha256 = "1694ndj701a8q4c4bwxz53kx94ih1rr4pgr4gk7a6c8k4jsbjgwi"; type = "gem"; }; - version = "2.19.0"; + version = "2.20.0"; }; faraday = { groups = ["default"]; @@ -684,12 +684,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "2bed5461f9e43e2608a90c3331045b62e8dba26a"; - sha256 = "0p2cj4zn75idxmmkckh5j1hrmnlbq4shc4yzzny6p9716mxfkfjs"; + rev = "f7cd9896b753377c4c663188b6c26500b7850f41"; + sha256 = "16swjg7c443jkbxvlzgxi2k5jkylvs4nkhymbkbq9xf8knvgx0aj"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.31"; + version = "6.1.32"; }; metasploit-model = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ghwsciyhldpja50f9wv1nd1xnns6ki9hjfhllh1dyja3l1knd9z"; + sha256 = "0chd5rn13210fgsvm0yqd59lfgg9kpmyx82jbf33dfiw6qh6mmi1"; type = "gem"; }; - version = "2.0.75"; + version = "2.0.77"; }; metasploit_data_models = { groups = ["default"]; @@ -1357,10 +1357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w7ywnf3b3dsfqarj9yc21q1f5p29vs359x5d7sipvc0ljdwn95l"; + sha256 = "0zgw3aplb0nd8ggyy2csywvnw7gdligzdqvw18j7s5yix8g2h4cz"; type = "gem"; }; - version = "3.0.4"; + version = "3.0.5"; }; rubyntlm = { groups = ["default"]; diff --git a/pkgs/tools/security/minio-certgen/default.nix b/pkgs/tools/security/minio-certgen/default.nix index b09a37a238f..ee4413c9041 100644 --- a/pkgs/tools/security/minio-certgen/default.nix +++ b/pkgs/tools/security/minio-certgen/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio-certgen"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "minio"; repo = "certgen"; rev = "v${version}"; - sha256 = "sha256-YLFrW0w1H6u/lTP4fWPcRFTG9gIm228J2KcE4VSeG2Q="; + sha256 = "sha256-Qs+wpx9pRdWdY9FrBaKM8gdB0+POy80I6DB4UaBsJEE="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/mokutil/default.nix b/pkgs/tools/security/mokutil/default.nix new file mode 100644 index 00000000000..a84763a242f --- /dev/null +++ b/pkgs/tools/security/mokutil/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, openssl +, efivar +, keyutils +}: + +stdenv.mkDerivation rec { + pname = "mokutil"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "lcp"; + repo = pname; + rev = version; + sha256 = "sha256-dt41TCr6RkmE9H+NN8LWv3ogGsK38JtLjVN/b2mbGJs="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + openssl + efivar + keyutils + ]; + + meta = with lib; { + homepage = "https://github.com/lcp/mokutil"; + description = "Utility to manipulate machines owner keys"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ nickcao ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 71533b1172b..0b3e21b73d1 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tu7jj2rRREXH9jsQBWXncjCD6MXCddB99mr6h9ng8GA="; + sha256 = "sha256-4jByNyO0EvJ2ppdg21+7YfeB9arjBZALrOm5MJlkZsg="; }; - vendorSha256 = "sha256-ezUknVPlIbiy6PmpOgkUQU4kfH2Ic8Wn64zwoyqJMl0="; + vendorSha256 = "sha256-717+jJiyqmctR9Yb/XnnKd1N+31K2+xO1XClGMKlL+k="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index f6fade16b86..60dc724d5aa 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "pgpdump"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "pgpdump"; rev = "v${version}"; - sha256 = "1vvxhbz8nqzw9gf7cdmas2shzziznsqj84w6w74h8zzgb4m3byzz"; + sha256 = "sha256-GjPy/feF437WtDqbEn1lGwWayWtvKhqsyJFMuH3IFl4="; }; buildInputs = lib.optionals supportCompressedPackets [ zlib bzip2 ]; diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/tools/security/pomerium-cli/default.nix new file mode 100644 index 00000000000..7dc7e3a7a90 --- /dev/null +++ b/pkgs/tools/security/pomerium-cli/default.nix @@ -0,0 +1,58 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, pomerium +}: + +let + inherit (lib) concatStringsSep concatMap id mapAttrsToList; +in +buildGoModule rec { + pname = "pomerium-cli"; + version = pomerium.version; + src = fetchFromGitHub { + owner = "pomerium"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256:0230b22xjnpykj8bcdahzzlsvlrd63z2cmg6yb246c5ngjs835q1"; + }; + + vendorSha256 = "sha256:0xx22lmh6wip1d1bjrp4lgab3q9yilw54v4lg24lf3xhbsr5si9b"; + subPackages = [ + "cmd/pomerium-cli" + ]; + + ldflags = let + # Set a variety of useful meta variables for stamping the build with. + setVars = { + "github.com/pomerium/cli/version" = { + Version = "v${version}"; + BuildMeta = "nixpkgs"; + ProjectName = "pomerium-cli"; + ProjectURL = "github.com/pomerium/cli"; + }; + }; + concatStringsSpace = list: concatStringsSep " " list; + mapAttrsToFlatList = fn: list: concatMap id (mapAttrsToList fn list); + varFlags = concatStringsSpace ( + mapAttrsToFlatList (package: packageVars: + mapAttrsToList (variable: value: + "-X ${package}.${variable}=${value}" + ) packageVars + ) setVars); + in [ + "${varFlags}" + ]; + + installPhase = '' + install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli + ''; + + meta = with lib; { + homepage = "https://pomerium.io"; + description = "Client-side helper for Pomerium authenticating reverse proxy"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/sdlookup/default.nix b/pkgs/tools/security/sdlookup/default.nix new file mode 100644 index 00000000000..80b6d3ba688 --- /dev/null +++ b/pkgs/tools/security/sdlookup/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "sdlookup"; + version = "unstable-2022-03-10"; + + src = fetchFromGitHub { + owner = "j3ssie"; + repo = pname; + rev = "8554bfa27284c4764401dbd8da23800d4ae968a2"; + hash = "sha256-c6xAgOxle51waiFsSWvwO9eyt1KXuM0dEeepVsRQHkk="; + }; + + vendorSha256 = "sha256-j0UzucZ6kDwM+6U0ZyIW9u8XG/Bn+VUCO2vV1BbnQo0="; + + meta = with lib; { + description = "IP lookups for open ports and vulnerabilities from internetdb.shodan.io"; + homepage = "https://github.com/j3ssie/sdlookup"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 18db48dfb24..324af6aa4c9 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -25,16 +25,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia"; # Upstream has separate version numbering for the library and the CLI frontend. # This derivation provides the CLI frontend, and thus uses its version number. - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia"; rev = "sq/v${version}"; - sha256 = "13f582g10vba0cpbdmqkkfzgd5jgagb640jaz1w425wf5nbh6q50"; + sha256 = "1rcbv1s7wpxhrzw082q6vfrq1ja2ssfxn53c90h8fh5wrj7ns751"; }; - cargoSha256 = "sha256-qIGP48uj2iQ6MVgy5anKI9QrX9vnuKh46Fmmcczda4w="; + cargoSha256 = "0f3b8rh4pl03n8j9ihazaak214sv1rsksbgrb1nfcy8sq2yqfj4g"; nativeBuildInputs = [ pkg-config @@ -77,15 +77,6 @@ rustPlatform.buildRustPackage rec { # Sometimes, tests fail on CI (ofborg) & hydra without this CARGO_TEST_ARGS = "--workspace --exclude sequoia-store"; - # Without this, the examples won't build - postPatch = '' - substituteInPlace openpgp-ffi/examples/Makefile \ - --replace '-O0 -g -Wall -Werror' '-g' - substituteInPlace ffi/examples/Makefile \ - --replace '-O0 -g -Wall -Werror' '-g' - ''; - - preInstall = lib.optionalString pythonSupport '' export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" '' + lib.optionalString (!pythonSupport) '' diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix new file mode 100644 index 00000000000..5a6a3ab9ef5 --- /dev/null +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sigma-cli"; + version = "0.3.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = pname; + rev = "v${version}"; + hash = "sha256-We6vJXLIxGe//78pgJFrihFJHl0gRd02I53hoYWcao0="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + prettytable + pysigma + pysigma-backend-splunk + pysigma-pipeline-crowdstrike + pysigma-pipeline-sysmon + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'prettytable = "^3.1.1"' 'prettytable = "*"' + ''; + + pythonImportsCheck = [ + "sigma.cli" + ]; + + meta = with lib; { + description = "Sigma command line interface"; + homepage = "https://github.com/SigmaHQ/sigma-cli"; + license = with licenses; [ lgpl21Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sonar-scanner-cli/default.nix b/pkgs/tools/security/sonar-scanner-cli/default.nix index 95db01370b4..553019299ba 100644 --- a/pkgs/tools/security/sonar-scanner-cli/default.nix +++ b/pkgs/tools/security/sonar-scanner-cli/default.nix @@ -2,16 +2,16 @@ let - version = "4.5.0.2216"; + version = "4.7.0.2747"; sonarScannerArchPackage = { "x86_64-linux" = { url = "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${version}-linux.zip"; - sha256 = "sha256-rmvDb5l2BGV8j94Uhu2kJXwoDAHA3VncAahqGvLY3I0="; + sha256 = "0qy97lcn9nfwg0x32v9x5kh5jswnjyw3wpvxj45z7cddlj2is4iy"; }; "x86_64-darwin" = { url = "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${version}-macosx.zip"; - sha256 = "1g3lldpkrjlvwld9h82hlwclyplxpbk4q3nq59ylw4dhp26kb993"; + sha256 = "0f8km7wqkw09g01l03kcrjgvq7b6xclzpvb5r64ymsmrc39p0ylp"; }; }; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 1cf89143925..9752d78a183 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sops"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "mozilla"; repo = pname; - sha256 = "0z3jcyl245yjszzjf2h6l1dwa092vxzvfmnivmwi6jvpsdcv33h1"; + sha256 = "sha256-NMuYMvaBSxKHvpqFkMfnMDvcXxTstqzracuSTT1VB1A="; }; - vendorSha256 = "1mnwgsbpi56ql0lbpn7dkaps96x9b1lmhlk5cd6d40da7xj616n7"; + vendorSha256 = "sha256-00/7O9EcGojUExJPtYWndb16VqrNby/5GsVs8Ak/Isc="; doCheck = false; diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index bb165c41d07..5f06abeda1b 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { meta = with lib; { description = "The SPIFFE Runtime Environment"; - homepage = "github.com/spiffe/spire"; + homepage = "https://github.com/spiffe/spire"; license = licenses.asl20; maintainers = with maintainers; [ jonringer fkautz ]; }; diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 1c9dfc36107..0885c1d2de6 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = version; - sha256 = "sha256-ROdi1pU2VeswmItHOSZimOkPYlgdqEMg2b7zt0f9WrM="; + sha256 = "sha256-lFb+W2PSmXzzNhG+yNmnDNqtUc0TsDYYnsBnKdsiPSo="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 97a42646312..b650b93f411 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-oebmJ+xrJTV5gXH3U1lWCSQMHiVnUTa0ZTp39sVB7KM="; + sha256 = "sha256-BhPup3q2muYGWzAa/9b4vnIjBces4GhUHZ/mg4CWMRc="; }; - vendorSha256 = "sha256-IJXJS+Z93Hw1I1CAeRv4mq8as9DKebqNFa0IMgZ+Kic="; + vendorSha256 = "sha256-oVaziWZGslZCVqkEXL32XvOVU54VOf41Qg+VoVWo7x0="; ldflags = [ "-buildid=" ]; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index e91a35b808c..0f8f37a4890 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gMJFzfqQsxOXPRdRj48c3FKhXsPLEmegiENa2OHWEGo="; + sha256 = "sha256-Ki6MrLVJf2U4Q0y6jtOQZOti/m3SULWNKZ9SdirlOVA="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-wnMQPnL8M57BOY9QmawLpqtWv+n3GdfIadJ3PwuicOU="; + vendorSha256 = "sha256-ftBZQmtrnGFMZRXDKmMyqnfxuY5vtrZDXVR43yd1shk="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 7baf1cf6b81..5385a9aba35 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.9"; + version = "1.9.10"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "sha256-bW7oY6O8Jsh2YQk6dOxj4Q/QMc66cUZC0hY23+JePgA="; + sha256 = "sha256-RKFGEJjnx7jmrFl0mcJPsuQ3SMDBOai0lE5X0TSaZPQ="; }; prePatch = '' diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index 648165d8262..39128084352 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -16,35 +16,40 @@ stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-LJQF8PlRkhCJ8rjZzDetg1BFuTb7GBJ8lW6u5hO134k="; + sha256 = "sha256-qeyPCJTNnwuaCosHzqnrQc0JNznGBfDTLsuDmuKREjU="; }; nativeBuildInputs = [ pkg-config unixtools.netstat expect socat perl # for pod2man + python3 autoreconfHook ]; checkInputs = [ - python3 which + which ]; buildInputs = [ libtpms - openssl libtasn1 libseccomp - fuse glib json-glib + openssl libtasn1 + glib json-glib gnutls + ] ++ lib.optionals stdenv.isLinux [ + fuse + libseccomp ]; configureFlags = [ - "--with-cuse" "--localstatedir=/var" + ] ++ lib.optionals stdenv.isLinux [ + "--with-cuse" ]; postPatch = '' @@ -56,9 +61,31 @@ stdenv.mkDerivation rec { # Use the correct path to the certtool binary # instead of relying on it being in the environment - substituteInPlace src/swtpm_localca/swtpm_localca.c --replace \ + substituteInPlace src/swtpm_localca/swtpm_localca.c \ + --replace \ + '# define CERTTOOL_NAME "gnutls-certtool"' \ + '# define CERTTOOL_NAME "${gnutls}/bin/certtool"' \ + --replace \ '# define CERTTOOL_NAME "certtool"' \ '# define CERTTOOL_NAME "${gnutls}/bin/certtool"' + + substituteInPlace tests/common --replace \ + 'CERTTOOL=gnutls-certtool;;' \ + 'CERTTOOL=certtool;;' + + # Fix error on macOS: + # stat: invalid option -- '%' + # This is caused by the stat program not being the BSD version, + # as is expected by the test + substituteInPlace tests/common --replace \ + 'if [[ "$(uname -s)" =~ (Linux|CYGWIN_NT-) ]]; then' \ + 'if [[ "$(uname -s)" =~ (Linux|Darwin|CYGWIN_NT-) ]]; then' + + # Otherwise certtool seems to pick up the system language on macOS, + # which might cause a test to fail + substituteInPlace tests/test_swtpm_setup_create_cert --replace \ + '$CERTTOOL' \ + 'LC_ALL=C.UTF-8 $CERTTOOL' ''; doCheck = true; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index d11426a2b48..a33c26419e1 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tboot"; - version = "1.10.3"; + version = "1.10.4"; src = fetchurl { url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz"; - sha256 = "sha256-ixFs9Bd6VNT1n5RU6n38hFR+m4+SBNzwrCNXRmCHgOQ="; + sha256 = "sha256-iEn6mZ0tuDBA1a2POpJEBaIM0TMVDohbVvp/6OO4nAY="; }; buildInputs = [ openssl trousers zlib ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 76bfee42196..571b4e7f4da 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.6.9"; + version = "0.4.6.10"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "1ad99k4wysxrnlaprv7brxr2nc0h5zdnrh0rma10pqlck2037sf7"; + sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw="; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/tor/update.nix b/pkgs/tools/security/tor/update.nix index c944883d417..50353ce32a6 100644 --- a/pkgs/tools/security/tor/update.nix +++ b/pkgs/tools/security/tor/update.nix @@ -15,14 +15,11 @@ with lib; let downloadPageUrl = "https://dist.torproject.org"; - # See https://www.torproject.org/docs/signing-keys.html + # See https://support.torproject.org/little-t-tor/#fetching-the-tor-developers-key signingKeys = [ - # Roger Dingledine - "B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5" - "F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451" - # Nick Mathewson - "2133 BC60 0AB1 33E1 D826 D173 FE43 009C 4607 B1FB" - "B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5" + "514102454D0A87DB0767A1EBBE6A0531C18A9179" # Alexander Færøy + "B74417EDDF22AC9F9E90F49142E86A2A11F48D36" # David Goulet + "2133BC600AB133E1D826D173FE43009C4607B1FB" # Nick Mathewson ]; in @@ -52,20 +49,24 @@ srcName=''${srcBase/.tar.gz/} srcVers=(''${srcName//-/ }) version=''${srcVers[1]} -sigUrl=$srcUrl.asc +checksumUrl=$srcUrl.sha256sum +checksumFile=''${checksumUrl##*/} + +sigUrl=$checksumUrl.asc sigFile=''${sigUrl##*/} # upstream does not support byte ranges ... [[ -e "$srcFile" ]] || curl -L -o "$srcFile" -- "$srcUrl" +[[ -e "$checksumFile" ]] || curl -L -o "$checksumFile" -- "$checksumUrl" [[ -e "$sigFile" ]] || curl -L -o "$sigFile" -- "$sigUrl" export GNUPGHOME=$PWD/gnupg mkdir -m 700 -p "$GNUPGHOME" gpg --batch --recv-keys ${concatStringsSep " " (map (x: "'${x}'") signingKeys)} -gpg --batch --verify "$sigFile" "$srcFile" +gpg --batch --verify "$sigFile" "$checksumFile" -sha256=$(nix-hash --type sha256 --flat --base32 "$srcFile") +sha256sum -c "$checksumFile" -update-source-version tor "$version" "$sha256" +update-source-version tor "$version" "$(cut -d ' ' "$checksumFile")" '' diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/tools/security/traitor/default.nix index 8132364298b..3401fe4f31e 100644 --- a/pkgs/tools/security/traitor/default.nix +++ b/pkgs/tools/security/traitor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "traitor"; - version = "0.0.9"; + version = "0.0.14"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SHfAPPVq5OmS0yPaSXGsMjskQdosoBN4XRLSzkrviJM="; + sha256 = "sha256-LQfKdjZaTm5z8DUt6He/RJHbOUCUwP3CV3Fyt5rJIfU="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 6f1de7b45a9..458e2a53389 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-2pysQsJynuedqX9Yi4BjTnWuJZ5XTq11UEgkSh7eZyw="; + sha256 = "sha256-zqtRM2p+RrLrXzDCMtHJZNx/dKWyFqM+3V5eICwWvWs="; }; - vendorSha256 = "sha256-LNN0u48B6xGjrUasxGF+4sw1HxiR22hj8H2/mSyh1SI="; + vendorSha256 = "sha256-EiQ6XmGrw1O2Zd8TM7HSr3sQUd1naQYKbYLKB/vWdXU="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index 571685afb40..bb15d9d72cc 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -1,25 +1,57 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "witness"; - version = "0.1.1"; + version = "0.1.6"; src = fetchFromGitHub { owner = "testifysec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NnDsiDUTCdjsHVA/mHnB8WRnvwFTzETkWUOd7IgMIWE="; + sha256 = "sha256-/35hIA6Wm/F5hwyLZbt4JXpwWISWbzVAWrX29r6pejY="; }; - vendorSha256 = "sha256-zkLparWJsuqrhOQxxV37dBqt6fwpSinTO+paJkbl+sM="; + vendorSha256 = "sha256-vXDsHHJknw9hsHx1mJA2c0CWwFbRXjCjitNWPh6V4yw="; + + nativeBuildInputs = [ installShellFiles ]; # We only want the witness binary, not the helper utilities for generating docs. subPackages = [ "cmd/witness" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/testifysec/witness/cmd/witness/cmd.Version=v${version}" + ]; + + # Feed in all tests for testing + # This is because subPackages above limits what is built to just what we + # want but also limits the tests + preCheck = '' + unset subPackages + ''; + + postInstall = '' + installShellCompletion --cmd witness \ + --bash <($out/bin/witness completion bash) \ + --fish <($out/bin/witness completion fish) \ + --zsh <($out/bin/witness completion zsh) + ''; + meta = with lib; { description = "A pluggable framework for software supply chain security. Witness prevents tampering of build materials and verifies the integrity of the build process from source to target"; + longDescription = '' + Witness prevents tampering of build materials and verifies the integrity + of the build process from source to target. It works by wrapping commands + executed in a continuous integration process. Its attestation system is + pluggable and offers support out of the box for most major CI and + infrastructure providers. Verification of Witness metadata and a secure + PKI distribution system will mitigate against many software supply chain + attack vectors and can be used as a framework for automated governance. + ''; homepage = "https://github.com/testifysec/witness"; + changelog = "https://github.com/testifysec/witness/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ fkautz ]; + maintainers = with maintainers; [ fkautz jk ]; }; } diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 082f163437c..9295dd40099 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "yara"; - version = "4.2.0-rc1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; rev = "v${version}"; - hash = "sha256-WcN6ClYO2d+/MdG06RHx3kN0o0WVAY876dJiG7CwJ8w="; + hash = "sha256-ECvNob5QbOe5JfaDMGvSxCS+E9nqdsfSCZAVlAs18q4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index c7db9e363f9..85aaee0bb9e 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.2.3"; - hash = "sha256-vH167BL2ekWwxIhQWXkgJxl8z77S8SkmHVclW6XGc+8="; + version = "1.2.5"; + hash = "sha256-W7DTaJVA9xqdgBjrrR+OK1buBMrjpw2T0I//ZZKQFOw="; src = fetchFromGitHub { owner = "aristocratos"; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 7a16c5ab592..5d09020eec3 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.27.2"; + version = "0.28.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-Uqb0HXaYHGcW7lkUNLa2oXM0gu+SWwpv+NdPnOO87cs="; + sha256 = "sha256-9NsudhalFm0km7BmK+2QzK9LxirrVtIFzNrugpw4f8g="; }; - vendorSha256 = "sha256-my4ECzmvrPhbKlcEptQ0xi4lYxHm42IrEsOvcetuMeQ="; + vendorSha256 = "sha256-SUbQPzFZUBgFZvaLc8730hZhJvt3/ni306Vt3EZMOmU="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 43d37569ba3..2bb49bf9803 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "List files recursively"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ vika_nezrimaya ]; + maintainers = with maintainers; [ vikanezrimaya ]; }; } diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix index ad10f0c6c9b..411c1054434 100644 --- a/pkgs/tools/system/natscli/default.nix +++ b/pkgs/tools/system/natscli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.0.29"; + version = "0.0.30"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q1T+bDOOPs4eLnRWkYG6VY0AwfG/W2boSY5DZhMv+ZI="; + sha256 = "sha256-+WvJWHRQr5wYV9TG5e379trBO2Gwy0/4bAEJNwDun7s="; }; - vendorSha256 = "sha256-YTvgofZoWGDZL/ujjZ9RqAgv6UH2caZBrV9/uav3KVw="; + vendorSha256 = "sha256-IHDJp+cjukX916dvffpv4Wit9kmuY101fasN+ChMxWQ="; meta = with lib; { description = "NATS Command Line Interface"; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index c91f5d818b1..1a2530d0a06 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${version}"; - hash = "sha256-zfsNGDAwBD91w0loWxd8AwuZ3kZSPCXMxxQnX6ktOiE="; + hash = "sha256-SQ6eBQzZ8CBD9RlIjt25FrOuWUSybBzx6ZzCOzHbxdI="; }; nativeBuildInputs = [ cmake wrapPython ]; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 5d7fd2b1b6d..6948728f16b 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "syslog-ng"; - version = "3.35.1"; + version = "3.36.1"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-HQI4sGs+WYfIWeW1Kezuc491us/wSxSTmLH+jLsSHlM="; + sha256 = "sha256-kKJcl2f+dJ21DxGN38kuxxOZdj0uzVrU8R/17qBJ5gs="; }; nativeBuildInputs = [ pkg-config which ]; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index eb1e8ab5a34..f2fae161daa 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { "--enable-gtk-doc" "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "--disable-werror" ]; preConfigure = "NO_CONFIGURE=1 ./autogen.sh"; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 9d56e2e4c19..a7e8293851b 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto }: +{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto, diffutils }: stdenv.mkDerivation rec { pname = "colordiff"; @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace 'TMPDIR=colordiff-''${VERSION}' "" + + substituteInPlace colordiff.pl \ + --replace '= "diff";' '= "${diffutils}/bin/diff";' ''; installFlags = [ diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index 844a09f0d58..85d78ffb732 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa"; }; - cargoSha256 = "05rfjangmyvmqm0bvl4bcvc7m4zhg66gknh85sxr3bzrlwzacwgw"; + cargoSha256 = "0pn3vqv13n29h8069a38306vjlzlxf1m08ldv7lpzgqxhl8an00r"; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 729a0900f85..14c95bd2f3b 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.19.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-pZyQnPIdyS8XkzP9KwGKRjF21YWGgCVNeQSie9g5NcE="; + sha256 = "sha256-VV4nCR+BGly+EdCkyI4KeS0Zmn6NkfRsMs//0Sj3E20="; }; - cargoSha256 = "sha256-VXbCrhoGF6bCzQ02Y1LQkbEVrmIfDIKFWF9vx43tt94="; + cargoSha256 = "sha256-MyCi5PuUs9MJArDFaBgjjBInYJAS/SAPe1iNTs9feLY="; meta = with lib; { description = "A syntax-aware diff"; diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix new file mode 100644 index 00000000000..b7fc915c44d --- /dev/null +++ b/pkgs/tools/text/igrep/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, Security +, testVersion +, igrep +}: + +rustPlatform.buildRustPackage rec { + pname = "igrep"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "konradsz"; + repo = "igrep"; + rev = "v${version}"; + sha256 = "sha256-CH0wf9EhNnfi93W/4IJf6bPqU4pgw6Q9965Wjln9pso="; + }; + + cargoSha256 = "sha256-VnZuRLBt/Q+D89+jKm0rak+ID5oNbvN1k8or3pYzfIM="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + passthru.tests = { + version = testVersion { package = igrep; command = "ig --version"; }; + }; + + meta = with lib; { + description = "Interactive Grep"; + homepage = "https://github.com/konradsz/igrep"; + changelog = "https://github.com/konradsz/igrep/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 1362591e24c..07f82c08591 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oTBxLO7wdN9pFCaQn8SjMrZvTD8UkKVIq1v7RjFsOFo="; + sha256 = "sha256-CDchWW2dQ3O8LxKYOUqN21tVp61NckKTOnzYrmRoPBo="; }; buildInputs = [ boost ]; diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index ce377fada9f..8c49fb5ee7f 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -2,24 +2,27 @@ stdenv.mkDerivation rec { pname = "recode"; - version = "3.7.9"; + version = "3.7.12"; # Use official tarball, avoid need to bootstrap/generate build system src = fetchurl { url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-5DIKaw9c2DfNtFT7WFQBjd+pcJEWCOHwHMLGX2M2csQ="; + hash = "sha256-TbHJB28E26oVlyb1AAhH5eWoOuyOXGT4ygQ4P2zaEtU="; }; nativeBuildInputs = [ python3 python3.pkgs.cython perl intltool flex texinfo libiconv ]; buildInputs = [ libintl ]; + enableParallelBuilding = true; + doCheck = true; meta = { homepage = "https://github.com/rrthomas/recode"; description = "Converts files between various character sets and usages"; + changelog = "https://github.com/rrthomas/recode/raw/v${version}/NEWS"; platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; + license = with lib.licenses; [ lgpl3Plus gpl3Plus ]; maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index 11cb4e6db07..c882e046c3d 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ruplacer"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "TankerHQ"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5r1OywctKAeSBPzjYSPith1QNxRH0hman7lnSym2XIY="; + sha256 = "sha256-jLGstlEqABT4ejdYlTQZaBVeYy86+lqIilyufPGIZyQ="; }; - cargoSha256 = "sha256-JrVPEuGBVo+NCsZ1DH/Af8OLWiNXnQIBxiOukw+W5Qo="; + cargoSha256 = "sha256-cv+g68WQvnnd0qZDB9PfZLbsdrM+RXs27a0Q5YPiHDQ="; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index b59a96bb3f8..4b4ec194a97 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "1x6pxzl2fxv0ldfdlgm5x2pcbkny8cf2b4gpk8yj8hhnn1ypim1w"; + sha256 = "sha256-Xw/Rs30mH81b8qqdpmbXjSSYIG08wwRvykzhPpF94uk="; }; - cargoSha256 = "0v5jc26icz83ssky85c8l92jcmglq9f2jbihfh4yqanpmwbpp5fl"; + cargoSha256 = "sha256-JzYCxsaBuQ5I+FgHVRQPNM32bJlE4H9Fd+48/jXDcr0="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index b094e223031..469f76fdc2b 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "svt-av1"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${version}"; - sha256 = "sha256-kmFyJ5b0EiesWUN71rbULF2cQt2pICF0P/MeZ+h7W9U="; + sha256 = "sha256-PIr2bCEKj1dXKiGWloZv2v+ed6JdHK3z+p11ugWGzAk="; }; nativeBuildInputs = [ cmake nasm ]; diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 31a3e5dac4c..9ae525bb7f2 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,8 +13,8 @@ let sha256 = "1f0nrdg8hf650qxz79i3a1d2zyf24niyrcnbnhc9i7hzbnqbp5qg"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.115.0"; - specSha256 = "1s9pis1jl6d8znkb8hwsv89wzf38bhjing4x4q9ggy038y7xkkwg"; + specVersion = "4.118.3"; + specSha256 = "0jf4fnadcdfm4ja0d0m5rxcpg48cqsi9plaqz6kwyx3mp2snx9yc"; 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.17.1"; + version = "5.17.2"; src = fetchFromGitHub { owner = "linode"; diff --git a/pkgs/tools/wayland/gnome-randr/default.nix b/pkgs/tools/wayland/gnome-randr/default.nix new file mode 100644 index 00000000000..9c88130f27b --- /dev/null +++ b/pkgs/tools/wayland/gnome-randr/default.nix @@ -0,0 +1,33 @@ +{ dbus +, fetchFromGitHub +, lib +, pkg-config +, rustPlatform +}: +let + version = "0.1.1"; +in +rustPlatform.buildRustPackage { + pname = "gnome-randr"; + inherit version; + + src = fetchFromGitHub { + owner = "maxwellainatchi"; + repo = "gnome-randr-rust"; + rev = "v" + version; + sha256 = "sha256-mciHgBEOCFjRA4MSoEdP7bIag0KE+zRbk4wOkB2PAn0="; + }; + + cargoSha256 = "sha256-rk8/sg5rSNS741QOWoAGIloqph+ZdBjl/xUaFl0A3Bs="; + + buildInputs = [ dbus ]; + + nativeBuildInputs = [ pkg-config ]; + + meta = { + description = "An xrandr-like CLI for configuring displays on GNOME/Wayland, on distros that don't support `wlr-randr`"; + homepage = "https://github.com/maxwellainatchi/gnome-randr-rust"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.roberth ]; + }; +} diff --git a/pkgs/tools/wayland/wl-gammactl/default.nix b/pkgs/tools/wayland/wl-gammactl/default.nix new file mode 100644 index 00000000000..98bfc40169a --- /dev/null +++ b/pkgs/tools/wayland/wl-gammactl/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub +, meson, pkg-config, ninja +, wayland, wayland-scanner, wlroots, wlr-protocols, gtk3 +}: + +stdenv.mkDerivation rec { + pname = "wl-gammactl"; + version = "unstable-2021-09-13"; + + src = fetchFromGitHub { + owner = "mischw"; + repo = pname; + rev = "e2385950d97a3baf1b6e2f064dd419ccec179586"; + sha256 = "8iMJK4O/sNIGPOBZQEfK47K6OjT6sxYFe19O2r/VSr8="; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ wayland wlroots gtk3 ]; + + postUnpack = '' + rmdir source/wlr-protocols + ln -s ${wlr-protocols}/share/wlr-protocols source + ''; + + postPatch = '' + substituteInPlace meson.build --replace "git = find_program('git')" "git = 'false'" + ''; + + meta = with lib; { + description = "Contrast, brightness, and gamma adjustments for Wayland"; + longDescription = '' + Small GTK GUI application to set contrast, brightness, and gamma for wayland compositors which + support the wlr-gamma-control protocol extension. + ''; + homepage = "https://github.com/mischw/wl-gammactl"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ lodi ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 38e6d5dcc0d..923dfe7b47d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -162,11 +162,13 @@ mapAliases ({ clang10Stdenv = lowPrio llvmPackages_10.stdenv; clang11Stdenv = lowPrio llvmPackages_11.stdenv; clang12Stdenv = lowPrio llvmPackages_12.stdenv; + clang13Stdenv = lowPrio llvmPackages_13.stdenv; clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22 + clearsilver = throw "clearsilver has been removed: abandoned by upstream"; # Added 2022-03-15 clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22 cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05 codimd = hedgedoc; # Added 2020-11-29 @@ -319,6 +321,8 @@ mapAliases ({ fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # Added 2021-04-13 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 + finger_bsd = bsd-finger; + fingerd_bsd = bsd-fingerd; firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25."; firefox-esr-wrapper = throw "'firefox-esr-wrapper' has been renamed to/replaced by 'firefox-esr'"; # Converted to throw 2022-02-22 firefoxWrapper = throw "'firefoxWrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 @@ -798,6 +802,7 @@ mapAliases ({ nix_2_4 = nixVersions.nix_2_4; nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; + nixopsUnstable = nixops_unstable; # Added 2022-03-03 nmap-unfree = nmap; # Added 2021-04-06 nmap_graphical = throw "'nmap_graphical' has been renamed to/replaced by 'nmap-graphical'"; # Converted to throw 2022-02-22 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 @@ -1121,8 +1126,6 @@ mapAliases ({ source-han-serif-korean = source-han-serif; source-han-serif-simplified-chinese = source-han-serif; source-han-serif-traditional-chinese = source-han-serif; - source-sans-pro = source-sans; # Added 2021-10-20 - source-serif-pro = source-serif; # Added 2021-10-20 spaceOrbit = throw "'spaceOrbit' has been renamed to/replaced by 'space-orbit'"; # Converted to throw 2022-02-22 spectral = neochat; # Added 2020-12-27 @@ -1143,6 +1146,7 @@ mapAliases ({ squid4 = squid; # added 2019-08-22 sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22 stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 + steam-run-native = steam-run; # added 2022-02-21 stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; @@ -1192,6 +1196,7 @@ mapAliases ({ thunderbird-bin-68 = thunderbird-68; timescale-prometheus = promscale; # Added 2020-09-29 timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 + tkcvs = tkrev; # Added 2022-03-07 togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 tomboy = throw "tomboy is not actively developed anymore and was removed."; # Added 2022-01-27 tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16 @@ -1433,10 +1438,12 @@ mapAliases ({ plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake + zanshin ; inherit (plasma5Packages.thirdParty) krohnkite + krunner-ssh krunner-symbols kwin-dynamic-workspaces kwin-tiling diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8b54c390f8..c7663d3d9de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -147,9 +147,14 @@ with pkgs; autorestic = callPackage ../tools/backup/autorestic { }; - autoPatchelfHook = makeSetupHook - { name = "auto-patchelf-hook"; deps = [ bintools ]; } - ../build-support/setup-hooks/auto-patchelf.sh; + autoPatchelfHook = makeSetupHook { + name = "auto-patchelf-hook"; + deps = [ bintools ]; + substitutions = { + pythonInterpreter = "${python3.withPackages (ps: [ ps.pyelftools ])}/bin/python"; + autoPatchelfScript = ../build-support/setup-hooks/auto-patchelf.py; + }; + } ../build-support/setup-hooks/auto-patchelf.sh; appflowy = callPackage ../applications/office/appflowy { }; @@ -208,8 +213,11 @@ with pkgs; appthreat-depscan = callPackage ../development/tools/appthreat-depscan { }; + authy = callPackage ../applications/misc/authy { }; + authz0 = callPackage ../tools/security/authz0 { }; + avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; @@ -365,9 +373,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + pridecat = callPackage ../tools/misc/pridecat { }; + proto-contrib = callPackage ../development/tools/proto-contrib { }; - protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { }; protoc-gen-go = callPackage ../development/tools/protoc-gen-go { }; @@ -385,6 +395,8 @@ with pkgs; protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; + protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { }; + proton-caller = callPackage ../applications/emulators/proton-caller { }; ptags = callPackage ../development/tools/misc/ptags { }; @@ -464,6 +476,8 @@ with pkgs; buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; + mkNugetSource = callPackage ../build-support/dotnet/make-nuget-source { }; + mkNugetDeps = callPackage ../build-support/dotnet/make-nuget-deps { }; dotnetenv = callPackage ../build-support/dotnet/dotnetenv { dotnetfx = dotnetfx40; @@ -544,6 +558,10 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; + opendrop = python3Packages.callPackage ../tools/networking/opendrop { }; + + owl = callPackage ../tools/networking/owl { }; + packer = callPackage ../development/tools/packer { }; packr = callPackage ../development/libraries/packr { }; @@ -761,6 +779,8 @@ with pkgs; mkShell = callPackage ../build-support/mkshell { }; mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; }; + mokutil = callPackage ../tools/security/mokutil { }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -825,8 +845,9 @@ with pkgs; writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { }; - desktopToDarwinBundle = makeSetupHook { deps = [ writeDarwinBundle imagemagick ]; } - ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; + desktopToDarwinBundle = makeSetupHook { + 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; @@ -1028,8 +1049,12 @@ with pkgs; amidst = callPackage ../tools/games/minecraft/amidst { }; + cf-vault = callPackage ../tools/admin/cf-vault { }; + cope = callPackage ../tools/misc/cope { }; + ejson2env = callPackage ../tools/admin/ejson2env { }; + gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; }; @@ -1040,7 +1065,9 @@ with pkgs; weidu = callPackage ../tools/games/weidu { }; - weylus = callPackage ../applications/graphics/weylus { }; + weylus = callPackage ../applications/graphics/weylus { + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa VideoToolbox; + }; gfshare = callPackage ../tools/security/gfshare { }; @@ -1048,6 +1075,8 @@ with pkgs; gobgp = callPackage ../tools/networking/gobgp { }; + goflow = callPackage ../tools/networking/goflow { }; + gofu = callPackage ../applications/misc/gofu { }; godns = callPackage ../tools/networking/godns { }; @@ -1060,12 +1089,16 @@ with pkgs; ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; + license-generator = callPackage ../tools/misc/license-generator { }; + linux-router = callPackage ../tools/networking/linux-router { }; linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; metapixel = callPackage ../tools/graphics/metapixel { }; + midimonster = callPackage ../tools/audio/midimonster { }; + pferd = callPackage ../tools/misc/pferd {}; qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; @@ -1074,6 +1107,8 @@ with pkgs; redfang = callPackage ../tools/networking/redfang { }; + sdlookup = callPackage ../tools/security/sdlookup { }; + sx-go = callPackage ../tools/security/sx-go { }; tauon = callPackage ../applications/audio/tauon { }; @@ -1270,6 +1305,8 @@ with pkgs; aldo = callPackage ../applications/radio/aldo { }; + alglib = callPackage ../development/libraries/alglib { }; + almanah = callPackage ../applications/misc/almanah { }; alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { }; @@ -1742,6 +1779,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + distrobox = callPackage ../applications/virtualization/distrobox { }; + djmount = callPackage ../tools/filesystems/djmount { }; dgsh = callPackage ../shells/dgsh { }; @@ -2349,6 +2388,8 @@ with pkgs; borgmatic = callPackage ../tools/backup/borgmatic { }; + borg-sans-mono = callPackage ../data/fonts/borg-sans-mono { }; + boringtun = callPackage ../tools/networking/boringtun { }; bookstack = callPackage ../servers/web-apps/bookstack { }; @@ -2562,7 +2603,7 @@ with pkgs; cht-sh = callPackage ../tools/misc/cht.sh { }; - cinny = callPackage ../applications/networking/instant-messengers/cinny {}; + cinny = callPackage ../applications/networking/instant-messengers/cinny { stdenv = stdenvNoCC; }; ckbcomp = callPackage ../tools/X11/ckbcomp { }; @@ -2696,6 +2737,8 @@ with pkgs; wlsunset = callPackage ../tools/wayland/wlsunset { }; + wl-gammactl = callPackage ../tools/wayland/wl-gammactl { }; + wluma = callPackage ../tools/wayland/wluma { }; wob = callPackage ../tools/wayland/wob { }; @@ -3339,6 +3382,10 @@ with pkgs; iotools = callPackage ../tools/misc/iotools { }; + irpf = callPackage ../applications/finance/irpf { }; + + jellycli = callPackage ../applications/audio/jellycli { }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { @@ -3383,6 +3430,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + lapce = callPackage ../applications/editors/lapce { }; + lcdproc = callPackage ../servers/monitoring/lcdproc { }; languagetool = callPackage ../tools/text/languagetool { }; @@ -3617,7 +3666,7 @@ with pkgs; odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; - oil-buku = callPackage ../applications/misc/oil { }; + oil-buku = callPackage ../applications/misc/oil-buku { }; ossutil = callPackage ../tools/admin/ossutil {}; @@ -3667,6 +3716,8 @@ with pkgs; precice = callPackage ../development/libraries/precice { }; + precice-config-visualizer = callPackage ../tools/misc/precice-config-visualizer { }; + pueue = callPackage ../applications/misc/pueue { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -4214,6 +4265,8 @@ with pkgs; colord-gtk = callPackage ../tools/misc/colord-gtk { }; + colord-gtk4 = colord-gtk.override { withGtk4 = true; }; + colordiff = callPackage ../tools/text/colordiff { }; connect = callPackage ../tools/networking/connect { }; @@ -4400,6 +4453,8 @@ with pkgs; brotli = callPackage ../tools/compression/brotli { }; + biodiff = callPackage ../development/tools/biodiff { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; @@ -4463,6 +4518,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + cobang = python3Packages.callPackage ../applications/misc/cobang { + gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; + }; + cocoapods = callPackage ../development/mobile/cocoapods { }; cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; }); @@ -4533,7 +4592,8 @@ with pkgs; cudatoolkit_11_2 cudatoolkit_11_3 cudatoolkit_11_4 - cudatoolkit_11_5; + cudatoolkit_11_5 + cudatoolkit_11_6; cudatoolkit = cudatoolkit_10; @@ -5192,6 +5252,8 @@ with pkgs; endlessh = callPackage ../servers/endlessh { }; + endlessh-go = callPackage ../servers/endlessh-go { }; + ericw-tools = callPackage ../applications/misc/ericw-tools { }; cryfs = callPackage ../tools/filesystems/cryfs { }; @@ -5379,6 +5441,10 @@ with pkgs; ferm = callPackage ../tools/networking/ferm { }; + feroxbuster = callPackage ../tools/security/feroxbuster { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ffsend = callPackage ../tools/misc/ffsend { inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security AppKit; }; @@ -5426,7 +5492,8 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; - finger_bsd = callPackage ../tools/networking/bsd-finger { }; + bsd-finger = callPackage ../tools/networking/bsd-finger { }; + bsd-fingerd = bsd-finger.override({ buildClient = false; }); iprange = callPackage ../applications/networking/firehol/iprange.nix {}; @@ -5494,6 +5561,8 @@ with pkgs; flawfinder = callPackage ../development/tools/flawfinder { }; + flintlock = callPackage ../applications/virtualization/flintlock { }; + flip-link = callPackage ../development/tools/flip-link { }; flips = callPackage ../tools/compression/flips { }; @@ -5544,8 +5613,6 @@ with pkgs; fpm = callPackage ../tools/package-management/fpm { }; - fprot = callPackage ../tools/security/fprot { }; - fprintd = callPackage ../tools/security/fprintd { }; fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { }; @@ -5962,6 +6029,8 @@ with pkgs; gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; + gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { }; + gitstats = callPackage ../applications/version-management/gitstats { }; gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { }; @@ -6014,6 +6083,8 @@ with pkgs; gnome-photos = callPackage ../applications/graphics/gnome-photos { }; + gnome-randr = callPackage ../tools/wayland/gnome-randr { }; + gnokii = callPackage ../tools/misc/gnokii { }; gnuapl = callPackage ../development/interpreters/gnu-apl { }; @@ -6196,6 +6267,10 @@ with pkgs; grin = callPackage ../tools/text/grin { }; + igrep = callPackage ../tools/text/igrep { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ripgrep = callPackage ../tools/text/ripgrep { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -6426,6 +6501,8 @@ with pkgs; hardinfo = callPackage ../tools/system/hardinfo { }; + hcl2json = callPackage ../applications/misc/hcl2json { }; + hcxtools = callPackage ../tools/security/hcxtools { }; hcxdumptool = callPackage ../tools/security/hcxdumptool { }; @@ -6724,9 +6801,7 @@ with pkgs; ipfs = callPackage ../applications/networking/ipfs { buildGoModule = buildGo116Module; }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { - buildGoModule = buildGo116Module; - }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { buildGoModule = buildGo116Module; @@ -6838,7 +6913,9 @@ with pkgs; jl = haskellPackages.callPackage ../development/tools/jl { }; - jless = callPackage ../development/tools/jless { }; + jless = callPackage ../development/tools/jless { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; jmespath = callPackage ../development/tools/jmespath { }; @@ -6947,6 +7024,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + kakoune-cr = callPackage ../tools/misc/kakoune-cr { }; + kbdd = callPackage ../applications/window-managers/kbdd { }; kbs2 = callPackage ../tools/security/kbs2 { @@ -7440,7 +7519,7 @@ with pkgs; leatherman = callPackage ../development/libraries/leatherman { }; ledit = callPackage ../tools/misc/ledit { - inherit (ocamlPackages) camlp5; + inherit (ocaml-ng.ocamlPackages_4_12) ocaml camlp5; }; ledmon = callPackage ../tools/system/ledmon { }; @@ -8134,9 +8213,6 @@ with pkgs; inherit (skawarePackages) cleanPackaging; }; - # stripped down, needed by steam - networkmanager098 = callPackage ../tools/networking/networkmanager/0.9.8 { }; - networkmanager = callPackage ../tools/networking/networkmanager { }; networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; @@ -8159,6 +8235,8 @@ with pkgs; libnma = callPackage ../tools/networking/networkmanager/libnma { }; + libnma-gtk4 = libnma.override { withGtk4 = true; }; + networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu { }; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; @@ -8170,7 +8248,7 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud20 nextcloud21 nextcloud22 nextcloud23; + nextcloud21 nextcloud22 nextcloud23; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -8246,6 +8324,8 @@ with pkgs; pa_applet = callPackage ../tools/audio/pa-applet { }; + pandoc-acro = python3Packages.callPackage ../tools/misc/pandoc-acro { }; + pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { }; @@ -8528,7 +8608,7 @@ with pkgs; openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; openrussian-cli = callPackage ../misc/openrussian-cli { - luaPackages = lua53Packages; + lua = lua5_3; }; opensbi = callPackage ../misc/opensbi { }; @@ -8673,7 +8753,7 @@ with pkgs; p7zip = callPackage ../tools/archivers/p7zip { }; - packagekit = callPackage ../tools/package-management/packagekit { }; + packagekit = callPackage ../tools/package-management/packagekit { nix = nixVersions.nix_2_6; }; packetdrill = callPackage ../tools/networking/packetdrill { }; @@ -8965,6 +9045,8 @@ with pkgs; pngnq = callPackage ../tools/graphics/pngnq { }; + pngoptimizer = callPackage ../tools/graphics/pngoptimizer { }; + pngtoico = callPackage ../tools/graphics/pngtoico { libpng = libpng12; }; @@ -8975,10 +9057,7 @@ with pkgs; podiff = callPackage ../tools/text/podiff { }; - podman = if stdenv.isDarwin then - callPackage ../applications/virtualization/podman { } - else - callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -9105,6 +9184,8 @@ with pkgs; pubs = callPackage ../tools/misc/pubs {}; + pulumictl = callPackage ../development/tools/pulumictl { }; + pure-prompt = callPackage ../shells/zsh/pure-prompt { }; pv = callPackage ../tools/misc/pv { }; @@ -9123,6 +9204,8 @@ with pkgs; pydf = callPackage ../applications/misc/pydf { }; + pyinfra = with python3Packages; toPythonApplication pyinfra; + pympress = callPackage ../applications/office/pympress { }; pyspread = libsForQt5.callPackage ../applications/office/pyspread { }; @@ -9294,6 +9377,8 @@ with pkgs; rcon = callPackage ../tools/networking/rcon { }; + rdap = callPackage ../tools/networking/rdap { }; + rdbtools = callPackage ../development/tools/rdbtools { python = python3; }; rdma-core = callPackage ../os-specific/linux/rdma-core { }; @@ -9534,6 +9619,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + rustdesk = callPackage ../applications/networking/remote/rustdesk { }; + rustscan = callPackage ../tools/security/rustscan { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9608,6 +9695,8 @@ with pkgs; samplicator = callPackage ../tools/networking/samplicator { }; + sanctity = callPackage ../tools/misc/sanctity { }; + sandboxfs = callPackage ../tools/filesystems/sandboxfs { }; sasquatch = callPackage ../tools/filesystems/sasquatch { }; @@ -9724,6 +9813,8 @@ with pkgs; shelldap = callPackage ../tools/misc/shelldap { }; + shellspec = callPackage ../tools/misc/shellspec { }; + schema2ldif = callPackage ../tools/text/schema2ldif { }; sharedown = callPackage ../tools/misc/sharedown { }; @@ -9768,6 +9859,8 @@ with pkgs; slither-analyzer = with python3Packages; toPythonApplication slither-analyzer; + sigma-cli = callPackage ../tools/security/sigma-cli { }; + signify = callPackage ../tools/security/signify { }; # aka., pgp-tools @@ -9807,7 +9900,9 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { }; + sks = callPackage ../servers/sks { + ocamlPackages = ocaml-ng.ocamlPackages_4_12; + }; skydns = callPackage ../servers/skydns { }; @@ -9855,6 +9950,8 @@ with pkgs; smu = callPackage ../tools/text/smu { }; + smug = callPackage ../tools/misc/smug { }; + smpq = callPackage ../applications/misc/smpq { }; sn0int = callPackage ../tools/security/sn0int { }; @@ -9869,6 +9966,8 @@ with pkgs; snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { }; + snet = callPackage ../tools/networking/snet { }; + sng = callPackage ../tools/graphics/sng { libpng = libpng12; }; @@ -9933,6 +10032,8 @@ with pkgs; sony-headphones-client = callPackage ../applications/audio/sony-headphones-client { }; + soundconverter = callPackage ../applications/audio/soundconverter { }; + soundkonverter = libsForQt5.soundkonverter; soundwireserver = callPackage ../applications/audio/soundwireserver { }; @@ -10604,7 +10705,7 @@ with pkgs; twurl = callPackage ../tools/misc/twurl { }; - txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; + txr = callPackage ../tools/misc/txr { inherit (llvmPackages_latest) stdenv; }; txt2man = callPackage ../tools/misc/txt2man { }; @@ -10828,6 +10929,8 @@ with pkgs; SDL = SDL_sixel; }; + vtm = callPackage ../tools/misc/vtm { }; + witness = callPackage ../tools/security/witness { }; openconnect = openconnect_gnutls; @@ -12674,10 +12777,9 @@ with pkgs; jdkdistro = oraclejdk8distro; oraclejdk8distro = installjdk: pluginSupport: - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { - inherit installjdk pluginSupport; - }); + (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { + inherit installjdk pluginSupport; + }); oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { }; @@ -12828,7 +12930,7 @@ with pkgs; else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 else if platform.isLinux then 11 - else if platform.isWasm then 8 + else if platform.isWasm then 12 else latest_version; # We take the "max of the mins". Why? Since those are lower bounds of the # supported version set, this is like intersecting those sets and then @@ -13238,6 +13340,7 @@ with pkgs; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; @@ -13973,8 +14076,18 @@ with pkgs; pipenv = callPackage ../development/tools/pipenv {}; - pipewire = callPackage ../development/libraries/pipewire {}; + pipewire = callPackage ../development/libraries/pipewire { + # ffmpeg depends on SDL2 which depends on pipewire by default. + # Break the cycle by disabling pipewire support in our ffmpeg. + ffmpeg = ffmpeg.override { + SDL2 = SDL2.override { + pipewireSupport = false; + }; + }; + }; + pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {}; + pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix {}; @@ -14058,8 +14171,11 @@ with pkgs; self = pkgsi686Linux.callPackage ../development/interpreters/self { }; inherit (callPackages ../applications/networking/cluster/spark { }) - spark3 - spark2; + spark_3_2 + spark_3_1 + spark_2_4; + spark3 = spark_3_2; + spark2 = spark_2_4; spark = spark3; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; @@ -14417,7 +14533,9 @@ with pkgs; bazelisk = callPackage ../development/tools/bazelisk { }; - rebazel = callPackage ../development/tools/rebazel { }; + rebazel = callPackage ../development/tools/rebazel { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; @@ -14732,10 +14850,7 @@ with pkgs; # This is for e.g. LLVM libraries on linux. gccForLibs = - # with gcc-7: undefined reference to `__divmoddi4' - if stdenv.targetPlatform.isi686 - then gcc6.cc - else if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU + if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU # Can only do this is in the native case, otherwise we might get infinite # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. then targetPackages.stdenv.cc.cc @@ -14916,6 +15031,7 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; + ocamlPackages = ocaml-ng.ocamlPackages_4_12; }; fly = callPackage ../development/tools/continuous-integration/fly { }; @@ -15191,6 +15307,8 @@ with pkgs; kubei = callPackage ../tools/security/kubei { }; + kubemq-community = callPackage ../servers/kubemq-community { }; + kubeone = callPackage ../applications/networking/cluster/kubeone { }; kubeprompt = callPackage ../development/tools/kubeprompt { }; @@ -15850,6 +15968,8 @@ with pkgs; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; + wails = callPackage ../development/tools/wails { }; + whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { }; whatstyle = callPackage ../development/tools/misc/whatstyle { @@ -16262,8 +16382,6 @@ with pkgs; classads = callPackage ../development/libraries/classads { }; - clearsilver = callPackage ../development/libraries/clearsilver { }; - clfft = callPackage ../development/libraries/clfft { }; clipp = callPackage ../development/libraries/clipp { }; @@ -16551,6 +16669,8 @@ with pkgs; fcl = callPackage ../development/libraries/fcl { }; + febio = callPackage ../development/libraries/febio { }; + ffcast = callPackage ../tools/X11/ffcast { }; fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; @@ -17794,6 +17914,8 @@ with pkgs; libctemplate = callPackage ../development/libraries/libctemplate { }; + libctl = callPackage ../development/libraries/libctl { }; + libcotp = callPackage ../development/libraries/libcotp { }; libcouchbase = callPackage ../development/libraries/libcouchbase { }; @@ -17970,6 +18092,8 @@ with pkgs; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome-keyring3 = gnome.libgnome-keyring; + libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; + libgnomekbd = callPackage ../development/libraries/libgnomekbd { }; libglvnd = callPackage ../development/libraries/libglvnd { }; @@ -18559,6 +18683,8 @@ with pkgs; libptytty = callPackage ../development/libraries/libptytty { }; + libpulsar = callPackage ../development/libraries/libpulsar { }; + libpwquality = callPackage ../development/libraries/libpwquality { }; libqalculate = callPackage ../development/libraries/libqalculate { @@ -18582,6 +18708,8 @@ with pkgs; libschrift = callPackage ../development/libraries/libschrift { }; + libsciter = callPackage ../development/libraries/libsciter { }; + libsearpc = callPackage ../development/libraries/libsearpc { }; libsigcxx = callPackage ../development/libraries/libsigcxx { }; @@ -18819,6 +18947,8 @@ with pkgs; libvori = callPackage ../development/libraries/libvori { }; + libwbxml = callPackage ../development/libraries/libwbxml { }; + libwebcam = callPackage ../os-specific/linux/libwebcam { }; libwebp = callPackage ../development/libraries/libwebp { }; @@ -18911,6 +19041,8 @@ with pkgs; libyubikey = callPackage ../development/libraries/libyubikey { }; + libyuv = callPackage ../development/libraries/libyuv { }; + libzapojit = callPackage ../development/libraries/libzapojit { }; libzen = callPackage ../development/libraries/libzen { }; @@ -19197,7 +19329,7 @@ with pkgs; ngtcp2 = callPackage ../development/libraries/ngtcp2 { }; - nix-plugins = callPackage ../development/libraries/nix-plugins { }; + nix-plugins = callPackage ../development/libraries/nix-plugins { nix = nixVersions.nix_2_5; }; nika-fonts = callPackage ../data/fonts/nika-fonts { }; @@ -19447,6 +19579,8 @@ with pkgs; osinfo-db = callPackage ../data/misc/osinfo-db { }; osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { }; + pacemaker = callPackage ../misc/logging/pacemaker { }; + p11-kit = callPackage ../development/libraries/p11-kit { }; paperkey = callPackage ../tools/security/paperkey { }; @@ -19648,12 +19782,12 @@ with pkgs; qmake4Hook = qmake48Hook; - qt48Full = appendToName "full" (qt48.override { + qt48Full = qt48.override { docs = true; demos = true; examples = true; developerBuild = true; - }); + }; qt512 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.12) { @@ -19943,6 +20077,8 @@ with pkgs; shhopt = callPackage ../development/libraries/shhopt { }; + shine = callPackage ../development/libraries/shine { }; + graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; s2n-tls = callPackage ../development/libraries/s2n-tls { }; @@ -20528,41 +20664,27 @@ with pkgs; wxformbuilder = callPackage ../development/tools/wxformbuilder { }; wxGTK = wxGTK28; - wxGTK30 = wxGTK30-gtk2; - wxGTK31 = wxGTK31-gtk2; - wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; + wxGTK28 = callPackage ../development/libraries/wxwidgets/wxGTK28.nix { }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { + wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; }; - wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { + wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { withGtk2 = true; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; + wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; + wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; }; - wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { - withGtk2 = false; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; - }; + wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { }; - wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { - withGtk2 = true; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; - }; - - wxGTK31-gtk3 = callPackage ../development/libraries/wxwidgets/3.1 { - withGtk2 = false; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; - }; - - wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { }; + wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { }; + wxGTK31-gtk2 = wxGTK31.override { withGtk2 = true; }; + wxGTK31-gtk3 = wxGTK31.override { withGtk2 = false; }; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30-gtk3; @@ -21164,8 +21286,6 @@ with pkgs; felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; - fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; - inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird; freeradius = callPackage ../servers/freeradius { }; @@ -21484,6 +21604,7 @@ with pkgs; openresty = callPackage ../servers/http/openresty { withPerl = false; + modules = []; }; opensmtpd = callPackage ../servers/mail/opensmtpd { }; @@ -21523,6 +21644,7 @@ with pkgs; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; pomerium = callPackage ../servers/http/pomerium { }; + pomerium-cli = callPackage ../tools/security/pomerium-cli { }; postgrey = callPackage ../servers/mail/postgrey { }; @@ -21806,6 +21928,7 @@ with pkgs; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; + prometheus-dmarc-exporter = callPackage ../servers/monitoring/prometheus/dmarc-exporter { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; @@ -21839,6 +21962,7 @@ with pkgs; prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; + prometheus-pve-exporter = callPackage ../servers/monitoring/prometheus/pve-exporter.nix { }; prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; @@ -22012,6 +22136,8 @@ with pkgs; slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; + slurm-spank-stunnel = callPackage ../servers/computing/slurm-spank-stunnel { }; + slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; @@ -23225,6 +23351,7 @@ with pkgs; buildUBoot ubootTools ubootA20OlinuxinoLime + ubootA20OlinuxinoLime2EMMC ubootBananaPi ubootBananaPim3 ubootBananaPim64 @@ -23773,6 +23900,8 @@ with pkgs; layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { }; + layan-kde = callPackage ../data/themes/layan-kde { }; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; @@ -24195,8 +24324,10 @@ with pkgs; source-code-pro = callPackage ../data/fonts/source-code-pro {}; source-sans = callPackage ../data/fonts/source-sans { }; + source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; source-serif = callPackage ../data/fonts/source-serif { }; + source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { }; @@ -24825,6 +24956,8 @@ with pkgs; carddav-util = callPackage ../tools/networking/carddav-util { }; + cardinal = callPackage ../applications/audio/cardinal { }; + carla = libsForQt5.callPackage ../applications/audio/carla { }; castor = callPackage ../applications/networking/browsers/castor { }; @@ -25292,12 +25425,12 @@ with pkgs; inherit (darwin) sigtool; }; - emacs27-nox = lowPrio (appendToName "nox" (emacs27.override { + emacs27-nox = lowPrio (emacs27.override { withX = false; withNS = false; withGTK2 = false; withGTK3 = false; - })); + }); emacsMacport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) @@ -25322,6 +25455,8 @@ with pkgs; eolie = callPackage ../applications/networking/browsers/eolie { }; + eos-installer = callPackage ../applications/misc/eos-installer { }; + epdfview = callPackage ../applications/misc/epdfview { }; epeg = callPackage ../applications/graphics/epeg { }; @@ -25375,6 +25510,10 @@ with pkgs; fnott = callPackage ../applications/misc/fnott { }; + furnace = callPackage ../applications/audio/furnace { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + gg-scm = callPackage ../applications/version-management/git-and-tools/gg { }; gigalixir = with python3Packages; toPythonApplication gigalixir; @@ -25393,6 +25532,8 @@ with pkgs; haruna = libsForQt5.callPackage ../applications/video/haruna { }; + hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { }; + helix = callPackage ../applications/editors/helix { }; icesl = callPackage ../applications/misc/icesl { }; @@ -25749,6 +25890,7 @@ with pkgs; }; wireshark-qt = wireshark; + tshark = wireshark-cli; wireshark-cli = wireshark.override { withQt = false; libpcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -26027,6 +26169,8 @@ with pkgs; got = callPackage ../applications/version-management/got { }; + gtkterm = callPackage ../tools/misc/gtkterm { }; + gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; hydrus = python3Packages.callPackage ../applications/graphics/hydrus { @@ -26485,6 +26629,8 @@ with pkgs; i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { }; + i3-swallow = python3Packages.callPackage ../applications/window-managers/i3/swallow.nix { }; + i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { }; @@ -26774,6 +26920,8 @@ with pkgs; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; + kchmviewer = libsForQt5.callPackage ../applications/misc/kchmviewer { }; + kappanhang = callPackage ../applications/radio/kappanhang { }; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; @@ -26884,6 +27032,8 @@ with pkgs; kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; + kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { }; + kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; kubernix = callPackage ../applications/networking/cluster/kubernix { }; @@ -26997,7 +27147,7 @@ with pkgs; caps = callPackage ../applications/audio/caps { }; - lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; }; + lbdb = callPackage ../tools/misc/lbdb { }; lbry = callPackage ../applications/video/lbry { }; @@ -27169,6 +27319,8 @@ with pkgs; luddite = with python3Packages; toPythonApplication luddite; + goobook = with python3Packages; toPythonApplication goobook; + lumail = callPackage ../applications/networking/mailreaders/lumail { lua = lua5_1; }; @@ -27493,6 +27645,11 @@ with pkgs; clerk = callPackage ../applications/audio/clerk { }; + jujutsu = callPackage ../applications/version-management/jujutsu { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin) libiconv; + }; + nbstripout = callPackage ../applications/version-management/nbstripout { python = python3; }; ncmpc = callPackage ../applications/audio/ncmpc { }; @@ -27558,6 +27715,7 @@ with pkgs; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; 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 {}; youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { }; cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { }; }; @@ -27879,7 +28037,7 @@ with pkgs; navipowm = callPackage ../applications/misc/navipowm { }; netbeans = callPackage ../applications/editors/netbeans { - jdk = jdk11; + jdk = jdk17; }; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; @@ -27942,6 +28100,8 @@ with pkgs; oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; + gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg_4 = ffmpeg-full; }; @@ -28041,7 +28201,9 @@ with pkgs; opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { }; + orpie = callPackage ../applications/misc/orpie { + ocamlPackages = ocaml-ng.ocamlPackages_4_12; + }; osmo = callPackage ../applications/office/osmo { }; @@ -28784,6 +28946,8 @@ with pkgs; styx = callPackage ../applications/misc/styx { }; + sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { }; + tecoc = callPackage ../applications/editors/tecoc { }; viber = callPackage ../applications/networking/instant-messengers/viber { }; @@ -28905,6 +29069,8 @@ with pkgs; sipp = callPackage ../development/tools/misc/sipp { }; + skanpage = libsForQt5.callPackage ../applications/graphics/skanpage { }; + soci = callPackage ../development/libraries/soci { }; socialscan = with python3.pkgs; toPythonApplication socialscan; @@ -28947,7 +29113,11 @@ with pkgs; spotifywm = callPackage ../applications/audio/spotifywm { }; - squeezelite = callPackage ../applications/audio/squeezelite { }; + psst = callPackage ../applications/audio/psst { }; + + squeezelite = callPackage ../applications/audio/squeezelite { audioBackend = "alsa"; }; + + squeezelite-pulse = callPackage ../applications/audio/squeezelite { audioBackend = "pulse"; }; ltunify = callPackage ../tools/misc/ltunify { }; @@ -28966,7 +29136,7 @@ with pkgs; stalonetray = callPackage ../applications/window-managers/stalonetray {}; - inherit (ocamlPackages) stog; + inherit (ocaml-ng.ocamlPackages_4_12) stog; stp = callPackage ../applications/science/logic/stp { }; @@ -29253,7 +29423,7 @@ with pkgs; tixati = callPackage ../applications/networking/p2p/tixati { }; - tkcvs = callPackage ../applications/version-management/tkcvs { }; + tkrev = callPackage ../applications/version-management/tkrev { }; tla = callPackage ../applications/version-management/arch { }; @@ -29339,7 +29509,9 @@ with pkgs; tree = callPackage ../tools/system/tree {}; - treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; + treesheets = callPackage ../applications/office/treesheets { + wxGTK = wxGTK31-gtk3; + }; tremc = callPackage ../applications/networking/p2p/tremc { }; @@ -29495,6 +29667,8 @@ with pkgs; qtile = callPackage ../applications/window-managers/qtile { }; + vimgolf = callPackage ../games/vimgolf { }; + vimpc = callPackage ../applications/audio/vimpc { }; # this is a lower-level alternative to wrapNeovim conceived to handle @@ -30169,8 +30343,6 @@ with pkgs; zammad = callPackage ../applications/networking/misc/zammad { }; - zanshin = libsForQt5.callPackage ../applications/office/zanshin { }; - zathuraPkgs = callPackage ../applications/misc/zathura { }; zathura = zathuraPkgs.zathuraWrapper; @@ -31112,7 +31284,7 @@ with pkgs; inherit (callPackages ../games/minetest { inherit (darwin) libiconv; - inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; + inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel; }) minetestclient_5 minetestserver_5; @@ -31431,9 +31603,6 @@ with pkgs; steam = steamPackages.steam-fhsenv; steam-run = steam.run; - steam-run-native = (steam.override { - nativeOnly = true; - }).run; steam-tui = callPackage ../games/steam-tui { }; @@ -31860,6 +32029,8 @@ with pkgs; alliance = callPackage ../applications/science/electronics/alliance { }; + angsd = callPackage ../applications/science/biology/angsd { }; + ants = callPackage ../applications/science/biology/ants { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -32098,8 +32269,12 @@ with pkgs; blas = callPackage ../build-support/alternatives/blas { }; + blas-ilp64 = blas.override { isILP64 = true; }; + blas-reference = callPackage ../development/libraries/science/math/blas { }; + bonmin = callPackage ../development/libraries/science/math/bonmin { }; + brial = callPackage ../development/libraries/science/math/brial { }; clblas = callPackage ../development/libraries/science/math/clblas { @@ -32120,9 +32295,13 @@ with pkgs; lapack = callPackage ../build-support/alternatives/lapack { }; + lapack-ilp64 = lapack.override { isILP64 = true; }; + lapack-reference = callPackage ../development/libraries/science/math/liblapack { }; liblapack = lapack-reference; + libamplsolver = callPackage ../development/libraries/science/math/libamplsolver { }; + libbraiding = callPackage ../development/libraries/science/math/libbraiding { }; libhomfly = callPackage ../development/libraries/science/math/libhomfly { }; @@ -32277,6 +32456,7 @@ with pkgs; singlePrec = true; enableMpi = true; enableCuda = true; + cudatoolkit = cudatoolkit_11; fftw = fftwSinglePrec; }); @@ -32323,7 +32503,9 @@ with pkgs; abc-verifier = callPackage ../applications/science/logic/abc {}; - abella = callPackage ../applications/science/logic/abella { }; + abella = callPackage ../applications/science/logic/abella { + ocamlPackages = ocaml-ng.ocamlPackages_4_12; + }; acgtk = callPackage ../applications/science/logic/acgtk {}; @@ -32402,7 +32584,7 @@ with pkgs; hol = callPackage ../applications/science/logic/hol { }; - inherit (ocamlPackages) hol_light; + inherit (ocaml-ng.ocamlPackages_4_12) hol_light; hologram = callPackage ../tools/security/hologram { }; @@ -32456,6 +32638,8 @@ with pkgs; monosat = callPackage ../applications/science/logic/monosat {}; + nuXmv = callPackage ../applications/science/logic/nuXmv {}; + opensmt = callPackage ../applications/science/logic/opensmt { }; ott = callPackage ../applications/science/logic/ott { }; @@ -32466,7 +32650,9 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = callPackage ../applications/science/logic/prooftree {}; + prooftree = callPackage ../applications/science/logic/prooftree { + ocamlPackages = ocaml-ng.ocamlPackages_4_12; + }; prover9 = callPackage ../applications/science/logic/prover9 { }; @@ -32574,6 +32760,8 @@ with pkgs; fped = callPackage ../applications/science/electronics/fped { }; + gaw = callPackage ../applications/science/electronics/gaw {}; + horizon-eda = callPackage ../applications/science/electronics/horizon-eda {}; # this is a wrapper for kicad.base and kicad.libraries @@ -32607,6 +32795,8 @@ with pkgs; xoscope = callPackage ../applications/science/electronics/xoscope { }; + xschem = callPackage ../applications/science/electronics/xschem { }; + xyce = callPackage ../applications/science/electronics/xyce { }; xyce-parallel = callPackage ../applications/science/electronics/xyce { @@ -33009,6 +33199,8 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; + dockutil = callPackage ../os-specific/darwin/dockutil { }; + dosbox = callPackage ../applications/emulators/dosbox { }; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; @@ -33023,6 +33215,8 @@ with pkgs; dump = callPackage ../tools/backup/dump { }; + dxvk = callPackage ../misc/dxvk { }; + ecdsatool = callPackage ../tools/security/ecdsatool { }; emulationstation = callPackage ../applications/emulators/emulationstation { }; @@ -33289,7 +33483,7 @@ with pkgs; nixops = callPackage ../tools/package-management/nixops { }; - nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); + nixops_unstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; @@ -33448,7 +33642,7 @@ with pkgs; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; - nix-doc = callPackage ../tools/package-management/nix-doc { }; + nix-doc = callPackage ../tools/package-management/nix-doc { nix = nixVersions.nix_2_5; }; nix-bundle = callPackage ../tools/package-management/nix-bundle { }; @@ -33555,7 +33749,11 @@ with pkgs; disnixos = callPackage ../tools/package-management/disnix/disnixos { }; - DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; + DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { + jdk = jdk8; + }; + + i3a = callPackage ../misc/i3a { }; lkproof = callPackage ../tools/typesetting/tex/lkproof { }; @@ -33660,6 +33858,8 @@ with pkgs; qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { }; + qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { }; + py-wmi-client = callPackage ../tools/networking/py-wmi-client { }; qdl = callPackage ../tools/misc/qdl { }; @@ -34178,6 +34378,8 @@ with pkgs; xosview2 = callPackage ../tools/X11/xosview2 { }; + xow_dongle-firmware = callPackage ../os-specific/linux/firmware/xow_dongle-firmware { }; + xpad = callPackage ../applications/misc/xpad { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8490870e589..dedb8f015fc 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -92,14 +92,7 @@ in { rpiVersion = 4; }; - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.4" - kernelPatches.modinst_arg_list_too_long - ]; - }; + linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = @@ -331,7 +324,7 @@ in { nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); + nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })); nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy390 = nvidiaPackages.legacy_390; @@ -462,6 +455,8 @@ in { xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; + xone = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/xone { } else null; + xpadneo = callPackage ../os-specific/linux/xpadneo { }; zenpower = callPackage ../os-specific/linux/zenpower { }; @@ -482,7 +477,7 @@ in { vanillaPackages = { # recurse to build modules for the kernels - linux_4_4 = recurseIntoAttrs (packagesFor kernels.linux_4_4); + linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; # Added 2022-02-11 linux_4_9 = recurseIntoAttrs (packagesFor kernels.linux_4_9); linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14); linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0b45f117d7f..cc126dc320d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -390,6 +390,29 @@ let ff-pbt = callPackage ../development/ocaml-modules/ff/pbt.nix { }; ff-sig = callPackage ../development/ocaml-modules/ff/sig.nix { }; + ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { }; + ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix { + inherit (pkgs) ffmpeg; + }; + ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix { + inherit (pkgs) ffmpeg; + }; + ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix { + inherit (pkgs) ffmpeg; + }; + ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix { + inherit (pkgs) ffmpeg; + }; + ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix { + inherit (pkgs) ffmpeg; + }; + ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix { + inherit (pkgs) ffmpeg; + }; + ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { + inherit (pkgs) ffmpeg; + }; + fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; fileutils = callPackage ../development/ocaml-modules/fileutils { }; @@ -398,6 +421,10 @@ let fix = callPackage ../development/ocaml-modules/fix { }; + flac = callPackage ../development/ocaml-modules/flac { + inherit (pkgs) flac; + }; + fmt = callPackage ../development/ocaml-modules/fmt { }; fontconfig = callPackage ../development/ocaml-modules/fontconfig { @@ -620,7 +647,7 @@ let lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { }; - lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { }; + lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; lens = callPackage ../development/ocaml-modules/lens { }; @@ -1001,6 +1028,8 @@ let optint = callPackage ../development/ocaml-modules/optint { }; + opus = callPackage ../development/ocaml-modules/opus { }; + otfm = callPackage ../development/ocaml-modules/otfm { }; otoml = callPackage ../development/ocaml-modules/otoml { }; @@ -1081,10 +1110,18 @@ let seq = callPackage ../development/ocaml-modules/seq { }; + shine = callPackage ../development/ocaml-modules/shine { + inherit (pkgs) shine; + }; + sosa = callPackage ../development/ocaml-modules/sosa { }; spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; + speex = callPackage ../development/ocaml-modules/speex { + inherit (pkgs) speex; + }; + tar-unix = callPackage ../development/ocaml-modules/tar/unix.nix { }; tar = callPackage ../development/ocaml-modules/tar { }; @@ -1133,6 +1170,8 @@ let ocurl = callPackage ../development/ocaml-modules/ocurl { }; + ogg = callPackage ../development/ocaml-modules/ogg { }; + parany = callPackage ../development/ocaml-modules/parany { }; pipebang = callPackage ../development/ocaml-modules/pipebang { }; @@ -1349,6 +1388,8 @@ let tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { }; tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { }; + theora = callPackage ../development/ocaml-modules/theora { }; + toml = callPackage ../development/ocaml-modules/toml { }; topkg = callPackage ../development/ocaml-modules/topkg { }; @@ -1394,6 +1435,8 @@ let vlq = callPackage ../development/ocaml-modules/vlq { }; + vorbis = callPackage ../development/ocaml-modules/vorbis { }; + visitors = callPackage ../development/ocaml-modules/visitors { }; wasm = callPackage ../development/ocaml-modules/wasm { }; @@ -1537,7 +1580,9 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_13 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.13.nix { }); + ocamlPackages_4_14 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { }); + ocamlPackages_latest = ocamlPackages_4_13; - ocamlPackages = ocamlPackages_4_12; + ocamlPackages = ocamlPackages_4_13; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d6745c559e1..d106a1897e4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17611,8 +17611,8 @@ let pname = "PDF-API2"; version = "2.042"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.038.tar.gz"; - sha256 = "dEfEdJsCp4T1JdPH7OmdNLChBHXbZQlvYxZ0jdL5vQk="; + url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.042.tar.gz"; + sha256 = "0p9wsnn60mcxr4032ahai0d56x8gw76ydym2l4qxq086a10jk6db"; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -20782,12 +20782,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "7.10.0"; + version = "8.1.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; - rev = "v7.10.0"; - sha256 = "sha256-cXuzg4bBwCftdZhz3e50L+4fO0RWX5Tl8zDOoydECd4="; + rev = "v${version}"; + sha256 = "sha256-9cjH4hIIxB+Pv9+ck6xg8KmfM8jtVFKVQNGLYr2AnAM="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 69781ced23b..1da6e934c24 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -140,8 +140,12 @@ lib.makeScope pkgs.newScope (self: with self; { deployer = callPackage ../development/php-packages/deployer { }; + grumphp = callPackage ../development/php-packages/grumphp { }; + phing = callPackage ../development/php-packages/phing { }; + phive = callPackage ../development/php-packages/phive { }; + php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 44c5c11ceb9..4718d942d8e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -85,6 +85,7 @@ mapAliases ({ pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pysmart-smartx = pysmart; # added 2021-10-22 + pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 @@ -96,6 +97,7 @@ mapAliases ({ python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 + pytwitchapi = twitchapi; # added 2022-03-07 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3711d1c5a8..720f463312f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ self: let inherit (self) callPackage; - inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; namePrefix = python.libPrefix + "-"; @@ -107,7 +107,7 @@ in { inherit pkgs stdenv; - inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; @@ -135,16 +135,6 @@ in { venvShellHook wheelUnpackHook; - # Not all packages are compatible with the latest pytest yet. - # We need to override the hook to select an older pytest, however, - # it should not override the version of pytest that is used for say - # Python 2. This is an ugly hack that is needed now because the hook - # propagates the package. - pytestCheckHook_6_1 = if isPy3k then - self.pytestCheckHook.override { pytest = self.pytest_6_1; } - else - self.pytestCheckHook; - # helpers # We use build packages because we are making a setup hook to be used as a @@ -186,6 +176,8 @@ in { actdiag = callPackage ../development/python-modules/actdiag { }; + adafruit-io = callPackage ../development/python-modules/adafruit-io { }; + adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { }; @@ -464,6 +456,8 @@ in { allpairspy = callPackage ../development/python-modules/allpairspy { }; + allure-behave = callPackage ../development/python-modules/allure-behave { }; + allure-python-commons = callPackage ../development/python-modules/allure-python-commons { }; allure-python-commons-test = callPackage ../development/python-modules/allure-python-commons-test { }; @@ -712,6 +706,8 @@ in { asyncpg = callPackage ../development/python-modules/asyncpg { }; + asyncsleepiq = callPackage ../development/python-modules/asyncsleepiq { }; + asyncssh = callPackage ../development/python-modules/asyncssh { }; asyncstdlib = callPackage ../development/python-modules/asyncstdlib { }; @@ -1210,9 +1206,7 @@ in { binwalk = callPackage ../development/python-modules/binwalk { }; - binwalk-full = appendToName "full" (self.binwalk.override { - visualizationSupport = true; - }); + binwalk-full = self.binwalk.override { visualizationSupport = true; }; biopython = callPackage ../development/python-modules/biopython { }; @@ -1517,6 +1511,8 @@ in { coqpit = callPackage ../development/python-modules/coqpit { }; + coqui-trainer = callPackage ../development/python-modules/coqui-trainer {}; + cepa = callPackage ../development/python-modules/cepa { }; cerberus = callPackage ../development/python-modules/cerberus { }; @@ -1605,6 +1601,8 @@ in { chispa = callPackage ../development/python-modules/chispa { }; + chromaprint = callPackage ../development/python-modules/chromaprint { }; + ci-info = callPackage ../development/python-modules/ci-info { }; ci-py = callPackage ../development/python-modules/ci-py { }; @@ -2212,7 +2210,7 @@ in { distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - django = self.django_2; + django = self.django_3; # Current LTS django_2 = callPackage ../development/python-modules/django/2.nix { }; @@ -2430,6 +2428,8 @@ in { docx2python = callPackage ../development/python-modules/docx2python { }; + docx2txt = callPackage ../development/python-modules/docx2txt { }; + dodgy = callPackage ../development/python-modules/dodgy { }; dogpile-cache = callPackage ../development/python-modules/dogpile-cache { }; @@ -3029,6 +3029,8 @@ in { flax = callPackage ../development/python-modules/flax { }; + fleep = callPackage ../development/python-modules/fleep { }; + flexmock = callPackage ../development/python-modules/flexmock { }; flickrapi = callPackage ../development/python-modules/flickrapi { }; @@ -3575,6 +3577,8 @@ in { growattserver = callPackage ../development/python-modules/growattserver { }; + gridnet = callPackage ../development/python-modules/gridnet { }; + grip = callPackage ../development/python-modules/grip { }; groestlcoin_hash = callPackage ../development/python-modules/groestlcoin_hash { }; @@ -3924,6 +3928,8 @@ in { icmplib = callPackage ../development/python-modules/icmplib { }; + icnsutil = callPackage ../development/python-modules/icnsutil { }; + ics = callPackage ../development/python-modules/ics { }; idasen = callPackage ../development/python-modules/idasen { }; @@ -4068,6 +4074,8 @@ in { invoke = callPackage ../development/python-modules/invoke { }; + iodata = callPackage ../development/python-modules/iodata { }; + iocapture = callPackage ../development/python-modules/iocapture { }; iotawattpy = callPackage ../development/python-modules/iotawattpy { }; @@ -4344,6 +4352,8 @@ in { jupyter_core = callPackage ../development/python-modules/jupyter_core { }; + jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { }; + jupyter_server = callPackage ../development/python-modules/jupyter_server { }; jupyterhub = callPackage ../development/python-modules/jupyterhub { }; @@ -4366,6 +4376,8 @@ in { jupyterlab-widgets = callPackage ../development/python-modules/jupyterlab-widgets { }; + jupyterlab-lsp = callPackage ../development/python-modules/jupyterlab-lsp { }; + jupyter-packaging = callPackage ../development/python-modules/jupyter-packaging { }; jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { @@ -4464,6 +4476,8 @@ in { kinparse = callPackage ../development/python-modules/kinparse { }; + kiss-headers = callPackage ../development/python-modules/kiss-headers { }; + kitchen = callPackage ../development/python-modules/kitchen { }; kivy = callPackage ../development/python-modules/kivy { @@ -5466,6 +5480,8 @@ in { nextcloudmonitor = callPackage ../development/python-modules/nextcloudmonitor { }; + nextcord = callPackage ../development/python-modules/nextcord { }; + nghttp2 = (toPythonModule (pkgs.nghttp2.override { inherit (self) python cython setuptools; inherit (pkgs) ncurses; @@ -5739,6 +5755,8 @@ in { opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; + opensfm = callPackage ../development/python-modules/opensfm { }; + openshift = callPackage ../development/python-modules/openshift { }; opensimplex = callPackage ../development/python-modules/opensimplex { }; @@ -6080,6 +6098,8 @@ in { pdunehd = callPackage ../development/python-modules/pdunehd { }; + pyprecice = callPackage ../development/python-modules/pyprecice { }; + phonopy = callPackage ../development/python-modules/phonopy { }; phpserialize = callPackage ../development/python-modules/phpserialize { }; @@ -6699,6 +6719,8 @@ in { pycec = callPackage ../development/python-modules/pycec { }; + pycep-parser = callPackage ../development/python-modules/pycep-parser { }; + pycfdns = callPackage ../development/python-modules/pycfdns { }; pycflow2dot = callPackage ../development/python-modules/pycflow2dot { @@ -6767,6 +6789,8 @@ in { pyct = callPackage ../development/python-modules/pyct { }; + pyctr = callPackage ../development/python-modules/pyctr { }; + pycuda = callPackage ../development/python-modules/pycuda { cudatoolkit = pkgs.cudatoolkit; inherit (pkgs.stdenv) mkDerivation; @@ -7617,6 +7641,14 @@ in { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + pysigma = callPackage ../development/python-modules/pysigma { }; + + pysigma-backend-splunk = callPackage ../development/python-modules/pysigma-backend-splunk { }; + + pysigma-pipeline-crowdstrike = callPackage ../development/python-modules/pysigma-pipeline-crowdstrike { }; + + pysigma-pipeline-sysmon = callPackage ../development/python-modules/pysigma-pipeline-sysmon { }; + pysignalclirestapi = callPackage ../development/python-modules/pysignalclirestapi { }; pysigset = callPackage ../development/python-modules/pysigset { }; @@ -7745,28 +7777,12 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; - pytest = self.pytest_6; - - pytest_6 = - callPackage ../development/python-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { - doCheck = false; - }; - }; - - pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec { - version = "6.1.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"; + pytest = callPackage ../development/python-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { + doCheck = false; }; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" - ''; - }); + }; pytest-aio = callPackage ../development/python-modules/pytest-aio { }; @@ -8225,6 +8241,8 @@ in { python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + python-trovo = callPackage ../development/python-modules/python-trovo { }; + python-twitch-client = callPackage ../development/python-modules/python-twitch-client { }; python-twitter = callPackage ../development/python-modules/python-twitter { }; @@ -8253,6 +8271,8 @@ in { python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + python-zbar = callPackage ../development/python-modules/python-zbar { }; + pythran = callPackage ../development/python-modules/pythran { inherit (pkgs.llvmPackages) openmp; }; @@ -8261,6 +8281,8 @@ in { pyeverlights = callPackage ../development/python-modules/pyeverlights { }; + pyinfra = callPackage ../development/python-modules/pyinfra { }; + pytibber = callPackage ../development/python-modules/pytibber { }; pytile = callPackage ../development/python-modules/pytile { }; @@ -8319,8 +8341,6 @@ in { pytweening = callPackage ../development/python-modules/pytweening { }; - pytwitchapi = callPackage ../development/python-modules/pytwitchapi { }; - pytz = callPackage ../development/python-modules/pytz { }; pytz-deprecation-shim = callPackage ../development/python-modules/pytz-deprecation-shim { }; @@ -8553,6 +8573,8 @@ in { radio_beam = callPackage ../development/python-modules/radio_beam { }; + radios = callPackage ../development/python-modules/radios { }; + radiotherm = callPackage ../development/python-modules/radiotherm { }; radish-bdd = callPackage ../development/python-modules/radish-bdd { }; @@ -8741,6 +8763,8 @@ in { rich = callPackage ../development/python-modules/rich { }; + rich-rst = callPackage ../development/python-modules/rich-rst { }; + rig = callPackage ../development/python-modules/rig { }; ring-doorbell = callPackage ../development/python-modules/ring-doorbell { }; @@ -9170,6 +9194,8 @@ in { simpy = callPackage ../development/python-modules/simpy { }; + single-version = callPackage ../development/python-modules/single-version { }; + signify = callPackage ../development/python-modules/signify { }; siosocks = callPackage ../development/python-modules/siosocks { }; @@ -9840,6 +9866,8 @@ in { textile = callPackage ../development/python-modules/textile { }; + textual = callPackage ../development/python-modules/textual { }; + testing-common-database = callPackage ../development/python-modules/testing-common-database { }; testing-postgresql = callPackage ../development/python-modules/testing-postgresql { }; @@ -9870,6 +9898,8 @@ in { tgcrypto = callPackage ../development/python-modules/tgcrypto { }; + theano-pymc = callPackage ../development/python-modules/theano-pymc { }; + Theano = callPackage ../development/python-modules/Theano rec { cudaSupport = pkgs.config.cudaSupport or false; cudnnSupport = cudaSupport; @@ -9915,6 +9945,8 @@ in { tika = callPackage ../development/python-modules/tika { }; + tikzplotlib = callPackage ../development/python-modules/tikzplotlib { }; + tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; }; @@ -9989,6 +10021,8 @@ in { toposort = callPackage ../development/python-modules/toposort { }; + torch-tb-profiler = callPackage ../development/python-modules/torch-tb-profiler/default.nix { }; + torchaudio-bin = callPackage ../development/python-modules/torchaudio/bin.nix { }; torchgpipe = callPackage ../development/python-modules/torchgpipe { }; @@ -10115,6 +10149,8 @@ in { twitch-python = callPackage ../development/python-modules/twitch-python { }; + twitchapi = callPackage ../development/python-modules/twitchapi { }; + twitter = callPackage ../development/python-modules/twitter { }; twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; @@ -10163,14 +10199,22 @@ in { typer = callPackage ../development/python-modules/typer { }; + types-cryptography = callPackage ../development/python-modules/types-cryptography { }; + types-dateutil = callPackage ../development/python-modules/types-dateutil { }; types-decorator = callPackage ../development/python-modules/types-decorator { }; + types-enum34 = callPackage ../development/python-modules/types-enum34 { }; + types-freezegun = callPackage ../development/python-modules/types-freezegun { }; types-futures = callPackage ../development/python-modules/types-futures { }; + types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; + + types-paramiko = callPackage ../development/python-modules/types-paramiko { }; + types-protobuf = callPackage ../development/python-modules/types-protobuf { }; types-pytz = callPackage ../development/python-modules/types-pytz { }; |