diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a4a653b175e3..fedcd5d75f63 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -134,7 +134,9 @@ /pkgs/development/ruby-modules @marsam # Rust -/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq +/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq @winterqt @figsoda +/pkgs/build-support/rust @zowoq @winterqt @figsoda +/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda # C compilers /pkgs/development/compilers/gcc @matthewbauer diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index 3d91f096051e..a0f0f97f9d53 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/builders/testers.chapter.md @@ -1,6 +1,19 @@ # Testers {#chap-testers} This chapter describes several testing builders which are available in the testers namespace. +## `hasPkgConfigModule` {#tester-hasPkgConfigModule} + +Checks whether a package exposes a certain `pkg-config` module. + +Example: + +```nix +passthru.tests.pkg-config = testers.hasPkgConfigModule { + package = finalAttrs.finalPackage; + moduleName = "libfoo"; +} +``` + ## `testVersion` {#tester-testVersion} Checks the command output contains the specified version diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 889b4114acca..a732eee4b962 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -27,7 +27,7 @@ If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual. As per [RFC 0072](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect. -Additional syntax extensions are available, though not all extensions can be used in NixOS option documentation. The following extensions are currently used: +Additional syntax extensions are available, all of which can be used in NixOS option documentation. The following extensions are currently used: - []{#ssec-contributing-markup-anchors} Explicitly defined **anchors** on headings, to allow linking to sections. These should be always used, to ensure the anchors can be linked even when the heading text changes, and to prevent conflicts between [automatically assigned identifiers](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/auto_identifiers.md). @@ -38,6 +38,10 @@ Additional syntax extensions are available, though not all extensions can be use ## Syntax {#sec-contributing-markup} ``` + ::: {.note} + NixOS option documentation does not support headings in general. + ::: + - []{#ssec-contributing-markup-anchors-inline} **Inline anchors**, which allow linking arbitrary place in the text (e.g. individual list items, sentences…). @@ -67,10 +71,6 @@ Additional syntax extensions are available, though not all extensions can be use This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point). Though, the feature originates from [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage) with slightly different syntax. - ::: {.note} - Inline roles are available for option documentation. - ::: - - []{#ssec-contributing-markup-admonitions} **Admonitions**, set off from the text to bring attention to something. @@ -96,10 +96,6 @@ Additional syntax extensions are available, though not all extensions can be use - [`tip`](https://tdg.docbook.org/tdg/5.0/tip.html) - [`warning`](https://tdg.docbook.org/tdg/5.0/warning.html) - ::: {.note} - Admonitions are available for option documentation. - ::: - - []{#ssec-contributing-markup-definition-lists} [**Definition lists**](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/definition_lists.md), for defining a group of terms: diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 7d404643d369..3774924c0be4 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -32,6 +32,7 @@ + diff --git a/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md new file mode 100644 index 000000000000..ee0a471be3e5 --- /dev/null +++ b/doc/languages-frameworks/pkg-config.section.md @@ -0,0 +1,9 @@ +# pkg-config {#sec-pkg-config} + +*pkg-config* is a unified interface for declaring and querying built C/C++ libraries. + +Nixpkgs provides a couple of facilities for working with this tool. + + - A [setup hook](#setup-hook-pkg-config) bundled with in the `pkg-config` package, to bring a derivation's declared build inputs into the environment. + - The [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), for packages that provide pkg-config modules. + - The `defaultPkgConfigPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead. diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 1972ca62f4f2..a12d68c0934f 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -253,7 +253,7 @@ The propagated equivalent of `depsTargetTarget`. This is prefixed for the same r #### `NIX_DEBUG` {#var-stdenv-NIX_DEBUG} -A natural number indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing. +A number between 0 and 7 indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing. ### Attributes affecting build properties {#attributes-affecting-build-properties} diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 1a51225a80ed..30952651adf4 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -168,7 +168,7 @@ rec { ] { a.b.c = 0; } => { a = { b = { d = 1; }; }; x = { y = "xy"; }; } - Type: updateManyAttrsByPath :: [{ path :: [String], update :: (Any -> Any) }] -> AttrSet -> AttrSet + Type: updateManyAttrsByPath :: [{ path :: [String]; update :: (Any -> Any); }] -> AttrSet -> AttrSet */ updateManyAttrsByPath = let # When recursing into attributes, instead of updating the `path` of each @@ -414,7 +414,7 @@ rec { => { name = "some"; value = 6; } Type: - nameValuePair :: String -> Any -> { name :: String, value :: Any } + nameValuePair :: String -> Any -> { name :: String; value :: Any; } */ nameValuePair = # Attribute name @@ -449,7 +449,7 @@ rec { => { foo_x = "bar-a"; foo_y = "bar-b"; } Type: - mapAttrs' :: (String -> Any -> { name = String; value = Any }) -> AttrSet -> AttrSet + mapAttrs' :: (String -> Any -> { name :: String; value :: Any; }) -> AttrSet -> AttrSet */ mapAttrs' = # A function, given an attribute's name and value, returns a new `nameValuePair`. @@ -649,7 +649,7 @@ rec { Example: zipAttrsWith (name: values: values) [{a = "x";} {a = "y"; b = "z";}] - => { a = ["x" "y"]; b = ["z"] } + => { a = ["x" "y"]; b = ["z"]; } Type: zipAttrsWith :: (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet @@ -664,7 +664,7 @@ rec { Example: zipAttrs [{a = "x";} {a = "y"; b = "z";}] - => { a = ["x" "y"]; b = ["z"] } + => { a = ["x" "y"]; b = ["z"]; } Type: zipAttrs :: [ AttrSet ] -> AttrSet diff --git a/lib/customisation.nix b/lib/customisation.nix index 101c9e62b9e6..42d711cf5fb9 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -252,7 +252,8 @@ rec { outputsList = map makeOutput outputs; drv' = (lib.head outputsList).value; - in lib.deepSeq drv' drv'; + in if drv == null then null else + lib.deepSeq drv' drv'; /* Make a set of packages with a common scope. All packages called with the provided `callPackage` will be evaluated with the same diff --git a/lib/lists.nix b/lib/lists.nix index 8b2c2d12801b..9f69485b4086 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -306,7 +306,7 @@ rec { /* Splits the elements of a list in two lists, `right` and `wrong`, depending on the evaluation of a predicate. - Type: (a -> bool) -> [a] -> { right :: [a], wrong :: [a] } + Type: (a -> bool) -> [a] -> { right :: [a]; wrong :: [a]; } Example: partition (x: x > 2) [ 5 1 2 3 4 ] @@ -374,7 +374,7 @@ rec { /* Merges two lists of the same size together. If the sizes aren't the same the merging stops at the shortest. - Type: zipLists :: [a] -> [b] -> [{ fst :: a, snd :: b}] + Type: zipLists :: [a] -> [b] -> [{ fst :: a; snd :: b; }] Example: zipLists [ 1 2 ] [ "a" "b" ] diff --git a/lib/meta.nix b/lib/meta.nix index cdd3e1d596c0..5fd55c4e90d6 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -76,20 +76,19 @@ rec { 1. (legacy) a system string. - 2. (modern) a pattern for the platform `parsed` field. + 2. (modern) a pattern for the entire platform structure (see `lib.systems.inspect.platformPatterns`). - 3. (functional) a predicate function returning a boolean. + 3. (modern) a pattern for the platform `parsed` field (see `lib.systems.inspect.patterns`). We can inject these into a pattern for the whole of a structured platform, and then match that. */ - platformMatch = platform: elem: - if builtins.isFunction elem - then elem platform - else let + platformMatch = platform: elem: let pattern = if builtins.isString elem then { system = elem; } + else if elem?parsed + then elem else { parsed = elem; }; in lib.matchAttrs pattern platform; diff --git a/lib/options.nix b/lib/options.nix index ce66bfb9d5d9..d14d209a8347 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -114,7 +114,7 @@ rec { You can omit the default path if the name of the option is also attribute path in nixpkgs. - Type: mkPackageOption :: pkgs -> string -> { default :: [string], example :: null | string | [string] } -> option + Type: mkPackageOption :: pkgs -> string -> { default :: [string]; example :: null | string | [string]; } -> option Example: mkPackageOption pkgs "hello" { } @@ -201,7 +201,7 @@ rec { /* Extracts values of all "value" keys of the given list. - Type: getValues :: [ { value :: a } ] -> [a] + Type: getValues :: [ { value :: a; } ] -> [a] Example: getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ] @@ -211,7 +211,7 @@ rec { /* Extracts values of all "file" keys of the given list - Type: getFiles :: [ { file :: a } ] -> [a] + Type: getFiles :: [ { file :: a; } ] -> [a] Example: getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ] diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index a5fed5acf2c5..30615c9fde32 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -7,6 +7,7 @@ let abis_ = abis; in let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis_; in rec { + # these patterns are to be matched against {host,build,target}Platform.parsed patterns = rec { isi686 = { cpu = cpuTypes.i686; }; isx86_32 = { cpu = { family = "x86"; bits = 32; }; }; @@ -81,8 +82,13 @@ rec { isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; - isEfi = map (family: { cpu.family = family; }) - [ "x86" "arm" "aarch64" "riscv" ]; + isEfi = [ + { cpu = { family = "arm"; version = "6"; }; } + { cpu = { family = "arm"; version = "7"; }; } + { cpu = { family = "arm"; version = "8"; }; } + { cpu = { family = "riscv"; }; } + { cpu = { family = "x86"; }; } + ]; }; matchAnyAttrs = patterns: @@ -90,4 +96,13 @@ rec { else matchAttrs patterns; predicates = mapAttrs (_: matchAnyAttrs) patterns; + + # these patterns are to be matched against the entire + # {host,build,target}Platform structure; they include a `parsed={}` marker so + # that `lib.meta.availableOn` can distinguish them from the patterns which + # apply only to the `parsed` field. + + platformPatterns = mapAttrs (_: p: { parsed = {}; } // p) { + isStatic = { isStatic = true; }; + }; } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bdf93d4e6d29..81b475669997 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2530,6 +2530,12 @@ githubId = 89596; name = "Florian Friesdorf"; }; + ChaosAttractor = { + email = "lostattractor@gmail.com"; + github = "LostAttractor"; + githubId = 46527539; + name = "ChaosAttractor"; + }; chekoopa = { email = "chekoopa@mail.ru"; github = "chekoopa"; @@ -4236,6 +4242,12 @@ githubId = 103082; name = "Ed Brindley"; }; + eliandoran = { + email = "contact@eliandoran.me"; + name = "Elian Doran"; + github = "eliandoran"; + githubId = 21236836; + }; elizagamedev = { email = "eliza@eliza.sh"; github = "elizagamedev"; @@ -5339,6 +5351,12 @@ githubId = 60962839; name = "Mazen Zahr"; }; + gkleen = { + name = "Gregor Kleen"; + email = "xpnfr@bouncy.email"; + github = "gkleen"; + githubId = 20089782; + }; gleber = { email = "gleber.p@gmail.com"; github = "gleber"; @@ -13990,6 +14008,13 @@ githubId = 2666479; name = "Y Nguyen"; }; + superherointj = { + name = "Sérgio Marcelo"; + email = "sergiomarcelo+nixpkgs@ya.ru"; + matrix = "@superherointj:matrix.org"; + github = "superherointj"; + githubId = 5861043; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; @@ -14124,6 +14149,15 @@ githubId = 5991987; name = "Alexander Sosedkin"; }; + t4ccer = { + email = "t4ccer@gmail.com"; + github = "t4ccer"; + githubId = 64430288; + name = "Tomasz Maciosowski"; + keys = [{ + fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19"; + }]; + }; tadeokondrak = { email = "me@tadeo.ca"; github = "tadeokondrak"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index b813948db1d6..49ddf1f10be8 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -698,9 +698,11 @@ with lib.maintainers; { rust = { members = [ - andir + figsoda lnl7 mic92 + tjni + winter zowoq ]; scope = "Maintain the Rust compiler toolchain and nixpkgs integration."; diff --git a/nixos/doc/manual/configuration/config-file.section.md b/nixos/doc/manual/configuration/config-file.section.md index efd231fd1f4e..b010026c5828 100644 --- a/nixos/doc/manual/configuration/config-file.section.md +++ b/nixos/doc/manual/configuration/config-file.section.md @@ -170,6 +170,6 @@ Packages ``` The latter option definition changes the default PostgreSQL package - used by NixOS's PostgreSQL service to 10.x. For more information on + used by NixOS's PostgreSQL service to 14.x. For more information on packages, including how to add new ones, see [](#sec-custom-packages). diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 0ddb3fa7fbe9..913058746b35 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -68,12 +68,15 @@ let sources = lib.sourceFilesBySuffices ./. [".xml"]; - modulesDoc = builtins.toFile "modules.xml" '' -
- ${(lib.concatMapStrings (path: '' - - '') (lib.catAttrs "value" config.meta.doc))} -
+ modulesDoc = runCommand "modules.xml" { + nativeBuildInputs = [ pkgs.nixos-render-docs ]; + } '' + nixos-render-docs manual docbook \ + --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ + "$out" \ + --section \ + --section-id modules \ + --chapters ${lib.concatMapStrings (p: "${p.value} ") config.meta.doc} ''; generatedSources = runCommand "generated-docbook" {} '' diff --git a/nixos/doc/manual/development/meta-attributes.section.md b/nixos/doc/manual/development/meta-attributes.section.md index 7129cf8723e6..33b41fe74d29 100644 --- a/nixos/doc/manual/development/meta-attributes.section.md +++ b/nixos/doc/manual/development/meta-attributes.section.md @@ -23,7 +23,7 @@ file. meta = { maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; + doc = ./default.md; buildDocsInSandbox = true; }; } @@ -31,7 +31,9 @@ file. - `maintainers` contains a list of the module maintainers. -- `doc` points to a valid DocBook file containing the module +- `doc` points to a valid [Nixpkgs-flavored CommonMark]( + https://nixos.org/manual/nixpkgs/unstable/#sec-contributing-markup + ) file containing the module documentation. Its contents is automatically added to [](#ch-configuration). Changes to a module documentation have to be checked to not break building the NixOS manual: @@ -40,26 +42,6 @@ file. $ nix-build nixos/release.nix -A manual.x86_64-linux ``` - This file should *not* usually be written by hand. Instead it is preferred - to write documentation using CommonMark and converting it to CommonMark - using pandoc. The simplest documentation can be converted using just - - ```ShellSession - $ pandoc doc.md -t docbook --top-level-division=chapter -f markdown+smart > doc.xml - ``` - - More elaborate documentation may wish to add one or more of the pandoc - filters used to build the remainder of the manual, for example the GNOME - desktop uses - - ```ShellSession - $ pandoc gnome.md -t docbook --top-level-division=chapter \ - --extract-media=media -f markdown+smart \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua \ - > gnome.xml - ``` - - `buildDocsInSandbox` indicates whether the option documentation for the module can be built in a derivation sandbox. This option is currently only honored for modules shipped by nixpkgs. User modules and modules taken from diff --git a/nixos/doc/manual/from_md/configuration/config-file.section.xml b/nixos/doc/manual/from_md/configuration/config-file.section.xml index f6c8f70cffc5..da5419cde4d3 100644 --- a/nixos/doc/manual/from_md/configuration/config-file.section.xml +++ b/nixos/doc/manual/from_md/configuration/config-file.section.xml @@ -221,7 +221,7 @@ services.postgresql.package = pkgs.postgresql_14; The latter option definition changes the default PostgreSQL - package used by NixOS’s PostgreSQL service to 10.x. For more + package used by NixOS’s PostgreSQL service to 14.x. For more information on packages, including how to add new ones, see . diff --git a/nixos/doc/manual/from_md/development/meta-attributes.section.xml b/nixos/doc/manual/from_md/development/meta-attributes.section.xml index 450a5f670f3a..64234f1cc0d7 100644 --- a/nixos/doc/manual/from_md/development/meta-attributes.section.xml +++ b/nixos/doc/manual/from_md/development/meta-attributes.section.xml @@ -28,7 +28,7 @@ meta = { maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; + doc = ./default.md; buildDocsInSandbox = true; }; } @@ -42,35 +42,16 @@ - doc points to a valid DocBook file containing - the module documentation. Its contents is automatically added to + doc points to a valid + Nixpkgs-flavored + CommonMark file containing the module documentation. Its + contents is automatically added to . Changes to a module documentation have to be checked to not break building the NixOS manual: $ nix-build nixos/release.nix -A manual.x86_64-linux - - - This file should not usually be written by - hand. Instead it is preferred to write documentation using - CommonMark and converting it to CommonMark using pandoc. The - simplest documentation can be converted using just - - -$ pandoc doc.md -t docbook --top-level-division=chapter -f markdown+smart > doc.xml - - - More elaborate documentation may wish to add one or more of the - pandoc filters used to build the remainder of the manual, for - example the GNOME desktop uses - - -$ pandoc gnome.md -t docbook --top-level-division=chapter \ - --extract-media=media -f markdown+smart \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua \ - > gnome.xml diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 69a6ff4aac05..dd0e6a5d068d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -351,6 +351,12 @@ relying on this should provide their own implementation. + + + Calling makeSetupHook without passing a + name argument is deprecated. + + Qt 5.12 and 5.14 have been removed, as the corresponding @@ -413,6 +419,17 @@ https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core + + + The iputils package, which is installed by default, no longer + provides the ninfod, + rarpd and rdisc tools. + See + upstream’s + release notes for more details and available + replacements. + +
@@ -702,6 +719,13 @@ hipcc. + + + services.nginx.recommendedProxySettings now + removes the Connection header preventing + clients from closing backend connections. + + Resilio sync secret keys can now be provided using a secrets @@ -766,15 +790,6 @@ been fixed to allow more than one plugin in the path. - - - A new option was added to the virtualisation module that - enables specifying explicitly named network interfaces in QEMU - VMs. The existing virtualisation.vlans is - still supported for cases where the name of the network - interface is irrelevant. - -
diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh index a7421bed532e..4698e94f508b 100755 --- a/nixos/doc/manual/md-to-db.sh +++ b/nixos/doc/manual/md-to-db.sh @@ -50,21 +50,3 @@ for mf in ${MD_FILES[*]}; do done popd - -# now handle module chapters. we'll need extra checks to ensure that we don't process -# markdown files we're not interested in, so we'll require an x.nix file for ever x.md -# that we'll convert to xml. -pushd "$DIR/../../modules" - -mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$') - -for mf in ${MD_FILES[*]}; do - [ -f "${mf%.md}.nix" ] || continue - - pandoc --top-level-division=chapter "$mf" "${pandoc_flags[@]}" -o "${mf%.md}.xml" - sed -i -e '1 i ' \ - "${mf%.md}.xml" -done - -popd diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index b33221714ab5..de455c1293bf 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -87,6 +87,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation. +- Calling `makeSetupHook` without passing a `name` argument is deprecated. + - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. - The [services.wordpress.sites.<name>.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.<name>.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name. @@ -101,6 +103,11 @@ In addition to numerous new and upgraded packages, this release has the followin - .NET 5.0 was removed due to being end-of-life, use a newer, supported .NET version - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core +- The iputils package, which is installed by default, no longer provides the + `ninfod`, `rarpd` and `rdisc` tools. See + [upstream's release notes](https://github.com/iputils/iputils/releases/tag/20221126) + for more details and available replacements. + ## Other Notable Changes {#sec-release-23.05-notable-changes} @@ -176,6 +183,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `hip` has been separated into `hip`, `hip-common` and `hipcc`. +- `services.nginx.recommendedProxySettings` now removes the `Connection` header preventing clients from closing backend connections. + - Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store. - The `firewall` and `nat` module now has a nftables based implementation. Enable `networking.nftables` to use it. @@ -191,5 +200,3 @@ In addition to numerous new and upgraded packages, this release has the followin - `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision - The option `services.nomad.extraSettingsPlugins` has been fixed to allow more than one plugin in the path. - -- A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 01db7bcbee9b..271af9ba1801 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -148,42 +148,19 @@ in rec { ''; optionsDocBook = pkgs.runCommand "options-docbook.xml" { - MANPAGE_URLS = pkgs.path + "/doc/manpage-urls.json"; - OTD_DOCUMENT_TYPE = documentType; - OTD_VARIABLE_LIST_ID = variablelistId; - OTD_OPTION_ID_PREFIX = optionIdPrefix; - OTD_REVISION = revision; - nativeBuildInputs = [ - (let - # python3Minimal can't be overridden with packages on Darwin, due to a missing framework. - # Instead of modifying stdenv, we take the easy way out, since most people on Darwin will - # just be hacking on the Nixpkgs manual (which also uses make-options-doc). - python = if pkgs.stdenv.isDarwin then pkgs.python3 else pkgs.python3Minimal; - self = (python.override { - inherit self; - includeSiteCustomize = true; - }); - in self.withPackages (p: - let - # TODO add our own small test suite when rendering is split out into a new tool - markdown-it-py = p.markdown-it-py.override { - disableTests = true; - }; - mdit-py-plugins = p.mdit-py-plugins.override { - inherit markdown-it-py; - disableTests = true; - }; - in [ - markdown-it-py - mdit-py-plugins - ])) + pkgs.nixos-render-docs ]; } '' - python ${./optionsToDocbook.py} \ + nixos-render-docs options docbook \ + --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ + --revision ${lib.escapeShellArg revision} \ + --document-type ${lib.escapeShellArg documentType} \ + --varlist-id ${lib.escapeShellArg variablelistId} \ + --id-prefix ${lib.escapeShellArg optionIdPrefix} \ ${lib.optionalString markdownByDefault "--markdown-by-default"} \ ${optionsJSON}/share/doc/nixos/options.json \ - > options.xml + options.xml if grep /nixpkgs/nixos/modules options.xml; then echo "The manual appears to depend on the location of Nixpkgs, which is bad" diff --git a/nixos/lib/make-options-doc/optionsToDocbook.py b/nixos/lib/make-options-doc/optionsToDocbook.py deleted file mode 100644 index 021623d10a7a..000000000000 --- a/nixos/lib/make-options-doc/optionsToDocbook.py +++ /dev/null @@ -1,343 +0,0 @@ -import collections -import json -import os -import sys -from typing import Any, Dict, List -from collections.abc import MutableMapping, Sequence -import inspect - -# for MD conversion -import markdown_it -import markdown_it.renderer -from markdown_it.token import Token -from markdown_it.utils import OptionsDict -from mdit_py_plugins.container import container_plugin -from mdit_py_plugins.deflist import deflist_plugin -from mdit_py_plugins.myst_role import myst_role_plugin -from xml.sax.saxutils import escape, quoteattr - -manpage_urls = json.load(open(os.getenv('MANPAGE_URLS'))) - -class Renderer(markdown_it.renderer.RendererProtocol): - __output__ = "docbook" - def __init__(self, parser=None): - self.rules = { - k: v - for k, v in inspect.getmembers(self, predicate=inspect.ismethod) - if not (k.startswith("render") or k.startswith("_")) - } | { - "container_{.note}_open": self._note_open, - "container_{.note}_close": self._note_close, - "container_{.important}_open": self._important_open, - "container_{.important}_close": self._important_close, - "container_{.warning}_open": self._warning_open, - "container_{.warning}_close": self._warning_close, - } - def render(self, tokens: Sequence[Token], options: OptionsDict, env: MutableMapping) -> str: - assert '-link-tag-stack' not in env - env['-link-tag-stack'] = [] - assert '-deflist-stack' not in env - env['-deflist-stack'] = [] - def do_one(i, token): - if token.type == "inline": - assert token.children is not None - return self.renderInline(token.children, options, env) - elif token.type in self.rules: - return self.rules[token.type](tokens[i], tokens, i, options, env) - else: - raise NotImplementedError("md token not supported yet", token) - return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) - def renderInline(self, tokens: Sequence[Token], options: OptionsDict, env: MutableMapping) -> str: - # HACK to support docbook links and xrefs. link handling is only necessary because the docbook - # manpage stylesheet converts - in urls to a mathematical minus, which may be somewhat incorrect. - for i, token in enumerate(tokens): - if token.type != 'link_open': - continue - token.tag = 'link' - # turn [](#foo) into xrefs - if token.attrs['href'][0:1] == '#' and tokens[i + 1].type == 'link_close': - token.tag = "xref" - # turn into links without contents - if tokens[i + 1].type == 'text' and tokens[i + 1].content == token.attrs['href']: - tokens[i + 1].content = '' - - def do_one(i, token): - if token.type in self.rules: - return self.rules[token.type](tokens[i], tokens, i, options, env) - else: - raise NotImplementedError("md node not supported yet", token) - return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) - - def text(self, token, tokens, i, options, env): - return escape(token.content) - def paragraph_open(self, token, tokens, i, options, env): - return "" - def paragraph_close(self, token, tokens, i, options, env): - return "" - def hardbreak(self, token, tokens, i, options, env): - return "\n" - def softbreak(self, token, tokens, i, options, env): - # should check options.breaks() and emit hard break if so - return "\n" - def code_inline(self, token, tokens, i, options, env): - return f"{escape(token.content)}" - def code_block(self, token, tokens, i, options, env): - return f"{escape(token.content)}" - def link_open(self, token, tokens, i, options, env): - env['-link-tag-stack'].append(token.tag) - (attr, start) = ('linkend', 1) if token.attrs['href'][0] == '#' else ('xlink:href', 0) - return f"<{token.tag} {attr}={quoteattr(token.attrs['href'][start:])}>" - def link_close(self, token, tokens, i, options, env): - return f"" - def list_item_open(self, token, tokens, i, options, env): - return "" - def list_item_close(self, token, tokens, i, options, env): - return "\n" - # HACK open and close para for docbook change size. remove soon. - def bullet_list_open(self, token, tokens, i, options, env): - return "\n" - def bullet_list_close(self, token, tokens, i, options, env): - return "\n" - def em_open(self, token, tokens, i, options, env): - return "" - def em_close(self, token, tokens, i, options, env): - return "" - def strong_open(self, token, tokens, i, options, env): - return "" - def strong_close(self, token, tokens, i, options, env): - return "" - def fence(self, token, tokens, i, options, env): - info = f" language={quoteattr(token.info)}" if token.info != "" else "" - return f"{escape(token.content)}" - def blockquote_open(self, token, tokens, i, options, env): - return "
" - def blockquote_close(self, token, tokens, i, options, env): - return "
" - def _note_open(self, token, tokens, i, options, env): - return "" - def _note_close(self, token, tokens, i, options, env): - return "" - def _important_open(self, token, tokens, i, options, env): - return "" - def _important_close(self, token, tokens, i, options, env): - return "" - def _warning_open(self, token, tokens, i, options, env): - return "" - def _warning_close(self, token, tokens, i, options, env): - return "" - # markdown-it emits tokens based on the html syntax tree, but docbook is - # slightly different. html has
{
{
}}
, - # docbook has {} - # we have to reject multiple definitions for the same term for time being. - def dl_open(self, token, tokens, i, options, env): - env['-deflist-stack'].append({}) - return "" - def dl_close(self, token, tokens, i, options, env): - env['-deflist-stack'].pop() - return "" - def dt_open(self, token, tokens, i, options, env): - env['-deflist-stack'][-1]['has-dd'] = False - return "" - def dt_close(self, token, tokens, i, options, env): - return "" - def dd_open(self, token, tokens, i, options, env): - if env['-deflist-stack'][-1]['has-dd']: - raise Exception("multiple definitions per term not supported") - env['-deflist-stack'][-1]['has-dd'] = True - return "" - def dd_close(self, token, tokens, i, options, env): - return "" - def myst_role(self, token, tokens, i, options, env): - if token.meta['name'] == 'command': - return f"{escape(token.content)}" - if token.meta['name'] == 'file': - return f"{escape(token.content)}" - if token.meta['name'] == 'var': - return f"{escape(token.content)}" - if token.meta['name'] == 'env': - return f"{escape(token.content)}" - if token.meta['name'] == 'option': - return f"" - if token.meta['name'] == 'manpage': - [page, section] = [ s.strip() for s in token.content.rsplit('(', 1) ] - section = section[:-1] - man = f"{page}({section})" - title = f"{escape(page)}" - vol = f"{escape(section)}" - ref = f"{title}{vol}" - if man in manpage_urls: - return f"{ref}" - else: - return ref - raise NotImplementedError("md node not supported yet", token) - -md = ( - markdown_it.MarkdownIt(renderer_cls=Renderer) - # TODO maybe fork the plugin and have only a single rule for all? - .use(container_plugin, name="{.note}") - .use(container_plugin, name="{.important}") - .use(container_plugin, name="{.warning}") - .use(deflist_plugin) - .use(myst_role_plugin) -) - -# converts in-place! -def convertMD(options: Dict[str, Any]) -> str: - def optionIs(option: Dict[str, Any], key: str, typ: str) -> bool: - if key not in option: return False - if type(option[key]) != dict: return False - if '_type' not in option[key]: return False - return option[key]['_type'] == typ - - def convertCode(name: str, option: Dict[str, Any], key: str): - if optionIs(option, key, 'literalMD'): - option[key] = md.render(f"*{key.capitalize()}:*\n{option[key]['text']}") - elif optionIs(option, key, 'literalExpression'): - code = option[key]['text'] - # for multi-line code blocks we only have to count ` runs at the beginning - # of a line, but this is much easier. - multiline = '\n' in code - longest, current = (0, 0) - for c in code: - current = current + 1 if c == '`' else 0 - longest = max(current, longest) - # inline literals need a space to separate ticks from content, code blocks - # need newlines. inline literals need one extra tick, code blocks need three. - ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ') - code = f"{ticks}{sep}{code}{sep}{ticks}" - option[key] = md.render(f"*{key.capitalize()}:*\n{code}") - elif optionIs(option, key, 'literalDocBook'): - option[key] = f"{key.capitalize()}: {option[key]['text']}" - elif key in option: - raise Exception(f"{name} {key} has unrecognized type", option[key]) - - for (name, option) in options.items(): - try: - if optionIs(option, 'description', 'mdDoc'): - option['description'] = md.render(option['description']['text']) - elif markdownByDefault: - option['description'] = md.render(option['description']) - else: - option['description'] = ("" + - option['description'] + - "") - - convertCode(name, option, 'example') - convertCode(name, option, 'default') - - if 'relatedPackages' in option: - option['relatedPackages'] = md.render(option['relatedPackages']) - except Exception as e: - raise Exception(f"Failed to render option {name}") from e - - return options - -id_translate_table = { - ord('*'): ord('_'), - ord('<'): ord('_'), - ord(' '): ord('_'), - ord('>'): ord('_'), - ord('['): ord('_'), - ord(']'): ord('_'), - ord(':'): ord('_'), - ord('"'): ord('_'), -} - -def need_env(n): - if n not in os.environ: - raise RuntimeError("required environment variable not set", n) - return os.environ[n] - -OTD_REVISION = need_env('OTD_REVISION') -OTD_DOCUMENT_TYPE = need_env('OTD_DOCUMENT_TYPE') -OTD_VARIABLE_LIST_ID = need_env('OTD_VARIABLE_LIST_ID') -OTD_OPTION_ID_PREFIX = need_env('OTD_OPTION_ID_PREFIX') - -def print_decl_def(header, locs): - print(f"""{header}:""") - print(f"""""") - for loc in locs: - # locations can be either plain strings (specific to nixpkgs), or attrsets - # { name = "foo/bar.nix"; url = "https://github.com/....."; } - if isinstance(loc, str): - # Hyperlink the filename either to the NixOS github - # repository (if it’s a module and we have a revision number), - # or to the local filesystem. - if not loc.startswith('/'): - if OTD_REVISION == 'local': - href = f"https://github.com/NixOS/nixpkgs/blob/master/{loc}" - else: - href = f"https://github.com/NixOS/nixpkgs/blob/{OTD_REVISION}/{loc}" - else: - href = f"file://{loc}" - # Print the filename and make it user-friendly by replacing the - # /nix/store/ prefix by the default location of nixos - # sources. - if not loc.startswith('/'): - name = f"" - elif loc.contains('nixops') and loc.contains('/nix/'): - name = f"" - else: - name = loc - print(f"""""") - print(escape(name)) - print(f"""""") - else: - href = f" xlink:href={quoteattr(loc['url'])}" if 'url' in loc else "" - print(f"""{escape(loc['name'])}""") - print(f"""""") - -markdownByDefault = False -optOffset = 0 -for arg in sys.argv[1:]: - if arg == "--markdown-by-default": - optOffset += 1 - markdownByDefault = True - -options = convertMD(json.load(open(sys.argv[1 + optOffset], 'r'))) - -keys = list(options.keys()) -keys.sort(key=lambda opt: [ (0 if p.startswith("enable") else 1 if p.startswith("package") else 2, p) - for p in options[opt]['loc'] ]) - -print(f"""""") -if OTD_DOCUMENT_TYPE == 'appendix': - print("""""") - print(""" Configuration Options""") -print(f"""""") - -for name in keys: - opt = options[name] - id = OTD_OPTION_ID_PREFIX + name.translate(id_translate_table) - print(f"""""") - # NOTE adding extra spaces here introduces spaces into xref link expansions - print(f"""""", end='') - print(f"""""", end='') - print(f"""""") - print(f"""""") - print(opt['description']) - if typ := opt.get('type'): - ro = " (read only)" if opt.get('readOnly', False) else "" - print(f"""Type: {escape(typ)}{ro}""") - if default := opt.get('default'): - print(default) - if example := opt.get('example'): - print(example) - if related := opt.get('relatedPackages'): - print(f"""""") - print(f""" Related packages:""") - print(f"""""") - print(related) - if decl := opt.get('declarations'): - print_decl_def("Declared by", decl) - if defs := opt.get('definitions'): - print_decl_def("Defined by", defs) - print(f"""""") - print(f"""""") - -print("""""") -if OTD_DOCUMENT_TYPE == 'appendix': - print("""""") diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix index 2c2ee179fede..fb181c1d7e9a 100644 --- a/nixos/lib/testing/driver.nix +++ b/nixos/lib/testing/driver.nix @@ -12,9 +12,7 @@ let }; - vlans = map (m: ( - m.virtualisation.vlans ++ - (lib.mapAttrsToList (_: v: v.vlan) m.virtualisation.interfaces))) (lib.attrValues config.nodes); + vlans = map (m: m.virtualisation.vlans) (lib.attrValues config.nodes); vms = map (m: m.system.build.vm) (lib.attrValues config.nodes); nodeHostNames = diff --git a/nixos/lib/testing/network.nix b/nixos/lib/testing/network.nix index 98a77f918e07..04ea9a2bc9f7 100644 --- a/nixos/lib/testing/network.nix +++ b/nixos/lib/testing/network.nix @@ -18,40 +18,24 @@ let networkModule = { config, nodes, pkgs, ... }: let - qemu-common = import ../qemu-common.nix { inherit lib pkgs; }; - - # Convert legacy VLANs to named interfaces and merge with explicit interfaces. - vlansNumbered = forEach (zipLists config.virtualisation.vlans (range 1 255)) (v: { - name = "eth${toString v.snd}"; - vlan = v.fst; - assignIP = true; - }); - explicitInterfaces = lib.mapAttrsToList (n: v: v // { name = n; }) config.virtualisation.interfaces; - interfaces = vlansNumbered ++ explicitInterfaces; - interfacesNumbered = zipLists interfaces (range 1 255); - - # Automatically assign IP addresses to requested interfaces. - assignIPs = lib.filter (i: i.assignIP) interfaces; - ipInterfaces = forEach assignIPs (i: - nameValuePair i.name { ipv4.addresses = - [ { address = "192.168.${toString i.vlan}.${toString config.virtualisation.test.nodeNumber}"; + interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255); + interfaces = forEach interfacesNumbered ({ fst, snd }: + nameValuePair "eth${toString snd}" { + ipv4.addresses = + [{ + address = "192.168.${toString fst}.${toString config.virtualisation.test.nodeNumber}"; prefixLength = 24; }]; }); - qemuOptions = lib.flatten (forEach interfacesNumbered ({ fst, snd }: - qemu-common.qemuNICFlags snd fst.vlan config.virtualisation.test.nodeNumber)); - udevRules = forEach interfacesNumbered ({ fst, snd }: - "SUBSYSTEM==\"net\",ACTION==\"add\",ATTR{address}==\"${qemu-common.qemuNicMac fst.vlan config.virtualisation.test.nodeNumber}\",NAME=\"${fst.name}\""); - networkConfig = { networking.hostName = mkDefault config.virtualisation.test.nodeName; - networking.interfaces = listToAttrs ipInterfaces; + networking.interfaces = listToAttrs interfaces; networking.primaryIPAddress = - optionalString (ipInterfaces != [ ]) (head (head ipInterfaces).value.ipv4.addresses).address; + optionalString (interfaces != [ ]) (head (head interfaces).value.ipv4.addresses).address; # Put the IP addresses of all VMs in this machine's # /etc/hosts file. If a machine has multiple @@ -67,13 +51,16 @@ let "${config.networking.hostName}.${config.networking.domain} " + "${config.networking.hostName}\n")); - virtualisation.qemu.options = qemuOptions; - boot.initrd.services.udev.rules = concatMapStrings (x: x + "\n") udevRules; + virtualisation.qemu.options = + let qemu-common = import ../qemu-common.nix { inherit lib pkgs; }; + in + flip concatMap interfacesNumbered + ({ fst, snd }: qemu-common.qemuNICFlags snd fst config.virtualisation.test.nodeNumber); }; in { - key = "network-interfaces"; + key = "ip-address"; config = networkConfig // { # Expose the networkConfig items for tests like nixops # that need to recreate the network config. diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 76092e738ebd..352d6e39435b 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -90,7 +90,7 @@ let only has an effect if {option}`uid` is {option}`null`, in which case it determines whether the user's UID is allocated in the range for system users - (below 500) or in the range for normal users (starting at + (below 1000) or in the range for normal users (starting at 1000). Exactly one of `isNormalUser` and `isSystemUser` must be true. @@ -677,7 +677,7 @@ in { { assertion = let xor = a: b: a && !b || b && !a; - isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 500); + isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 1000); in xor isEffectivelySystemUser user.isNormalUser; message = '' Exactly one of users.users.${user.name}.isSystemUser and users.users.${user.name}.isNormalUser must be set. diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index 07fb86bcc25e..5f803b4f2ee7 100644 --- a/nixos/modules/i18n/input-method/default.nix +++ b/nixos/modules/i18n/input-method/default.nix @@ -66,7 +66,7 @@ in meta = { maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; + doc = ./default.md; }; } diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml deleted file mode 100644 index 7b7907cd32a6..000000000000 --- a/nixos/modules/i18n/input-method/default.xml +++ /dev/null @@ -1,275 +0,0 @@ - - - Input Methods - - Input methods are an operating system component that allows any - data, such as keyboard strokes or mouse movements, to be received as - input. In this way users can enter characters and symbols not found - on their input devices. Using an input method is obligatory for any - language that has more graphemes than there are keys on the - keyboard. - - - The following input methods are available in NixOS: - - - - - IBus: The intelligent input bus. - - - - - Fcitx: A customizable lightweight input method. - - - - - Nabi: A Korean input method based on XIM. - - - - - Uim: The universal input method, is a library with a XIM bridge. - - - - - Hime: An extremely easy-to-use input method framework. - - - - - Kime: Korean IME - - - -
- IBus - - IBus is an Intelligent Input Bus. It provides full featured and - user friendly input method user interface. - - - The following snippet can be used to configure IBus: - - -i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; -}; - - - i18n.inputMethod.ibus.engines is optional and - can be used to add extra IBus engines. - - - Available extra IBus engines are: - - - - - Anthy (ibus-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to - Kana Kanji mixed text. - - - - - Hangul (ibus-engines.hangul): Korean input - method. - - - - - m17n (ibus-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the - m17n database. - - - - - mozc (ibus-engines.mozc): A Japanese input - method from Google. - - - - - Table (ibus-engines.table): An input method - that load tables of input methods. - - - - - table-others (ibus-engines.table-others): - Various table-based input methods. To use this, and any other - table-based input methods, it must appear in the list of - engines along with table. For example: - - -ibus.engines = with pkgs.ibus-engines; [ table table-others ]; - - - - - To use any input method, the package must be added in the - configuration, as shown above, and also (after running - nixos-rebuild) the input method must be added - from IBus’ preference dialog. - -
- Troubleshooting - - If IBus works in some applications but not others, a likely - cause of this is that IBus is depending on a different version - of glib to what the applications are - depending on. This can be checked by running - nix-store -q --requisites <path> | grep glib, - where <path> is the path of either IBus - or an application in the Nix store. The glib - packages must match exactly. If they do not, uninstalling and - reinstalling the application is a likely fix. - -
-
-
- Fcitx - - Fcitx is an input method framework with extension support. It has - three built-in Input Method Engine, Pinyin, QuWei and Table-based - input methods. - - - The following snippet can be used to configure Fcitx: - - -i18n.inputMethod = { - enabled = "fcitx"; - fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; -}; - - - i18n.inputMethod.fcitx.engines is optional and - can be used to add extra Fcitx engines. - - - Available extra Fcitx engines are: - - - - - Anthy (fcitx-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to - Kana Kanji mixed text. - - - - - Chewing (fcitx-engines.chewing): Chewing is - an intelligent Zhuyin input method. It is one of the most - popular input methods among Traditional Chinese Unix users. - - - - - Hangul (fcitx-engines.hangul): Korean input - method. - - - - - Unikey (fcitx-engines.unikey): Vietnamese - input method. - - - - - m17n (fcitx-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the - m17n database. - - - - - mozc (fcitx-engines.mozc): A Japanese input - method from Google. - - - - - table-others (fcitx-engines.table-others): - Various table-based input methods. - - - -
-
- Nabi - - Nabi is an easy to use Korean X input method. It allows you to - enter phonetic Korean characters (hangul) and pictographic Korean - characters (hanja). - - - The following snippet can be used to configure Nabi: - - -i18n.inputMethod = { - enabled = "nabi"; -}; - -
-
- Uim - - Uim (short for universal input method) is a - multilingual input method framework. Applications can use it - through so-called bridges. - - - The following snippet can be used to configure uim: - - -i18n.inputMethod = { - enabled = "uim"; -}; - - - Note: The - option can be used to choose uim toolbar. - -
-
- Hime - - Hime is an extremely easy-to-use input method framework. It is - lightweight, stable, powerful and supports many commonly used - input methods, including Cangjie, Zhuyin, Dayi, Rank, Shrimp, - Greek, Korean Pinyin, Latin Alphabet, etc… - - - The following snippet can be used to configure Hime: - - -i18n.inputMethod = { - enabled = "hime"; -}; - -
-
- Kime - - Kime is Korean IME. it’s built with Rust language and let you get - simple, safe, fast Korean typing - - - The following snippet can be used to configure Kime: - - -i18n.inputMethod = { - enabled = "kime"; -}; - -
- diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix index e1d16f802cee..95f2765aff1e 100644 --- a/nixos/modules/misc/meta.nix +++ b/nixos/modules/misc/meta.nix @@ -47,7 +47,7 @@ in doc = mkOption { type = docFile; internal = true; - example = "./meta.chapter.xml"; + example = "./meta.chapter.md"; description = lib.mdDoc '' Documentation prologue for the set of options of each module. This option should be defined at most once per module. diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixos/modules/programs/digitalbitbox/default.nix index 054110fe5df2..5ee6cdafe63a 100644 --- a/nixos/modules/programs/digitalbitbox/default.nix +++ b/nixos/modules/programs/digitalbitbox/default.nix @@ -33,7 +33,7 @@ in }; meta = { - doc = ./default.xml; + doc = ./default.md; maintainers = with lib.maintainers; [ vidbina ]; }; } diff --git a/nixos/modules/programs/digitalbitbox/default.xml b/nixos/modules/programs/digitalbitbox/default.xml deleted file mode 100644 index ee892523223c..000000000000 --- a/nixos/modules/programs/digitalbitbox/default.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - Digital Bitbox - - Digital Bitbox is a hardware wallet and second-factor authenticator. - - - The digitalbitbox programs module may be - installed by setting programs.digitalbitbox to - true in a manner similar to - - -programs.digitalbitbox.enable = true; - - - and bundles the digitalbitbox package (see - ), which contains the - dbb-app and dbb-cli binaries, - along with the hardware module (see - ) which sets up - the necessary udev rules to access the device. - - - Enabling the digitalbitbox module is pretty much the easiest way to - get a Digital Bitbox device working on your system. - - - For more information, see - https://digitalbitbox.com/start_linux. - -
- Package - - The binaries, dbb-app (a GUI tool) and - dbb-cli (a CLI tool), are available through the - digitalbitbox package which could be installed - as follows: - - -environment.systemPackages = [ - pkgs.digitalbitbox -]; - -
-
- Hardware - - The digitalbitbox hardware package enables the udev rules for - Digital Bitbox devices and may be installed as follows: - - -hardware.digitalbitbox.enable = true; - - - In order to alter the udev rules, one may provide different values - for the udevRule51 and - udevRule52 attributes by means of overriding as - follows: - - -programs.digitalbitbox = { - enable = true; - package = pkgs.digitalbitbox.override { - udevRule51 = "something else"; - }; -}; - -
- diff --git a/nixos/modules/programs/plotinus.nix b/nixos/modules/programs/plotinus.nix index a011bb862aea..c2b6884d6490 100644 --- a/nixos/modules/programs/plotinus.nix +++ b/nixos/modules/programs/plotinus.nix @@ -8,7 +8,7 @@ in { meta = { maintainers = pkgs.plotinus.meta.maintainers; - doc = ./plotinus.xml; + doc = ./plotinus.md; }; ###### interface diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml deleted file mode 100644 index 2d4db0285148..000000000000 --- a/nixos/modules/programs/plotinus.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - Plotinus - - Source: - modules/programs/plotinus.nix - - - Upstream documentation: - https://github.com/p-e-w/plotinus - - - Plotinus is a searchable command palette in every modern GTK - application. - - - When in a GTK 3 application and Plotinus is enabled, you can press - Ctrl+Shift+P to open the command palette. The - command palette provides a searchable list of of all menu items in - the application. - - - To enable Plotinus, add the following to your - configuration.nix: - - -programs.plotinus.enable = true; - - diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 41ea31b0f122..83eee1c88b3c 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -142,5 +142,5 @@ in }; - meta.doc = ./oh-my-zsh.xml; + meta.doc = ./oh-my-zsh.md; } diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml deleted file mode 100644 index 2a2bba96b859..000000000000 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - Oh my ZSH - - oh-my-zsh - is a framework to manage your - ZSH configuration - including completion scripts for several CLI tools or custom prompt - themes. - -
- Basic usage - - The module uses the oh-my-zsh package with all - available features. The initial setup using Nix expressions is - fairly similar to the configuration format of - oh-my-zsh. - - -{ - programs.zsh.ohMyZsh = { - enable = true; - plugins = [ "git" "python" "man" ]; - theme = "agnoster"; - }; -} - - - For a detailed explanation of these arguments please refer to the - oh-my-zsh - docs. - - - The expression generates the needed configuration and writes it - into your /etc/zshrc. - -
-
- Custom additions - - Sometimes third-party or custom scripts such as a modified theme - may be needed. oh-my-zsh provides the - ZSH_CUSTOM - environment variable for this which points to a directory with - additional scripts. - - - The module can do this as well: - - -{ - programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts"; -} - -
-
- Custom environments - - There are several extensions for oh-my-zsh - packaged in nixpkgs. One of them is - nix-zsh-completions - which bundles completion scripts and a plugin for - oh-my-zsh. - - - Rather than using a single mutable path for - ZSH_CUSTOM, it’s also possible to generate this - path from a list of Nix packages: - - -{ pkgs, ... }: -{ - programs.zsh.ohMyZsh.customPkgs = [ - pkgs.nix-zsh-completions - # and even more... - ]; -} - - - Internally a single store path will be created using - buildEnv. Please refer to the docs of - buildEnv - for further reference. - - - Please keep in mind that this is not compatible with - programs.zsh.ohMyZsh.custom as it requires an - immutable store path while custom shall remain - mutable! An evaluation failure will be thrown if both - custom and customPkgs are - set. - -
-
- Package your own customizations - - If third-party customizations (e.g. new themes) are supposed to be - added to oh-my-zsh there are several pitfalls - to keep in mind: - - - - - To comply with the default structure of ZSH - the entire output needs to be written to - $out/share/zsh. - - - - - Completion scripts are supposed to be stored at - $out/share/zsh/site-functions. This - directory is part of the - fpath - and the package should be compatible with pure - ZSH setups. The module will automatically - link the contents of site-functions to - completions directory in the proper store path. - - - - - The plugins directory needs the structure - pluginname/pluginname.plugin.zsh as - structured in the - upstream - repo. - - - - - A derivation for oh-my-zsh may look like this: - - -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "exemplary-zsh-customization-${version}"; - version = "1.0.0"; - src = fetchFromGitHub { - # path to the upstream repository - }; - - dontBuild = true; - installPhase = '' - mkdir -p $out/share/zsh/site-functions - cp {themes,plugins} $out/share/zsh - cp completions $out/share/zsh/site-functions - ''; -} - -
- diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index eb4f11f7dcde..ef0636258994 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -916,6 +916,6 @@ in { meta = { maintainers = lib.teams.acme.members; - doc = ./default.xml; + doc = ./default.md; }; } diff --git a/nixos/modules/security/acme/default.xml b/nixos/modules/security/acme/default.xml deleted file mode 100644 index e80ce3b6a494..000000000000 --- a/nixos/modules/security/acme/default.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - SSL/TLS Certificates with ACME - - NixOS supports automatic domain validation & certificate - retrieval and renewal using the ACME protocol. Any provider can be - used, but by default NixOS uses Let’s Encrypt. The alternative ACME - client - lego is - used under the hood. - - - Automatic cert validation and configuration for Apache and Nginx - virtual hosts is included in NixOS, however if you would like to - generate a wildcard cert or you are not using a web server you will - have to configure DNS based validation. - -
- Prerequisites - - To use the ACME module, you must accept the provider’s terms of - service by setting - to - true. The Let’s Encrypt ToS can be found - here. - - - You must also set an email address to be used when creating - accounts with Let’s Encrypt. You can set this for all certs with - and/or on a - per-cert basis with - . This - address is only used for registration and renewal reminders, and - cannot be used to administer the certificates in any way. - - - Alternatively, you can use a different ACME server by changing the - option to a - provider of your choosing, or just change the server for one cert - with . - - - You will need an HTTP server or DNS server for verification. For - HTTP, the server must have a webroot defined that can serve - .well-known/acme-challenge. This directory - must be writeable by the user that will run the ACME client. For - DNS, you must set up credentials with your provider/server for use - with lego. - -
-
- Using ACME certificates in Nginx - - NixOS supports fetching ACME certificates for you by setting - enableACME = true; in a virtualHost config. We - first create self-signed placeholder certificates in place of the - real ACME certs. The placeholder certs are overwritten when the - ACME certs arrive. For foo.example.com the - config would look like this: - - -security.acme.acceptTerms = true; -security.acme.defaults.email = "admin+acme@example.com"; -services.nginx = { - enable = true; - virtualHosts = { - "foo.example.com" = { - forceSSL = true; - enableACME = true; - # All serverAliases will be added as extra domain names on the certificate. - serverAliases = [ "bar.example.com" ]; - locations."/" = { - root = "/var/www"; - }; - }; - - # We can also add a different vhost and reuse the same certificate - # but we have to append extraDomainNames manually beforehand: - # security.acme.certs."foo.example.com".extraDomainNames = [ "baz.example.com" ]; - "baz.example.com" = { - forceSSL = true; - useACMEHost = "foo.example.com"; - locations."/" = { - root = "/var/www"; - }; - }; - }; -} - -
-
- Using ACME certificates in Apache/httpd - - Using ACME certificates with Apache virtual hosts is identical to - using them with Nginx. The attribute names are all the same, just - replace nginx with httpd where - appropriate. - -
-
- Manual configuration of HTTP-01 validation - - First off you will need to set up a virtual host to serve the - challenges. This example uses a vhost called - certs.example.com, with the intent that you - will generate certs for all your vhosts and redirect everyone to - HTTPS. - - -security.acme.acceptTerms = true; -security.acme.defaults.email = "admin+acme@example.com"; - -# /var/lib/acme/.challenges must be writable by the ACME user -# and readable by the Nginx user. The easiest way to achieve -# this is to add the Nginx user to the ACME group. -users.users.nginx.extraGroups = [ "acme" ]; - -services.nginx = { - enable = true; - virtualHosts = { - "acmechallenge.example.com" = { - # Catchall vhost, will redirect users to HTTPS for all vhosts - serverAliases = [ "*.example.com" ]; - locations."/.well-known/acme-challenge" = { - root = "/var/lib/acme/.challenges"; - }; - locations."/" = { - return = "301 https://$host$request_uri"; - }; - }; - }; -} -# Alternative config for Apache -users.users.wwwrun.extraGroups = [ "acme" ]; -services.httpd = { - enable = true; - virtualHosts = { - "acmechallenge.example.com" = { - # Catchall vhost, will redirect users to HTTPS for all vhosts - serverAliases = [ "*.example.com" ]; - # /var/lib/acme/.challenges must be writable by the ACME user and readable by the Apache user. - # By default, this is the case. - documentRoot = "/var/lib/acme/.challenges"; - extraConfig = '' - RewriteEngine On - RewriteCond %{HTTPS} off - RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge [NC] - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301] - ''; - }; - }; -} - - - Now you need to configure ACME to generate a certificate. - - -security.acme.certs."foo.example.com" = { - webroot = "/var/lib/acme/.challenges"; - email = "foo@example.com"; - # Ensure that the web server you use can read the generated certs - # Take a look at the group option for the web server you choose. - group = "nginx"; - # Since we have a wildcard vhost to handle port 80, - # we can generate certs for anything! - # Just make sure your DNS resolves them. - extraDomainNames = [ "mail.example.com" ]; -}; - - - The private key key.pem and certificate - fullchain.pem will be put into - /var/lib/acme/foo.example.com. - - - Refer to for all available - configuration options for the - security.acme - module. - -
-
- Configuring ACME for DNS validation - - This is useful if you want to generate a wildcard certificate, - since ACME servers will only hand out wildcard certs over DNS - validation. There are a number of supported DNS providers and - servers you can utilise, see the - lego - docs for provider/server specific configuration values. For - the sake of these docs, we will provide a fully self-hosted - example using bind. - - -services.bind = { - enable = true; - extraConfig = '' - include "/var/lib/secrets/dnskeys.conf"; - ''; - zones = [ - rec { - name = "example.com"; - file = "/var/db/bind/${name}"; - master = true; - extraConfig = "allow-update { key rfc2136key.example.com.; };"; - } - ]; -} - -# Now we can configure ACME -security.acme.acceptTerms = true; -security.acme.defaults.email = "admin+acme@example.com"; -security.acme.certs."example.com" = { - domain = "*.example.com"; - dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/certs.secret"; - # We don't need to wait for propagation since this is a local DNS server - dnsPropagationCheck = false; -}; - - - The dnskeys.conf and - certs.secret must be kept secure and thus you - should not keep their contents in your Nix config. Instead, - generate them one time with a systemd service: - - -systemd.services.dns-rfc2136-conf = { - requiredBy = ["acme-example.com.service" "bind.service"]; - before = ["acme-example.com.service" "bind.service"]; - unitConfig = { - ConditionPathExists = "!/var/lib/secrets/dnskeys.conf"; - }; - serviceConfig = { - Type = "oneshot"; - UMask = 0077; - }; - path = [ pkgs.bind ]; - script = '' - mkdir -p /var/lib/secrets - chmod 755 /var/lib/secrets - tsig-keygen rfc2136key.example.com > /var/lib/secrets/dnskeys.conf - chown named:root /var/lib/secrets/dnskeys.conf - chmod 400 /var/lib/secrets/dnskeys.conf - - # extract secret value from the dnskeys.conf - while read x y; do if [ "$x" = "secret" ]; then secret="''${y:1:''${#y}-3}"; fi; done < /var/lib/secrets/dnskeys.conf - - cat > /var/lib/secrets/certs.secret << EOF - RFC2136_NAMESERVER='127.0.0.1:53' - RFC2136_TSIG_ALGORITHM='hmac-sha256.' - RFC2136_TSIG_KEY='rfc2136key.example.com' - RFC2136_TSIG_SECRET='$secret' - EOF - chmod 400 /var/lib/secrets/certs.secret - ''; -}; - - - Now you’re all set to generate certs! You should monitor the first - invocation by running - systemctl start acme-example.com.service & journalctl -fu acme-example.com.service - and watching its log output. - -
-
- Using DNS validation with web server virtual hosts - - It is possible to use DNS-01 validation with all certificates, - including those automatically configured via the Nginx/Apache - enableACME - option. This configuration pattern is fully supported and part of - the module’s test suite for Nginx + Apache. - - - You must follow the guide above on configuring DNS-01 validation - first, however instead of setting the options for one certificate - (e.g. - ) you - will set them as defaults (e.g. - ). - - -# Configure ACME appropriately -security.acme.acceptTerms = true; -security.acme.defaults.email = "admin+acme@example.com"; -security.acme.defaults = { - dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/certs.secret"; - # We don't need to wait for propagation since this is a local DNS server - dnsPropagationCheck = false; -}; - -# For each virtual host you would like to use DNS-01 validation with, -# set acmeRoot = null -services.nginx = { - enable = true; - virtualHosts = { - "foo.example.com" = { - enableACME = true; - acmeRoot = null; - }; - }; -} - - - And that’s it! Next time your configuration is rebuilt, or when - you add a new virtualHost, it will be DNS-01 validated. - -
-
- Using ACME with services demanding root owned - certificates - - Some services refuse to start if the configured certificate files - are not owned by root. PostgreSQL and OpenSMTPD are examples of - these. There is no way to change the user the ACME module uses (it - will always be acme), however you can use - systemd’s LoadCredential feature to resolve - this elegantly. Below is an example configuration for OpenSMTPD, - but this pattern can be applied to any service. - - -# Configure ACME however you like (DNS or HTTP validation), adding -# the following configuration for the relevant certificate. -# Note: You cannot use `systemctl reload` here as that would mean -# the LoadCredential configuration below would be skipped and -# the service would continue to use old certificates. -security.acme.certs."mail.example.com".postRun = '' - systemctl restart opensmtpd -''; - -# Now you must augment OpenSMTPD's systemd service to load -# the certificate files. -systemd.services.opensmtpd.requires = ["acme-finished-mail.example.com.target"]; -systemd.services.opensmtpd.serviceConfig.LoadCredential = let - certDir = config.security.acme.certs."mail.example.com".directory; -in [ - "cert.pem:${certDir}/cert.pem" - "key.pem:${certDir}/key.pem" -]; - -# Finally, configure OpenSMTPD to use these certs. -services.opensmtpd = let - credsDir = "/run/credentials/opensmtpd.service"; -in { - enable = true; - setSendmail = false; - serverConfiguration = '' - pki mail.example.com cert "${credsDir}/cert.pem" - pki mail.example.com key "${credsDir}/key.pem" - listen on localhost tls pki mail.example.com - action act1 relay host smtp://127.0.0.1:10027 - match for local action act1 - ''; -}; - -
-
- Regenerating certificates - - Should you need to regenerate a particular certificate in a hurry, - such as when a vulnerability is found in Let’s Encrypt, there is - now a convenient mechanism for doing so. Running - systemctl clean --what=state acme-example.com.service - will remove all certificate files and the account data for the - given domain, allowing you to then - systemctl start acme-example.com.service to - generate fresh ones. - -
-
- Fixing JWS Verification error - - It is possible that your account credentials file may become - corrupt and need to be regenerated. In this scenario lego will - produce the error JWS verification error. The - solution is to simply delete the associated accounts file and - re-run the affected service(s). - - -# Find the accounts folder for the certificate -systemctl cat acme-example.com.service | grep -Po 'accounts/[^:]*' -export accountdir="$(!!)" -# Move this folder to some place else -mv /var/lib/acme/.lego/$accountdir{,.bak} -# Recreate the folder using systemd-tmpfiles -systemd-tmpfiles --create -# Get a new account and reissue certificates -# Note: Do this for all certs that share the same account email address -systemctl start acme-example.com.service - -
- diff --git a/nixos/modules/services/audio/roon-bridge.nix b/nixos/modules/services/audio/roon-bridge.nix index e9335091ba9a..70392b647cc6 100644 --- a/nixos/modules/services/audio/roon-bridge.nix +++ b/nixos/modules/services/audio/roon-bridge.nix @@ -42,7 +42,7 @@ in { environment.ROON_DATAROOT = "/var/lib/${name}"; serviceConfig = { - ExecStart = "${pkgs.roon-bridge}/start.sh"; + ExecStart = "${pkgs.roon-bridge}/bin/RoonBridge"; LimitNOFILE = 8192; User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index c5fc09dcea02..bc2d79ac10ac 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -226,7 +226,7 @@ let in { meta.maintainers = with maintainers; [ dotlambda ]; - meta.doc = ./borgbackup.xml; + meta.doc = ./borgbackup.md; ###### interface diff --git a/nixos/modules/services/backup/borgbackup.xml b/nixos/modules/services/backup/borgbackup.xml deleted file mode 100644 index 2b9e0baa6d09..000000000000 --- a/nixos/modules/services/backup/borgbackup.xml +++ /dev/null @@ -1,215 +0,0 @@ - - - BorgBackup - - Source: - modules/services/backup/borgbackup.nix - - - Upstream documentation: - https://borgbackup.readthedocs.io/ - - - BorgBackup - (short: Borg) is a deduplicating backup program. Optionally, it - supports compression and authenticated encryption. - - - The main goal of Borg is to provide an efficient and secure way to - backup data. The data deduplication technique used makes Borg - suitable for daily backups since only changes are stored. The - authenticated encryption technique makes it suitable for backups to - not fully trusted targets. - -
- Configuring - - A complete list of options for the Borgbase module may be found - here. - -
-
- Basic usage for a local backup - - A very basic configuration for backing up to a locally accessible - directory is: - - -{ - opt.services.borgbackup.jobs = { - { rootBackup = { - paths = "/"; - exclude = [ "/nix" "/path/to/local/repo" ]; - repo = "/path/to/local/repo"; - doInit = true; - encryption = { - mode = "repokey"; - passphrase = "secret"; - }; - compression = "auto,lzma"; - startAt = "weekly"; - }; - } - }; -} - - - - If you do not want the passphrase to be stored in the - world-readable Nix store, use passCommand. You find an example - below. - - -
-
- Create a borg backup server - - You should use a different SSH key for each repository you write - to, because the specified keys are restricted to running borg - serve and can only access this single repository. You need the - output of the generate pub file. - - -# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo -# cat /run/keys/id_ed25519_my_borg_repo -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos - - - Add the following snippet to your NixOS configuration: - - -{ - services.borgbackup.repos = { - my_borg_repo = { - authorizedKeys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos" - ] ; - path = "/var/lib/my_borg_repo" ; - }; - }; -} - -
-
- Backup to the borg repository server - - The following NixOS snippet creates an hourly backup to the - service (on the host nixos) as created in the section above. We - assume that you have stored a secret passphrasse in the file - /run/keys/borgbackup_passphrase, which should - be only accessible by root - - -{ - services.borgbackup.jobs = { - backupToLocalServer = { - paths = [ "/etc/nixos" ]; - doInit = true; - repo = "borg@nixos:." ; - encryption = { - mode = "repokey-blake2"; - passCommand = "cat /run/keys/borgbackup_passphrase"; - }; - environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_my_borg_repo"; }; - compression = "auto,lzma"; - startAt = "hourly"; - }; - }; -}; - - - The following few commands (run as root) let you test your backup. - - -> nixos-rebuild switch -...restarting the following units: polkit.service -> systemctl restart borgbackup-job-backupToLocalServer -> sleep 10 -> systemctl restart borgbackup-job-backupToLocalServer -> export BORG_PASSPHRASE=topSecrect -> borg list --rsh='ssh -i /run/keys/id_ed25519_my_borg_repo' borg@nixos:. -nixos-backupToLocalServer-2020-03-30T21:46:17 Mon, 2020-03-30 21:46:19 [84feb97710954931ca384182f5f3cb90665f35cef214760abd7350fb064786ac] -nixos-backupToLocalServer-2020-03-30T21:46:30 Mon, 2020-03-30 21:46:32 [e77321694ecd160ca2228611747c6ad1be177d6e0d894538898de7a2621b6e68] - -
-
- Backup to a hosting service - - Several companies offer - (paid) - hosting services for Borg repositories. - - - To backup your home directory to borgbase you have to: - - - - - Generate a SSH key without a password, to access the remote - server. E.g. - - -sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_borgbase - - - - - Create the repository on the server by following the - instructions for your hosting server. - - - - - Initialize the repository on the server. Eg. - - -sudo borg init --encryption=repokey-blake2 \ - -rsh "ssh -i /run/keys/id_ed25519_borgbase" \ - zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo - - - - - Add it to your NixOS configuration, e.g. - - -{ - services.borgbackup.jobs = { - my_Remote_Backup = { - paths = [ "/" ]; - exclude = [ "/nix" "'**/.cache'" ]; - repo = "zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo"; - encryption = { - mode = "repokey-blake2"; - passCommand = "cat /run/keys/borgbackup_passphrase"; - }; - environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_borgbase"; }; - compression = "auto,lzma"; - startAt = "daily"; - }; - }; -}} - - - -
-
- Vorta backup client for the desktop - - Vorta is a backup client for macOS and Linux desktops. It - integrates the mighty BorgBackup with your desktop environment to - protect your data from disk failure, ransomware and theft. - - - It can be installed in NixOS e.g. by adding - pkgs.vorta to - . - - - Details about using Vorta can be found under - https://vorta.borgbase.com - . - -
- diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 16d539b661eb..48e9898a68c2 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -424,6 +424,6 @@ in }; }; - meta.doc = ./foundationdb.xml; + meta.doc = ./foundationdb.md; meta.maintainers = with lib.maintainers; [ thoughtpolice ]; } diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml deleted file mode 100644 index 611535a9eb8a..000000000000 --- a/nixos/modules/services/databases/foundationdb.xml +++ /dev/null @@ -1,425 +0,0 @@ - - - FoundationDB - - Source: - modules/services/databases/foundationdb.nix - - - Upstream documentation: - https://apple.github.io/foundationdb/ - - - Maintainer: Austin Seipp - - - Available version(s): 5.1.x, 5.2.x, 6.0.x - - - FoundationDB (or FDB) is an open source, distributed, - transactional key-value store. - -
- Configuring and basic setup - - To enable FoundationDB, add the following to your - configuration.nix: - - -services.foundationdb.enable = true; -services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x - - - The option is - required, and must always be specified. Due to the fact - FoundationDB network protocols and on-disk storage formats may - change between (major) versions, and upgrades must be explicitly - handled by the user, you must always manually specify this - yourself so that the NixOS module will use the proper version. - Note that minor, bugfix releases are always compatible. - - - After running nixos-rebuild, you can verify - whether FoundationDB is running by executing - fdbcli (which is added to - ): - - -$ sudo -u foundationdb fdbcli -Using cluster file `/etc/foundationdb/fdb.cluster'. - -The database is available. - -Welcome to the fdbcli. For help, type `help'. -fdb> status - -Using cluster file `/etc/foundationdb/fdb.cluster'. - -Configuration: - Redundancy mode - single - Storage engine - memory - Coordinators - 1 - -Cluster: - FoundationDB processes - 1 - Machines - 1 - Memory availability - 5.4 GB per process on machine with least available - Fault Tolerance - 0 machines - Server time - 04/20/18 15:21:14 - -... - -fdb> - - - You can also write programs using the available client libraries. - For example, the following Python program can be run in order to - grab the cluster status, as a quick example. (This example uses - nix-shell shebang support to automatically - supply the necessary Python modules). - - -a@link> cat fdb-status.py -#! /usr/bin/env nix-shell -#! nix-shell -i python -p python pythonPackages.foundationdb52 - -import fdb -import json - -def main(): - fdb.api_version(520) - db = fdb.open() - - @fdb.transactional - def get_status(tr): - return str(tr['\xff\xff/status/json']) - - obj = json.loads(get_status(db)) - print('FoundationDB available: %s' % obj['client']['database_status']['available']) - -if __name__ == "__main__": - main() -a@link> chmod +x fdb-status.py -a@link> ./fdb-status.py -FoundationDB available: True -a@link> - - - FoundationDB is run under the foundationdb user - and group by default, but this may be changed in the NixOS - configuration. The systemd unit - foundationdb.service controls the - fdbmonitor process. - - - By default, the NixOS module for FoundationDB creates a single - SSD-storage based database for development and basic usage. This - storage engine is designed for SSDs and will perform poorly on - HDDs; however it can handle far more data than the alternative - memory engine and is a better default choice for - most deployments. (Note that you can change the storage backend - on-the-fly for a given FoundationDB cluster using - fdbcli.) - - - Furthermore, only 1 server process and 1 backup agent are started - in the default configuration. See below for more on scaling to - increase this. - - - FoundationDB stores all data for all server processes under - /var/lib/foundationdb. You can override this - using , e.g. - - -services.foundationdb.dataDir = "/data/fdb"; - - - Similarly, logs are stored under - /var/log/foundationdb by default, and there - is a corresponding - as well. - -
-
- Scaling processes and backup agents - - Scaling the number of server processes is quite easy; simply - specify to - be the number of FoundationDB worker processes that should be - started on the machine. - - - FoundationDB worker processes typically require 4GB of RAM - per-process at minimum for good performance, so this option is set - to 1 by default since the maximum amount of RAM is unknown. You’re - advised to abide by this restriction, so pick a number of - processes so that each has 4GB or more. - - - A similar option exists in order to scale backup agent processes, - . Backup - agents are not as performance/RAM sensitive, so feel free to - experiment with the number of available backup processes. - -
-
- Clustering - - FoundationDB on NixOS works similarly to other Linux systems, so - this section will be brief. Please refer to the full FoundationDB - documentation for more on clustering. - - - FoundationDB organizes clusters using a set of - coordinators, which are just - specially-designated worker processes. By default, every - installation of FoundationDB on NixOS will start as its own - individual cluster, with a single coordinator: the first worker - process on localhost. - - - Coordinators are specified globally using the - /etc/foundationdb/fdb.cluster file, which all - servers and client applications will use to find and join - coordinators. Note that this file can not be - managed by NixOS so easily: FoundationDB is designed so that it - will rewrite the file at runtime for all clients and nodes when - cluster coordinators change, with clients transparently handling - this without intervention. It is fundamentally a mutable file, and - you should not try to manage it in any way in NixOS. - - - When dealing with a cluster, there are two main things you want to - do: - - - - - Add a node to the cluster for storage/compute. - - - - - Promote an ordinary worker to a coordinator. - - - - - A node must already be a member of the cluster in order to - properly be promoted to a coordinator, so you must always add it - first if you wish to promote it. - - - To add a machine to a FoundationDB cluster: - - - - - Choose one of the servers to start as the initial coordinator. - - - - - Copy the /etc/foundationdb/fdb.cluster file - from this server to all the other servers. Restart - FoundationDB on all of these other servers, so they join the - cluster. - - - - - All of these servers are now connected and working together in - the cluster, under the chosen coordinator. - - - - - At this point, you can add as many nodes as you want by just - repeating the above steps. By default there will still be a single - coordinator: you can use fdbcli to change this - and add new coordinators. - - - As a convenience, FoundationDB can automatically assign - coordinators based on the redundancy mode you wish to achieve for - the cluster. Once all the nodes have been joined, simply set the - replication policy, and then issue the - coordinators auto command - - - For example, assuming we have 3 nodes available, we can enable - double redundancy mode, then auto-select coordinators. For double - redundancy, 3 coordinators is ideal: therefore FoundationDB will - make every node a coordinator automatically: - - -fdbcli> configure double ssd -fdbcli> coordinators auto - - - This will transparently update all the servers within seconds, and - appropriately rewrite the fdb.cluster file, as - well as informing all client processes to do the same. - -
-
- Client connectivity - - By default, all clients must use the current - fdb.cluster file to access a given FoundationDB - cluster. This file is located by default in - /etc/foundationdb/fdb.cluster on all machines - with the FoundationDB service enabled, so you may copy the active - one from your cluster to a new node in order to connect, if it is - not part of the cluster. - -
-
- Client authorization and TLS - - By default, any user who can connect to a FoundationDB process - with the correct cluster configuration can access anything. - FoundationDB uses a pluggable design to transport security, and - out of the box it supports a LibreSSL-based plugin for TLS - support. This plugin not only does in-flight encryption, but also - performs client authorization based on the given endpoint’s - certificate chain. For example, a FoundationDB server may be - configured to only accept client connections over TLS, where the - client TLS certificate is from organization Acme - Co in the Research and Development - unit. - - - Configuring TLS with FoundationDB is done using the - options in order to - control the peer verification string, as well as the certificate - and its private key. - - - Note that the certificate and its private key must be accessible - to the FoundationDB user account that the server runs under. These - files are also NOT managed by NixOS, as putting them into the - store may reveal private information. - - - After you have a key and certificate file in place, it is not - enough to simply set the NixOS module options – you must also - configure the fdb.cluster file to specify that - a given set of coordinators use TLS. This is as simple as adding - the suffix :tls to your cluster coordinator - configuration, after the port number. For example, assuming you - have a coordinator on localhost with the default configuration, - simply specifying: - - -XXXXXX:XXXXXX@127.0.0.1:4500:tls - - - will configure all clients and server processes to use TLS from - now on. - -
-
- Backups and Disaster Recovery - - The usual rules for doing FoundationDB backups apply on NixOS as - written in the FoundationDB manual. However, one important - difference is the security profile for NixOS: by default, the - foundationdb systemd unit uses Linux - namespaces to restrict write access to the system, - except for the log directory, data directory, and the - /etc/foundationdb/ directory. This is enforced - by default and cannot be disabled. - - - However, a side effect of this is that the - fdbbackup command doesn’t work properly for - local filesystem backups: FoundationDB uses a server process - alongside the database processes to perform backups and copy the - backups to the filesystem. As a result, this process is put under - the restricted namespaces above: the backup process can only write - to a limited number of paths. - - - In order to allow flexible backup locations on local disks, the - FoundationDB NixOS module supports a - option. - This option takes a list of paths, and adds them to the systemd - unit, allowing the processes inside the service to write (and - read) the specified directories. - - - For example, to create backups in - /opt/fdb-backups, first set up the paths in the - module options: - - -services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; - - - Restart the FoundationDB service, and it will now be able to write - to this directory (even if it does not yet exist.) Note: this path - must exist before restarting the unit. - Otherwise, systemd will not include it in the private FoundationDB - namespace (and it will not add it dynamically at runtime). - - - You can now perform a backup: - - -$ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups -$ sudo -u foundationdb fdbbackup status -t default - -
-
- Known limitations - - The FoundationDB setup for NixOS should currently be considered - beta. FoundationDB is not new software, but the NixOS compilation - and integration has only undergone fairly basic testing of all the - available functionality. - - - - - There is no way to specify individual parameters for - individual fdbserver processes. Currently, - all server processes inherit all the global - fdbmonitor settings. - - - - - Ruby bindings are not currently installed. - - - - - Go bindings are not currently installed. - - - -
-
- Options - - NixOS’s FoundationDB module allows you to configure all of the - most relevant configuration options for - fdbmonitor, matching it quite closely. A - complete list of options for the FoundationDB module may be found - here. You - should also read the FoundationDB documentation as well. - -
-
- Full documentation - - FoundationDB is a complex piece of software, and requires careful - administration to properly use. Full documentation for - administration can be found here: - https://apple.github.io/foundationdb/. - -
- diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 6665e7a088fc..7bbe1ad22595 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -585,6 +585,6 @@ in }; - meta.doc = ./postgresql.xml; + meta.doc = ./postgresql.md; meta.maintainers = with lib.maintainers; [ thoughtpolice danbst ]; } diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml deleted file mode 100644 index 2f62d5d80b19..000000000000 --- a/nixos/modules/services/databases/postgresql.xml +++ /dev/null @@ -1,250 +0,0 @@ - - - PostgreSQL - - Source: - modules/services/databases/postgresql.nix - - - Upstream documentation: - http://www.postgresql.org/docs/ - - - PostgreSQL is an advanced, free relational database. - -
- Configuring - - To enable PostgreSQL, add the following to your - configuration.nix: - - -services.postgresql.enable = true; -services.postgresql.package = pkgs.postgresql_11; - - - Note that you are required to specify the desired version of - PostgreSQL (e.g. pkgs.postgresql_11). Since - upgrading your PostgreSQL version requires a database dump and - reload (see below), NixOS cannot provide a default value for - such as the - most recent release of PostgreSQL. - - - By default, PostgreSQL stores its databases in - /var/lib/postgresql/$psqlSchema. You can - override this using - , e.g. - - -services.postgresql.dataDir = "/data/postgresql"; - -
-
- Upgrading - - - The steps below demonstrate how to upgrade from an older version - to pkgs.postgresql_13. These instructions are - also applicable to other versions. - - - - Major PostgreSQL upgrades require a downtime and a few imperative - steps to be called. This is the case because each major version - has some internal changes in the databases’ state during major - releases. Because of that, NixOS places the state into - /var/lib/postgresql/<version> where - each version can be obtained like this: - - -$ nix-instantiate --eval -A postgresql_13.psqlSchema -"13" - - - For an upgrade, a script like this can be used to simplify the - process: - - -{ config, pkgs, ... }: -{ - environment.systemPackages = [ - (let - # XXX specify the postgresql package you'd like to upgrade to. - # Do not forget to list the extensions you need. - newPostgres = pkgs.postgresql_13.withPackages (pp: [ - # pp.plv8 - ]); - in pkgs.writeScriptBin "upgrade-pg-cluster" '' - set -eux - # XXX it's perhaps advisable to stop all services that depend on postgresql - systemctl stop postgresql - - export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}" - - export NEWBIN="${newPostgres}/bin" - - export OLDDATA="${config.services.postgresql.dataDir}" - export OLDBIN="${config.services.postgresql.package}/bin" - - install -d -m 0700 -o postgres -g postgres "$NEWDATA" - cd "$NEWDATA" - sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" - - sudo -u postgres $NEWBIN/pg_upgrade \ - --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ - --old-bindir $OLDBIN --new-bindir $NEWBIN \ - "$@" - '') - ]; -} - - - The upgrade process is: - - - - - Rebuild nixos configuration with the configuration above added - to your configuration.nix. Alternatively, - add that into separate file and reference it in - imports list. - - - - - Login as root (sudo su -) - - - - - Run upgrade-pg-cluster. It will stop old - postgresql, initialize a new one and migrate the old one to - the new one. You may supply arguments like - --jobs 4 and --link to - speedup migration process. See - https://www.postgresql.org/docs/current/pgupgrade.html - for details. - - - - - Change postgresql package in NixOS configuration to the one - you were upgrading to via - . Rebuild - NixOS. This should start new postgres using upgraded data - directory and all services you stopped during the upgrade. - - - - - After the upgrade it’s advisable to analyze the new cluster. - - - - - For PostgreSQL ≥ 14, use the vacuumdb - command printed by the upgrades script. - - - - - For PostgreSQL < 14, run (as - su -l postgres in the - , in - this example /var/lib/postgresql/13): - - -$ ./analyze_new_cluster.sh - - - - - - The next step removes the old state-directory! - - - -$ ./delete_old_cluster.sh - - - -
-
- Options - - A complete list of options for the PostgreSQL module may be found - here. - -
-
- Plugins - - Plugins collection for each PostgreSQL version can be accessed - with .pkgs. For example, for - pkgs.postgresql_11 package, its plugin - collection is accessed by - pkgs.postgresql_11.pkgs: - - -$ nix repl '<nixpkgs>' - -Loading '<nixpkgs>'... -Added 10574 variables. - -nix-repl> postgresql_11.pkgs.<TAB><TAB> -postgresql_11.pkgs.cstore_fdw postgresql_11.pkgs.pg_repack -postgresql_11.pkgs.pg_auto_failover postgresql_11.pkgs.pg_safeupdate -postgresql_11.pkgs.pg_bigm postgresql_11.pkgs.pg_similarity -postgresql_11.pkgs.pg_cron postgresql_11.pkgs.pg_topn -postgresql_11.pkgs.pg_hll postgresql_11.pkgs.pgjwt -postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga -... - - - To add plugins via NixOS configuration, set - services.postgresql.extraPlugins: - - -services.postgresql.package = pkgs.postgresql_11; -services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ - pg_repack - postgis -]; - - - You can build custom PostgreSQL-with-plugins (to be used outside - of NixOS) using function .withPackages. For - example, creating a custom PostgreSQL package in an overlay can - look like: - - -self: super: { - postgresql_custom = self.postgresql_11.withPackages (ps: [ - ps.pg_repack - ps.postgis - ]); -} - - - Here’s a recipe on how to override a particular plugin through an - overlay: - - -self: super: { - postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // { - pkgs = super.postgresql_11.pkgs // { - pg_repack = super.postgresql_11.pkgs.pg_repack.overrideAttrs (_: { - name = "pg_repack-v20181024"; - src = self.fetchzip { - url = "https://github.com/reorg/pg_repack/archive/923fa2f3c709a506e111cc963034bf2fd127aa00.tar.gz"; - sha256 = "17k6hq9xaax87yz79j773qyigm4fwk8z4zh5cyp6z0sxnwfqxxw5"; - }; - }); - }; - }; -} - -
- diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 3b14ad75ab30..d99faf381e01 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -7,7 +7,7 @@ let cfg = config.services.flatpak; in { meta = { - doc = ./flatpak.xml; + doc = ./flatpak.md; maintainers = pkgs.flatpak.meta.maintainers; }; diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml deleted file mode 100644 index cdc3278fa996..000000000000 --- a/nixos/modules/services/desktops/flatpak.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - Flatpak - - Source: - modules/services/desktop/flatpak.nix - - - Upstream documentation: - https://github.com/flatpak/flatpak/wiki - - - Flatpak is a system for building, distributing, and running - sandboxed desktop applications on Linux. - - - To enable Flatpak, add the following to your - configuration.nix: - - - services.flatpak.enable = true; - - - For the sandboxed apps to work correctly, desktop integration - portals need to be installed. If you run GNOME, this will be handled - automatically for you; in other cases, you will need to add - something like the following to your - configuration.nix: - - - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - - - Then, you will need to add a repository, for example, - Flathub, - either using the following commands: - - -$ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -$ flatpak update - - - or by opening the - repository - file in GNOME Software. - - - Finally, you can search and install programs: - - -$ flatpak search bustle -$ flatpak install flathub org.freedesktop.Bustle -$ flatpak run org.freedesktop.Bustle - - - Again, GNOME Software offers graphical interface for these tasks. - - diff --git a/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json b/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json index 9aa51b61431d..c204606193af 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json @@ -35,5 +35,20 @@ } ], "filter.properties": {}, - "stream.properties": {} + "stream.properties": {}, + "alsa.properties": {}, + "alsa.rules": [ + { + "matches": [ + { + "application.process.binary": "resolve" + } + ], + "actions": { + "update-props": { + "alsa.buffer-bytes": 131072 + } + } + } + ] } diff --git a/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json b/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json index 4a173f732297..f2e396dd28d7 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json @@ -58,6 +58,18 @@ "node.passive": true } } + }, + { + "matches": [ + { + "client.name": "Mixxx" + } + ], + "actions": { + "update-props": { + "jack.merge-monitor": false + } + } } ] } diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index a4ef88a45ad0..09cec9a79109 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -42,7 +42,7 @@ let in { meta = { - maintainers = teams.freedesktop.members; + maintainers = teams.freedesktop.members ++ [ lib.maintainers.k900 ]; # uses attributes of the linked package buildDocsInSandbox = false; }; diff --git a/nixos/modules/services/development/blackfire.nix b/nixos/modules/services/development/blackfire.nix index 054cef9ae80b..3c98d7a281c6 100644 --- a/nixos/modules/services/development/blackfire.nix +++ b/nixos/modules/services/development/blackfire.nix @@ -11,7 +11,7 @@ let in { meta = { maintainers = pkgs.blackfire.meta.maintainers; - doc = ./blackfire.xml; + doc = ./blackfire.md; }; options = { diff --git a/nixos/modules/services/development/blackfire.xml b/nixos/modules/services/development/blackfire.xml deleted file mode 100644 index 842e5bec97d5..000000000000 --- a/nixos/modules/services/development/blackfire.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - Blackfire profiler - - Source: - modules/services/development/blackfire.nix - - - Upstream documentation: - https://blackfire.io/docs/introduction - - - Blackfire is a - proprietary tool for profiling applications. There are several - languages supported by the product but currently only PHP support is - packaged in Nixpkgs. The back-end consists of a module that is - loaded into the language runtime (called probe) - and a service (agent) that the probe connects - to and that sends the profiles to the server. - - - To use it, you will need to enable the agent and the probe on your - server. The exact method will depend on the way you use PHP but here - is an example of NixOS configuration for PHP-FPM: - - -let - php = pkgs.php.withExtensions ({ enabled, all }: enabled ++ (with all; [ - blackfire - ])); -in { - # Enable the probe extension for PHP-FPM. - services.phpfpm = { - phpPackage = php; - }; - - # Enable and configure the agent. - services.blackfire-agent = { - enable = true; - settings = { - # You will need to get credentials at https://blackfire.io/my/settings/credentials - # You can also use other options described in https://blackfire.io/docs/up-and-running/configuration/agent - server-id = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"; - server-token = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"; - }; - }; - - # Make the agent run on start-up. - # (WantedBy= from the upstream unit not respected: https://github.com/NixOS/nixpkgs/issues/81138) - # Alternately, you can start it manually with `systemctl start blackfire-agent`. - systemd.services.blackfire-agent.wantedBy = [ "phpfpm-foo.service" ]; -} - - - On your developer machine, you will also want to install - the - client (see blackfire package) or the - browser extension to actually trigger the profiling. - - diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 5ae28cd9bbb3..2be46e47d64c 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -99,5 +99,5 @@ in environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "${editorScript}/bin/emacseditor"); }; - meta.doc = ./emacs.xml; + meta.doc = ./emacs.md; } diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml deleted file mode 100644 index 37d7a93a12b3..000000000000 --- a/nixos/modules/services/editors/emacs.xml +++ /dev/null @@ -1,490 +0,0 @@ - - - Emacs - - Emacs - is an extensible, customizable, self-documenting real-time display - editor — and more. At its core is an interpreter for Emacs Lisp, a - dialect of the Lisp programming language with extensions to support - text editing. - - - Emacs runs within a graphical desktop environment using the X Window - System, but works equally well on a text terminal. Under macOS, a - Mac port edition is available, which uses Apple’s - native GUI frameworks. - - - Nixpkgs provides a superior environment for running Emacs. It’s - simple to create custom builds by overriding the default packages. - Chaotic collections of Emacs Lisp code and extensions can be brought - under control using declarative package management. NixOS even - provides a systemd user service for automatically - starting the Emacs daemon. - -
- Installing Emacs - - Emacs can be installed in the normal way for Nix (see - ). In addition, a NixOS - service can be enabled. - -
- The Different Releases of Emacs - - Nixpkgs defines several basic Emacs packages. The following are - attributes belonging to the pkgs set: - - - - - emacs - - - - The latest stable version of Emacs using the - GTK 2 widget - toolkit. - - - - - - emacs-nox - - - - Emacs built without any dependency on X11 libraries. - - - - - - emacsMacport - - - - Emacs with the Mac port patches, providing - a more native look and feel under macOS. - - - - - - If those aren’t suitable, then the following imitation Emacs - editors are also available in Nixpkgs: - Zile, - mg, - Yi, - jmacs. - -
-
- Adding Packages to Emacs - - Emacs includes an entire ecosystem of functionality beyond text - editing, including a project planner, mail and news reader, - debugger interface, calendar, and more. - - - Most extensions are gotten with the Emacs packaging system - (package.el) from - Emacs Lisp Package - Archive (ELPA), - MELPA, - MELPA - Stable, and - Org ELPA. - Nixpkgs is regularly updated to mirror all these archives. - - - Under NixOS, you can continue to use - package-list-packages and - package-install to install packages. You can - also declare the set of Emacs packages you need using the - derivations from Nixpkgs. The rest of this section discusses - declarative installation of Emacs packages through nixpkgs. - - - The first step to declare the list of packages you want in your - Emacs installation is to create a dedicated derivation. This can - be done in a dedicated emacs.nix file such - as: - - - - - -/* -This is a nix expression to build Emacs and some Emacs packages I like -from source on any distribution where Nix is installed. This will install -all the dependencies from the nixpkgs repository and build the binary files -without interfering with the host distribution. - -To build the project, type the following from the current directory: - -$ nix-build emacs.nix - -To run the newly compiled executable: - -$ ./result/bin/emacs -*/ - -# The first non-comment line in this file indicates that -# the whole file represents a function. -{ pkgs ? import <nixpkgs> {} }: - -let - # The let expression below defines a myEmacs binding pointing to the - # current stable version of Emacs. This binding is here to separate - # the choice of the Emacs binary from the specification of the - # required packages. - myEmacs = pkgs.emacs; - # This generates an emacsWithPackages function. It takes a single - # argument: a function from a package set to a list of packages - # (the packages that will be available in Emacs). - emacsWithPackages = (pkgs.emacsPackagesFor myEmacs).emacsWithPackages; -in - # The rest of the file specifies the list of packages to install. In the - # example, two packages (magit and zerodark-theme) are taken from - # MELPA stable. - emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - magit # ; Integrate git <C-x g> - zerodark-theme # ; Nicolas' theme - ]) - # Two packages (undo-tree and zoom-frm) are taken from MELPA. - ++ (with epkgs.melpaPackages; [ - undo-tree # ; <C-x u> to show the undo tree - zoom-frm # ; increase/decrease font size for all buffers %lt;C-x C-+> - ]) - # Three packages are taken from GNU ELPA. - ++ (with epkgs.elpaPackages; [ - auctex # ; LaTeX mode - beacon # ; highlight my cursor when scrolling - nameless # ; hide current package name everywhere in elisp code - ]) - # notmuch is taken from a nixpkgs derivation which contains an Emacs mode. - ++ [ - pkgs.notmuch # From main packages set - ]) - - - The result of this configuration will be an - emacs command which launches Emacs with all - of your chosen packages in the load-path. - - - You can check that it works by executing this in a terminal: - - -$ nix-build emacs.nix -$ ./result/bin/emacs -q - - - and then typing M-x package-initialize. Check - that you can use all the packages you want in this Emacs - instance. For example, try switching to the zerodark theme - through - M-x load-theme <RET> zerodark <RET> y. - - - - A few popular extensions worth checking out are: auctex, - company, edit-server, flycheck, helm, iedit, magit, - multiple-cursors, projectile, and yasnippet. - - - - The list of available packages in the various ELPA repositories - can be seen with the following commands: - - - -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.elpaPackages -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaPackages -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaStablePackages -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.orgPackages - - - If you are on NixOS, you can install this particular Emacs for - all users by adding it to the list of system packages (see - ). Simply modify - your file configuration.nix to make it - contain: - - - -{ - environment.systemPackages = [ - # [...] - (import /path/to/emacs.nix { inherit pkgs; }) - ]; -} - - - In this case, the next nixos-rebuild switch - will take care of adding your emacs to the - PATH environment variable (see - ). - - - If you are not on NixOS or want to install this particular Emacs - only for yourself, you can do so by adding it to your - ~/.config/nixpkgs/config.nix (see - Nixpkgs - manual): - - - -{ - packageOverrides = super: let self = super.pkgs; in { - myemacs = import /path/to/emacs.nix { pkgs = self; }; - }; -} - - - In this case, the next - nix-env -f '<nixpkgs>' -iA myemacs will - take care of adding your emacs to the PATH - environment variable. - -
-
- Advanced Emacs Configuration - - If you want, you can tweak the Emacs package itself from your - emacs.nix. For example, if you want to have - a GTK 3-based Emacs instead of the default GTK 2-based binary - and remove the automatically generated - emacs.desktop (useful if you only use - emacsclient), you can change your file - emacs.nix in this way: - - - - - -{ pkgs ? import <nixpkgs> {} }: -let - myEmacs = (pkgs.emacs.override { - # Use gtk3 instead of the default gtk2 - withGTK3 = true; - withGTK2 = false; - }).overrideAttrs (attrs: { - # I don't want emacs.desktop file because I only use - # emacsclient. - postInstall = (attrs.postInstall or "") + '' - rm $out/share/applications/emacs.desktop - ''; - }); -in [...] - - - After building this file as shown in - the example above, you will - get an GTK 3-based Emacs binary pre-loaded with your favorite - packages. - -
-
-
- Running Emacs as a Service - - NixOS provides an optional systemd service - which launches - Emacs - daemon with the user’s login session. - - - Source: - modules/services/editors/emacs.nix - -
- Enabling the Service - - To install and enable the systemd user - service for Emacs daemon, add the following to your - configuration.nix: - - -services.emacs.enable = true; -services.emacs.package = import /home/cassou/.emacs.d { pkgs = pkgs; }; - - - The services.emacs.package option allows a - custom derivation to be used, for example, one created by - emacsWithPackages. - - - Ensure that the Emacs server is enabled for your user’s Emacs - configuration, either by customizing the - server-mode variable, or by adding - (server-start) to - ~/.emacs.d/init.el. - - - To start the daemon, execute the following: - - -$ nixos-rebuild switch # to activate the new configuration.nix -$ systemctl --user daemon-reload # to force systemd reload -$ systemctl --user start emacs.service # to start the Emacs daemon - - - The server should now be ready to serve Emacs clients. - -
-
- Starting the client - - Ensure that the emacs server is enabled, either by customizing - the server-mode variable, or by adding - (server-start) to - ~/.emacs. - - - To connect to the emacs daemon, run one of the following: - - -emacsclient FILENAME -emacsclient --create-frame # opens a new frame (window) -emacsclient --create-frame --tty # opens a new frame on the current terminal - -
-
- Configuring the <varname>EDITOR</varname> variable - - If is - true, the EDITOR variable - will be set to a wrapper script which launches - emacsclient. - - - Any setting of EDITOR in the shell config - files will override - services.emacs.defaultEditor. To make sure - EDITOR refers to the Emacs wrapper script, - remove any existing EDITOR assignment from - .profile, .bashrc, - .zshenv or any other shell config file. - - - If you have formed certain bad habits when editing files, these - can be corrected with a shell alias to the wrapper script: - - -alias vi=$EDITOR - -
-
- Per-User Enabling of the Service - - In general, systemd user services are - globally enabled by symlinks in - /etc/systemd/user. In the case where Emacs - daemon is not wanted for all users, it is possible to install - the service but not globally enable it: - - -services.emacs.enable = false; -services.emacs.install = true; - - - To enable the systemd user service for just - the currently logged in user, run: - - -systemctl --user enable emacs - - - This will add the symlink - ~/.config/systemd/user/emacs.service. - -
-
-
- Configuring Emacs - - The Emacs init file should be changed to load the extension - packages at startup: - - - -(require 'package) - -;; optional. makes unpure packages archives unavailable -(setq package-archives nil) - -(setq package-enable-at-startup nil) -(package-initialize) - - - After the declarative emacs package configuration has been tested, - previously downloaded packages can be cleaned up by removing - ~/.emacs.d/elpa (do make a backup first, in - case you forgot a package). - -
- A Major Mode for Nix Expressions - - Of interest may be melpaPackages.nix-mode, - which provides syntax highlighting for the Nix language. This is - particularly convenient if you regularly edit Nix files. - -
-
- Accessing man pages - - You can use woman to get completion of all - available man pages. For example, type - M-x woman <RET> nixos-rebuild <RET>. - -
-
- Editing DocBook 5 XML Documents - - Emacs includes - nXML, - a major-mode for validating and editing XML documents. When - editing DocBook 5.0 documents, such as - this one, nXML needs to - be configured with the relevant schema, which is not included. - - - To install the DocBook 5.0 schemas, either add - pkgs.docbook5 to - - (NixOS), or - run nix-env -f '<nixpkgs>' -iA docbook5 - (Nix). - - - Then customize the variable - rng-schema-locating-files to include - ~/.emacs.d/schemas.xml and put the - following text into that file: - - - -<?xml version="1.0"?> -<!-- - To let emacs find this file, evaluate: - (add-to-list 'rng-schema-locating-files "~/.emacs.d/schemas.xml") ---> -<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0"> - <!-- - Use this variation if pkgs.docbook5 is added to environment.systemPackages - --> - <namespace ns="http://docbook.org/ns/docbook" - uri="/run/current-system/sw/share/xml/docbook-5.0/rng/docbookxi.rnc"/> - <!-- - Use this variation if installing schema with "nix-env -iA pkgs.docbook5". - <namespace ns="http://docbook.org/ns/docbook" - uri="../.nix-profile/share/xml/docbook-5.0/rng/docbookxi.rnc"/> - --> -</locatingRules> - -
-
- diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 6453e6968dcc..2a58be51bb02 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -71,6 +71,29 @@ in }; description = lib.mdDoc "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; }; + + input = mkOption { + type = cfgFmt.type; + default = { }; + example = { + General = { + IdleTimeout = 30; + ClassicBondedOnly = true; + }; + }; + description = lib.mdDoc "Set configuration for the input service (/etc/bluetooth/input.conf)."; + }; + + network = mkOption { + type = cfgFmt.type; + default = { }; + example = { + General = { + DisableSecurity = true; + }; + }; + description = lib.mdDoc "Set configuration for the network service (/etc/bluetooth/network.conf)."; + }; }; }; @@ -80,6 +103,10 @@ in environment.systemPackages = [ package ] ++ optional cfg.hsphfpd.enable pkgs.hsphfpd; + environment.etc."bluetooth/input.conf".source = + cfgFmt.generate "input.conf" cfg.input; + environment.etc."bluetooth/network.conf".source = + cfgFmt.generate "network.conf" cfg.network; environment.etc."bluetooth/main.conf".source = cfgFmt.generate "main.conf" (recursiveUpdate defaults cfg.settings); services.udev.packages = [ package ]; diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index 70c1fd09860e..b2217fc97124 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -8,7 +8,7 @@ in { ### docs meta = { - doc = ./trezord.xml; + doc = ./trezord.md; }; ### interface diff --git a/nixos/modules/services/hardware/trezord.xml b/nixos/modules/services/hardware/trezord.xml deleted file mode 100644 index 1ba9dc1f1887..000000000000 --- a/nixos/modules/services/hardware/trezord.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - Trezor - - Trezor is an open-source cryptocurrency hardware wallet and security - token allowing secure storage of private keys. - - - It offers advanced features such U2F two-factor authorization, SSH - login through - Trezor SSH - agent, - GPG and a - password - manager. For more information, guides and documentation, see - https://wiki.trezor.io. - - - To enable Trezor support, add the following to your - configuration.nix: - - -services.trezord.enable = true; - - - This will add all necessary udev rules and start Trezor Bridge. - - diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 2adc7427abf4..9273f71db7d5 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -642,7 +642,7 @@ in { meta = { maintainers = with lib.maintainers; [ lheckemann qyliss ma27 ]; - doc = ./mailman.xml; + doc = ./mailman.md; }; } diff --git a/nixos/modules/services/mail/mailman.xml b/nixos/modules/services/mail/mailman.xml deleted file mode 100644 index 23b0d0b7da4c..000000000000 --- a/nixos/modules/services/mail/mailman.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - Mailman - - Mailman is free - software for managing electronic mail discussion and e-newsletter - lists. Mailman and its web interface can be configured using the - corresponding NixOS module. Note that this service is best used with - an existing, securely configured Postfix setup, as it does not - automatically configure this. - -
- Basic usage with Postfix - - For a basic configuration with Postfix as the MTA, the following - settings are suggested: - - -{ config, ... }: { - services.postfix = { - enable = true; - relayDomains = ["hash:/var/lib/mailman/data/postfix_domains"]; - sslCert = config.security.acme.certs."lists.example.org".directory + "/full.pem"; - sslKey = config.security.acme.certs."lists.example.org".directory + "/key.pem"; - config = { - transport_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; - local_recipient_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; - }; - }; - services.mailman = { - enable = true; - serve.enable = true; - hyperkitty.enable = true; - webHosts = ["lists.example.org"]; - siteOwner = "mailman@example.org"; - }; - services.nginx.virtualHosts."lists.example.org".enableACME = true; - networking.firewall.allowedTCPPorts = [ 25 80 443 ]; -} - - - DNS records will also be required: - - - - - AAAA and A records - pointing to the host in question, in order for browsers to be - able to discover the address of the web server; - - - - - An MX record pointing to a domain name at - which the host is reachable, in order for other mail servers - to be able to deliver emails to the mailing lists it hosts. - - - - - After this has been done and appropriate DNS records have been set - up, the Postorius mailing list manager and the Hyperkitty archive - browser will be available at https://lists.example.org/. Note that - this setup is not sufficient to deliver emails to most email - providers nor to avoid spam – a number of additional measures for - authenticating incoming and outgoing mails, such as SPF, DMARC and - DKIM are necessary, but outside the scope of the Mailman module. - -
-
- Using with other MTAs - - Mailman also supports other MTA, though with a little bit more - configuration. For example, to use Mailman with Exim, you can use - the following settings: - - -{ config, ... }: { - services = { - mailman = { - enable = true; - siteOwner = "mailman@example.org"; - enablePostfix = false; - settings.mta = { - incoming = "mailman.mta.exim4.LMTP"; - outgoing = "mailman.mta.deliver.deliver"; - lmtp_host = "localhost"; - lmtp_port = "8024"; - smtp_host = "localhost"; - smtp_port = "25"; - configuration = "python:mailman.config.exim4"; - }; - }; - exim = { - enable = true; - # You can configure Exim in a separate file to reduce configuration.nix clutter - config = builtins.readFile ./exim.conf; - }; - }; -} - - - The exim config needs some special additions to work with Mailman. - Currently NixOS can’t manage Exim config with such granularity. - Please refer to - Mailman - documentation for more info on configuring Mailman for - working with Exim. - -
- diff --git a/nixos/modules/services/matrix/mjolnir.nix b/nixos/modules/services/matrix/mjolnir.nix index cbf7b93329d7..b6a3e5e8c730 100644 --- a/nixos/modules/services/matrix/mjolnir.nix +++ b/nixos/modules/services/matrix/mjolnir.nix @@ -236,7 +236,7 @@ in }; meta = { - doc = ./mjolnir.xml; + doc = ./mjolnir.md; maintainers = with maintainers; [ jojosch ]; }; } diff --git a/nixos/modules/services/matrix/mjolnir.xml b/nixos/modules/services/matrix/mjolnir.xml deleted file mode 100644 index 5bd2919e437c..000000000000 --- a/nixos/modules/services/matrix/mjolnir.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - Mjolnir (Matrix Moderation Tool) - - This chapter will show you how to set up your own, self-hosted - Mjolnir - instance. - - - As an all-in-one moderation tool, it can protect your server from - malicious invites, spam messages, and whatever else you don’t want. - In addition to server-level protection, Mjolnir is great for - communities wanting to protect their rooms without having to use - their personal accounts for moderation. - - - The bot by default includes support for bans, redactions, anti-spam, - server ACLs, room directory changes, room alias transfers, account - deactivation, room shutdown, and more. - - - See the - README - page and the - Moderator’s - guide for additional instructions on how to setup and use - Mjolnir. - - - For additional - settings see - the - default configuration. - -
- Mjolnir Setup - - First create a new Room which will be used as a management room - for Mjolnir. In this room, Mjolnir will log possible errors and - debugging information. You’ll need to set this Room-ID in - services.mjolnir.managementRoom. - - - Next, create a new user for Mjolnir on your homeserver, if not - present already. - - - The Mjolnir Matrix user expects to be free of any rate limiting. - See - Synapse - #6286 for an example on how to achieve this. - - - If you want Mjolnir to be able to deactivate users, move room - aliases, shutdown rooms, etc. you’ll need to make the Mjolnir user - a Matrix server admin. - - - Now invite the Mjolnir user to the management room. - - - It is recommended to use - Pantalaimon, - so your management room can be encrypted. This also applies if you - are looking to moderate an encrypted room. - - - To enable the Pantalaimon E2E Proxy for mjolnir, enable - services.mjolnir.pantalaimon. - This will autoconfigure a new Pantalaimon instance, which will - connect to the homeserver set in - services.mjolnir.homeserverUrl - and Mjolnir itself will be configured to connect to the new - Pantalaimon instance. - - -{ - services.mjolnir = { - enable = true; - homeserverUrl = "https://matrix.domain.tld"; - pantalaimon = { - enable = true; - username = "mjolnir"; - passwordFile = "/run/secrets/mjolnir-password"; - }; - protectedRooms = [ - "https://matrix.to/#/!xxx:domain.tld" - ]; - managementRoom = "!yyy:domain.tld"; - }; -} - -
- Element Matrix Services (EMS) - - If you are using a managed - Element Matrix - Services (EMS) server, you will need to consent - to the terms and conditions. Upon startup, an error log entry - with a URL to the consent page will be generated. - -
-
-
- Synapse Antispam Module - - A Synapse module is also available to apply the same rulesets the - bot uses across an entire homeserver. - - - To use the Antispam Module, add - matrix-synapse-plugins.matrix-synapse-mjolnir-antispam - to the Synapse plugin list and enable the - mjolnir.Module module. - - -{ - services.matrix-synapse = { - plugins = with pkgs; [ - matrix-synapse-plugins.matrix-synapse-mjolnir-antispam - ]; - extraConfig = '' - modules: - - module: mjolnir.Module - config: - # Prevent servers/users in the ban lists from inviting users on this - # server to rooms. Default true. - block_invites: true - # Flag messages sent by servers/users in the ban lists as spam. Currently - # this means that spammy messages will appear as empty to users. Default - # false. - block_messages: false - # Remove users from the user directory search by filtering matrix IDs and - # display names by the entries in the user ban list. Default false. - block_usernames: false - # The room IDs of the ban lists to honour. Unlike other parts of Mjolnir, - # this list cannot be room aliases or permalinks. This server is expected - # to already be joined to the room - Mjolnir will not automatically join - # these rooms. - ban_lists: - - "!roomid:example.org" - ''; - }; -} - -
- diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index 3087d879b9d2..aee275dab1ec 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -801,7 +801,7 @@ in { meta = { buildDocsInSandbox = false; - doc = ./synapse.xml; + doc = ./synapse.md; maintainers = teams.matrix.members; }; diff --git a/nixos/modules/services/matrix/synapse.xml b/nixos/modules/services/matrix/synapse.xml deleted file mode 100644 index 686aec93ab67..000000000000 --- a/nixos/modules/services/matrix/synapse.xml +++ /dev/null @@ -1,263 +0,0 @@ - - - Matrix - - Matrix is an open - standard for interoperable, decentralised, real-time communication - over IP. It can be used to power Instant Messaging, VoIP/WebRTC - signalling, Internet of Things communication - or anywhere you need - a standard HTTP API for publishing and subscribing to data whilst - tracking the conversation history. - - - This chapter will show you how to set up your own, self-hosted - Matrix homeserver using the Synapse reference homeserver, and how to - serve your own copy of the Element web client. See the - Try - Matrix Now! overview page for links to Element Apps for - Android and iOS, desktop clients, as well as bridges to other - networks and other projects around Matrix. - -
- Synapse Homeserver - - Synapse - is the reference homeserver implementation of Matrix from the core - development team at matrix.org. The following configuration - example will set up a synapse server for the - example.org domain, served from the host - myhostname.example.org. For more information, - please refer to the - installation - instructions of Synapse . - - -{ pkgs, lib, config, ... }: -let - fqdn = "${config.networking.hostName}.${config.networking.domain}"; - clientConfig = { - "m.homeserver".base_url = "https://${fqdn}"; - "m.identity_server" = {}; - }; - serverConfig."m.server" = "${config.services.matrix-synapse.settings.server_name}:443"; - mkWellKnown = data: '' - add_header Content-Type application/json; - add_header Access-Control-Allow-Origin *; - return 200 '${builtins.toJSON data}'; - ''; -in { - networking.hostName = "myhostname"; - networking.domain = "example.org"; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - - services.postgresql.enable = true; - services.postgresql.initialScript = pkgs.writeText "synapse-init.sql" '' - CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; - CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" - TEMPLATE template0 - LC_COLLATE = "C" - LC_CTYPE = "C"; - ''; - - services.nginx = { - enable = true; - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; - virtualHosts = { - # If the A and AAAA DNS records on example.org do not point on the same host as the - # records for myhostname.example.org, you can easily move the /.well-known - # virtualHost section of the code to the host that is serving example.org, while - # the rest stays on myhostname.example.org with no other changes required. - # This pattern also allows to seamlessly move the homeserver from - # myhostname.example.org to myotherhost.example.org by only changing the - # /.well-known redirection target. - "${config.networking.domain}" = { - enableACME = true; - forceSSL = true; - # This section is not needed if the server_name of matrix-synapse is equal to - # the domain (i.e. example.org from @foo:example.org) and the federation port - # is 8448. - # Further reference can be found in the docs about delegation under - # https://matrix-org.github.io/synapse/latest/delegate.html - locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig; - # This is usually needed for homeserver discovery (from e.g. other Matrix clients). - # Further reference can be found in the upstream docs at - # https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixclient - locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig; - }; - "${fqdn}" = { - enableACME = true; - forceSSL = true; - # It's also possible to do a redirect here or something else, this vhost is not - # needed for Matrix. It's recommended though to *not put* element - # here, see also the section about Element. - locations."/".extraConfig = '' - return 404; - ''; - # Forward all Matrix API calls to the synapse Matrix homeserver. A trailing slash - # *must not* be used here. - locations."/_matrix".proxyPass = "http://[::1]:8008"; - # Forward requests for e.g. SSO and password-resets. - locations."/_synapse/client".proxyPass = "http://[::1]:8008"; - }; - }; - }; - - services.matrix-synapse = { - enable = true; - settings.server_name = config.networking.domain; - settings.listeners = [ - { port = 8008; - bind_addresses = [ "::1" ]; - type = "http"; - tls = false; - x_forwarded = true; - resources = [ { - names = [ "client" "federation" ]; - compress = true; - } ]; - } - ]; - }; -} - -
-
- Registering Matrix users - - If you want to run a server with public registration by anybody, - you can then enable - services.matrix-synapse.settings.enable_registration = true;. - Otherwise, or you can generate a registration secret with - pwgen -s 64 1 and set it with - . - To create a new user or admin, run the following after you have - set the secret and have rebuilt NixOS: - - -$ nix-shell -p matrix-synapse -$ register_new_matrix_user -k your-registration-shared-secret http://localhost:8008 -New user localpart: your-username -Password: -Confirm password: -Make admin [no]: -Success! - - - In the example, this would create a user with the Matrix - Identifier @your-username:example.org. - - - - When using - , - the secret will end up in the world-readable store. Instead it’s - recommended to deploy the secret in an additional file like - this: - - - - - Create a file with the following contents: - - -registration_shared_secret: your-very-secret-secret - - - - - Deploy the file with a secret-manager such as - - from - nixops1 - or - sops-nix - to e.g. - /run/secrets/matrix-shared-secret and - ensure that it’s readable by - matrix-synapse. - - - - - Include the file like this in your configuration: - - -{ - services.matrix-synapse.extraConfigFiles = [ - "/run/secrets/matrix-shared-secret" - ]; -} - - - - - - - It’s also possible to user alternative authentication mechanism - such as - LDAP - (via matrix-synapse-ldap3) or - OpenID. - - -
-
- Element (formerly known as Riot) Web Client - - Element - Web is the reference web client for Matrix and developed by - the core team at matrix.org. Element was formerly known as - Riot.im, see the - Element - introductory blog post for more information. The following - snippet can be optionally added to the code before to complete the - synapse installation with a web client served at - https://element.myhostname.example.org and - https://element.example.org. Alternatively, you - can use the hosted copy at - https://app.element.io/, - or use other web clients or native client applications. Due to the - /.well-known urls set up done above, many - clients should fill in the required connection details - automatically when you enter your Matrix Identifier. See - Try - Matrix Now! for a list of existing clients and their - supported featureset. - - -{ - services.nginx.virtualHosts."element.${fqdn}" = { - enableACME = true; - forceSSL = true; - serverAliases = [ - "element.${config.networking.domain}" - ]; - - root = pkgs.element-web.override { - conf = { - default_server_config = clientConfig; # see `clientConfig` from the snippet above. - }; - }; - }; -} - - - - The Element developers do not recommend running Element and your - Matrix homeserver on the same fully-qualified domain name for - security reasons. In the example, this means that you should not - reuse the myhostname.example.org virtualHost - to also serve Element, but instead serve it on a different - subdomain, like element.example.org in the - example. See the - Element - Important Security Notes for more information on this - subject. - - -
- diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e6689217ad9a..179359c97a3a 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1504,6 +1504,6 @@ in { }; - meta.doc = ./gitlab.xml; + meta.doc = ./gitlab.md; } diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml deleted file mode 100644 index a193657b0b76..000000000000 --- a/nixos/modules/services/misc/gitlab.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - GitLab - - GitLab is a feature-rich git hosting service. - -
- Prerequisites - - The gitlab service exposes only an Unix socket - at /run/gitlab/gitlab-workhorse.socket. You - need to configure a webserver to proxy HTTP requests to the - socket. - - - For instance, the following configuration could be used to use - nginx as frontend proxy: - - -services.nginx = { - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts."git.example.com" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; - }; -}; - -
-
- Configuring - - GitLab depends on both PostgreSQL and Redis and will automatically - enable both services. In the case of PostgreSQL, a database and a - role will be created. - - - The default state dir is /var/gitlab/state. - This is where all data like the repositories and uploads will be - stored. - - - A basic configuration with some custom settings could look like - this: - - -services.gitlab = { - enable = true; - databasePasswordFile = "/var/keys/gitlab/db_password"; - initialRootPasswordFile = "/var/keys/gitlab/root_password"; - https = true; - host = "git.example.com"; - port = 443; - user = "git"; - group = "git"; - smtp = { - enable = true; - address = "localhost"; - port = 25; - }; - secrets = { - dbFile = "/var/keys/gitlab/db"; - secretFile = "/var/keys/gitlab/secret"; - otpFile = "/var/keys/gitlab/otp"; - jwsFile = "/var/keys/gitlab/jws"; - }; - extraConfig = { - gitlab = { - email_from = "gitlab-no-reply@example.com"; - email_display_name = "Example GitLab"; - email_reply_to = "gitlab-no-reply@example.com"; - default_projects_features = { builds = false; }; - }; - }; -}; - - - If you’re setting up a new GitLab instance, generate new secrets. - You for instance use - tr -dc A-Za-z0-9 < /dev/urandom | head -c 128 > /var/keys/gitlab/db - to generate a new db secret. Make sure the files can be read by, - and only by, the user specified by - services.gitlab.user. - GitLab encrypts sensitive data stored in the database. If you’re - restoring an existing GitLab instance, you must specify the - secrets secret from config/secrets.yml located - in your GitLab state folder. - - - When incoming_mail.enabled is set to - true in - extraConfig - an additional service called gitlab-mailroom is - enabled for fetching incoming mail. - - - Refer to for all available - configuration options for the - services.gitlab - module. - -
-
- Maintenance -
- Backups - - Backups can be configured with the options in - services.gitlab.backup. - Use the - services.gitlab.backup.startAt - option to configure regular backups. - - - To run a manual backup, start the - gitlab-backup service: - - -$ systemctl start gitlab-backup.service - -
-
- Rake tasks - - You can run GitLab’s rake tasks with - gitlab-rake which will be available on the - system when GitLab is enabled. You will have to run the command - as the user that you configured to run GitLab with. - - - A list of all available rake tasks can be obtained by running: - - -$ sudo -u git -H gitlab-rake -T - -
-
- diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 1dddd147ac09..667f16d98f82 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -226,9 +226,26 @@ in # Auto-migrate on first run or if the package has changed versionFile="${cfg.dataDir}/src-version" - if [[ $(cat "$versionFile" 2>/dev/null) != ${pkg} ]]; then + version=$(cat "$versionFile" 2>/dev/null || echo 0) + + if [[ $version != ${pkg.version} ]]; then ${pkg}/bin/paperless-ngx migrate - echo ${pkg} > "$versionFile" + + # Parse old version string format for backwards compatibility + version=$(echo "$version" | grep -ohP '[^-]+$') + + versionLessThan() { + target=$1 + [[ $({ echo "$version"; echo "$target"; } | sort -V | head -1) != "$target" ]] + } + + if versionLessThan 1.12.0; then + # Reindex documents as mentioned in https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.12.1 + echo "Reindexing documents, to allow searching old comments. Required after the 1.12.x upgrade." + ${pkg}/bin/paperless-ngx document_index reindex + fi + + echo ${pkg.version} > "$versionFile" fi '' + optionalString (cfg.passwordFile != null) '' diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index b03cf0739e9d..b2cadbf0c436 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -1390,6 +1390,6 @@ in '') ]; - meta.doc = ./default.xml; + meta.doc = ./default.md; meta.maintainers = with maintainers; [ tomberek ]; } diff --git a/nixos/modules/services/misc/sourcehut/default.xml b/nixos/modules/services/misc/sourcehut/default.xml deleted file mode 100644 index 1d8330931ddf..000000000000 --- a/nixos/modules/services/misc/sourcehut/default.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - Sourcehut - - Sourcehut is an - open-source, self-hostable software development platform. The server - setup can be automated using - services.sourcehut. - -
- Basic usage - - Sourcehut is a Python and Go based set of applications. This NixOS - module also provides basic configuration integrating Sourcehut - into locally running services.nginx, - services.redis.servers.sourcehut, - services.postfix and - services.postgresql services. - - - A very basic configuration may look like this: - - -{ pkgs, ... }: -let - fqdn = - let - join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; - in join config.networking.hostName config.networking.domain; -in { - - networking = { - hostName = "srht"; - domain = "tld"; - firewall.allowedTCPPorts = [ 22 80 443 ]; - }; - - services.sourcehut = { - enable = true; - git.enable = true; - man.enable = true; - meta.enable = true; - nginx.enable = true; - postfix.enable = true; - postgresql.enable = true; - redis.enable = true; - settings = { - "sr.ht" = { - environment = "production"; - global-domain = fqdn; - origin = "https://${fqdn}"; - # Produce keys with srht-keygen from sourcehut.coresrht. - network-key = "/run/keys/path/to/network-key"; - service-key = "/run/keys/path/to/service-key"; - }; - webhooks.private-key= "/run/keys/path/to/webhook-key"; - }; - }; - - security.acme.certs."${fqdn}".extraDomainNames = [ - "meta.${fqdn}" - "man.${fqdn}" - "git.${fqdn}" - ]; - - services.nginx = { - enable = true; - # only recommendedProxySettings are strictly required, but the rest make sense as well. - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; - - # Settings to setup what certificates are used for which endpoint. - virtualHosts = { - "${fqdn}".enableACME = true; - "meta.${fqdn}".useACMEHost = fqdn: - "man.${fqdn}".useACMEHost = fqdn: - "git.${fqdn}".useACMEHost = fqdn: - }; - }; -} - - - The hostName option is used internally to - configure the nginx reverse-proxy. The settings - attribute set is used by the configuration generator and the - result is placed in /etc/sr.ht/config.ini. - -
-
- Configuration - - All configuration parameters are also stored in - /etc/sr.ht/config.ini which is generated by the - module and linked from the store to ensure that all values from - config.ini can be modified by the module. - -
-
- Using an alternative webserver as reverse-proxy (e.g. - <literal>httpd</literal>) - - By default, nginx is used as reverse-proxy for - sourcehut. However, it’s possible to use e.g. - httpd by explicitly disabling - nginx using - and fixing the - settings. - -
- diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 7331c323adba..775b3b6d2eae 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -566,5 +566,5 @@ in { }) ]; - meta.doc = ./default.xml; + meta.doc = ./default.md; } diff --git a/nixos/modules/services/misc/taskserver/default.xml b/nixos/modules/services/misc/taskserver/default.xml deleted file mode 100644 index bbb38211b7ca..000000000000 --- a/nixos/modules/services/misc/taskserver/default.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - Taskserver - - Taskserver is the server component of - Taskwarrior, a - free and open source todo list application. - - - Upstream documentation: - https://taskwarrior.org/docs/#taskd - -
- Configuration - - Taskserver does all of its authentication via TLS using client - certificates, so you either need to roll your own CA or purchase a - certificate from a known CA, which allows creation of client - certificates. These certificates are usually advertised as - server certificates. - - - So in order to make it easier to handle your own CA, there is a - helper tool called nixos-taskserver which - manages the custom CA along with Taskserver organisations, users - and groups. - - - While the client certificates in Taskserver only authenticate - whether a user is allowed to connect, every user has its own UUID - which identifies it as an entity. - - - With nixos-taskserver the client certificate is - created along with the UUID of the user, so it handles all of the - credentials needed in order to setup the Taskwarrior client to - work with a Taskserver. - -
-
- The nixos-taskserver tool - - Because Taskserver by default only provides scripts to setup users - imperatively, the nixos-taskserver tool is used - for addition and deletion of organisations along with users and - groups defined by - and as - well for imperative set up. - - - The tool is designed to not interfere if the command is used to - manually set up some organisations, users or groups. - - - For example if you add a new organisation using - nixos-taskserver org add foo, the organisation - is not modified and deleted no matter what you define in - , even if you’re - adding the same organisation in that option. - - - The tool is modelled to imitate the official - taskd command, documentation for each - subcommand can be shown by using the - switch. - -
-
- Declarative/automatic CA management - - Everything is done according to what you specify in the module - options, however in order to set up a Taskwarrior client for - synchronisation with a Taskserver instance, you have to transfer - the keys and certificates to the client machine. - - - This is done using - nixos-taskserver user export $orgname $username - which is printing a shell script fragment to stdout which can - either be used verbatim or adjusted to import the user on the - client machine. - - - For example, let’s say you have the following configuration: - - -{ - services.taskserver.enable = true; - services.taskserver.fqdn = "server"; - services.taskserver.listenHost = "::"; - services.taskserver.organisations.my-company.users = [ "alice" ]; -} - - - This creates an organisation called my-company - with the user alice. - - - Now in order to import the alice user to - another machine alicebox, all we need to do is - something like this: - - -$ ssh server nixos-taskserver user export my-company alice | sh - - - Of course, if no SSH daemon is available on the server you can - also copy & paste it directly into a shell. - - - After this step the user should be set up and you can start - synchronising your tasks for the first time with - task sync init on alicebox. - - - Subsequent synchronisation requests merely require the command - task sync after that stage. - -
-
- Manual CA management - - If you set any options within - service.taskserver.pki.manual.*, - nixos-taskserver won’t issue certificates, but - you can still use it for adding or removing user accounts. - -
- diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix index aa5b9b22837e..338493e3cd37 100644 --- a/nixos/modules/services/misc/weechat.nix +++ b/nixos/modules/services/misc/weechat.nix @@ -59,5 +59,5 @@ in }; }; - meta.doc = ./weechat.xml; + meta.doc = ./weechat.md; } diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml deleted file mode 100644 index 83ae171217d2..000000000000 --- a/nixos/modules/services/misc/weechat.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - WeeChat - - WeeChat is a fast and - extensible IRC client. - -
- Basic Usage - - By default, the module creates a - systemd - unit which runs the chat client in a detached - screen - session. - - - This can be done by enabling the weechat - service: - - -{ ... }: - -{ - services.weechat.enable = true; -} - - - The service is managed by a dedicated user named - weechat in the state directory - /var/lib/weechat. - -
-
- Re-attaching to WeeChat - - WeeChat runs in a screen session owned by a dedicated user. To - explicitly allow your another user to attach to this session, the - screenrc needs to be tweaked by adding - multiuser - support: - - -{ - programs.screen.screenrc = '' - multiuser on - acladd normal_user - ''; -} - - - Now, the session can be re-attached like this: - - -screen -x weechat/weechat-screen - - - The session name can be changed using - services.weechat.sessionName. - -
- diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index 2e7c4fd00b42..fdaefbe17f2d 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -539,6 +539,6 @@ in }; }; - meta.doc = ./parsedmarc.xml; + meta.doc = ./parsedmarc.md; meta.maintainers = [ lib.maintainers.talyz ]; } diff --git a/nixos/modules/services/monitoring/parsedmarc.xml b/nixos/modules/services/monitoring/parsedmarc.xml deleted file mode 100644 index 4d9b12c9a429..000000000000 --- a/nixos/modules/services/monitoring/parsedmarc.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - parsedmarc - - parsedmarc - is a service which parses incoming - DMARC reports and - stores or sends them to a downstream service for further analysis. - In combination with Elasticsearch, Grafana and the included Grafana - dashboard, it provides a handy overview of DMARC reports over time. - -
- Basic usage - - A very minimal setup which reads incoming reports from an external - email address and saves them to a local Elasticsearch instance - looks like this: - - -services.parsedmarc = { - enable = true; - settings.imap = { - host = "imap.example.com"; - user = "alice@example.com"; - password = "/path/to/imap_password_file"; - }; - provision.geoIp = false; # Not recommended! -}; - - - Note that GeoIP provisioning is disabled in the example for - simplicity, but should be turned on for fully functional reports. - -
-
- Local mail - - Instead of watching an external inbox, a local inbox can be - automatically provisioned. The recipient’s name is by default set - to dmarc, but can be configured in - services.parsedmarc.provision.localMail.recipientName. - You need to add an MX record pointing to the host. More - concretely: for the example to work, an MX record needs to be set - up for monitoring.example.com and the complete - email address that should be configured in the domain’s dmarc - policy is dmarc@monitoring.example.com. - - -services.parsedmarc = { - enable = true; - provision = { - localMail = { - enable = true; - hostname = monitoring.example.com; - }; - geoIp = false; # Not recommended! - }; -}; - -
-
- Grafana and GeoIP - - The reports can be visualized and summarized with parsedmarc’s - official Grafana dashboard. For all views to work, and for the - data to be complete, GeoIP databases are also required. The - following example shows a basic deployment where the provisioned - Elasticsearch instance is automatically added as a Grafana - datasource, and the dashboard is added to Grafana as well. - - -services.parsedmarc = { - enable = true; - provision = { - localMail = { - enable = true; - hostname = url; - }; - grafana = { - datasource = true; - dashboard = true; - }; - }; -}; - -# Not required, but recommended for full functionality -services.geoipupdate = { - settings = { - AccountID = 000000; - LicenseKey = "/path/to/license_key_file"; - }; -}; - -services.grafana = { - enable = true; - addr = "0.0.0.0"; - domain = url; - rootUrl = "https://" + url; - protocol = "socket"; - security = { - adminUser = "admin"; - adminPasswordFile = "/path/to/admin_password_file"; - secretKeyFile = "/path/to/secret_key_file"; - }; -}; - -services.nginx = { - enable = true; - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; - upstreams.grafana.servers."unix:/${config.services.grafana.socket}" = {}; - virtualHosts.${url} = { - root = config.services.grafana.staticRootPath; - enableACME = true; - forceSSL = true; - locations."/".tryFiles = "$uri @grafana"; - locations."@grafana".proxyPass = "http://grafana"; - }; -}; -users.users.nginx.extraGroups = [ "grafana" ]; - -
- diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index f3fbfb149ad7..23cac6793cc6 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -323,7 +323,7 @@ in ); meta = { - doc = ./exporters.xml; + doc = ./exporters.md; maintainers = [ maintainers.willibutz ]; }; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml deleted file mode 100644 index 0ea95e513ff3..000000000000 --- a/nixos/modules/services/monitoring/prometheus/exporters.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - Prometheus exporters - - Prometheus exporters provide metrics for the - prometheus monitoring - system. - -
- Configuration - - One of the most common exporters is the - node - exporter, it provides hardware and OS metrics from the host - it’s running on. The exporter could be configured as follows: - - - services.prometheus.exporters.node = { - enable = true; - port = 9100; - enabledCollectors = [ - "logind" - "systemd" - ]; - disabledCollectors = [ - "textfile" - ]; - openFirewall = true; - firewallFilter = "-i br0 -p tcp -m tcp --dport 9100"; - }; - - - It should now serve all metrics from the collectors that are - explicitly enabled and the ones that are - enabled - by default, via http under /metrics. In - this example the firewall should just allow incoming connections - to the exporter’s port on the bridge interface - br0 (this would have to be configured - separately of course). For more information about configuration - see man configuration.nix or search through the - available - options. - - - Prometheus can now be configured to consume the metrics produced - by the exporter: - - - services.prometheus = { - # ... - - scrapeConfigs = [ - { - job_name = "node"; - static_configs = [{ - targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; - }]; - } - ]; - - # ... - } - -
-
- Adding a new exporter - - To add a new exporter, it has to be packaged first (see - nixpkgs/pkgs/servers/monitoring/prometheus/ for - examples), then a module can be added. The postfix exporter is - used in this example: - - - - - Some default options for all exporters are provided by - nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix: - - - - - enable - - - - - port - - - - - listenAddress - - - - - extraFlags - - - - - openFirewall - - - - - firewallFilter - - - - - user - - - - - group - - - - - - - As there is already a package available, the module can now be - added. This is accomplished by adding a new file to the - nixos/modules/services/monitoring/prometheus/exporters/ - directory, which will be called postfix.nix and contains all - exporter specific options and configuration: - - -# nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix -{ config, lib, pkgs, options }: - -with lib; - -let - # for convenience we define cfg here - cfg = config.services.prometheus.exporters.postfix; -in -{ - port = 9154; # The postfix exporter listens on this port by default - - # `extraOpts` is an attribute set which contains additional options - # (and optional overrides for default options). - # Note that this attribute is optional. - extraOpts = { - telemetryPath = mkOption { - type = types.str; - default = "/metrics"; - description = '' - Path under which to expose metrics. - ''; - }; - logfilePath = mkOption { - type = types.path; - default = /var/log/postfix_exporter_input.log; - example = /var/log/mail.log; - description = '' - Path where Postfix writes log entries. - This file will be truncated by this exporter! - ''; - }; - showqPath = mkOption { - type = types.path; - default = /var/spool/postfix/public/showq; - example = /var/lib/postfix/queue/public/showq; - description = '' - Path at which Postfix places its showq socket. - ''; - }; - }; - - # `serviceOpts` is an attribute set which contains configuration - # for the exporter's systemd service. One of - # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart` - # has to be specified here. This will be merged with the default - # service configuration. - # Note that by default 'DynamicUser' is 'true'. - serviceOpts = { - serviceConfig = { - DynamicUser = false; - ExecStart = '' - ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ - --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - --web.telemetry-path ${cfg.telemetryPath} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - }; -} - - - - - This should already be enough for the postfix exporter. - Additionally one could now add assertions and conditional - default values. This can be done in the - meta-module that combines all exporter - definitions and generates the submodules: - nixpkgs/nixos/modules/services/prometheus/exporters.nix - - - -
-
- Updating an exporter module - - Should an exporter option change at some point, it is possible to - add information about the change to the exporter definition - similar to nixpkgs/nixos/modules/rename.nix: - - -{ config, lib, pkgs, options }: - -with lib; - -let - cfg = config.services.prometheus.exporters.nginx; -in -{ - port = 9113; - extraOpts = { - # additional module options - # ... - }; - serviceOpts = { - # service configuration - # ... - }; - imports = [ - # 'services.prometheus.exporters.nginx.telemetryEndpoint' -> 'services.prometheus.exporters.nginx.telemetryPath' - (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ]) - - # removed option 'services.prometheus.exporters.nginx.insecure' - (mkRemovedOptionModule [ "insecure" ] '' - This option was replaced by 'prometheus.exporters.nginx.sslVerify' which defaults to true. - '') - ({ options.warnings = options.warnings; }) - ]; -} - -
- diff --git a/nixos/modules/services/network-filesystems/litestream/default.nix b/nixos/modules/services/network-filesystems/litestream/default.nix index 0d987f12a324..6e2ec1ccaa3c 100644 --- a/nixos/modules/services/network-filesystems/litestream/default.nix +++ b/nixos/modules/services/network-filesystems/litestream/default.nix @@ -95,5 +95,5 @@ in users.groups.litestream = {}; }; - meta.doc = ./default.xml; + meta.doc = ./default.md; } diff --git a/nixos/modules/services/network-filesystems/litestream/default.xml b/nixos/modules/services/network-filesystems/litestream/default.xml deleted file mode 100644 index 756899fdb88d..000000000000 --- a/nixos/modules/services/network-filesystems/litestream/default.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - Litestream - - Litestream is a - standalone streaming replication tool for SQLite. - -
- Configuration - - Litestream service is managed by a dedicated user named - litestream which needs permission to the - database file. Here’s an example config which gives required - permissions to access - grafana - database: - - -{ pkgs, ... }: -{ - users.users.litestream.extraGroups = [ "grafana" ]; - - systemd.services.grafana.serviceConfig.ExecStartPost = "+" + pkgs.writeShellScript "grant-grafana-permissions" '' - timeout=10 - - while [ ! -f /var/lib/grafana/data/grafana.db ]; - do - if [ "$timeout" == 0 ]; then - echo "ERROR: Timeout while waiting for /var/lib/grafana/data/grafana.db." - exit 1 - fi - - sleep 1 - - ((timeout--)) - done - - find /var/lib/grafana -type d -exec chmod -v 775 {} \; - find /var/lib/grafana -type f -exec chmod -v 660 {} \; - ''; - - services.litestream = { - enable = true; - - environmentFile = "/run/secrets/litestream"; - - settings = { - dbs = [ - { - path = "/var/lib/grafana/data/grafana.db"; - replicas = [{ - url = "s3://mybkt.litestream.io/grafana"; - }]; - } - ]; - }; - }; -} - -
- diff --git a/nixos/modules/services/networking/firefox-syncserver.nix b/nixos/modules/services/networking/firefox-syncserver.nix index c26a6ae265ff..a06b9573a850 100644 --- a/nixos/modules/services/networking/firefox-syncserver.nix +++ b/nixos/modules/services/networking/firefox-syncserver.nix @@ -311,6 +311,6 @@ in meta = { maintainers = with lib.maintainers; [ pennae ]; - doc = ./firefox-syncserver.xml; + doc = ./firefox-syncserver.md; }; } diff --git a/nixos/modules/services/networking/firefox-syncserver.xml b/nixos/modules/services/networking/firefox-syncserver.xml deleted file mode 100644 index 440922cbba00..000000000000 --- a/nixos/modules/services/networking/firefox-syncserver.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - Firefox Sync server - - A storage server for Firefox Sync that you can easily host yourself. - -
- Quickstart - - The absolute minimal configuration for the sync server looks like - this: - - -services.mysql.package = pkgs.mariadb; - -services.firefox-syncserver = { - enable = true; - secrets = builtins.toFile "sync-secrets" '' - SYNC_MASTER_SECRET=this-secret-is-actually-leaked-to-/nix/store - ''; - singleNode = { - enable = true; - hostname = "localhost"; - url = "http://localhost:5000"; - }; -}; - - - This will start a sync server that is only accessible locally. - Once the services is running you can navigate to - about:config in your Firefox profile and set - identity.sync.tokenserver.uri to - http://localhost:5000/1.0/sync/1.5. Your - browser will now use your local sync server for data storage. - - - - This configuration should never be used in production. It is not - encrypted and stores its secrets in a world-readable location. - - -
-
- More detailed setup - - The firefox-syncserver service provides a - number of options to make setting up small deployment easier. - These are grouped under the singleNode element - of the option tree and allow simple configuration of the most - important parameters. - - - Single node setup is split into two kinds of options: those that - affect the sync server itself, and those that affect its - surroundings. Options that affect the sync server are - capacity, which configures how many accounts - may be active on this instance, and url, which - holds the URL under which the sync server can be accessed. The - url can be configured automatically when using - nginx. - - - Options that affect the surroundings of the sync server are - enableNginx, enableTLS and - hostnam. If enableNginx is - set the sync server module will automatically add an nginx virtual - host to the system using hostname as the domain - and set url accordingly. If - enableTLS is set the module will also enable - ACME certificates on the new virtual host and force all - connections to be made via TLS. - - - For actual deployment it is also recommended to store the - secrets file in a secure location. - -
- diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 563412025561..a4fd2fd7c89f 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -671,6 +671,6 @@ in meta = { maintainers = with lib.maintainers; [ pennae ]; - doc = ./mosquitto.xml; + doc = ./mosquitto.md; }; } diff --git a/nixos/modules/services/networking/mosquitto.xml b/nixos/modules/services/networking/mosquitto.xml deleted file mode 100644 index 91934617c56d..000000000000 --- a/nixos/modules/services/networking/mosquitto.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - Mosquitto - - Mosquitto is a MQTT broker often used for IoT or home automation - data transport. - -
- Quickstart - - A minimal configuration for Mosquitto is - - -services.mosquitto = { - enable = true; - listeners = [ { - acl = [ "pattern readwrite #" ]; - omitPasswordAuth = true; - settings.allow_anonymous = true; - } ]; -}; - - - This will start a broker on port 1883, listening on all interfaces - of the machine, allowing read/write access to all topics to any - user without password requirements. - - - User authentication can be configured with the - users key of listeners. A config that gives - full read access to a user monitor and - restricted write access to a user service could - look like - - -services.mosquitto = { - enable = true; - listeners = [ { - users = { - monitor = { - acl = [ "read #" ]; - password = "monitor"; - }; - service = { - acl = [ "write service/#" ]; - password = "service"; - }; - }; - } ]; -}; - - - TLS authentication is configured by setting TLS-related options of - the listener: - - -services.mosquitto = { - enable = true; - listeners = [ { - port = 8883; # port change is not required, but helpful to avoid mistakes - # ... - settings = { - cafile = "/path/to/mqtt.ca.pem"; - certfile = "/path/to/mqtt.pem"; - keyfile = "/path/to/mqtt.key"; - }; - } ]; - -
-
- Configuration - - The Mosquitto configuration has four distinct types of settings: - the global settings of the daemon, listeners, plugins, and - bridges. Bridges and listeners are part of the global - configuration, plugins are part of listeners. Users of the broker - are configured as parts of listeners rather than globally, - allowing configurations in which a given user is only allowed to - log in to the broker using specific listeners (eg to configure an - admin user with full access to all topics, but restricted to - localhost). - - - Almost all options of Mosquitto are available for configuration at - their appropriate levels, some as NixOS options written in camel - case, the remainders under settings with their - exact names in the Mosquitto config file. The exceptions are - acl_file (which is always set according to the - acl attributes of a listener and its users) and - per_listener_settings (which is always set to - true). - -
- Password authentication - - Mosquitto can be run in two modes, with a password file or - without. Each listener has its own password file, and different - listeners may use different password files. Password file - generation can be disabled by setting - omitPasswordAuth = true for a listener; in - this case it is necessary to either set - settings.allow_anonymous = true to allow all - logins, or to configure other authentication methods like TLS - client certificates with - settings.use_identity_as_username = true. - - - The default is to generate a password file for each listener - from the users configured to that listener. Users with no - configured password will not be added to the password file and - thus will not be able to use the broker. - -
-
- ACL format - - Every listener has a Mosquitto acl_file - attached to it. This ACL is configured via two attributes of the - config: - - - - - the acl attribute of the listener - configures pattern ACL entries and topic ACL entries for - anonymous users. Each entry must be prefixed with - pattern or topic to - distinguish between these two cases. - - - - - the acl attribute of every user - configures in the listener configured the ACL for that given - user. Only topic ACLs are supported by Mosquitto in this - setting, so no prefix is required or allowed. - - - - - The default ACL for a listener is empty, disallowing all - accesses from all clients. To configure a completely open ACL, - set acl = [ "pattern readwrite #" ] - in the listener. - -
-
- diff --git a/nixos/modules/services/networking/multipath.nix b/nixos/modules/services/networking/multipath.nix index 54ee2a015687..b20ec76ddf59 100644 --- a/nixos/modules/services/networking/multipath.nix +++ b/nixos/modules/services/networking/multipath.nix @@ -516,7 +516,6 @@ in { ${optionalString (!isNull defaults) '' defaults { ${indentLines 2 defaults} - multipath_dir ${cfg.package}/lib/multipath } ''} ${optionalString (!isNull blacklist) '' diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index dc180d4a4f95..6c8d7b985d5f 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -185,7 +185,7 @@ in ProtectSystem = "full"; ProtectHome = true; PrivateTmp = true; - PrivateDevices = true; + PrivateDevices = false; PrivateUsers = false; ProtectHostname = true; ProtectClock = false; @@ -203,7 +203,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "chown" ]; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "chown" ] ++ lib.optional pkgs.stdenv.hostPlatform.isAarch64 "fchownat"; }; }; }; diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix index 5a02bd072257..7f9006053b89 100644 --- a/nixos/modules/services/networking/openconnect.nix +++ b/nixos/modules/services/networking/openconnect.nix @@ -90,6 +90,7 @@ let generateConfig = name: icfg: pkgs.writeText "config" '' interface=${name} + ${optionalString (icfg.protocol != null) "protocol=${icfg.protocol}"} ${optionalString (icfg.user != null) "user=${icfg.user}"} ${optionalString (icfg.passwordFile != null) "passwd-on-stdin"} ${optionalString (icfg.certificate != null) diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index f317510258ba..e9db7f3eab8e 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -147,5 +147,5 @@ in { }; meta.maintainers = with lib.maintainers; [ ninjatrappeur ]; - meta.doc = ./pleroma.xml; + meta.doc = ./pleroma.md; } diff --git a/nixos/modules/services/networking/pleroma.xml b/nixos/modules/services/networking/pleroma.xml deleted file mode 100644 index 97954f4b9514..000000000000 --- a/nixos/modules/services/networking/pleroma.xml +++ /dev/null @@ -1,244 +0,0 @@ - - - Pleroma - - Pleroma is a - lightweight activity pub server. - -
- Generating the Pleroma config - - The pleroma_ctl CLI utility will prompt you - some questions and it will generate an initial config file. This - is an example of usage - - -$ mkdir tmp-pleroma -$ cd tmp-pleroma -$ nix-shell -p pleroma-otp -$ pleroma_ctl instance gen --output config.exs --output-psql setup.psql - - - The config.exs file can be further customized - following the instructions on the - upstream - documentation. Many refinements can be applied also after - the service is running. - -
-
- Initializing the database - - First, the Postgresql service must be enabled in the NixOS - configuration - - -services.postgresql = { - enable = true; - package = pkgs.postgresql_13; -}; - - - and activated with the usual - - -$ nixos-rebuild switch - - - Then you can create and seed the database, using the - setup.psql file that you generated in the - previous section, by running - - -$ sudo -u postgres psql -f setup.psql - -
-
- Enabling the Pleroma service locally - - In this section we will enable the Pleroma service only locally, - so its configurations can be improved incrementally. - - - This is an example of configuration, where - option contains - the content of the file config.exs, generated - in the - first section, but with the secrets (database password, - endpoint secret key, salts, etc.) removed. Removing secrets is - important, because otherwise they will be stored publicly in the - Nix store. - - -services.pleroma = { - enable = true; - secretConfigFile = "/var/lib/pleroma/secrets.exs"; - configs = [ - '' - import Config - - config :pleroma, Pleroma.Web.Endpoint, - url: [host: "pleroma.example.net", scheme: "https", port: 443], - http: [ip: {127, 0, 0, 1}, port: 4000] - - config :pleroma, :instance, - name: "Test", - email: "admin@example.net", - notify_email: "admin@example.net", - limit: 5000, - registrations_open: true - - config :pleroma, :media_proxy, - enabled: false, - redirect_on_failure: true - - config :pleroma, Pleroma.Repo, - adapter: Ecto.Adapters.Postgres, - username: "pleroma", - database: "pleroma", - hostname: "localhost" - - # Configure web push notifications - config :web_push_encryption, :vapid_details, - subject: "mailto:admin@example.net" - - # ... TO CONTINUE ... - '' - ]; -}; - - - Secrets must be moved into a file pointed by - , in our - case /var/lib/pleroma/secrets.exs. This file - can be created copying the previously generated - config.exs file and then removing all the - settings, except the secrets. This is an example - - -# Pleroma instance passwords - -import Config - -config :pleroma, Pleroma.Web.Endpoint, - secret_key_base: "<the secret generated by pleroma_ctl>", - signing_salt: "<the secret generated by pleroma_ctl>" - -config :pleroma, Pleroma.Repo, - password: "<the secret generated by pleroma_ctl>" - -# Configure web push notifications -config :web_push_encryption, :vapid_details, - public_key: "<the secret generated by pleroma_ctl>", - private_key: "<the secret generated by pleroma_ctl>" - -# ... TO CONTINUE ... - - - Note that the lines of the same configuration group are comma - separated (i.e. all the lines end with a comma, except the last - one), so when the lines with passwords are added or removed, - commas must be adjusted accordingly. - - - The service can be enabled with the usual - - -$ nixos-rebuild switch - - - The service is accessible only from the local - 127.0.0.1:4000 port. It can be tested using a - port forwarding like this - - -$ ssh -L 4000:localhost:4000 myuser@example.net - - - and then accessing - http://localhost:4000 - from a web browser. - -
-
- Creating the admin user - - After Pleroma service is running, all - Pleroma - administration utilities can be used. In particular an - admin user can be created with - - -$ pleroma_ctl user new <nickname> <email> --admin --moderator --password <password> - -
-
- Configuring Nginx - - In this configuration, Pleroma is listening only on the local port - 4000. Nginx can be configured as a Reverse Proxy, for forwarding - requests from public ports to the Pleroma service. This is an - example of configuration, using - Let’s Encrypt - for the TLS certificates - - -security.acme = { - email = "root@example.net"; - acceptTerms = true; -}; - -services.nginx = { - enable = true; - addSSL = true; - - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - - recommendedProxySettings = false; - # NOTE: if enabled, the NixOS proxy optimizations will override the Pleroma - # specific settings, and they will enter in conflict. - - virtualHosts = { - "pleroma.example.net" = { - http2 = true; - enableACME = true; - forceSSL = true; - - locations."/" = { - proxyPass = "http://127.0.0.1:4000"; - - extraConfig = '' - etag on; - gzip on; - - add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; - add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; - if ($request_method = OPTIONS) { - return 204; - } - add_header X-XSS-Protection "1; mode=block"; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options DENY; - add_header X-Content-Type-Options nosniff; - add_header Referrer-Policy same-origin; - add_header X-Download-Options noopen; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - - client_max_body_size 16m; - # NOTE: increase if users need to upload very big files - ''; - }; - }; - }; -}; - -
- diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 0746bbf184fc..9f68853f9fa8 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -905,5 +905,5 @@ in }; - meta.doc = ./prosody.xml; + meta.doc = ./prosody.md; } diff --git a/nixos/modules/services/networking/prosody.xml b/nixos/modules/services/networking/prosody.xml deleted file mode 100644 index 5df046f81459..000000000000 --- a/nixos/modules/services/networking/prosody.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - Prosody - - Prosody is an - open-source, modern XMPP server. - -
- Basic usage - - A common struggle for most XMPP newcomers is to find the right set - of XMPP Extensions (XEPs) to setup. Forget to activate a few of - those and your XMPP experience might turn into a nightmare! - - - The XMPP community tackles this problem by creating a meta-XEP - listing a decent set of XEPs you should implement. This meta-XEP - is issued every year, the 2020 edition being - XEP-0423. - - - The NixOS Prosody module will implement most of these recommendend - XEPs out of the box. That being said, two components still require - some manual configuration: the - Multi - User Chat (MUC) and the - HTTP - File Upload ones. You’ll need to create a DNS subdomain for - each of those. The current convention is to name your MUC endpoint - conference.example.org and your HTTP upload - domain upload.example.org. - - - A good configuration to start with, including a - Multi - User Chat (MUC) endpoint as well as a - HTTP - File Upload endpoint will look like this: - - -services.prosody = { - enable = true; - admins = [ "root@example.org" ]; - ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; - ssl.key = "/var/lib/acme/example.org/key.pem"; - virtualHosts."example.org" = { - enabled = true; - domain = "example.org"; - ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; - ssl.key = "/var/lib/acme/example.org/key.pem"; - }; - muc = [ { - domain = "conference.example.org"; - } ]; - uploadHttp = { - domain = "upload.example.org"; - }; -}; - -
-
- Let’s Encrypt Configuration - - As you can see in the code snippet from the - previous - section, you’ll need a single TLS certificate covering your - main endpoint, the MUC one as well as the HTTP Upload one. We can - generate such a certificate by leveraging the ACME - extraDomainNames - module option. - - - Provided the setup detailed in the previous section, you’ll need - the following acme configuration to generate a TLS certificate for - the three endponits: - - -security.acme = { - email = "root@example.org"; - acceptTerms = true; - certs = { - "example.org" = { - webroot = "/var/www/example.org"; - email = "root@example.org"; - extraDomainNames = [ "conference.example.org" "upload.example.org" ]; - }; - }; -}; - -
- diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 119575bdddb4..0595e9e6df23 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -121,11 +121,15 @@ let ''} # substitute environment variables - ${pkgs.gawk}/bin/awk '{ - for(varname in ENVIRON) - gsub("@"varname"@", ENVIRON[varname]) - print - }' "${configFile}" > "${finalConfig}" + if [ -f "${configFile}" ]; then + ${pkgs.gawk}/bin/awk '{ + for(varname in ENVIRON) + gsub("@"varname"@", ENVIRON[varname]) + print + }' "${configFile}" > "${finalConfig}" + else + touch "${finalConfig}" + fi iface_args="-s ${optionalString cfg.dbusControlled "-u"} -D${cfg.driver} ${configStr}" diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 3d5cbdd2dc3e..fd7193154c6c 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -193,7 +193,7 @@ in { environment.systemPackages = [ cfg.package ]; }); meta = { - doc = ./yggdrasil.xml; + doc = ./yggdrasil.md; maintainers = with lib.maintainers; [ gazally ehmry ]; }; } diff --git a/nixos/modules/services/networking/yggdrasil.xml b/nixos/modules/services/networking/yggdrasil.xml deleted file mode 100644 index 39faacbf30ef..000000000000 --- a/nixos/modules/services/networking/yggdrasil.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - Yggdrasil - - Source: - modules/services/networking/yggdrasil/default.nix - - - Upstream documentation: - https://yggdrasil-network.github.io/ - - - Yggdrasil is an early-stage implementation of a fully end-to-end - encrypted, self-arranging IPv6 network. - -
- Configuration -
- Simple ephemeral node - - An annotated example of a simple configuration: - - -{ - services.yggdrasil = { - enable = true; - persistentKeys = false; - # The NixOS module will generate new keys and a new IPv6 address each time - # it is started if persistentKeys is not enabled. - - settings = { - Peers = [ - # Yggdrasil will automatically connect and "peer" with other nodes it - # discovers via link-local multicast announcements. Unless this is the - # case (it probably isn't) a node needs peers within the existing - # network that it can tunnel to. - "tcp://1.2.3.4:1024" - "tcp://1.2.3.5:1024" - # Public peers can be found at - # https://github.com/yggdrasil-network/public-peers - ]; - }; - }; -} - -
-
- Persistent node with prefix - - A node with a fixed address that announces a prefix: - - -let - address = "210:5217:69c0:9afc:1b95:b9f:8718:c3d2"; - prefix = "310:5217:69c0:9afc"; - # taken from the output of "yggdrasilctl getself". -in { - - services.yggdrasil = { - enable = true; - persistentKeys = true; # Maintain a fixed public key and IPv6 address. - settings = { - Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ]; - NodeInfo = { - # This information is visible to the network. - name = config.networking.hostName; - location = "The North Pole"; - }; - }; - }; - - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; - # Forward traffic under the prefix. - - networking.interfaces.${eth0}.ipv6.addresses = [{ - # Set a 300::/8 address on the local physical device. - address = prefix + "::1"; - prefixLength = 64; - }]; - - services.radvd = { - # Announce the 300::/8 prefix to eth0. - enable = true; - config = '' - interface eth0 - { - AdvSendAdvert on; - prefix ${prefix}::/64 { - AdvOnLink on; - AdvAutonomous on; - }; - route 200::/8 {}; - }; - ''; - }; -} - -
-
- Yggdrasil attached Container - - A NixOS container attached to the Yggdrasil network via a node - running on the host: - - -let - yggPrefix64 = "310:5217:69c0:9afc"; - # Again, taken from the output of "yggdrasilctl getself". -in -{ - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; - # Enable IPv6 forwarding. - - networking = { - bridges.br0.interfaces = [ ]; - # A bridge only to containers… - - interfaces.br0 = { - # … configured with a prefix address. - ipv6.addresses = [{ - address = "${yggPrefix64}::1"; - prefixLength = 64; - }]; - }; - }; - - containers.foo = { - autoStart = true; - privateNetwork = true; - hostBridge = "br0"; - # Attach the container to the bridge only. - config = { config, pkgs, ... }: { - networking.interfaces.eth0.ipv6 = { - addresses = [{ - # Configure a prefix address. - address = "${yggPrefix64}::2"; - prefixLength = 64; - }]; - routes = [{ - # Configure the prefix route. - address = "200::"; - prefixLength = 7; - via = "${yggPrefix64}::1"; - }]; - }; - - services.httpd.enable = true; - networking.firewall.allowedTCPPorts = [ 80 ]; - }; - }; - -} - -
-
- diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 9b727b76b1c6..73567ca0bc98 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -9,7 +9,7 @@ in { meta.maintainers = with maintainers; [ Br1ght0ne happysalada ]; - meta.doc = ./meilisearch.xml; + meta.doc = ./meilisearch.md; ###### interface diff --git a/nixos/modules/services/search/meilisearch.xml b/nixos/modules/services/search/meilisearch.xml deleted file mode 100644 index 8bfd64920b03..000000000000 --- a/nixos/modules/services/search/meilisearch.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - Meilisearch - - Meilisearch is a lightweight, fast and powerful search engine. Think - elastic search with a much smaller footprint. - -
- Quickstart - - the minimum to start meilisearch is - - -services.meilisearch.enable = true; - - - this will start the http server included with meilisearch on port - 7700. - - - test with - curl -X GET 'http://localhost:7700/health' - -
-
- Usage - - you first need to add documents to an index before you can search - for documents. - -
- Add a documents to the <literal>movies</literal> - index - - curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{"id": "123", "title": "Superman"}, {"id": 234, "title": "Batman"}]' - -
-
- Search documents in the <literal>movies</literal> - index - - curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ "q": "botman" }' - (note the typo is intentional and there to demonstrate the typo - tolerant capabilities) - -
-
-
- Defaults - - - - The default nixos package doesn’t come with the - dashboard, - since the dashboard features makes some assets downloads at - compile time. - - - - - Anonimized Analytics sent to meilisearch are disabled by - default. - - - - - Default deployment is development mode. It doesn’t require a - secret master key. All routes are not protected and - accessible. - - - -
-
- Missing - - - - the snapshot feature is not yet configurable from the module, - it’s just a matter of adding the relevant environment - variables. - - - -
- diff --git a/nixos/modules/services/torrent/rtorrent.nix b/nixos/modules/services/torrent/rtorrent.nix index 627439e1079b..64cda7fb675f 100644 --- a/nixos/modules/services/torrent/rtorrent.nix +++ b/nixos/modules/services/torrent/rtorrent.nix @@ -19,6 +19,15 @@ in { ''; }; + dataPermissions = mkOption { + type = types.str; + default = "0750"; + example = "0755"; + description = lib.mdDoc '' + Unix Permissions in octal on the rtorrent directory. + ''; + }; + downloadDir = mkOption { type = types.str; default = "${cfg.dataDir}/download"; @@ -205,7 +214,7 @@ in { }; }; - tmpfiles.rules = [ "d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} -" ]; + tmpfiles.rules = [ "d '${cfg.dataDir}' ${cfg.dataPermissions} ${cfg.user} ${cfg.group} -" ]; }; }; } diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 47ba53e42221..fc482ff32deb 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -1082,5 +1082,5 @@ in { }; meta.maintainers = with maintainers; [ mvs ]; - meta.doc = ./akkoma.xml; + meta.doc = ./akkoma.md; } diff --git a/nixos/modules/services/web-apps/akkoma.xml b/nixos/modules/services/web-apps/akkoma.xml deleted file mode 100644 index 49cbcc911e1d..000000000000 --- a/nixos/modules/services/web-apps/akkoma.xml +++ /dev/null @@ -1,398 +0,0 @@ - - - Akkoma - - Akkoma is a - lightweight ActivityPub microblogging server forked from Pleroma. - -
- Service configuration - - The Elixir configuration file required by Akkoma is generated - automatically from - . - Secrets must be included from external files outside of the Nix - store by setting the configuration option to an attribute set - containing the attribute – a string - pointing to the file containing the actual value of the option. - - - For the mandatory configuration settings these secrets will be - generated automatically if the referenced file does not exist - during startup, unless disabled through - . - - - The following configuration binds Akkoma to the Unix socket - /run/akkoma/socket, expecting to be run behind - a HTTP proxy on fediverse.example.com. - - -services.akkoma.enable = true; -services.akkoma.config = { - ":pleroma" = { - ":instance" = { - name = "My Akkoma instance"; - description = "More detailed description"; - email = "admin@example.com"; - registration_open = false; - }; - - "Pleroma.Web.Endpoint" = { - url.host = "fediverse.example.com"; - }; - }; -}; - - - Please refer to the - configuration - cheat sheet for additional configuration options. - -
-
- User management - - After the Akkoma service is running, the administration utility - can be used to - manage - users. In particular an administrative user can be created - with - - -$ pleroma_ctl user new <nickname> <email> --admin --moderator --password <password> - -
-
- Proxy configuration - - Although it is possible to expose Akkoma directly, it is common - practice to operate it behind an HTTP reverse proxy such as nginx. - - -services.akkoma.nginx = { - enableACME = true; - forceSSL = true; -}; - -services.nginx = { - enable = true; - - clientMaxBodySize = "16m"; - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; -}; - - - Please refer to for - details on how to provision an SSL/TLS certificate. - -
- Media proxy - - Without the media proxy function, Akkoma does not store any - remote media like pictures or video locally, and clients have to - fetch them directly from the source server. - - -# Enable nginx slice module distributed with Tengine -services.nginx.package = pkgs.tengine; - -# Enable media proxy -services.akkoma.config.":pleroma".":media_proxy" = { - enabled = true; - proxy_opts.redirect_on_failure = true; -}; - -# Adjust the persistent cache size as needed: -# Assuming an average object size of 128 KiB, around 1 MiB -# of memory is required for the key zone per GiB of cache. -# Ensure that the cache directory exists and is writable by nginx. -services.nginx.commonHttpConfig = '' - proxy_cache_path /var/cache/nginx/cache/akkoma-media-cache - levels= keys_zone=akkoma_media_cache:16m max_size=16g - inactive=1y use_temp_path=off; -''; - -services.akkoma.nginx = { - locations."/proxy" = { - proxyPass = "http://unix:/run/akkoma/socket"; - - extraConfig = '' - proxy_cache akkoma_media_cache; - - # Cache objects in slices of 1 MiB - slice 1m; - proxy_cache_key $host$uri$is_args$args$slice_range; - proxy_set_header Range $slice_range; - - # Decouple proxy and upstream responses - proxy_buffering on; - proxy_cache_lock on; - proxy_ignore_client_abort on; - - # Default cache times for various responses - proxy_cache_valid 200 1y; - proxy_cache_valid 206 301 304 1h; - - # Allow serving of stale items - proxy_cache_use_stale error timeout invalid_header updating; - ''; - }; -}; - -
- Prefetch remote media - - The following example enables the - MediaProxyWarmingPolicy MRF policy which - automatically fetches all media associated with a post through - the media proxy, as soon as the post is received by the - instance. - - -services.akkoma.config.":pleroma".":mrf".policies = - map (pkgs.formats.elixirConf { }).lib.mkRaw [ - "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy" -]; - -
-
- Media previews - - Akkoma can generate previews for media. - - -services.akkoma.config.":pleroma".":media_preview_proxy" = { - enabled = true; - thumbnail_max_width = 1920; - thumbnail_max_height = 1080; -}; - -
-
-
-
- Frontend management - - Akkoma will be deployed with the pleroma-fe and - admin-fe frontends by default. These can be - modified by setting - . - - - The following example overrides the primary frontend’s default - configuration using a custom derivation. - - -services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { - config = builtins.toJSON { - expertLevel = 1; - collapseMessageWithSubject = false; - stopGifs = false; - replyVisibility = "following"; - webPushHideIfCW = true; - hideScopeNotice = true; - renderMisskeyMarkdown = false; - hideSiteFavicon = true; - postContentType = "text/markdown"; - showNavShortcuts = false; - }; - nativeBuildInputs = with pkgs; [ jq xorg.lndir ]; - passAsFile = [ "config" ]; -} '' - mkdir $out - lndir ${pkgs.akkoma-frontends.pleroma-fe} $out - - rm $out/static/config.json - jq -s add ${pkgs.akkoma-frontends.pleroma-fe}/static/config.json ${config} \ - >$out/static/config.json -''; - -
-
- Federation policies - - Akkoma comes with a number of modules to police federation with - other ActivityPub instances. The most valuable for typical users - is the - :mrf_simple - module which allows limiting federation based on instance - hostnames. - - - This configuration snippet provides an example on how these can be - used. Choosing an adequate federation policy is not trivial and - entails finding a balance between connectivity to the rest of the - fediverse and providing a pleasant experience to the users of an - instance. - - -services.akkoma.config.":pleroma" = with (pkgs.formats.elixirConf { }).lib; { - ":mrf".policies = map mkRaw [ - "Pleroma.Web.ActivityPub.MRF.SimplePolicy" - ]; - - ":mrf_simple" = { - # Tag all media as sensitive - media_nsfw = mkMap { - "nsfw.weird.kinky" = "Untagged NSFW content"; - }; - - # Reject all activities except deletes - reject = mkMap { - "kiwifarms.cc" = "Persistent harassment of users, no moderation"; - }; - - # Force posts to be visible by followers only - followers_only = mkMap { - "beta.birdsite.live" = "Avoid polluting timelines with Twitter posts"; - }; - }; -}; - -
-
- Upload filters - - This example strips GPS and location metadata from uploads, - deduplicates them and anonymises the the file name. - - -services.akkoma.config.":pleroma"."Pleroma.Upload".filters = - map (pkgs.formats.elixirConf { }).lib.mkRaw [ - "Pleroma.Upload.Filter.Exiftool" - "Pleroma.Upload.Filter.Dedupe" - "Pleroma.Upload.Filter.AnonymizeFilename" - ]; - -
-
- Migration from Pleroma - - Pleroma instances can be migrated to Akkoma either by copying the - database and upload data or by pointing Akkoma to the existing - data. The necessary database migrations are run automatically - during startup of the service. - - - The configuration has to be copy‐edited manually. - - - Depending on the size of the database, the initial migration may - take a long time and exceed the startup timeout of the system - manager. To work around this issue one may adjust the startup - timeout - - or simply run the migrations manually: - - -pleroma_ctl migrate - -
- Copying data - - Copying the Pleroma data instead of re‐using it in place may - permit easier reversion to Pleroma, but allows the two data sets - to diverge. - - - First disable Pleroma and then copy its database and upload - data: - - -# Create a copy of the database -nix-shell -p postgresql --run 'createdb -T pleroma akkoma' - -# Copy upload data -mkdir /var/lib/akkoma -cp -R --reflink=auto /var/lib/pleroma/uploads /var/lib/akkoma/ - - - After the data has been copied, enable the Akkoma service and - verify that the migration has been successful. If no longer - required, the original data may then be deleted: - - -# Delete original database -nix-shell -p postgresql --run 'dropdb pleroma' - -# Delete original Pleroma state -rm -r /var/lib/pleroma - -
-
- Re‐using data - - To re‐use the Pleroma data in place, disable Pleroma and enable - Akkoma, pointing it to the Pleroma database and upload - directory. - - -# Adjust these settings according to the database name and upload directory path used by Pleroma -services.akkoma.config.":pleroma"."Pleroma.Repo".database = "pleroma"; -services.akkoma.config.":pleroma".":instance".upload_dir = "/var/lib/pleroma/uploads"; - - - Please keep in mind that after the Akkoma service has been - started, any migrations applied by Akkoma have to be rolled back - before the database can be used again with Pleroma. This can be - achieved through pleroma_ctl ecto.rollback. - Refer to the - Ecto - SQL documentation for details. - -
-
-
- Advanced deployment options -
- Confinement - - The Akkoma systemd service may be confined to a chroot with - - -services.systemd.akkoma.confinement.enable = true; - - - Confinement of services is not generally supported in NixOS and - therefore disabled by default. Depending on the Akkoma - configuration, the default confinement settings may be - insufficient and lead to subtle errors at run time, requiring - adjustment: - - - Use - - to make packages available in the chroot. - - - - and - - permit access to outside paths through bind mounts. Refer to - systemd.exec5 - for details. - -
-
- Distributed deployment - - Being an Elixir application, Akkoma can be deployed in a - distributed fashion. - - - This requires setting - - and - . - The specifics depend strongly on the deployment environment. For - more information please check the relevant - Erlang - documentation. - -
-
- diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index b8104ade4676..5565a4f45d1e 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -1080,6 +1080,6 @@ in ]; }; - meta.doc = ./discourse.xml; + meta.doc = ./discourse.md; meta.maintainers = [ lib.maintainers.talyz ]; } diff --git a/nixos/modules/services/web-apps/discourse.xml b/nixos/modules/services/web-apps/discourse.xml deleted file mode 100644 index a5e8b3656b7d..000000000000 --- a/nixos/modules/services/web-apps/discourse.xml +++ /dev/null @@ -1,331 +0,0 @@ - - - Discourse - - Discourse is a - modern and open source discussion platform. - -
- Basic usage - - A minimal configuration using Let’s Encrypt for TLS certificates - looks like this: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; -security.acme.email = "me@example.com"; -security.acme.acceptTerms = true; - - - Provided a proper DNS setup, you’ll be able to connect to the - instance at discourse.example.com and log in - using the credentials provided in - services.discourse.admin. - -
-
- Using a regular TLS certificate - - To set up TLS using a regular certificate and key on file, use the - and - - options: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - -
-
- Database access - - Discourse uses PostgreSQL to store most of its data. A database - will automatically be enabled and a database and role created - unless is - changed from its default of null or - - is set to false. - - - External database access can also be configured by setting - , - and - as - appropriate. Note that you need to manually create a database - called discourse (or the name you chose in - ) and allow - the configured database user full access to it. - -
-
- Email - - In addition to the basic setup, you’ll want to configure an SMTP - server Discourse can use to send user registration and password - reset emails, among others. You can also optionally let Discourse - receive email, which enables people to reply to threads and - conversations via email. - - - A basic setup which assumes you want to use your configured - hostname as - email domain can be done like this: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - mail.outgoing = { - serverAddress = "smtp.emailprovider.com"; - port = 587; - username = "user@emailprovider.com"; - passwordFile = "/path/to/smtp_password_file"; - }; - mail.incoming.enable = true; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - - - This assumes you have set up an MX record for the address you’ve - set in - hostname - and requires proper SPF, DKIM and DMARC configuration to be done - for the domain you’re sending from, in order for email to be - reliably delivered. - - - If you want to use a different domain for your outgoing email (for - example example.com instead of - discourse.example.com) you should set - - and - - manually. - - - - Setup of TLS for incoming email is currently only configured - automatically when a regular TLS certificate is used, i.e. when - and - are - set. - - -
-
- Additional settings - - Additional site settings and backend settings, for which no - explicit NixOS options are provided, can be set in - and - - respectively. - -
- Site settings - - Site settings are the settings that can be - changed through the Discourse UI. Their - default values can be set using - . - - - Settings are expressed as a Nix attribute set which matches the - structure of the configuration in - config/site_settings.yml. - To find a setting’s path, you only need to care about the first - two levels; i.e. its category (e.g. login) - and name (e.g. invite_only). - - - Settings containing secret data should be set to an attribute - set containing the attribute _secret - a - string pointing to a file containing the value the option should - be set to. See the example. - -
-
- Backend settings - - Settings are expressed as a Nix attribute set which matches the - structure of the configuration in - config/discourse.conf. - Empty parameters can be defined by setting them to - null. - -
-
- Example - - The following example sets the title and description of the - Discourse instance and enables GitHub login in the site - settings, and changes a few request limits in the backend - settings: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - mail.outgoing = { - serverAddress = "smtp.emailprovider.com"; - port = 587; - username = "user@emailprovider.com"; - passwordFile = "/path/to/smtp_password_file"; - }; - mail.incoming.enable = true; - siteSettings = { - required = { - title = "My Cats"; - site_description = "Discuss My Cats (and be nice plz)"; - }; - login = { - enable_github_logins = true; - github_client_id = "a2f6dfe838cb3206ce20"; - github_client_secret._secret = /run/keys/discourse_github_client_secret; - }; - }; - backendSettings = { - max_reqs_per_ip_per_minute = 300; - max_reqs_per_ip_per_10_seconds = 60; - max_asset_reqs_per_ip_per_10_seconds = 250; - max_reqs_per_ip_mode = "warn+block"; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - - - In the resulting site settings file, the - login.github_client_secret key will be set to - the contents of the - /run/keys/discourse_github_client_secret - file. - -
-
-
- Plugins - - You can install Discourse plugins using the - option. - Pre-packaged plugins are provided in - <your_discourse_package_here>.plugins. If - you want the full suite of plugins provided through - nixpkgs, you can also set the - option to - pkgs.discourseAllPlugins. - - - Plugins can be built with the - <your_discourse_package_here>.mkDiscoursePlugin - function. Normally, it should suffice to provide a - name and src attribute. If - the plugin has Ruby dependencies, however, they need to be - packaged in accordance with the - Developing - with Ruby section of the Nixpkgs manual and the appropriate - gem options set in bundlerEnvArgs (normally - gemdir is sufficient). A plugin’s Ruby - dependencies are listed in its plugin.rb file - as function calls to gem. To construct the - corresponding Gemfile manually, run - bundle init, then add the - gem lines to it verbatim. - - - Much of the packaging can be done automatically by the - nixpkgs/pkgs/servers/web-apps/discourse/update.py - script - just add the plugin to the plugins - list in the update_plugins function and run the - script: - - -./update.py update-plugins - - - Some plugins provide - site - settings. Their defaults can be configured using - , just like - regular site settings. To find the names of these settings, look - in the config/settings.yml file of the plugin - repo. - - - For example, to add the - discourse-spoiler-alert - and - discourse-solved - plugins, and disable discourse-spoiler-alert by - default: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - mail.outgoing = { - serverAddress = "smtp.emailprovider.com"; - port = 587; - username = "user@emailprovider.com"; - passwordFile = "/path/to/smtp_password_file"; - }; - mail.incoming.enable = true; - plugins = with config.services.discourse.package.plugins; [ - discourse-spoiler-alert - discourse-solved - ]; - siteSettings = { - plugins = { - spoiler_enabled = false; - }; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - -
- diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix index 6efc2ccfd302..3bcda3caedac 100644 --- a/nixos/modules/services/web-apps/grocy.nix +++ b/nixos/modules/services/web-apps/grocy.nix @@ -167,6 +167,6 @@ in { meta = { maintainers = with maintainers; [ ma27 ]; - doc = ./grocy.xml; + doc = ./grocy.md; }; } diff --git a/nixos/modules/services/web-apps/grocy.xml b/nixos/modules/services/web-apps/grocy.xml deleted file mode 100644 index 08de25b4ce2b..000000000000 --- a/nixos/modules/services/web-apps/grocy.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - Grocy - - Grocy is a web-based - self-hosted groceries & household management solution for your - home. - -
- Basic usage - - A very basic configuration may look like this: - - -{ pkgs, ... }: -{ - services.grocy = { - enable = true; - hostName = "grocy.tld"; - }; -} - - - This configures a simple vhost using - nginx which - listens to grocy.tld with fully configured - ACME/LE (this can be disabled by setting - services.grocy.nginx.enableSSL - to false). After the initial setup the - credentials admin:admin can be used to login. - - - The application’s state is persisted at - /var/lib/grocy/grocy.db in a - sqlite3 database. The migration is applied when - requesting the /-route of the application. - -
-
- Settings - - The configuration for grocy is located at - /etc/grocy/config.php. By default, the - following settings can be defined in the NixOS-configuration: - - -{ pkgs, ... }: -{ - services.grocy.settings = { - # The default currency in the system for invoices etc. - # Please note that exchange rates aren't taken into account, this - # is just the setting for what's shown in the frontend. - currency = "EUR"; - - # The display language (and locale configuration) for grocy. - culture = "de"; - - calendar = { - # Whether or not to show the week-numbers - # in the calendar. - showWeekNumber = true; - - # Index of the first day to be shown in the calendar (0=Sunday, 1=Monday, - # 2=Tuesday and so on). - firstDayOfWeek = 2; - }; - }; -} - - - If you want to alter the configuration file on your own, you can - do this manually with an expression like this: - - -{ lib, ... }: -{ - environment.etc."grocy/config.php".text = lib.mkAfter '' - // Arbitrary PHP code in grocy's configuration file - ''; -} - -
- diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 5b0934b2fb76..28be3a3702eb 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -451,6 +451,6 @@ in }; }; - meta.doc = ./jitsi-meet.xml; + meta.doc = ./jitsi-meet.md; meta.maintainers = lib.teams.jitsi.members; } diff --git a/nixos/modules/services/web-apps/jitsi-meet.xml b/nixos/modules/services/web-apps/jitsi-meet.xml deleted file mode 100644 index 4d2d8aa55e19..000000000000 --- a/nixos/modules/services/web-apps/jitsi-meet.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - Jitsi Meet - - With Jitsi Meet on NixOS you can quickly configure a complete, - private, self-hosted video conferencing solution. - -
- Basic usage - - A minimal configuration using Let’s Encrypt for TLS certificates - looks like this: - - -{ - services.jitsi-meet = { - enable = true; - hostName = "jitsi.example.com"; - }; - services.jitsi-videobridge.openFirewall = true; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - security.acme.email = "me@example.com"; - security.acme.acceptTerms = true; -} - -
-
- Configuration - - Here is the minimal configuration with additional configurations: - - -{ - services.jitsi-meet = { - enable = true; - hostName = "jitsi.example.com"; - config = { - enableWelcomePage = false; - prejoinPageEnabled = true; - defaultLang = "fi"; - }; - interfaceConfig = { - SHOW_JITSI_WATERMARK = false; - SHOW_WATERMARK_FOR_GUESTS = false; - }; - }; - services.jitsi-videobridge.openFirewall = true; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - security.acme.email = "me@example.com"; - security.acme.acceptTerms = true; -} - -
- diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index d52190a28648..a7e4fab8ea28 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -674,6 +674,6 @@ in mkIf createLocalMySQL (mkDefault dbPkg); }; - meta.doc = ./keycloak.xml; + meta.doc = ./keycloak.md; meta.maintainers = [ maintainers.talyz ]; } diff --git a/nixos/modules/services/web-apps/keycloak.xml b/nixos/modules/services/web-apps/keycloak.xml deleted file mode 100644 index 148782d30f39..000000000000 --- a/nixos/modules/services/web-apps/keycloak.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - Keycloak - - Keycloak is an - open source identity and access management server with support for - OpenID - Connect, OAUTH - 2.0 and - SAML - 2.0. - -
- Administration - - An administrative user with the username admin - is automatically created in the master realm. - Its initial password can be configured by setting - and - defaults to changeme. The password is not - stored safely and should be changed immediately in the admin - panel. - - - Refer to the - Keycloak - Server Administration Guide for information on how to - administer your Keycloak instance. - -
-
- Database access - - Keycloak can be used with either PostgreSQL, MariaDB or MySQL. - Which one is used can be configured in - . The - selected database will automatically be enabled and a database and - role created unless - is changed - from its default of localhost or - is - set to false. - - - External database access can also be configured by setting - , - , - , - and - as - appropriate. Note that you need to manually create the database - and allow the configured database user full access to it. - - - - must be set to the path to a file containing the password used to - log in to the database. If - and - - are kept at their defaults, the database role - keycloak with that password is provisioned on - the local database instance. - - - - The path should be provided as a string, not a Nix path, since - Nix paths are copied into the world readable Nix store. - - -
-
- Hostname - - The hostname is used to build the public URL used as base for all - frontend requests and must be configured through - . - - - - If you’re migrating an old Wildfly based Keycloak instance and - want to keep compatibility with your current clients, you’ll - likely want to set - - to /auth. See the option description for more - details. - - - - - determines whether Keycloak should force all requests to go - through the frontend URL. By default, Keycloak allows backend - requests to instead use its local hostname or IP address and may - also advertise it to clients through its OpenID Connect Discovery - endpoint. - - - For more information on hostname configuration, see the - Hostname - section of the Keycloak Server Installation and Configuration - Guide. - -
-
- Setting up TLS/SSL - - By default, Keycloak won’t accept unsecured HTTP connections - originating from outside its local network. - - - HTTPS support requires a TLS/SSL certificate and a private key, - both - PEM - formatted. Their paths should be set through - and - . - - - - The paths should be provided as a strings, not a Nix paths, - since Nix paths are copied into the world readable Nix store. - - -
-
- Themes - - You can package custom themes and make them visible to Keycloak - through . See the - Themes - section of the Keycloak Server Development Guide and the - description of the aforementioned NixOS option for more - information. - -
-
- Configuration file settings - - Keycloak server configuration parameters can be set in - . These - correspond directly to options in - conf/keycloak.conf. Some of the most - important parameters are documented as suboptions, the rest can be - found in the - All - configuration section of the Keycloak Server Installation and - Configuration Guide. - - - Options containing secret data should be set to an attribute set - containing the attribute _secret - a string - pointing to a file containing the value the option should be set - to. See the description of - for an example. - -
-
- Example configuration - - A basic configuration with some custom settings could look like - this: - - -services.keycloak = { - enable = true; - settings = { - hostname = "keycloak.example.com"; - hostname-strict-backchannel = true; - }; - initialAdminPassword = "e6Wcm0RrtegMEHl"; # change on first login - sslCertificate = "/run/keys/ssl_cert"; - sslCertificateKey = "/run/keys/ssl_key"; - database.passwordFile = "/run/keys/db_password"; -}; - -
- diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index f2eb6e726b90..af0fb38121a3 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -6,7 +6,7 @@ let in { meta.maintainers = with maintainers; [ happysalada ]; - meta.doc = ./lemmy.xml; + meta.doc = ./lemmy.md; imports = [ (mkRemovedOptionModule [ "services" "lemmy" "jwtSecretPath" ] "As of v0.13.0, Lemmy auto-generates the JWT secret.") diff --git a/nixos/modules/services/web-apps/lemmy.xml b/nixos/modules/services/web-apps/lemmy.xml deleted file mode 100644 index 114e11f3488a..000000000000 --- a/nixos/modules/services/web-apps/lemmy.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - Lemmy - - Lemmy is a federated alternative to reddit in rust. - -
- Quickstart - - the minimum to start lemmy is - - -services.lemmy = { - enable = true; - settings = { - hostname = "lemmy.union.rocks"; - database.createLocally = true; - }; - caddy.enable = true; -} - - - this will start the backend on port 8536 and the frontend on port - 1234. It will expose your instance with a caddy reverse proxy to - the hostname you’ve provided. Postgres will be initialized on that - same instance automatically. - -
-
- Usage - - On first connection you will be asked to define an admin user. - -
-
- Missing - - - - Exposing with nginx is not implemented yet. - - - - - This has been tested using a local database with a unix socket - connection. Using different database settings will likely - require modifications - - - -
- diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 984510659952..eadf8b62b977 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -325,7 +325,7 @@ in { }; meta = { - doc = ./matomo.xml; + doc = ./matomo.md; maintainers = with lib.maintainers; [ florianjacob ]; }; } diff --git a/nixos/modules/services/web-apps/matomo.xml b/nixos/modules/services/web-apps/matomo.xml deleted file mode 100644 index 30994cc9f1da..000000000000 --- a/nixos/modules/services/web-apps/matomo.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - Matomo - - Matomo is a real-time web analytics application. This module - configures php-fpm as backend for Matomo, optionally configuring an - nginx vhost as well. - - - An automatic setup is not suported by Matomo, so you need to - configure Matomo itself in the browser-based Matomo setup. - -
- Database Setup - - You also need to configure a MariaDB or MySQL database and -user - for Matomo yourself, and enter those credentials in your browser. - You can use passwordless database authentication via the - UNIX_SOCKET authentication plugin with the following SQL commands: - - -# For MariaDB -INSTALL PLUGIN unix_socket SONAME 'auth_socket'; -CREATE DATABASE matomo; -CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket; -GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - -# For MySQL -INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; -CREATE DATABASE matomo; -CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; -GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - - - Then fill in matomo as database user and - database name, and leave the password field blank. This - authentication works by allowing only the - matomo unix user to authenticate as the - matomo database user (without needing a - password), but no other users. For more information on - passwordless login, see - https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/. - - - Of course, you can use password based authentication as well, e.g. - when the database is not on the same host. - -
-
- Archive Processing - - This module comes with the systemd service - matomo-archive-processing.service and a timer - that automatically triggers archive processing every hour. This - means that you can safely - disable - browser triggers for Matomo archiving at - Administration > System > General Settings. - - - With automatic archive processing, you can now also enable to - delete - old visitor logs at - Administration > System > Privacy, but - make sure that you run - systemctl start matomo-archive-processing.service - at least once without errors if you have already collected data - before, so that the reports get archived before the source data - gets deleted. - -
-
- Backup - - You only need to take backups of your MySQL database and the - /var/lib/matomo/config/config.ini.php file. - Use a user in the matomo group or root to - access the file. For more information, see - https://matomo.org/faq/how-to-install/faq_138/. - -
-
- Issues - - - - Matomo will warn you that the JavaScript tracker is not - writable. This is because it’s located in the read-only nix - store. You can safely ignore this, unless you need a plugin - that needs JavaScript tracker access. - - - -
-
- Using other Web Servers than nginx - - You can use other web servers by forwarding calls for - index.php and piwik.php - to the - services.phpfpm.pools.<name>.socket - fastcgi unix socket. You can use the nginx configuration in the - module code as a reference to what else should be configured. - -
- diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 90801e996817..50c2d68c77e4 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1146,5 +1146,5 @@ in { } ]); - meta.doc = ./nextcloud.xml; + meta.doc = ./nextcloud.md; } diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml deleted file mode 100644 index a5ac05723ef4..000000000000 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ /dev/null @@ -1,333 +0,0 @@ - - - Nextcloud - - Nextcloud is an - open-source, self-hostable cloud platform. The server setup can be - automated using - services.nextcloud. - A desktop client is packaged at - pkgs.nextcloud-client. - - - The current default by NixOS is nextcloud25 which - is also the latest major version available. - -
- Basic usage - - Nextcloud is a PHP-based application which requires an HTTP server - (services.nextcloud - optionally supports - services.nginx) - and a database (it’s recommended to use - services.postgresql). - - - A very basic configuration may look like this: - - -{ pkgs, ... }: -{ - services.nextcloud = { - enable = true; - hostName = "nextcloud.tld"; - config = { - dbtype = "pgsql"; - dbuser = "nextcloud"; - dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself - dbname = "nextcloud"; - adminpassFile = "/path/to/admin-pass-file"; - adminuser = "root"; - }; - }; - - services.postgresql = { - enable = true; - ensureDatabases = [ "nextcloud" ]; - ensureUsers = [ - { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - ]; - }; - - # ensure that postgres is running *before* running the setup - systemd.services."nextcloud-setup" = { - requires = ["postgresql.service"]; - after = ["postgresql.service"]; - }; - - networking.firewall.allowedTCPPorts = [ 80 443 ]; -} - - - The hostName option is used internally to - configure an HTTP server using - PHP-FPM - and nginx. The config - attribute set is used by the imperative installer and all values - are written to an additional file to ensure that changes can be - applied by changing the module’s options. - - - In case the application serves multiple domains (those are checked - with - $_SERVER['HTTP_HOST']) - it’s needed to add them to - services.nextcloud.config.extraTrustedDomains. - - - Auto updates for Nextcloud apps can be enabled using - services.nextcloud.autoUpdateApps. - -
-
- Common problems - - - - General notes. - Unfortunately Nextcloud appears to be very stateful when it - comes to managing its own configuration. The config file lives - in the home directory of the nextcloud user - (by default - /var/lib/nextcloud/config/config.php) and - is also used to track several states of the application (e.g., - whether installed or not). - - - All configuration parameters are also stored in - /var/lib/nextcloud/config/override.config.php - which is generated by the module and linked from the store to - ensure that all values from config.php - can be modified by the module. However - config.php manages the application’s - state and shouldn’t be touched manually because of that. - - - - Don’t delete config.php! This file - tracks the application’s state and a deletion can cause - unwanted side-effects! - - - - - Don’t rerun - nextcloud-occ maintenance:install! This - command tries to install the application and can cause - unwanted side-effects! - - - - - - Multiple version upgrades. - Nextcloud doesn’t allow to move more than one major-version - forward. E.g., if you’re on v16, you cannot - upgrade to v18, you need to upgrade to - v17 first. This is ensured automatically as - long as the - stateVersion is - declared properly. In that case the oldest version available - (one major behind the one from the previous NixOS release) - will be selected by default and the module will generate a - warning that reminds the user to upgrade to latest Nextcloud - after that deploy. - - - - - Error: Command "upgrade" is not defined. - This error usually occurs if the initial installation - (nextcloud-occ maintenance:install) has - failed. After that, the application is not installed, but the - upgrade is attempted to be executed. Further context can be - found in - NixOS/nixpkgs#111175. - - - First of all, it makes sense to find out what went wrong by - looking at the logs of the installation via - journalctl -u nextcloud-setup and try to - fix the underlying issue. - - - - - If this occurs on an existing setup, - this is most likely because the maintenance mode is - active. It can be deactivated by running - nextcloud-occ maintenance:mode --off. - It’s advisable though to check the logs first on why the - maintenance mode was activated. - - - - - - Only perform the following measures on freshly - installed instances! - - - - A re-run of the installer can be forced by - deleting - /var/lib/nextcloud/config/config.php. - This is the only time advisable because the fresh install - doesn’t have any state that can be lost. In case that - doesn’t help, an entire re-creation can be forced via - rm -rf ~nextcloud/. - - - - - - - Server-side encryption. - Nextcloud supports - server-side - encryption (SSE). This is not an end-to-end encryption, - but can be used to encrypt files that will be persisted to - external storage such as S3. Please note that this won’t work - anymore when using OpenSSL 3 for PHP’s openssl extension - because this is implemented using the legacy cipher RC4. If - is - above 22.05, this is - disabled by default. To turn it on again and for further - information please refer to - . - - - -
-
- Using an alternative webserver as reverse-proxy (e.g. - <literal>httpd</literal>) - - By default, nginx is used as reverse-proxy for - nextcloud. However, it’s possible to use e.g. - httpd by explicitly disabling - nginx using - and fixing the - settings listen.owner & - listen.group in the - corresponding - phpfpm pool. - - - An exemplary configuration may look like this: - - -{ config, lib, pkgs, ... }: { - services.nginx.enable = false; - services.nextcloud = { - enable = true; - hostName = "localhost"; - - /* further, required options */ - }; - services.phpfpm.pools.nextcloud.settings = { - "listen.owner" = config.services.httpd.user; - "listen.group" = config.services.httpd.group; - }; - services.httpd = { - enable = true; - adminAddr = "webmaster@localhost"; - extraModules = [ "proxy_fcgi" ]; - virtualHosts."localhost" = { - documentRoot = config.services.nextcloud.package; - extraConfig = '' - <Directory "${config.services.nextcloud.package}"> - <FilesMatch "\.php$"> - <If "-f %{REQUEST_FILENAME}"> - SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud.socket}|fcgi://localhost/" - </If> - </FilesMatch> - <IfModule mod_rewrite.c> - RewriteEngine On - RewriteBase / - RewriteRule ^index\.php$ - [L] - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule . /index.php [L] - </IfModule> - DirectoryIndex index.php - Require all granted - Options +FollowSymLinks - </Directory> - ''; - }; - }; -} - -
-
- Installing Apps and PHP extensions - - Nextcloud apps are installed statefully through the web interface. - Some apps may require extra PHP extensions to be installed. This - can be configured with the - - setting. - - - Alternatively, extra apps can also be declared with the - setting. When - using this setting, apps can no longer be managed statefully - because this can lead to Nextcloud updating apps that are managed - by Nix. If you want automatic updates it is recommended that you - use web interface to install apps. - -
-
- Maintainer information - - As stated in the previous paragraph, we must provide a clean - upgrade-path for Nextcloud since it cannot move more than one - major version forward on a single upgrade. This chapter adds some - notes how Nextcloud updates should be rolled out in the future. - - - While minor and patch-level updates are no problem and can be done - directly in the package-expression (and should be backported to - supported stable branches after that), major-releases should be - added in a new attribute (e.g. Nextcloud - v19.0.0 should be available in - nixpkgs as - pkgs.nextcloud19). To provide simple upgrade - paths it’s generally useful to backport those as well to stable - branches. As long as the package-default isn’t altered, this won’t - break existing setups. After that, the versioning-warning in the - nextcloud-module should be updated to make sure - that the - package-option - selects the latest version on fresh setups. - - - If major-releases will be abandoned by upstream, we should check - first if those are needed in NixOS for a safe upgrade-path before - removing those. In that case we should keep those packages, but - mark them as insecure in an expression like this (in - <nixpkgs/pkgs/servers/nextcloud/default.nix>): - - -/* ... */ -{ - nextcloud17 = generic { - version = "17.0.x"; - sha256 = "0000000000000000000000000000000000000000000000000000"; - eol = true; - }; -} - - - Ideally we should make sure that it’s possible to jump two NixOS - versions forward: i.e. the warnings and the logic in the module - should guard a user to upgrade from a Nextcloud on e.g. 19.09 to a - Nextcloud on 20.09. - -
- diff --git a/nixos/modules/services/web-apps/pict-rs.nix b/nixos/modules/services/web-apps/pict-rs.nix index ad07507ca37d..0f13b2ae6db1 100644 --- a/nixos/modules/services/web-apps/pict-rs.nix +++ b/nixos/modules/services/web-apps/pict-rs.nix @@ -5,7 +5,7 @@ let in { meta.maintainers = with maintainers; [ happysalada ]; - meta.doc = ./pict-rs.xml; + meta.doc = ./pict-rs.md; options.services.pict-rs = { enable = mkEnableOption (lib.mdDoc "pict-rs server"); diff --git a/nixos/modules/services/web-apps/pict-rs.xml b/nixos/modules/services/web-apps/pict-rs.xml deleted file mode 100644 index 3f5900c55f15..000000000000 --- a/nixos/modules/services/web-apps/pict-rs.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - Pict-rs - - pict-rs is a a simple image hosting service. - -
- Quickstart - - the minimum to start pict-rs is - - -services.pict-rs.enable = true; - - - this will start the http server on port 8080 by default. - -
-
- Usage - - pict-rs offers the following endpoints: - - - - - POST /image for uploading an image. - Uploaded content must be valid multipart/form-data with an - image array located within the images[] key - - - This endpoint returns the following JSON structure on success - with a 201 Created status - - -{ - "files": [ - { - "delete_token": "JFvFhqJA98", - "file": "lkWZDRvugm.jpg" - }, - { - "delete_token": "kAYy9nk2WK", - "file": "8qFS0QooAn.jpg" - }, - { - "delete_token": "OxRpM3sf0Y", - "file": "1hJaYfGE01.jpg" - } - ], - "msg": "ok" -} - - - - - GET /image/download?url=... Download an - image from a remote server, returning the same JSON payload as - the POST endpoint - - - - - GET /image/original/{file} for getting a - full-resolution image. file here is the - file key from the /image - endpoint’s JSON - - - - - GET /image/details/original/{file} for - getting the details of a full-resolution image. The returned - JSON is structured like so: - - -{ - "width": 800, - "height": 537, - "content_type": "image/webp", - "created_at": [ - 2020, - 345, - 67376, - 394363487 - ] -} - - - - - GET /image/process.{ext}?src={file}&... - get a file with transformations applied. existing - transformations include - - - - - identity=true: apply no changes - - - - - blur={float}: apply a gaussian blur to - the file - - - - - thumbnail={int}: produce a thumbnail of - the image fitting inside an {int} by - {int} square using raw pixel sampling - - - - - resize={int}: produce a thumbnail of - the image fitting inside an {int} by - {int} square using a Lanczos2 filter. - This is slower than sampling but looks a bit better in - some cases - - - - - crop={int-w}x{int-h}: produce a cropped - version of the image with an {int-w} by - {int-h} aspect ratio. The resulting - crop will be centered on the image. Either the width or - height of the image will remain full-size, depending on - the image’s aspect ratio and the requested aspect ratio. - For example, a 1600x900 image cropped with a 1x1 aspect - ratio will become 900x900. A 1600x1100 image cropped with - a 16x9 aspect ratio will become 1600x900. - - - - - Supported ext file extensions include - png, jpg, and - webp - - - An example of usage could be - - -GET /image/process.jpg?src=asdf.png&thumbnail=256&blur=3.0 - - - which would create a 256x256px JPEG thumbnail and blur it - - - - - GET /image/details/process.{ext}?src={file}&... - for getting the details of a processed image. The returned - JSON is the same format as listed for the full-resolution - details endpoint. - - - - - DELETE /image/delete/{delete_token}/{file} - or GET /image/delete/{delete_token}/{file} - to delete a file, where delete_token and - file are from the /image - endpoint’s JSON - - - -
-
- Missing - - - - Configuring the secure-api-key is not included yet. The - envisioned basic use case is consumption on localhost by other - services without exposing the service to the internet. - - - -
- diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index e5dc1b103601..f64254d62524 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -292,5 +292,5 @@ in { }; meta.maintainers = with maintainers; [ ma27 ]; - meta.doc = ./plausible.xml; + meta.doc = ./plausible.md; } diff --git a/nixos/modules/services/web-apps/plausible.xml b/nixos/modules/services/web-apps/plausible.xml deleted file mode 100644 index 39ff004ffd95..000000000000 --- a/nixos/modules/services/web-apps/plausible.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - Plausible - - Plausible is a - privacy-friendly alternative to Google analytics. - -
- Basic Usage - - At first, a secret key is needed to be generated. This can be done - with e.g. - - -$ openssl rand -base64 64 - - - After that, plausible can be deployed like - this: - - -{ - services.plausible = { - enable = true; - adminUser = { - # activate is used to skip the email verification of the admin-user that's - # automatically created by plausible. This is only supported if - # postgresql is configured by the module. This is done by default, but - # can be turned off with services.plausible.database.postgres.setup. - activate = true; - email = "admin@localhost"; - passwordFile = "/run/secrets/plausible-admin-pwd"; - }; - server = { - baseUrl = "http://analytics.example.org"; - # secretKeybaseFile is a path to the file which contains the secret generated - # with openssl as described above. - secretKeybaseFile = "/run/secrets/plausible-secret-key-base"; - }; - }; -} - -
- diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 1c25d865f980..2491c788d6c5 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -9,7 +9,7 @@ let in { meta = { - doc = ./garage.xml; + doc = ./garage.md; maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; }; diff --git a/nixos/modules/services/web-servers/garage.xml b/nixos/modules/services/web-servers/garage.xml deleted file mode 100644 index 6a16b1693daf..000000000000 --- a/nixos/modules/services/web-servers/garage.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - Garage - - Garage is - an open-source, self-hostable S3 store, simpler than MinIO, for - geodistributed stores. The server setup can be automated using - services.garage. A - client configured to your local Garage instance is available in the - global environment as garage-manage. - - - The current default by NixOS is garage_0_8 which - is also the latest major version available. - -
- General considerations on upgrades - - Garage provides a cookbook documentation on how to upgrade: - https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/ - - - - Garage has two types of upgrades: patch-level upgrades and - minor/major version upgrades. - - - In all cases, you should read the changelog and ideally test the - upgrade on a staging cluster. - - - Checking the health of your cluster can be achieved using - garage-manage repair. - - - - - Until 1.0 is released, patch-level upgrades are considered as - minor version upgrades. Minor version upgrades are considered as - major version upgrades. i.e. 0.6 to 0.7 is a major version - upgrade. - - - - - - Straightforward upgrades (patch-level - upgrades). Upgrades must be performed one by one, - i.e. for each node, stop it, upgrade it : change - stateVersion or - services.garage.package, - restart it if it was not already by switching. - - - - - Multiple version upgrades. - Garage do not provide any guarantee on moving more than one - major-version forward. E.g., if you’re on - 0.7, you cannot upgrade to - 0.9. You need to upgrade to - 0.8 first. As long as - stateVersion is - declared properly, this is enforced automatically. The module - will issue a warning to remind the user to upgrade to latest - Garage after that deploy. - - - -
-
- Advanced upgrades (minor/major version upgrades) - - Here are some baseline instructions to handle advanced upgrades in - Garage, when in doubt, please refer to upstream instructions. - - - - - Disable API and web access to Garage. - - - - - Perform - garage-manage repair --all-nodes --yes tables - and - garage-manage repair --all-nodes --yes blocks. - - - - - Verify the resulting logs and check that data is synced - properly between all nodes. If you have time, do additional - checks (scrub, - block_refs, etc.). - - - - - Check if queues are empty by - garage-manage stats or through monitoring - tools. - - - - - Run systemctl stop garage to stop the - actual Garage version. - - - - - Backup the metadata folder of ALL your nodes, e.g. for a - metadata directory (the default one) in - /var/lib/garage/meta, you can run - pushd /var/lib/garage; tar -acf meta-v0.7.tar.zst meta/; popd. - - - - - Run the offline migration: - nix-shell -p garage_0_8 --run "garage offline-repair --yes", - this can take some time depending on how many objects are - stored in your cluster. - - - - - Bump Garage version in your NixOS configuration, either by - changing - stateVersion or - bumping - services.garage.package, - this should restart Garage automatically. - - - - - Perform - garage-manage repair --all-nodes --yes tables - and - garage-manage repair --all-nodes --yes blocks. - - - - - Wait for a full table sync to run. - - - - - Your upgraded cluster should be in a working state, re-enable API - and web access. - -
-
- Maintainer information - - As stated in the previous paragraph, we must provide a clean - upgrade-path for Garage since it cannot move more than one major - version forward on a single upgrade. This chapter adds some notes - how Garage updates should be rolled out in the future. This is - inspired from how Nextcloud does it. - - - While patch-level updates are no problem and can be done directly - in the package-expression (and should be backported to supported - stable branches after that), major-releases should be added in a - new attribute (e.g. Garage v0.8.0 should be - available in nixpkgs as - pkgs.garage_0_8_0). To provide simple upgrade - paths it’s generally useful to backport those as well to stable - branches. As long as the package-default isn’t altered, this won’t - break existing setups. After that, the versioning-warning in the - garage-module should be updated to make sure - that the - package-option - selects the latest version on fresh setups. - - - If major-releases will be abandoned by upstream, we should check - first if those are needed in NixOS for a safe upgrade-path before - removing those. In that case we shold keep those packages, but - mark them as insecure in an expression like this (in - <nixpkgs/pkgs/tools/filesystem/garage/default.nix>): - - -/* ... */ -{ - garage_0_7_3 = generic { - version = "0.7.3"; - sha256 = "0000000000000000000000000000000000000000000000000000"; - eol = true; - }; -} - - - Ideally we should make sure that it’s possible to jump two NixOS - versions forward: i.e. the warnings and the logic in the module - should guard a user to upgrade from a Garage on e.g. 22.11 to a - Garage on 23.11. - -
- diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index c723b962c847..c0b90997ae9b 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -211,6 +211,8 @@ let proxy_send_timeout ${cfg.proxyTimeout}; proxy_read_timeout ${cfg.proxyTimeout}; proxy_http_version 1.1; + # don't let clients close the keep-alive connection to upstream + proxy_set_header "Connection" ""; include ${recommendedProxyConfig}; ''} diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index dadfb421d3a8..79b2e7c6ead7 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -66,7 +66,7 @@ in { meta = { - doc = ./gnome.xml; + doc = ./gnome.md; maintainers = teams.gnome.members; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.xml b/nixos/modules/services/x11/desktop-managers/gnome.xml deleted file mode 100644 index 6613f49eec7a..000000000000 --- a/nixos/modules/services/x11/desktop-managers/gnome.xml +++ /dev/null @@ -1,261 +0,0 @@ - - - GNOME Desktop - - GNOME provides a simple, yet full-featured desktop environment with - a focus on productivity. Its Mutter compositor supports both Wayland - and X server, and the GNOME Shell user interface is fully - customizable by extensions. - -
- Enabling GNOME - - All of the core apps, optional apps, games, and core developer - tools from GNOME are available. - - - To enable the GNOME desktop use: - - -services.xserver.desktopManager.gnome.enable = true; -services.xserver.displayManager.gdm.enable = true; - - - - While it is not strictly necessary to use GDM as the display - manager with GNOME, it is recommended, as some features such as - screen lock - might - not work without it. - - - - The default applications used in NixOS are very minimal, inspired - by the defaults used in - gnome-build-meta. - -
- GNOME without the apps - - If you’d like to only use the GNOME desktop and not the apps, - you can disable them with: - - -services.gnome.core-utilities.enable = false; - - - and none of them will be installed. - - - If you’d only like to omit a subset of the core utilities, you - can use - . Note - that this mechanism can only exclude core utilities, games and - core developer tools. - -
-
- Disabling GNOME services - - It is also possible to disable many of the - core - services. For example, if you do not need indexing files, - you can disable Tracker with: - - -services.gnome.tracker-miners.enable = false; -services.gnome.tracker.enable = false; - - - Note, however, that doing so is not supported and might break - some applications. Notably, GNOME Music cannot work without - Tracker. - -
-
- GNOME games - - You can install all of the GNOME games with: - - -services.gnome.games.enable = true; - -
-
- GNOME core developer tools - - You can install GNOME core developer tools with: - - -services.gnome.core-developer-tools.enable = true; - -
-
-
- Enabling GNOME Flashback - - GNOME Flashback provides a desktop environment based on the - classic GNOME 2 architecture. You can enable the default GNOME - Flashback session, which uses the Metacity window manager, with: - - -services.xserver.desktopManager.gnome.flashback.enableMetacity = true; - - - It is also possible to create custom sessions that replace - Metacity with a different window manager using - . - - - The following example uses xmonad window - manager: - - -services.xserver.desktopManager.gnome.flashback.customSessions = [ - { - wmName = "xmonad"; - wmLabel = "XMonad"; - wmCommand = "${pkgs.haskellPackages.xmonad}/bin/xmonad"; - enableGnomePanel = false; - } -]; - -
-
- Icons and GTK Themes - - Icon themes and GTK themes don’t require any special option to - install in NixOS. - - - You can add them to - and switch to - them with GNOME Tweaks. If you’d like to do this manually in - dconf, change the values of the following keys: - - -/org/gnome/desktop/interface/gtk-theme -/org/gnome/desktop/interface/icon-theme - - - in dconf-editor - -
-
- Shell Extensions - - Most Shell extensions are packaged under the - gnomeExtensions attribute. Some packages that - include Shell extensions, like gnome.gpaste, - don’t have their extension decoupled under this attribute. - - - You can install them like any other package: - - -environment.systemPackages = [ - gnomeExtensions.dash-to-dock - gnomeExtensions.gsconnect - gnomeExtensions.mpris-indicator-button -]; - - - Unfortunately, we lack a way for these to be managed in a - completely declarative way. So you have to enable them manually - with an Extensions application. It is possible to use a - GSettings - override for this on - org.gnome.shell.enabled-extensions, but that - will only influence the default value. - -
-
- GSettings Overrides - - Majority of software building on the GNOME platform use GLib’s - GSettings - system to manage runtime configuration. For our purposes, the - system consists of XML schemas describing the individual - configuration options, stored in the package, and a settings - backend, where the values of the settings are stored. On NixOS, - like on most Linux distributions, dconf database is used as the - backend. - - - GSettings - vendor overrides can be used to adjust the default values - for settings of the GNOME desktop and apps by replacing the - default values specified in the XML schemas. Using overrides will - allow you to pre-seed user settings before you even start the - session. - - - - Overrides really only change the default values for GSettings - keys so if you or an application changes the setting value, the - value set by the override will be ignored. Until - NixOS’s - dconf module implements changing values, you will either - need to keep that in mind and clear the setting from the backend - using dconf reset command when that happens, - or use the - module - from home-manager. - - - - You can override the default GSettings values using the - - option. - - - Take note that whatever packages you want to override GSettings - for, you need to add them to - . - - - You can use dconf-editor tool to explore which - GSettings you can set. - -
- Example - -services.xserver.desktopManager.gnome = { - extraGSettingsOverrides = '' - # Change default background - [org.gnome.desktop.background] - picture-uri='file://${pkgs.nixos-artwork.wallpapers.mosaic-blue.gnomeFilePath}' - - # Favorite apps in gnome-shell - [org.gnome.shell] - favorite-apps=['org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop'] - ''; - - extraGSettingsOverridePackages = [ - pkgs.gsettings-desktop-schemas # for org.gnome.desktop - pkgs.gnome.gnome-shell # for org.gnome.shell - ]; -}; - -
-
-
- Frequently Asked Questions -
- Can I use LightDM with GNOME? - - Yes you can, and any other display-manager in NixOS. - - - However, it doesn’t work correctly for the Wayland session of - GNOME Shell yet, and won’t be able to lock your screen. - - - See - this - issue. - -
-
- diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index f5cc2d8187da..7791a98965d1 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -17,7 +17,7 @@ in { meta = { - doc = ./pantheon.xml; + doc = ./pantheon.md; maintainers = teams.pantheon.members; }; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml deleted file mode 100644 index 0e98b08fb658..000000000000 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - Pantheon Desktop - - Pantheon is the desktop environment created for the elementary OS - distribution. It is written from scratch in Vala, utilizing GNOME - technologies with GTK and Granite. - -
- Enabling Pantheon - - All of Pantheon is working in NixOS and the applications should be - available, aside from a few - exceptions. - To enable Pantheon, set - - -services.xserver.desktopManager.pantheon.enable = true; - - - This automatically enables LightDM and Pantheon’s LightDM greeter. - If you’d like to disable this, set - - -services.xserver.displayManager.lightdm.greeters.pantheon.enable = false; -services.xserver.displayManager.lightdm.enable = false; - - - but please be aware using Pantheon without LightDM as a display - manager will break screenlocking from the UI. The NixOS module for - Pantheon installs all of Pantheon’s default applications. If you’d - like to not install Pantheon’s apps, set - - -services.pantheon.apps.enable = false; - - - You can also use - to - remove any other app (like elementary-mail). - -
-
- Wingpanel and Switchboard plugins - - Wingpanel and Switchboard work differently than they do in other - distributions, as far as using plugins. You cannot install a - plugin globally (like with - ) to start using it. - You should instead be using the following options: - - - - - - - - - - - - - - - to configure the programs with plugs or indicators. - - - The difference in NixOS is both these programs are patched to load - plugins from a directory that is the value of an environment - variable. All of which is controlled in Nix. If you need to - configure the particular packages manually you can override the - packages like: - - -wingpanel-with-indicators.override { - indicators = [ - pkgs.some-special-indicator - ]; -}; - -switchboard-with-plugs.override { - plugs = [ - pkgs.some-special-plug - ]; -}; - - - please note that, like how the NixOS options describe these as - extra plugins, this would only add to the default plugins included - with the programs. If for some reason you’d like to configure - which plugins to use exactly, both packages have an argument for - this: - - -wingpanel-with-indicators.override { - useDefaultIndicators = false; - indicators = specialListOfIndicators; -}; - -switchboard-with-plugs.override { - useDefaultPlugs = false; - plugs = specialListOfPlugs; -}; - - - this could be most useful for testing a particular plug-in in - isolation. - -
-
- FAQ - - - - I have - switched from a different desktop and Pantheon’s theming looks - messed up. - - - - Open Switchboard and go to: Administration → About → Restore - Default Settings → Restore Settings. This will reset any - dconf settings to their Pantheon defaults. Note this could - reset certain GNOME specific preferences if that desktop was - used prior. - - - - - - I - cannot enable both GNOME and Pantheon. - - - - This is a known - issue - and there is no known workaround. - - - - - - Does AppCenter - work, or is it available? - - - - AppCenter has been available since 20.03. Starting from - 21.11, the Flatpak backend should work so you can install - some Flatpak applications using it. However, due to missing - appstream metadata, the Packagekit backend does not function - currently. See this - issue. - - - If you are using Pantheon, AppCenter should be installed by - default if you have - Flatpak - support enabled. If you also wish to add the - appcenter Flatpak remote: - - -$ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo - - - - -
- diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index b295b9a109b6..65b94f61c4ae 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -365,6 +365,7 @@ in pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ]; optionalPackages = [ + pkgs.aha # needed by kinfocenter for fwupd support plasma-browser-integration konsole oxygen diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index f74e8efb8f64..65f414705fc5 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -32,7 +32,7 @@ let usersConf = writeText "users.conf" '' [UserList] - minimum-uid=500 + minimum-uid=1000 hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} hidden-shells=/run/current-system/sw/bin/nologin ''; diff --git a/nixos/modules/system/boot/loader/external/external.nix b/nixos/modules/system/boot/loader/external/external.nix index 7c5455bb47aa..926cbd2b4b3f 100644 --- a/nixos/modules/system/boot/loader/external/external.nix +++ b/nixos/modules/system/boot/loader/external/external.nix @@ -8,7 +8,7 @@ in { meta = { maintainers = with maintainers; [ cole-h grahamc raitobezarius ]; - doc = ./external.xml; + doc = ./external.md; }; options.boot.loader.external = { diff --git a/nixos/modules/system/boot/loader/external/external.xml b/nixos/modules/system/boot/loader/external/external.xml deleted file mode 100644 index 9a392c27441d..000000000000 --- a/nixos/modules/system/boot/loader/external/external.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - External Bootloader Backends - - NixOS has support for several bootloader backends by default: - systemd-boot, grub, uboot, etc. The built-in bootloader backend - support is generic and supports most use cases. Some users may - prefer to create advanced workflows around managing the bootloader - and bootable entries. - - - You can replace the built-in bootloader support with your own - tooling using the external bootloader option. - - - Imagine you have created a new package called FooBoot. FooBoot - provides a program at - ${pkgs.fooboot}/bin/fooboot-install which takes - the system closure’s path as its only argument and configures the - system’s bootloader. - - - You can enable FooBoot like this: - - -{ pkgs, ... }: { - boot.loader.external = { - enable = true; - installHook = "${pkgs.fooboot}/bin/fooboot-install"; - }; -} - -
- Developing Custom Bootloader Backends - - Bootloaders should use - RFC-0125’s - Bootspec format and synthesis tools to identify the key properties - for bootable system generations. - -
- diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 9b6472fea429..a1ab70938575 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -146,6 +146,9 @@ in systemd.services.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ]; systemd.paths.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ]; + # Prevent Plymouth taking over the screen during system updates. + systemd.services.plymouth-start.restartIfChanged = false; + boot.initrd.systemd = { extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell storePaths = [ diff --git a/nixos/modules/system/boot/systemd/coredump.nix b/nixos/modules/system/boot/systemd/coredump.nix index c2ca973d3807..03ef00e5683c 100644 --- a/nixos/modules/system/boot/systemd/coredump.nix +++ b/nixos/modules/system/boot/systemd/coredump.nix @@ -44,7 +44,21 @@ in { ''; # install provided sysctl snippets - "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; + "sysctl.d/50-coredump.conf".source = + # Fix systemd-coredump error caused by truncation of `kernel.core_pattern` + # when the `systemd` derivation name is too long. This works by substituting + # the path to `systemd` with a symlink that has a constant-length path. + # + # See: https://github.com/NixOS/nixpkgs/issues/213408 + pkgs.substitute { + src = "${systemd}/example/sysctl.d/50-coredump.conf"; + replacements = [ + "--replace" + "${systemd}" + "${pkgs.symlinkJoin { name = "systemd"; paths = [ systemd ]; }}" + ]; + }; + "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 933a9c539e48..06210529eb8c 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -545,8 +545,7 @@ in virtualisation.vlans = mkOption { type = types.listOf types.ints.unsigned; - default = if config.virtualisation.interfaces == {} then [ 1 ] else [ ]; - defaultText = lib.literalExpression ''if config.virtualisation.interfaces == {} then [ 1 ] else [ ]''; + default = [ 1 ]; example = [ 1 2 ]; description = lib.mdDoc '' @@ -561,35 +560,6 @@ in ''; }; - virtualisation.interfaces = mkOption { - default = {}; - example = { - enp1s0.vlan = 1; - }; - description = lib.mdDoc '' - Network interfaces to add to the VM. - ''; - type = with types; attrsOf (submodule { - options = { - vlan = mkOption { - type = types.ints.unsigned; - description = lib.mdDoc '' - VLAN to which the network interface is connected. - ''; - }; - - assignIP = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Automatically assign an IP address to the network interface using the same scheme as - virtualisation.vlans. - ''; - }; - }; - }); - }; - virtualisation.writableStore = mkOption { type = types.bool; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 12e386f1c2d5..fe51123f1d0f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -126,6 +126,7 @@ in { cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {}; charliecloud = handleTest ./charliecloud.nix {}; chromium = (handleTestOn ["aarch64-linux" "x86_64-linux"] ./chromium.nix {}).stable or {}; + chrony-ptp = handleTestOn ["aarch64-linux" "x86_64-linux"] ./chrony-ptp.nix {}; cinnamon = handleTest ./cinnamon.nix {}; cjdns = handleTest ./cjdns.nix {}; clickhouse = handleTest ./clickhouse.nix {}; @@ -135,6 +136,7 @@ in { cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {}; cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; collectd = handleTest ./collectd.nix {}; + connman = handleTest ./connman.nix {}; consul = handleTest ./consul.nix {}; containers-bridge = handleTest ./containers-bridge.nix {}; containers-custom-pkgs.nix = handleTest ./containers-custom-pkgs.nix {}; diff --git a/nixos/tests/chrony-ptp.nix b/nixos/tests/chrony-ptp.nix new file mode 100644 index 000000000000..b2634a8cfc5c --- /dev/null +++ b/nixos/tests/chrony-ptp.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ lib, ... }: +{ + name = "chrony-ptp"; + + meta = { + maintainers = with lib.maintainers; [ gkleen ]; + }; + + nodes = { + qemuGuest = { lib, ... }: { + boot.kernelModules = [ "ptp_kvm" ]; + + services.chrony = { + enable = true; + extraConfig = '' + refclock PHC /dev/ptp_kvm poll 2 dpoll -2 offset 0 stratum 3 + ''; + }; + }; + }; + + testScript = '' + start_all() + + qemuGuest.wait_for_unit('multi-user.target') + qemuGuest.succeed('systemctl is-active chronyd.service') + ''; +}) diff --git a/nixos/tests/connman.nix b/nixos/tests/connman.nix new file mode 100644 index 000000000000..348b2a895a63 --- /dev/null +++ b/nixos/tests/connman.nix @@ -0,0 +1,77 @@ +import ./make-test-python.nix ({ pkgs, lib, ...}: +{ + name = "connman"; + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + # Router running radvd on VLAN 1 + nodes.router = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + virtualisation.vlans = [ 1 ]; + + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; + + networking = { + useDHCP = false; + interfaces.eth1.ipv6.addresses = + [ { address = "fd12::1"; prefixLength = 64; } ]; + }; + + services.radvd = { + enable = true; + config = '' + interface eth1 { + AdvSendAdvert on; + AdvManagedFlag on; + AdvOtherConfigFlag on; + prefix fd12::/64 { + AdvAutonomous off; + }; + }; + ''; + }; + }; + + # Client running connman, connected to VLAN 1 + nodes.client = { ... }: { + virtualisation.vlans = [ 1 ]; + + # add a virtual wlan interface + boot.kernelModules = [ "mac80211_hwsim" ]; + boot.extraModprobeConfig = '' + options mac80211_hwsim radios=1 + ''; + + # Note: the overrides are needed because the wifi is + # disabled with mkVMOverride in qemu-vm.nix. + services.connman.enable = lib.mkOverride 0 true; + services.connman.networkInterfaceBlacklist = [ "eth0" ]; + networking.wireless.enable = lib.mkOverride 0 true; + networking.wireless.interfaces = [ "wlan0" ]; + }; + + testScript = + '' + start_all() + + with subtest("Router is ready"): + router.wait_for_unit("radvd.service") + + with subtest("Daemons are running"): + client.wait_for_unit("wpa_supplicant-wlan0.service") + client.wait_for_unit("connman.service") + client.wait_until_succeeds("connmanctl state | grep -q ready") + + with subtest("Wired interface is configured"): + client.wait_until_succeeds("ip -6 route | grep -q fd12::/64") + client.wait_until_succeeds("ping -c 1 fd12::1") + + with subtest("Can set up a wireless access point"): + client.succeed("connmanctl enable wifi") + client.wait_until_succeeds("connmanctl tether wifi on nixos-test reproducibility | grep -q 'Enabled'") + client.wait_until_succeeds("iw wlan0 info | grep -q nixos-test") + ''; +}) + diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 1eb927632eb7..96378452ade3 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -22,9 +22,15 @@ let }; }; - systemd.tmpfiles.rules = [ - "L /var/lib/grafana/dashboards/test.json 0700 grafana grafana - ${pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json)}" - ]; + system.activationScripts.setup-grafana = { + deps = [ "users" ]; + text = '' + mkdir -p /var/lib/grafana/dashboards + chown -R grafana:grafana /var/lib/grafana + chmod 0700 -R /var/lib/grafana/dashboards + cp ${pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json)} /var/lib/grafana/dashboards/ + ''; + }; }; extraNodeConfs = { diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index c720c8068c87..441d258afc08 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -93,19 +93,18 @@ let name = "Static"; nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; defaultGateway = "192.168.1.1"; defaultGateway6 = "fd00:1234:5678:1::1"; - interfaces.enp1s0.ipv4.addresses = [ + interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } { address = "192.168.1.3"; prefixLength = 32; } { address = "192.168.1.10"; prefixLength = 32; } ]; - interfaces.enp2s0.ipv4.addresses = [ + interfaces.eth2.ipv4.addresses = mkOverride 0 [ { address = "192.168.2.2"; prefixLength = 24; } ]; }; @@ -171,12 +170,12 @@ let # Disable test driver default config networking.interfaces = lib.mkForce {}; networking.useNetworkd = networkd; - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; }; testScript = '' start_all() client.wait_for_unit("multi-user.target") - client.wait_until_succeeds("ip addr show dev enp1s0 | grep '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep '192.168.1'") client.shell_interact() client.succeed("ping -c 1 192.168.1.1") router.succeed("ping -c 1 192.168.1.1") @@ -188,13 +187,20 @@ let name = "SimpleDHCP"; nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.useDHCP = true; - interfaces.enp2s0.useDHCP = true; + interfaces.eth1 = { + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; + useDHCP = true; + }; + interfaces.eth2 = { + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; + useDHCP = true; + }; }; }; testScript = { ... }: @@ -205,10 +211,10 @@ let router.wait_for_unit("network-online.target") with subtest("Wait until we have an ip address on each interface"): - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q '192.168.1'") - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q 'fd00:1234:5678:1:'") - client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q '192.168.2'") - client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q 'fd00:1234:5678:2:'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'") + client.wait_until_succeeds("ip addr show dev eth2 | grep -q '192.168.2'") + client.wait_until_succeeds("ip addr show dev eth2 | grep -q 'fd00:1234:5678:2:'") with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") @@ -237,15 +243,16 @@ let name = "OneInterfaceDHCP"; nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0 = { + interfaces.eth1 = { + ipv4.addresses = mkOverride 0 [ ]; mtu = 1343; useDHCP = true; }; + interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; }; }; testScript = { ... }: @@ -257,10 +264,10 @@ let router.wait_for_unit("network.target") with subtest("Wait until we have an ip address on each interface"): - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'") with subtest("ensure MTU is set"): - assert "mtu 1343" in client.succeed("ip link show dev enp1s0") + assert "mtu 1343" in client.succeed("ip link show dev eth1") with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") @@ -279,15 +286,16 @@ let }; bond = let node = address: { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; bonds.bond0 = { - interfaces = [ "enp1s0" "enp2s0" ]; + interfaces = [ "eth1" "eth2" ]; driverOptions.mode = "802.3ad"; }; + interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; + interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; interfaces.bond0.ipv4.addresses = mkOverride 0 [ { inherit address; prefixLength = 30; } ]; }; @@ -318,11 +326,12 @@ let }; bridge = let node = { address, vlan }: { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = vlan; + virtualisation.vlans = [ vlan ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.ipv4.addresses = [ { inherit address; prefixLength = 24; } ]; + interfaces.eth1.ipv4.addresses = mkOverride 0 + [ { inherit address; prefixLength = 24; } ]; }; }; in { @@ -330,12 +339,11 @@ let nodes.client1 = node { address = "192.168.1.2"; vlan = 1; }; nodes.client2 = node { address = "192.168.1.3"; vlan = 2; }; nodes.router = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; - bridges.bridge.interfaces = [ "enp1s0" "enp2s0" ]; + bridges.bridge.interfaces = [ "eth1" "eth2" ]; interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; interfaces.bridge.ipv4.addresses = mkOverride 0 @@ -369,7 +377,7 @@ let nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; @@ -377,9 +385,14 @@ let # reverse path filtering rules for the macvlan interface seem # to be incorrect, causing the test to fail. Disable temporarily. firewall.checkReversePath = false; - macvlans.macvlan.interface = "enp1s0"; - interfaces.enp1s0.useDHCP = true; - interfaces.macvlan.useDHCP = true; + macvlans.macvlan.interface = "eth1"; + interfaces.eth1 = { + ipv4.addresses = mkOverride 0 [ ]; + useDHCP = true; + }; + interfaces.macvlan = { + useDHCP = true; + }; }; }; testScript = { ... }: @@ -391,7 +404,7 @@ let router.wait_for_unit("network.target") with subtest("Wait until we have an ip address on each interface"): - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'") client.wait_until_succeeds("ip addr show dev macvlan | grep -q '192.168.1'") with subtest("Print lots of diagnostic information"): @@ -418,22 +431,23 @@ let fou = { name = "foo-over-udp"; nodes.machine = { ... }: { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + interfaces.eth1.ipv4.addresses = mkOverride 0 + [ { address = "192.168.1.1"; prefixLength = 24; } ]; fooOverUDP = { fou1 = { port = 9001; }; fou2 = { port = 9002; protocol = 41; }; fou3 = mkIf (!networkd) { port = 9003; local.address = "192.168.1.1"; }; fou4 = mkIf (!networkd) - { port = 9004; local = { address = "192.168.1.1"; dev = "enp1s0"; }; }; + { port = 9004; local = { address = "192.168.1.1"; dev = "eth1"; }; }; }; }; systemd.services = { - fou3-fou-encap.after = optional (!networkd) "network-addresses-enp1s0.service"; + fou3-fou-encap.after = optional (!networkd) "network-addresses-eth1.service"; }; }; testScript = { ... }: @@ -456,20 +470,20 @@ let "gue": None, "family": "inet", "local": "192.168.1.1", - "dev": "enp1s0", + "dev": "eth1", } in fous, "fou4 exists" ''; }; sit = let node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; sits.sit = { inherit remote; local = address4; - dev = "enp1s0"; + dev = "eth1"; }; interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = address4; prefixLength = 24; } ]; @@ -671,10 +685,10 @@ let vlan-ping = let baseIP = number: "10.10.10.${number}"; vlanIP = number: "10.1.1.${number}"; - baseInterface = "enp1s0"; + baseInterface = "eth1"; vlanInterface = "vlan42"; node = number: {pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { #useNetworkd = networkd; useDHCP = false; @@ -771,12 +785,12 @@ let privacy = { name = "Privacy"; nodes.router = { ... }: { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.ipv6.addresses = singleton { + interfaces.eth1.ipv6.addresses = singleton { address = "fd00:1234:5678:1::1"; prefixLength = 64; }; @@ -798,11 +812,11 @@ let }; }; nodes.client_with_privacy = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0 = { + interfaces.eth1 = { tempAddress = "default"; ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; @@ -811,11 +825,11 @@ let }; }; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0 = { + interfaces.eth1 = { tempAddress = "enabled"; ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; @@ -833,9 +847,9 @@ let with subtest("Wait until we have an ip address"): client_with_privacy.wait_until_succeeds( - "ip addr show dev enp1s0 | grep -q 'fd00:1234:5678:1:'" + "ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'" ) - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q 'fd00:1234:5678:1:'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'") with subtest("Test vlan 1"): client_with_privacy.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1") @@ -933,7 +947,7 @@ let ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue) ''; }; - rename = if networkd then { + rename = { name = "RenameInterface"; nodes.machine = { pkgs, ... }: { virtualisation.vlans = [ 1 ]; @@ -941,20 +955,23 @@ let useNetworkd = networkd; useDHCP = false; }; - systemd.network.links."10-custom_name" = { - matchConfig.MACAddress = "52:54:00:12:01:01"; - linkConfig.Name = "custom_name"; - }; - }; + } // + (if networkd + then { systemd.network.links."10-custom_name" = { + matchConfig.MACAddress = "52:54:00:12:01:01"; + linkConfig.Name = "custom_name"; + }; + } + else { boot.initrd.services.udev.rules = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="custom_name" + ''; + }); testScript = '' machine.succeed("udevadm settle") print(machine.succeed("ip link show dev custom_name")) ''; - } else { - name = "RenameInterface"; - nodes = { }; - testScript = ""; }; + nodes = { }; # even with disabled networkd, systemd.network.links should work # (as it's handled by udev, not networkd) link = { diff --git a/nixos/tests/tracee.nix b/nixos/tests/tracee.nix index 6ef7e5342bee..1e0249056fea 100644 --- a/nixos/tests/tracee.nix +++ b/nixos/tests/tracee.nix @@ -11,19 +11,19 @@ import ./make-test-python.nix ({ pkgs, ... }: { # build the go integration tests as a binary (pkgs.tracee.overrideAttrs (oa: { pname = oa.pname + "-integration"; - patches = oa.patches or [] ++ [ - # change the prefix from /usr/bin to /run to find nix processes - ../../pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch - ]; + postPatch = oa.postPatch or "" + '' + # prepare tester.sh + patchShebangs tests/integration/tester.sh + # fix the test to look at nixos paths for running programs + substituteInPlace tests/integration/integration_test.go \ + --replace "/usr/bin" "/run" + ''; + nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ pkgs.makeWrapper ]; buildPhase = '' runHook preBuild # just build the static lib we need for the go test binary make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} bpf-core ./dist/btfhub - # remove the /usr/bin prefix to work with the patch above - substituteInPlace tests/integration/integration_test.go \ - --replace "/usr/bin/ls" "ls" - # then compile the tests to be ran later CGO_LDFLAGS="$(pkg-config --libs libbpf)" go test -tags core,ebpf,integration -p 1 -c -o $GOPATH/tracee-integration ./tests/integration/... runHook postBuild @@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { doCheck = false; installPhase = '' mkdir -p $out/bin - cp $GOPATH/tracee-integration $out/bin + mv $GOPATH/tracee-integration $out/bin/ ''; doInstallCheck = false; })) @@ -44,6 +44,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { # EventFilters/trace_only_events_from_new_containers also requires a container called "alpine" machine.succeed('tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - alpine --change ENTRYPOINT=sleep') - print(machine.succeed('TRC_BIN="${pkgs.tracee}" tracee-integration -test.v')) + print(machine.succeed('tracee-integration -test.v')) ''; }) diff --git a/pkgs/applications/audio/cavalier/default.nix b/pkgs/applications/audio/cavalier/default.nix new file mode 100644 index 000000000000..17fdabc5bc0d --- /dev/null +++ b/pkgs/applications/audio/cavalier/default.nix @@ -0,0 +1,68 @@ +{ lib +, python3 +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gobject-introspection +, glib +, gtk4 +, librsvg +, libadwaita +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, cava +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cavalier"; + version = "2023.01.29"; + format = "other"; + + src = fetchFromGitHub { + owner = "fsobolev"; + repo = pname; + rev = version; + hash = "sha256-6bvi73cFQHtIyD4d4+mqje0qkmG4wkahZ2ohda5RvRQ="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libadwaita + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + ]; + + # Prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH ":" "${lib.makeBinPath [ cava ]}" + ) + ''; + + meta = with lib; { + description = "Audio visualizer based on CAVA with customizable LibAdwaita interface"; + homepage = "https://github.com/fsobolev/cavalier"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 98b9faf8d24a..4564fcccc4e1 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "9.5.1"; + version = "10.0.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-45aA2Ib69Gb1Mg/5907rp1nfRbNyQq12pm/aFwTdgeA="; + sha256 = "sha256-59p5x+d7Vmxx+bdBDxrlf4+NRIdUBuRk+DqohV98XYY="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index cbed4b36181e..df42258700ca 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-7SuM7a8IIecAJ83QvJfUba/wArAEXywqL2HwVbeG8H4="; + sha256 = "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k"; }; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix new file mode 100644 index 000000000000..cf5ac3f8c52e --- /dev/null +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, clangStdenv +, pkg-config +, alsa-lib +, flac +}: + +# gcc only supports objc on darwin +buildGoModule.override { stdenv = clangStdenv; } rec { + pname = "go-musicfox"; + version = "3.6.1"; + + src = fetchFromGitHub { + owner = "anhoder"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iinEo+HrcNM3gx1iUqe1duRd45PrYgVybRt9NKphwuY="; + }; + + deleteVendor = true; + + vendorHash = "sha256-DbdAEvcspTYMYMvc5IBEUtQAJMW8JZpNi0UA/DvzGFo="; + + subPackages = [ "cmd/musicfox.go" ]; + + ldflags = [ + "-s" + "-w" + "-X go-musicfox/pkg/constants.AppVersion=${version}" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + flac + ]; + + meta = with lib; { + description = "Terminal netease cloud music client written in Go"; + homepage = "https://github.com/anhoder/go-musicfox"; + license = licenses.mit; + mainProgram = "musicfox"; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 1b20f306166f..0bbe0b1f0da5 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.9.4-1"; + version = "3.9.5-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-10gcVxMLhMXUblvJYLj0TTwGFl1YHI7HU3TfHXtJ+24="; + sha256 = "sha256-5OqTQBOYE6XU3BRiVwXOHrn22bVZzIIeZI8pgsWxhPw="; }; postPatch = '' @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { meta = { description = "Virtual Pipe Organ Software"; - homepage = "https://sourceforge.net/projects/ourorgan"; - license = lib.licenses.gpl2; + homepage = "https://github.com/GrandOrgue/grandorgue"; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.puzzlewolf ]; }; diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 3574dc2f5ac9..0860501c87c4 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-6tRd8boVwWc8qGlklYqA/Kp76VOMvtUJlu/G/InvHkA="; + hash = "sha256-tfWimJ9eEFBUxPRVNjgbu8tQNokPbXOxOXO64mFuMfM="; }; # Remove some Electron stuff from package.json diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 308d5b65f3e5..55ab6261aa9e 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -93,14 +93,11 @@ let fetchWithCurlScript { inherit name sha256; script = '' - "''${curl[@]}" --silent --request POST \ + "''${curl[@]}" --silent --request GET \ --cookie cookies \ - --header "modartt-json: request" \ - --header "origin: https://www.modartt.com" \ - --header "content-type: application/json; charset=UTF-8" \ - --header "accept: application/json, text/javascript, */*" \ - --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download -o /dev/null + --header "accept: */*" \ + https://www.modartt.com/ -o /dev/null + json=$( "''${curl[@]}" --silent --request POST \ --cookie cookies \ @@ -109,8 +106,9 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download + https://www.modartt.com/api/0/download ) + url=$(echo $json | ${jq}/bin/jq -r .url) "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" ''; @@ -140,7 +138,7 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data @login.json \ - https://www.modartt.com/json/session + https://www.modartt.com/api/0/session json=$( "''${curl[@]}" --silent --request POST \ @@ -150,10 +148,10 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download + https://www.modartt.com/api/0/download ) - url=$(echo $json | ${jq}/bin/jq -r .url) + url=$(echo $json | ${jq}/bin/jq -r .url) "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" ''; }; @@ -162,20 +160,20 @@ in { # TODO currently can't install more than one because `lame` clashes stage-trial = mkPianoteq rec { name = "stage-trial"; - version = "7.5.4"; + version = "8.0.5"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc="; + sha256 = "sha256-9Lo4e1SM1gw2/+TmpDUdZCOQcHEpT/aaG6P80/GRPQY="; }; }; standard-trial = mkPianoteq rec { name = "standard-trial"; - version = "7.5.4"; + version = "8.0.5"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ="; + sha256 = "sha256-qxViVIbld8zTMj1+TIfOsIOhmujOGJux2/u2J4hvsqw="; }; }; stage-6 = mkPianoteq rec { diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 323a83c4ca9b..519f59a1d89d 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.3.04"; + version = "6.3.05"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-C5wDiqoS6dF8VGTqiQbr1obtjpsiIa2bmtF6qGYc8XQ="; + sha256 = "sha256-0e225cmP0CSYjRYNEXi4Oqq9o8XR2N7bNS1X5x+mQKw="; }; configurePhase = '' diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 2be471650a6e..74668b03f2b3 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.36"; + version = "0.9.0"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xEFjyVly1VyDz9ALtVwxxrEs856joP+pe/mappyKrPU="; + hash = "sha256-8Kr+DRbkTKvhetIIs4htOHlIXGLpoe+T+0yxjm/JcWk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch index fed5a2ea5e1d..0b2cab3975e5 100644 --- a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch +++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch @@ -1,5 +1,3 @@ -diff --git a/SConstruct b/SConstruct -index 3ad4d9a..fb02365 100644 --- a/SConstruct +++ b/SConstruct @@ -94,11 +94,8 @@ def CheckWiX(context): @@ -16,13 +14,15 @@ index 3ad4d9a..fb02365 100644 def validate_spd_version(key,val,env): m=re.match(r"^\d+\.\d+",val) -@@ -208,9 +205,9 @@ def create_base_env(user_vars): +@@ -207,10 +204,10 @@ def create_base_env(user_vars): + env_args["LIBS"]=[] env_args["package_name"]="RHVoice" env_args["CPPDEFINES"]=[("RHVOICE","1")] - env=Environment(**env_args) +- env=Environment(**env_args) - if env["dev"]: - env["prefix"]=os.path.abspath("local") - env["RPATH"]=env.Dir("$libdir").abspath ++ env=Environment(ENV = os.environ, **env_args) + env.PrependENVPath("PATH", os.environ["PATH"]) + env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"] + env["RPATH"]=env.Dir("$libdir").abspath diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix new file mode 100644 index 000000000000..9fa3a5336b9f --- /dev/null +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -0,0 +1,52 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, cmake +, alsa-lib +, dbus +, fontconfig +}: + +rustPlatform.buildRustPackage rec { + pname = "spotify-player"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "aome510"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-bHPWpx8EJibr2kNuzuGAQPZ0DE6qeJwIRYDy+NFS/PQ="; + }; + + cargoSha256 = "sha256-QeQ3PYI5RmbJ+VQ9hLSTXgQXVVoID5zbRqSTrbWzVy8="; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + buildInputs = [ + openssl + alsa-lib + dbus + fontconfig + ]; + + buildNoDefaultFeatures = true; + + buildFeatures = [ + "rodio-backend" + "media-control" + "image" + "lyric-finder" + ]; + + meta = with lib; { + description = "A command driven spotify player"; + homepage = "https://github.com/aome510/spotify-player"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 8905351da533..93b8d3203534 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.3.1"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "sha256-Q+K8oF1VEsuhmhPH6K3as1+71vCfaKCdzRzCIxtiXvE="; + sha256 = "sha256-6KlcxBV/zHN+ZnvIu1PcKNeS0u7LqhDqAjbXawT5Vv8="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; @@ -109,13 +109,12 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ "''${gappsWrapperArgs[@]}" substituteInPlace $out/share/applications/tidal-hifi.desktop \ - --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" \ - --replace "/usr/share/icons/hicolor/0x0/apps/tidal-hifi.png" "tidal-hifi.png" + --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" for size in 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/ convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \ - -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/tidal-hifi.png + -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/icon.png done ''; @@ -124,7 +123,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Mastermindzh/tidal-hifi"; changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ alternateved ]; + maintainers = with maintainers; [ qbit ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/yesplaymusic/default.nix b/pkgs/applications/audio/yesplaymusic/default.nix new file mode 100644 index 000000000000..758dcbbd935a --- /dev/null +++ b/pkgs/applications/audio/yesplaymusic/default.nix @@ -0,0 +1,120 @@ +{ lib +, stdenv +, fetchurl +, undmg +, dpkg +, autoPatchelfHook +, wrapGAppsHook +, makeWrapper +, alsa-lib +, at-spi2-atk +, cups +, nspr +, nss +, mesa # for libgbm +, xorg +, xdg-utils +, libdrm +, libnotify +, libsecret +, libuuid +, gtk3 +, systemd +}: +let + pname = "YesPlayMusic"; + version = "0.4.5"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_amd64.deb"; + hash = "sha256-igd2MzIjwDSOLP0Xi2mSJnEPGWendggPC/MwTDCDui0="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_arm64.deb"; + hash = "sha256-6MZrAJGXuEJ9HMUje3ppTz2rdaBydwoQKBk6af81pT0="; + }; + x86_64-darwin = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-x64.dmg"; + hash = "sha256-mvmaSrDoIDeOVylkJCVY97yRUHfEI8CysmKrgBUrFGM="; + }; + aarch64-darwin = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-arm64.dmg"; + hash = "sha256-Qo03rGS/qB6Sc1IunU7F81WJ/t+mWR7ZRsKYK97LHik="; + }; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + libraries = [ + alsa-lib + at-spi2-atk + cups + nspr + nss + mesa + xorg.libxshmfence + xorg.libXScrnSaver + xorg.libXtst + xdg-utils + libdrm + libnotify + libsecret + libuuid + gtk3 + ]; + + meta = with lib; { + description = "A good-looking third-party netease cloud music player"; + homepage = "https://github.com/qier222/YesPlayMusic/"; + license = licenses.mit; + maintainers = with maintainers; [ ChaosAttractor ]; + platforms = builtins.attrNames srcs; + }; +in +if stdenv.isDarwin +then stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; +} +else stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + makeWrapper + ]; + + buildInputs = libraries; + + runtimeDependencies = [ + (lib.getLib systemd) + ]; + + unpackPhase = '' + ${dpkg}/bin/dpkg-deb -x $src . + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r opt $out/opt + cp -r usr/share $out/share + substituteInPlace $out/share/applications/yesplaymusic.desktop \ + --replace "/opt/YesPlayMusic/yesplaymusic" "$out/bin/yesplaymusic" + makeWrapper $out/opt/YesPlayMusic/yesplaymusic $out/bin/yesplaymusic \ + --argv0 "yesplaymusic" \ + --add-flags "$out/opt/YesPlayMusic/resources/app.asar" + + runHook postInstall + ''; +} diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index 5b1d12634df5..4f53eaf580cc 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "haven-cli"; - version = "3.0.3"; + version = "3.0.7"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - sha256 = "sha256-JbNk1TF0N3tRYGfZfSBFk+t/8GA4yjqP9G6S0ktdur8="; + sha256 = "sha256-HLZ9j75MtF7FkHA4uefkrYp07pVZe1Ac1wny7T0CMpA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix index 953c95c47248..a37c90fb99d3 100644 --- a/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -1,15 +1,15 @@ # This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit! { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: let - packages = ( self: +packages = ( self: { active-window-kak = buildKakounePluginFrom2Nix { pname = "active-window-kak"; - version = "2020-05-13"; + version = "2022-11-14"; src = fetchFromGitHub { owner = "greenfork"; repo = "active-window.kak"; - rev = "988db69cfbb88bd741d089bb43b0be551693e7c1"; + rev = "36bf0364eed856a52cddf274072e9f255902c0ee"; sha256 = "1fv1cp9q212gamf9z2papl5xcl2w31fpcmbgdzbxcxdl1pvfsqp8"; }; meta.homepage = "https://github.com/greenfork/active-window.kak/"; @@ -17,12 +17,12 @@ let auto-pairs-kak = buildKakounePluginFrom2Nix { pname = "auto-pairs-kak"; - version = "2021-03-28"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "526779a26a5cf5f48e7c4f5c5fecca274968a737"; - sha256 = "0gkhvwxyh8pdfydrj7zkfidk0drrbhvdi1fq3pkzllna3vz8q181"; + rev = "bfdcb8566076f653ec707f86207f83ea75173ce9"; + sha256 = "0vx9msk8wlj8p9qf6yiv9gzrbanb5w245cidnx5cppgld2w842ij"; }; meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/"; }; @@ -41,48 +41,48 @@ let fzf-kak = buildKakounePluginFrom2Nix { pname = "fzf-kak"; - version = "2021-04-03"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "1b3a3beebbe7134e671fde2ef2f4242b34ae2c60"; - sha256 = "0rsd65zcizbq3isy8576gqw7mcml5ixw84padaz6ndwfif5fv701"; + rev = "6910bfb4c23cac59c17f5b7850f7bd49aba3e5cb"; + sha256 = "1hlals4d9x5i4mwigxjlx4f9xgc9rw15yzvbvc64cminxic2i3i8"; }; meta.homepage = "https://github.com/andreyorst/fzf.kak/"; }; kakboard = buildKakounePluginFrom2Nix { pname = "kakboard"; - version = "2020-05-09"; + version = "2022-04-02"; src = fetchFromGitHub { owner = "lePerdu"; repo = "kakboard"; - rev = "2f13f5cd99591b76ad5cba230815b80138825120"; - sha256 = "1kvnbsv20y09rlnyar87qr0h26i16qsq801krswvxcwhid7ijlvd"; + rev = "5759dcc5af593ff88a7faecc41a8f549ec440771"; + sha256 = "0g8q0rkdnzsfvlibjd1zfcapngfli5aa3qrgmkgdi24n9ad8wzvh"; }; meta.homepage = "https://github.com/lePerdu/kakboard/"; }; kakoune-buffer-switcher = buildKakounePluginFrom2Nix { pname = "kakoune-buffer-switcher"; - version = "2020-12-27"; + version = "2022-09-18"; src = fetchFromGitHub { owner = "occivink"; repo = "kakoune-buffer-switcher"; - rev = "6a27c45db87a23070c34fab36d2f8d812cd002a6"; - sha256 = "1rmwy317908v8p54806m721bpzm8sgygb9abri34537ka6r05y5j"; + rev = "21319aa08e7c9072dcf1a4f2f5583887d701fc37"; + sha256 = "0lnvcb4khw1ywxd369phd2xibsh5f6qc11x5vrla331wr1q7y8j8"; }; meta.homepage = "https://github.com/occivink/kakoune-buffer-switcher/"; }; kakoune-buffers = buildKakounePluginFrom2Nix { pname = "kakoune-buffers"; - version = "2021-04-02"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "Delapouite"; repo = "kakoune-buffers"; - rev = "7832ea7a4528363482f5684f16cbcebcbec0adfd"; - sha256 = "196d36jww6asf5zr03l1rwg49kkv16s2d4zyryb2m3zvy7prf2bb"; + rev = "6b2081f5b7d58c72de319a5cba7bf628b6802881"; + sha256 = "0pbrgydifw2a8yf3ringyqq91fccfv4lm4v8sk5349hbcz6apr4c"; }; meta.homepage = "https://github.com/Delapouite/kakoune-buffers/"; }; @@ -101,12 +101,12 @@ let kakoune-extra-filetypes = buildKakounePluginFrom2Nix { pname = "kakoune-extra-filetypes"; - version = "2021-01-15"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "kakoune-editor"; repo = "kakoune-extra-filetypes"; - rev = "c6f8aaccd8c9cd6b487964c8943416e21fbe7c18"; - sha256 = "1vkff8xbycfgxv8x09cvc79qcg5fdzn2x77mbmifmkq236khrwrg"; + rev = "8ffeec08068edfee42e076c5f6d56a54a498bad2"; + sha256 = "1v87aqfk2jcysbdls3mh2v1yafk1albbinfxsxp11m4nxd2b9agl"; }; meta.homepage = "https://github.com/kakoune-editor/kakoune-extra-filetypes/"; }; @@ -125,24 +125,24 @@ let kakoune-registers = buildKakounePluginFrom2Nix { pname = "kakoune-registers"; - version = "2020-06-19"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "Delapouite"; repo = "kakoune-registers"; - rev = "9531947baecd83c1d4c3bea0adf10f4462f1e120"; - sha256 = "08v9ndghh7wvr8rsrqm05gksk9ai5vnwvw9gwqasbppb48cv4a8c"; + rev = "b8ca8e04ebe50671a937bceccba69c62b68ae8b0"; + sha256 = "0vy5dc6jly5xqcck0vhnmbjxjdy3615b6d329v0b04amzy0hdlck"; }; meta.homepage = "https://github.com/Delapouite/kakoune-registers/"; }; kakoune-vertical-selection = buildKakounePluginFrom2Nix { pname = "kakoune-vertical-selection"; - version = "2019-04-11"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "occivink"; repo = "kakoune-vertical-selection"; - rev = "c420f8b867ce47375fac303886e31623669a42b7"; - sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb"; + rev = "227b3fd9643e6e3b9d36fab324081a988c038e21"; + sha256 = "0ygqhlk31ilczpwws28iqya8i1qhnwkb5rw6bn2zqgxj428a1kqj"; }; meta.homepage = "https://github.com/occivink/kakoune-vertical-selection/"; }; @@ -161,24 +161,24 @@ let pandoc-kak = buildKakounePluginFrom2Nix { pname = "pandoc-kak"; - version = "2020-11-30"; + version = "2021-06-29"; src = fetchFromGitHub { owner = "basbebe"; repo = "pandoc.kak"; - rev = "63979f7e08b86d80436bbe2d9dba173a56057b97"; - sha256 = "16pmmnpyxf8r7gpj8g1lwa960nscjmcl52n1a7s6xcqkp9856wxs"; + rev = "e9597e8df58427884161ce27392a9558930832a7"; + sha256 = "1baslidszbybx2ngdkm7wns2m5l27gc0mb3blhhydiav8fcfvc6m"; }; meta.homepage = "https://github.com/basbebe/pandoc.kak/"; }; powerline-kak = buildKakounePluginFrom2Nix { pname = "powerline-kak"; - version = "2021-04-06"; + version = "2022-04-05"; src = fetchFromGitHub { owner = "andreyorst"; repo = "powerline.kak"; - rev = "6fa5ad383f2884f201d6e3ef07a4687c606df525"; - sha256 = "1s7ggjby0bymq48njzhdvkkarmzl44803xv0dlnzrj7q9c3xv27a"; + rev = "c5ef9a845bbd886c73ef00c0efff986e02d5f5d8"; + sha256 = "1lshlnz5xrxzafxmb6w05g2i6nvi49aqyd8852k9l0lmzqryp7l2"; }; meta.homepage = "https://github.com/andreyorst/powerline.kak/"; }; @@ -195,41 +195,41 @@ let meta.homepage = "https://github.com/kakounedotcom/prelude.kak/"; }; - replace-mode-kak = buildKakounePluginFrom2Nix { - pname = "replace-mode-kak"; - version = "2020-10-07"; + smarttab-kak = buildKakounePluginFrom2Nix { + pname = "smarttab-kak"; + version = "2022-04-10"; src = fetchFromGitHub { - owner = "alexherbo2"; - repo = "replace-mode.kak"; - rev = "5f4c73cdbaf5aeb964ee35ad4b9081b233af90c0"; - sha256 = "1cmylx99bm7jwfb4hclb69sdc4n8f29ssyy2byjiw53ni9rnc8q0"; + owner = "andreyorst"; + repo = "smarttab.kak"; + rev = "86ac6599b13617ff938905ba4cdd8225d7eb6a2e"; + sha256 = "1992xwf2aygzfd26lhg3yiy253g0hl1iagj0kq9yhcqg0i5xjcj9"; }; - meta.homepage = "https://github.com/alexherbo2/replace-mode.kak/"; - }; - - sleuth-kak = buildKakounePluginFrom2Nix { - pname = "sleuth-kak"; - version = "2020-11-06"; - src = fetchFromGitHub { - owner = "alexherbo2"; - repo = "sleuth.kak"; - rev = "911db8bd208ad0d289b8fa15a2ac665ff39bd6bd"; - sha256 = "0g41c0038fpmihqva71xl4vfbmvsp13i47gp6fnmaikajpynzc51"; - }; - meta.homepage = "https://github.com/alexherbo2/sleuth.kak/"; + meta.homepage = "https://github.com/andreyorst/smarttab.kak/"; }; tabs-kak = buildKakounePluginFrom2Nix { pname = "tabs-kak"; - version = "2021-04-14"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "enricozb"; repo = "tabs.kak"; - rev = "048f83455ea7c671ab06e9b9578ac25e5de1d6fb"; - sha256 = "0xswpsdf1bj54inl6vf2lzbjkxfc6g0fyv5kd6y9ahlh5irij8z0"; + rev = "1cb19e410a3ef299f7a701fa5bec98c2d9284dac"; + sha256 = "0hxa4mvw1k74vscxkm520c6g7iwcaqh8kj9g4mwy6n5kkvr1drf0"; }; meta.homepage = "https://github.com/enricozb/tabs.kak/"; }; + zig-kak = buildKakounePluginFrom2Nix { + pname = "zig-kak"; + version = "2019-05-06"; + src = fetchFromGitHub { + owner = "adrusi"; + repo = "zig.kak"; + rev = "5a7e84e138324e6b8d140fe384dfe5cc941e26b7"; + sha256 = "1w0nmhsgchjga4by9ch9md3pdc1bwn0p157g6zwnfpj7lnaahsmq"; + }; + meta.homepage = "https://github.com/adrusi/zig.kak/"; + }; + }); in lib.fix' (lib.extends overrides packages) diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names index a6cae7a4505b..b856308c7831 100644 --- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names +++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -1,20 +1,20 @@ repo,branch,alias -alexherbo2/auto-pairs.kak,, -alexherbo2/replace-mode.kak,, -alexherbo2/sleuth.kak,, -andreyorst/fzf.kak,, -andreyorst/powerline.kak,, -basbebe/pandoc.kak,, -danr/kakoune-easymotion,, -Delapouite/kakoune-buffers,, -Delapouite/kakoune-registers,, -enricozb/tabs.kak@main,, -greenfork/active-window.kak,, -kakoune-editor/kakoune-extra-filetypes,, -kakounedotcom/connect.kak,, -kakounedotcom/prelude.kak,, -lePerdu/kakboard,, -listentolist/kakoune-rainbow,, -mayjs/openscad.kak,, -occivink/kakoune-buffer-switcher,, -occivink/kakoune-vertical-selection,, +https://github.com/greenfork/active-window.kak/,, +https://github.com/alexherbo2/auto-pairs.kak/,, +https://github.com/kakounedotcom/connect.kak/,, +https://github.com/andreyorst/fzf.kak/,, +https://github.com/lePerdu/kakboard/,, +https://github.com/occivink/kakoune-buffer-switcher/,, +https://github.com/Delapouite/kakoune-buffers/,, +https://github.com/danr/kakoune-easymotion/,, +https://github.com/kakoune-editor/kakoune-extra-filetypes/,, +https://github.com/listentolist/kakoune-rainbow/,, +https://github.com/Delapouite/kakoune-registers/,, +https://github.com/occivink/kakoune-vertical-selection/,, +https://github.com/mayjs/openscad.kak/,, +https://github.com/basbebe/pandoc.kak/,, +https://github.com/andreyorst/powerline.kak/,, +https://github.com/kakounedotcom/prelude.kak/,, +https://github.com/andreyorst/smarttab.kak/,, +https://github.com/enricozb/tabs.kak/,, +https://github.com/adrusi/zig.kak/,, diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index dd8765db28a4..49662a0e8e2e 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -42,19 +42,19 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/ class KakouneEditor(pluginupdate.Editor): - def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): - sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) + def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str): + sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower()) with open(outfile, "w+") as f: f.write(HEADER) f.write( """ - { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: - let - packages = ( self: - {""" +{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: +let +packages = ( self: +{""" ) - for owner, repo, plugin in sorted_plugins: + for pluginDesc, plugin in sorted_plugins: if plugin.has_submodules: submodule_attr = "\n fetchSubmodules = true;" else: @@ -62,24 +62,19 @@ class KakouneEditor(pluginupdate.Editor): f.write( f""" - {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ - pname = "{plugin.normalized_name}"; - version = "{plugin.version}"; - src = fetchFromGitHub {{ - owner = "{owner}"; - repo = "{repo}"; - rev = "{plugin.commit}"; - sha256 = "{plugin.sha256}";{submodule_attr} - }}; - meta.homepage = "https://github.com/{owner}/{repo}/"; - }}; - """ + {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ + pname = "{plugin.normalized_name}"; + version = "{plugin.version}"; + src = {pluginDesc.repo.as_nix(plugin)}; + meta.homepage = "{pluginDesc.repo.url("")}"; + }}; +""" ) f.write( """ - }); - in lib.fix' (lib.extends overrides packages) - """ +}); +in lib.fix' (lib.extends overrides packages) +""" ) print(f"updated {outfile}") diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 0697497d43db..09b5a7665d32 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.139.0", + "version": "3.142.1", "appimage": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-x86_64.AppImage", - "hash": "sha512-0s/tQmP5PINoQB7FOhR5wYuBvynKHpM9uMNmkJs77z84rY+WXOdZRjki6ZeG60niNXr8rUSLOBffy4jyLka6tg==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-x86_64.AppImage", + "hash": "sha512-tf6vk108RMnxk7ZCFIAbWnlTvQqCkU6NtG+JCmMK/oR+/N3T5TDaHyufNJ9yVIh9pZrmaKMHjDUdCUgGc7lIRA==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-arm64.AppImage", - "hash": "sha512-LralbOiIVQCtQTqmhTtKttdtMz4M14drPFZ00LPFcwzQviLdU2C/od3NUxf5H5piGgqt5TJlgMCOcLIiyoNKFA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-arm64.AppImage", + "hash": "sha512-wQYeWUDLbthgcWPWcz5TbqR1rk3OkdISr/SsdbbrLIyroAaXppg+7FA/FbPW7wlrksiMKowJ/hAPQz1NIxSRZg==" } } } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 98d7a8db2f4d..bcc6d6d7d013 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-12-30"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "4ba9154caafe707c95d438681da4eb4774380024"; - sha256 = "11c39hjpn9i3d74wqnqczcx9bysgaj3wjkb8y86b312kpi4r2agh"; + rev = "564a64651578164b5c7f2503e306bc436beb88da"; + sha256 = "151w10p8w7ml9v7h18y3zzgbr48ffpxsxj3lnxl8lm44dab76qp1"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-01-17"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "8ec6e1b030d933cba9a207a78c2f24333641fb2c"; - sha256 = "1cqhg2mp2qjpi28yq7pj9qlyry9vlyjw30nvwm0sd02pkjal0m0j"; + rev = "e942fac8de03539dc07ea96e70a8ec262dccadda"; + sha256 = "0iznxnl5m3kkmbqyynjvr3mgsrcm0a8g12s5cx42g0v9i9xpjf1y"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-01-22"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "e2b6cd07b45f8457ea183d16e483fdac3581b04f"; - sha256 = "0hx85bkbqcp94d2i1p9jd3c5n91xg1fhmm86yf7xjpx4knynsdbh"; + rev = "911373eb6be91700a3597aeb228f553d4a29aec1"; + sha256 = "1w7yp0rw3ij5gv4nnjzzhfqx9z5n4ayxg9phlxxpvysmma90sfar"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-01-06"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "69c1dc8b5f3d215d4a0538265b2d257c2ed7a8fa"; - sha256 = "00jr9s90i03zkl076pa0knc0k9dx1xcc98ajlrxw3dkq38kbshiy"; + rev = "116d713f63c7a81663fa53efa10e34649c9479e3"; + sha256 = "1hqlav8h09qffcicxjwzq74rm8b128jav1hgcyjv7jyz7f3fjcw4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -835,24 +835,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-01-03"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "c1b5d351ccd8f88fd2729b90ade2ef5d333463de"; - sha256 = "1cwkkg57mga200kyvd9j02xi82mbq95i5nj0lkpc7r2lxds70qbr"; + rev = "e9da670e3fd58598bd0d2cf7e32e1af24cb2fcca"; + sha256 = "0bsid941ybaibwwq5hgp13n8xqh8z2yjldggrcamhm9hga5sy0a0"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "ab0d20b2d48551340b52b3cbe8922462caa06950"; - sha256 = "10382d94lg6k7g8inwqs40ddywzm8pfg6j0m97kansag4q7c8p4j"; + rev = "b03479533f8b17f1b5b3dc625ddf2c528e914e6c"; + sha256 = "0g1rxpk74iq05ji1bb7kffmfjizn6i4r0b82y5a2vm7kqbb2sdpi"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1399,12 +1399,12 @@ final: prev: cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; - version = "2022-12-08"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "kdheepak"; repo = "cmp-latex-symbols"; - rev = "1ec2e4f47cde6c7ffcebec92cfec58ddc1f6689a"; - sha256 = "093wj6kfln2lsgcijnwjj924lbgld0vhfvx8w0kfhlhpv5fr5dfz"; + rev = "165fb66afdbd016eaa1570e41672c4c557b57124"; + sha256 = "19hrj03b1l6n981h0rjy6y98fach7hj64hh3l787w1wkhq3pirxj"; }; meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; @@ -1795,12 +1795,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2023-01-21"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "e86b15bbcabc2cc1f20a40e7c127a424e7ad3850"; - sha256 = "1qh30yg082a6s55psa1z844n3s5z8s31pan7iywaygwcnpxhlgx6"; + rev = "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043"; + sha256 = "116h45vnz98ni60i12f2z6rwz9gkpp1k4ysp1ry0qpjgmb5fcbsy"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1819,12 +1819,12 @@ final: prev: codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2022-12-02"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "6537ba677a0c7c6c796b195f29077b57fad33716"; - sha256 = "01rk4i212zcas64hk3d2a15qvn8rxwlkghzci2cd1n79ywj0q9xd"; + rev = "ab8c5faa867424c79a7d5d3a7f55d3a2528ee9b9"; + sha256 = "0d3rpj31wd5xzwcrnv7rwm54g81s3i4hxs7lcwph8k1j7pb8i1nl"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1951,12 +1951,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2023-01-19"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "c9ce6476e4b481c64d13939c6696043b8e21dd43"; - sha256 = "0mqb300w663xb4yfxkijbn8ixzgj8azgywmhg7qjskds7w8af15z"; + rev = "1528b525d17a98dfc6f7b07aa28672106df9cde7"; + sha256 = "1mv844ijirg9vv8klphrdka3qyji9hvgfqcwf2v2a3c4h2vd78rf"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2083,12 +2083,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-01-22"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "6ca9b4b3eda9138406291493750a6890c927dbfa"; - sha256 = "00dfhj44hfqi66j1ayr7h424qc160l9d91wlbfb4hhbg2rcldp4l"; + rev = "cfedeb726dc18b25f69d2f2a084b41061ae16e8f"; + sha256 = "1ysg39cmvk3cw2dwkdx9gjirq8lkfdh3zskxrbw6zkc0xl7zs31a"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2107,24 +2107,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "0b78334e1edcd7eb3d2038621b388ff040f035fb"; - sha256 = "0ag9f1h03s0pfiqaxclcz73sra0lwkva23dyacg53svcmpi9bpic"; + rev = "53513efa7cc878ae7929ec6a389028effa569441"; + sha256 = "0syix30ag4fda8hzpraijm0v6s64gr4vwz4i9c3lvcwssd4q6dfw"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "d48f1315617092a8c0db29c2fd2d81d5e244c555"; - sha256 = "1ddzfj9gg67jz5kx4i51iyyl3js1b3k7mzxxa8pp5fh1021pi1hy"; + rev = "5b9fb4da049d48a1e8872f92c180a3646f610a14"; + sha256 = "0bplxcdv3yxls893myc6a6kpq01wfypw2sgnd61pc8k78xkhmdps"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2143,12 +2143,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "25232d23926c28c34f462dd9a57847d90b1af969"; - sha256 = "1ycf3mfrs2a4c43mbdc3rs2kby1y2gxpp0kxilv8vp0c1idibyxr"; + rev = "b6032a67b53ca92b7bda401ef45284e888c5f4b6"; + sha256 = "1wxwwnbbz25idi4bwqzb9byf44awss97ca1925n5gmxq19g7x1gc"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2179,12 +2179,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-01-13"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "707ed7d6f8927a5ec0c241aa793f694f1b05f731"; - sha256 = "1nd7n871vlp5hdgl5xap09kn596rx99i11ccn7nr4abl56q2dp2s"; + rev = "c2e9929c3ac40776c30bc7b328a7dff98756050a"; + sha256 = "1lqxbb6r49afqqc2gfxdim1kr3dww74gg1pbz26s6bqvga1wzf8s"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2287,12 +2287,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-01-10"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "f7d623457d6621b25a1292b24e366fae40cb79ab"; - sha256 = "17vwcqajvxhbvifg562zxvzwln0llb3gzyih3k61yssdp5akcfl0"; + rev = "9688f9d8df356d4bc06b42a74b78f0e374f6c534"; + sha256 = "0p64q1kbq03dgrpqxhl7pn85j8rqwxn6yqw8a29x09nahjrxkfrw"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2661,24 +2661,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-01-15"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "dbcfd4510d31884d444ec33a4453d0f06ad4a5eb"; - sha256 = "1qcwchka11gaphb36njcwa7qdw4hbp0x36w7mhsdm8p4i5xw3161"; + rev = "5020da900cc5dfd7067f181ee2ebd872ca7c84e8"; + sha256 = "0qxd2wn6q5v60ai222yjhzqkcb9v0dnlr4k2pvn9zqcwhj0qc2py"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-01-15"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "5bbcf162d03287296fe393f88da6065db3cf9fd0"; - sha256 = "0lmqvm2sdj5mpq8hd03wyvmxgm6y286f0b7kr820znh1swlky3z1"; + rev = "ab3757c1ea1b84ef59f7dda54f11d10022e0e3b7"; + sha256 = "1rbcf3llcq542533l0cxqf3bwnzk99x76k9yclfdy12zfdcjx4fv"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2757,24 +2757,24 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2023-01-14"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "5064f59094c42911e2ce57e1b59acda546c3905b"; - sha256 = "1gssj61d8lma9kbadmdwgpa3i4343srlfnzjc3br527dhw7ihcqm"; + rev = "c9a87dd0b7b5417c3797332ef06b17733626387f"; + sha256 = "1cjl5gyp2wibhb8d4rwsav62bs0x12n4xjrkmz189rc5dmh1yplw"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-01-22"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "ed23a49992a8adfc0a1db765cb5353adeb12f9ff"; - sha256 = "09bi47gv5xd7wf7i53kbp3d2n5xzbns408cg52faxixd001m0f71"; + rev = "ee6e91ca09d59043d365bd96a32e989bd75abe84"; + sha256 = "068af4iznkvkafxnyj54clwalmzcywlfxphlzas4psg6qxzcdj13"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2843,12 +2843,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2023-01-03"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "62408f6cb189606bc4b16832ada29be3ae33515f"; - sha256 = "18h7mwr9lpsdsdi90vn4nc868g50li27xvylrs2srppfjr7kvl7w"; + rev = "aa97c07ee7b327120e467927c85a57ff1d713754"; + sha256 = "0pr4igijc9n8gwr64x4srgbwg21m6x0bkl2v00ps6iscblfmzzr3"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3084,12 +3084,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-01-19"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "046e4d3491baf664e0eef5231d28beb49333578b"; - sha256 = "1ywp6lfzdx4k1pj6fzxd703zcvwrfkbmcmggds267bjgadrfbbnc"; + rev = "a6f7a1609addb4e57daa6bedc300f77f8d225ab7"; + sha256 = "1rw4r8g4hblmlddbddd5skf5x8i4zaba8ncmzbr26svdmayk1c16"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3204,12 +3204,12 @@ final: prev: fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2023-01-16"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "bdf48c282ad2174c25c059b3cdb7956427b07a99"; - sha256 = "0xjbnvyp0qnfnvz0grhyfcmzn7m90v3d3pfqfvivis3x1vws883q"; + rev = "dc71692255b62d1f67dc55c8e51ab1aa467b1d46"; + sha256 = "0h8yq3rxm6dfryjlh57n13bylwg4f4c4skc9z0krgl200v39ard0"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3348,12 +3348,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-01-20"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "7b37bd5c2dd4d7abc86f2af096af79120608eeca"; - sha256 = "19kna3rjdzfx2ys07jwb413saj9dg25i9ym6r8037r7h65h42yz2"; + rev = "0d4fe37ba5285171f3729da955955205f3fa945b"; + sha256 = "0bpi4xhpi031sgrkxdqrrl7fk16wdkk1k7ln6b8qyf5vyhkcckfz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3372,12 +3372,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-01-10"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "611478d2b36beb3c416c92f77e7c116d7bd25ee6"; - sha256 = "0fhxg27yq2lfwfwgpg2zf28hrb6kfa6nffrm6bzajk192z1zbak0"; + rev = "3275558ac586c2778318d36cf1bf48c071c286c2"; + sha256 = "0xzd6i1nx2ijcl0r6nzspgcqv5c2m97k0nm5q92ivgkr5cgvw96g"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3396,12 +3396,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-01-14"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "c88184a0bbd3e32e0274ad8c3782aba718f1053c"; - sha256 = "0b1yqy0j7akgqal1zq8h3zgrk0asvyffxrad81s2wv4r0dcg8csr"; + rev = "c87b1120b618577e64d910a7493a26829044a8a2"; + sha256 = "1i5d249jga0slnwnk6as1zqlc03x8nxd0vbrxr43qg6vw322sj7k"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3516,24 +3516,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-01-14"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "30e9f4b0fa24c25980df1690a8c47c36e40b6673"; - sha256 = "0nzrjrkfvckhzmxpwmn5qr62zfhkidmccfwj7iaaa3f4mi2ya5mb"; + rev = "13b7eb4589d9ab0f388ca51047051f7158c930e5"; + sha256 = "0mivkynl1xl40mk9ppiixk5mk8z70g30i7bm3lwpg02746vyp04v"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-01-04"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "e863942494d7c72a7c8d2c54cf651f28fc5a76ab"; - sha256 = "0xh1y64bn274f7rm597gqgqjrra5fafydqcm127ikdiqsa948psy"; + rev = "2e93ac50b3e95d650e62729f8810a005861e77ad"; + sha256 = "0ahgpgjazrwsvqpvsgbgwzhiglzb291d1ww20f8grakdhppvas3h"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3576,35 +3576,35 @@ final: prev: hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2022-10-10"; + version = "2023-01-30"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256"; - sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k"; + rev = "92e8a80edc11ad5df6fdcfccee567515027682eb"; + sha256 = "10fl95n5c2yk8v00hr4r4zbbi4rrdhbz6jg7r86d8jw6qjxl6c1b"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-11-23"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "21d0d1bfa3000e4384740bfaefa0ebc51c773786"; - sha256 = "16idy8a2ar2gc7kdr888wwlyw4m48kbw2yzflz16fbdg56krb43d"; + rev = "8c0bb0a328e57278f4783bb0e2ea32f296d36db1"; + sha256 = "0w1v0r420m9aqkl4h4wjzhc7am8pf43pbv6g8mkf50x8mgxqyac6"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "6ac15db045393cb40c484b19f3903d89acf2b125"; - sha256 = "07rsq2wgdjqlav15jvaiwk4a33q6w07all7q6v7hzdpng8bmywgi"; + rev = "5e1b41ef7338c0aa764425144378d8d1b3b59242"; + sha256 = "0y7xkfy2jf28xam2j0z4b95w477sjr077gas0j1vvr16n4grg8wi"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3850,12 +3850,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-12-08"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7"; - sha256 = "1kanfs0c1rbi23dm0vkmyzg4qkxq18hc2jc2izvyqiklbpi49x06"; + rev = "8299fe7703dfff4b1752aeed271c3b95281a952d"; + sha256 = "1z2rnaa9p62yid89n9pni9jzzdlcdc55i95c67yn5qzxd3h637hi"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4139,12 +4139,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-01-22"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "cab4682d22a0451bc36a648694235621b5dd808e"; - sha256 = "0kxvb6l9pxdrs9cxh1cqf9p4y8nbfn9rx3a7zgd21h4c6126bcvh"; + rev = "15fe46a728b7473d4cae368838bbc1c79c3a3f48"; + sha256 = "0vw5p1cl9cblq39wvcsh6bq0li6qfqhxqvbn786b3xidlsw8wzv4"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4391,12 +4391,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2023-01-15"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "937e882c169d572a8a73dfcb71137a264c6369b2"; - sha256 = "00aw82ymjqh729mi38l3nx0fhpp6rciqyqv0ar4g0v1qlq4gyp4l"; + rev = "3aa6c2029499625dc76911cb007e9cd370137f11"; + sha256 = "1pbpssf24zam4py6wg5k2m7hadivlsv25yvm4gxr0cnn79fv5cqp"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -4475,12 +4475,12 @@ final: prev: lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "750d59b643865b906996028147675e9af216ea95"; - sha256 = "1i5qn1npa9zil3xql7yavx3p7w9xa26fz2lxw9ks23mpgdplk9gs"; + rev = "d0b245232aeb197bbd097111d8b69621b0671edb"; + sha256 = "1nvspfsd3x3i5wv8y3a0kvnnl56wha038dblz2d8psrbkghr1fbh"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; @@ -4547,12 +4547,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-01-19"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "0b312c34372ec2b0daec722d1b7fad77b84bef5b"; - sha256 = "095n5sq850b66cpbqfbqkz5xzd2klyv5ijknffrbdrx0gwjh561l"; + rev = "d3e00eb9ac9131cd9241ba28c06678d11ba83dcf"; + sha256 = "1wkad9iygialmbjxfs0zp6il9p5327g0fhwc22sld8h72298ca9p"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4654,12 +4654,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-01-22"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "5955bdd7b20854aea74dc86c7ddf9989296d52d7"; - sha256 = "0yzhz6cyhsh7aypvi0cz20wapn1xcild6llif7yvqbmvl4ygrdl5"; + rev = "94f192cf5f0a1931b3035c2d8affdebec460968c"; + sha256 = "163zh6pq6a7qxs3yvkrpn5sihrbn1vhmr3jv27p4swkh2x3dn5q8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4727,36 +4727,36 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-01-22"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "d7ff61a828d59bc593ea3e2020508c114048d790"; - sha256 = "03rmdhp30kzvc98gaagxbm3cm0q1mqy28wjih6r7l14kp3qv8bv1"; + rev = "422b9745143150e16cd3fe331c74f6737de75e72"; + sha256 = "0imsx0zz5059anxbglfvfimnffjw7pzi3byp5arj7qwjmkrwgyay"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPluginFrom2Nix { pname = "mason-tool-installer.nvim"; - version = "2022-10-29"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "27f61f75a71bb3c2504a17e02b571f79cae43676"; - sha256 = "0zhmffjqssfqjbx69j7ambzr4dz52r4sgl6xhmzf9qxr8xlkhvny"; + rev = "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576"; + sha256 = "0a4h7hmm53qaydnqfrfp7yb4j157da0mvr0ivkm77f270rr2pwg0"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-01-22"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "bb88357eff0d0c69ab8ecc5985952e0a9a72175a"; - sha256 = "0hfnwjv165w1d89xd7gs11q5j8a52zj43acxaash2qaxy5hl3zpz"; + rev = "2469bfc2538652cb0cf88c129f67d38e46a9cb59"; + sha256 = "13ymyc881zkd7c47ayc9cknkzabcgmskm94cq9qjk34r00zgd2jh"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4823,12 +4823,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-01-21"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "1c11d5fdb71c1d766545e42b0dd99eda50f1e349"; - sha256 = "16g9yzwiibrjhl9ln911kw433li5av64p6nrhypj6pcf2n1dkrfc"; + rev = "e742f416df94846cb0c5936db46d650ac1339058"; + sha256 = "0jxy9pmg8k45wxsk4npp46x2xdwyriimnfd92fvbls2s2px0myc8"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5183,12 +5183,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-01-22"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "0d4a5197def6019f125444c3870aa5a8f251a2db"; - sha256 = "03shsrnagr37awsvr88pzm1yhdp680dbzzgknzxf5d9sw7c3jfsg"; + rev = "d65df617fd98d1224b342fc6a6ee3cfcc2b6c751"; + sha256 = "1ca1p6cpwps43v7nl661ljsnrhiafx41nap73hvyjblm1c732cjx"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5207,12 +5207,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-01-21"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "34dd33cd283b3a89f70d32c8f55bb5ec4ce2de93"; - sha256 = "1skz0fj0v5s926mfg58nrdmivsadjzlhlymxfyz0zvkj3vkf7d50"; + rev = "8fd21037453f4306f500e437c5cbdf6e8b6c2f99"; + sha256 = "0zxac4425677w3pvj5yp7sxllmnj4bhwc6kwwa6c409wvyzrfas2"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-01-20"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "30265e7a1bdf59361b37e293cdcecc167851c602"; - sha256 = "0fk29ggvncc26zx8zxdbyhqydxmvw3k71nf7ipp7pcxgkgm4zj4s"; + rev = "da8b0931724864e20c541ec1ec51f998cf8212f9"; + sha256 = "1hww128m01k9b3zyp1zfjj7scshafafxssn1cwgbczjc5y10yhja"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5291,12 +5291,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-01-16"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "4a9a5fe13cd454692fc4db0b27783cd005e6be56"; - sha256 = "15a8az9xlcc0h0pw7s8kmd4zm5nx7d0q0j4d192d62mkdqc685mh"; + rev = "b977fa0f2069ff71111237df07de2bdeeb2b7079"; + sha256 = "04r5pcdkvm9dgfsyhx0skf8nwyf790myrha7rjkqr9cpr707l6mj"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5351,12 +5351,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-01-18"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "6676edc3078b8936df989df639900dc9a70dfc8a"; - sha256 = "1rhh775mm7byxcazl63hwdz8yjlz4fghd7yxaysv49s3rbrka1z1"; + rev = "392808a91d6ee28d27cbfb93c9fd9781759b5d00"; + sha256 = "03s8kkj386i77vryss1br3033azmbjhf4wzaqnrm9238951hls5w"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5387,12 +5387,12 @@ final: prev: neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2021-07-02"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "0bef4e1a81c65fc05d31380dd74454bd67733837"; - sha256 = "02a8ipk341bs6y8mk7nixdkbk1c4jdddsjp1qvqgyyca0shaqsz8"; + rev = "f6a1429bd0ac9953eb1d838ba800e69685fbcac1"; + sha256 = "0d2r8dx9sicf4fjf87ksclsvdvx2f7npjqpscyvycn04wrzvjsaq"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -5423,12 +5423,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-11-09"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "98cc4a2d64ca67cccbf5b5cf47c682ebadaaff58"; - sha256 = "0s8czq77lsf10b2fsw6mhavirc1ivby1a9c5y49zj9fva876h968"; + rev = "06f6166e5dfcf78eb0d055c21274cafc3927d461"; + sha256 = "0h340y2v4bb1wfqa8015skd7yb694iwqgq3v42mqpcsa3ssnvh70"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -5483,24 +5483,24 @@ final: prev: nginx-vim = buildVimPluginFrom2Nix { pname = "nginx.vim"; - version = "2022-12-31"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "chr4"; repo = "nginx.vim"; - rev = "99694458062e4e1d138bd022b10432a05612a2db"; - sha256 = "1ih25dl3zzcp2245vrq3ypii76b3ri73ayv3w8qg7s73j1g1c6p5"; + rev = "8a42e93c9f004fbc5b32bb2e4940107fb7b70a42"; + sha256 = "12dhzglvmpv1b0ynwig224dnilakqkwh4npidmgh5njy2rrqvy9m"; }; meta.homepage = "https://github.com/chr4/nginx.vim/"; }; nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-01-18"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "97e66dfaaecdc81f1dd7da00f8d4a6033f3bf6b2"; - sha256 = "01q3qlazc6m39rn67qpz03prrs2x9wqf71xi5s4a82vp53ha1fjv"; + rev = "aa793975d10dda69817190faea84e28eeb176934"; + sha256 = "15ml496n90dd80z4gm09562wzfv8npch3sz0kdv6hjkkgg04p3rw"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5531,12 +5531,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-01-22"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "26fb0c6c5653b0bda95f29eae638305bab351123"; - sha256 = "0w9yy5c4rxw0k8z975p6zn1792lmjld1gch1m1gji0nvyyasvsbi"; + rev = "69f4018faa021027d4b0651b4836bc8ac127d573"; + sha256 = "0a5rqbq821aiqfam0iw6jmwz07rcf1r68r9k5bs06cm7pdai3784"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5567,12 +5567,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-01-17"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "16b60455867dec069bf41699d690fa01261b4bf6"; - sha256 = "1fsngf0lf45csr5w6691xkdnkjbmp82xr4q65fnc5p0931q1yl7x"; + rev = "34f7cf628666c6eb0c93fbe8a0490e977ac78b7b"; + sha256 = "0nkk0zji3fdjzjhd5l2lmqb5208mkw08xkgvvxbddsjwgxx3jbg4"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5639,12 +5639,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-01-20"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "33cfeb7a761f08e8535dca722d4b237cabadd371"; - sha256 = "1lna5833nvk8db5jv549147078m6mzgzqvc42gqby8ma54rn6dq3"; + rev = "7b2b28e207a1df4ebb13c7dc0bd83f69b5403d71"; + sha256 = "02ing7v31xk43161986b7np04d58cxkm19h00mq95gdbqy3gnaz8"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5673,6 +5673,18 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; + nvim-FeMaco-lua = buildVimPluginFrom2Nix { + pname = "nvim-FeMaco.lua"; + version = "2022-10-10"; + src = fetchFromGitHub { + owner = "AckslD"; + repo = "nvim-FeMaco.lua"; + rev = "469465fc1adf8bddc2c9bbe549d38304de95e9f7"; + sha256 = "1rv3ppjfndi27dbg7dsapxacbal1mj2a9dx2vq0yvi2v1gb97b3x"; + }; + meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; + }; + nvim-ale-diagnostic = buildVimPluginFrom2Nix { pname = "nvim-ale-diagnostic"; version = "2021-11-06"; @@ -5687,24 +5699,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-01-21"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "31042a5823b55c4bfb30efcbba2fc1b5b53f90dc"; - sha256 = "1jiwwmm87d2i76jgimk40mydsg2jddpl7q9axy94g6411hkdq261"; + rev = "5a3523ddb573804752de6c021c5cb82e267b79ca"; + sha256 = "1s17rmxgnadz6wbcd21x8504ra8crbxf27qjdxh6b4a1g0w75hy1"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-01-11"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "cf8252058c8fc486bc565a815083a2eb390f7621"; - sha256 = "1hcj0k8szin32b2ki6mkqwpckinyca8vpwvd3rmaf597qnk0bv5h"; + rev = "d41f301dcd3de51e95d5e1b7737e22a4e1eddd28"; + sha256 = "1dlxa4n0xv5zpkpvw06xvbmcyaghs5byrw9xkpv9m3wqk55x395d"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5759,12 +5771,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-01-06"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "11a95792a5be0f5a40bab5fc5b670e5b1399a939"; - sha256 = "178r1v9p7mcwg8xgl3jr4ibjsh9wiq0y81mps0nhx8q2dgnx8cyz"; + rev = "e7e2ef7031db8e0cfad7ad9916ec766ddd9dbb3b"; + sha256 = "1jd1x6rg9k5gjwnlfrhmy976xky6sm7335hcz2lpgjapgy7rnyz7"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5867,12 +5879,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-01-18"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c64a6627bb01eb151da96b28091797beaac09536"; - sha256 = "1nf48ns1zfmpizmki9545w4m8ndmkh76aadlmjpzn7y4draq5asf"; + rev = "0e376f00e7fac143e29e1017d2ac2cc3df13d185"; + sha256 = "0xdbvbah2zxy27irc4dn9kz7ga5jv88d0z5vsbdgnqpnvv7gzc1c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5903,24 +5915,24 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-01-11"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "b80227ea56a48177786904f6322abc8b2dc0bc36"; - sha256 = "11a9jn4m1db2zlkfvwym98h15l46idf14gaddczf1njxhms52nm1"; + rev = "395382466f12325919708da238e90add967d0912"; + sha256 = "1jpp88lm1fxd21f21rmsysc1h9h943kg1k8mfs5bwmh063pxwpfn"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2023-01-16"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "191345947a92a5188d791e9786a5b4f205dcaca3"; - sha256 = "05rhpr34qsjczcv5kjd8664629308k3nazd8ksgfrpkjbg0ifjq9"; + rev = "7f7f2af549e72a0b7bddc3b4f827beb027ea8ce3"; + sha256 = "0ljipdw5cbcny6790r85hsfhnf0may6bamf27s3mzabrczayyd1w"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -6095,12 +6107,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-01-21"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "57a52fce9b4a045f0b371a4ca5cbb535b9db0bdd"; - sha256 = "0bliv6vzgqk6nz0wk334gkbsdmkzxv38rjs0pf7jdk5azvgczslh"; + rev = "379be679d3c5f80964bc19131554b846dce5d34e"; + sha256 = "019wc4kxdyzpdbjazsy9ji1r0ymgbwx620ghvqw4wdvccyklg5if"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6119,12 +6131,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-22"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "85cd2ecacd8805614efe3fb3a5146ac7d0f88a17"; - sha256 = "0fhfqf4rag58q64wfrlfzyw87n3zv24gnwr9inn3i63b27r57w83"; + rev = "1e988250a0f52a68ddb72905d623405d634e9c5d"; + sha256 = "1l3mdym1a0h8d6dsv6wr7whgsml7z9r9g0f6qraj4yp93l3n3wd4"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6167,12 +6179,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-01-14"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "c552c96b837ce8b1318cf3eccbda41a73760cb21"; - sha256 = "1fqi33clnjsyx0fkdajl9vyrpmbdry11dm38nmm5d83a4zyb4qax"; + rev = "0b9c5303b7402ae24971ed2f0e5890fd72505532"; + sha256 = "18r8vhflf9k8rmbw7czv2v7l46144nv7ia3sszhby8p1npd57ld7"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6191,12 +6203,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-12-11"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "7a2b823152fe4de65ee7925b0e32d26ed73bc57c"; - sha256 = "00hsnlbr6s2ljwzl5ayjw1m2bdm4kmypl7xlg2p8l1yjnnsk4dn4"; + rev = "11e08391eeed00effa85ca24ff9d1e0472cbcd6a"; + sha256 = "16nr10lyzq45hm49mh2y6xjk8f59bra1mzgybclz09l9aikzmkhq"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6251,12 +6263,12 @@ final: prev: nvim-rename-state = buildVimPluginFrom2Nix { pname = "nvim-rename-state"; - version = "2022-10-16"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "olrtg"; repo = "nvim-rename-state"; - rev = "43f2a8eb313eef767f1a28b69758cd86fc221e65"; - sha256 = "08q5q7l2l4jvw7yh4zddcczwndcajddbaj3zddwc04ykzlh2ks1f"; + rev = "8ba78ea517a605ea1a89bd1ed335886435010882"; + sha256 = "15n1xnip4dzil7fh50s2216wbryzv75jggmz4qabdfv0s6zz67n2"; }; meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; }; @@ -6287,12 +6299,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-01-19"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "97df9b3e7da6f9a7325cb5c32649dddc48bb1630"; - sha256 = "188gr37y77l74dlzsp8wgccglx5c67gpdb3fmrn34cbw7id7fj7d"; + rev = "04f602f931e81dc330a0c4dd51f3dd896f0be920"; + sha256 = "1vvh9mgqspw3q3qhv0assvjmx9hkm5ihqxdgjbh7z471g9jzhz78"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6359,24 +6371,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-01-21"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "96506fee49542f3aedab76368d400a147fea344e"; - sha256 = "137gwzb6xq32mwkbzwqiw2i3bgjz07nd1xx7d6ys825a9akkddcn"; + rev = "f3b73725c5a007b8195118bec5868c32a5eff81f"; + sha256 = "04f95q5w80kpj3f0gygfm4m1f6mdpnbim1fv10mkqiq3gpkxp8mf"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-01-22"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "7bef1d53302f1087a07f83a4321582d835f44d4f"; - sha256 = "1v560a216ink7km0gr32kgjxd84lcvpiwy991pvp3s0xqxmw5bx7"; + rev = "adeb6e02d3bd682f7bea99a988b0deadd407e888"; + sha256 = "1grgs2a3rps80kmpsa1idfslcmg6zzssqi07g0zzlvrrqf96h36y"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6419,12 +6431,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-01-17"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "2fb97bd6c53d78517d2022a0b84422c18ce5686e"; - sha256 = "0wwzmkkdw3n2agxsclaniblwfjaqwav7vyd5w0fjcqvqjim4jd9d"; + rev = "9011d333aa411ae71ca8762ca3a277ce6b9e6527"; + sha256 = "09pb0miwm2wzsn4d1jyayay3b3ig67y30mjnncz1jxx688blvc86"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6478,12 +6490,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-01-21"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "13d06d74afad093d8312fe051633b55f24049c16"; - sha256 = "07qixz6l1dyy84l14mbx6jwrmpmwdgvj8crq9vxqh44w5gwjr3qs"; + rev = "a421d183ef37dfa13f51a5805bed2381aebf9080"; + sha256 = "0754m29aizcav7ynqflpbv3kzz2n7mw2xx8aliay3slzq18kix8d"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6562,24 +6574,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-01-18"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "52b2c9702fb9e219cd4182ed29daee644ec535f6"; - sha256 = "0inw57p02ad644f7fjfwsvk0lap6kpwrriz43kpp2x7wypkj8jxi"; + rev = "7900dc0cd37e7bb5d4175a37c9c4c3dfb94a1f7b"; + sha256 = "1197x2agkc5h97z1hi6pk72sbx397vccpc5xsxc9hrsq5llpx37n"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "6c6b7673af1314dd7c8254a95eb8d331f6b76ac6"; - sha256 = "0gwfl7hslgbr2fawx15wbd6p4j60jnd2l68v36rxrmxl9iqm1ra6"; + rev = "716dd8f9cf1ff2b9cda03497025612ce3c366307"; + sha256 = "14qydwhkr90w2bb1xza44pm2d1iiqmvijqik8qjs122i6z5hc7c6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6635,12 +6647,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-01-18"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "2aeceb0f0700ba57c8248aa36b3a900e58f5820e"; - sha256 = "0nslv7dxsxfjh2xlkh5w10gpi29c65g3mf9m7zyrbj3s0m5pldgg"; + rev = "c3409eca73d2ae334935ca4afdb0428f453ba404"; + sha256 = "1zj4kp8ffhgq9syqh5w7rr5zzb92kvzdkcpf3x0v2d4cwxysd2ji"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6695,12 +6707,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-12-13"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "dadf56334d2be7d9e8ad1e22c697a6e75f0164b7"; - sha256 = "19bp9mbjldxi2qzsa364rw86zp450zr2ajnnflp2sr0hhdvg620f"; + rev = "458fac9f6c33400dd6976514ea29f88fa34fe1cd"; + sha256 = "06hp5ylp7xi22w9q5bssdfc9hamgvlsnvxppkgqk0glidsy90pbd"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -6839,12 +6851,12 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2023-01-15"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "01c27f37a1f067200680cacfb7b96f5ad2fa5cd6"; - sha256 = "13h5w5f9ywigi33g38ij5k24kyyz2nafwhzs5zqn8mngnvh7h0km"; + rev = "c19bcfd6a3681bc876e1b861f6685bfc04972d0d"; + sha256 = "07vhiknf5gfd8rp6ynp9xq3rlc17b1sh322mlhg3976hl62lgs4f"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -6900,12 +6912,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2022-11-17"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "c1c54758824cbecd4e18065d37191f7666fdd097"; - sha256 = "0j23gdp29xb1rfb7crr5s1xs61wjzrsxwdpv01s79cjnwcvxzgxz"; + rev = "87c857a56b7703f976d3a5ef15967d80508df6e6"; + sha256 = "06cql88anhwnwxmssgbzaxwnx9d88mp04rjbh7cgrzr7pff2x6v6"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -7129,12 +7141,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-01-19"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "ee63338cfb9151018afb243f5af5262c1686b280"; - sha256 = "03fgla400n5mqhpfa3lljzark76ah7n0mzzxfsn5c6m3hxfkvaim"; + rev = "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a"; + sha256 = "0w4gw09b94dhxbbkyl0zhwxl5m370qp8la6frbjcan06bqh85xcv"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -7165,12 +7177,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "090e253c114b6d5448bac5869a28a6623c195e3a"; - sha256 = "0qdxm9rcbq78yh0s3cvsbpnjjfd772fhkdrzwg1gc7k8p4ppnm1q"; + rev = "0fdb69f328529b34a2279c14be63b3325dc52740"; + sha256 = "0dn9g6a3lidavw381cd9ckhw3biiq81vypgg4bl5yl6w4avp5nr0"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -7189,12 +7201,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-12-08"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "64579c485812867bbd7890a55ca93884beb440b6"; - sha256 = "0yzy3mq7b7hnnb04z45m4r3hcpf11djv5zxhsyk60pnyvlwrdl7k"; + rev = "8e98463b7a940c1ffee1930d18d3c499db366585"; + sha256 = "0nlcx5dnzxrv3kdsih411ng90sxlbbfw0xvr3q8x680jxqs3dzky"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -7249,12 +7261,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2023-01-08"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "df584e84393ef255f5b8cbd709677d6a3a5bf42f"; - sha256 = "1h2p6xdv4bxphn98iwjzk9fh54lh1ff41smp2n0j84inqpl0mygv"; + rev = "b297167d9e01accc9b9afe872ce91e791df2dde0"; + sha256 = "1fwjykp6gaafniflb3816z2nkfkpwa9pkxdcs6l2ka06ngr3xdih"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -7403,6 +7415,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; + sg-nvim = buildVimPluginFrom2Nix { + pname = "sg.nvim"; + version = "2023-01-30"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "sg.nvim"; + rev = "c5e4ab788efeec9453706a4489bcaeaa867aeeb3"; + sha256 = "1yd006gykkxddr57mc0mpfqc817akaaaj2cabih9gbdsm7qy131p"; + }; + meta.homepage = "https://github.com/tjdevries/sg.nvim/"; + }; + shabadou-vim = buildVimPluginFrom2Nix { pname = "shabadou.vim"; version = "2016-07-19"; @@ -7514,12 +7538,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2023-01-14"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "e2e89497f178bec568a0a43cda651f0429ec8ec1"; - sha256 = "0dh5dsn8znhxsdr9plxa2mchlnfbgrvalc5pnz2wdsc2adz37521"; + rev = "c55985d5df53751a44fc532a53bed3be9f3b0d14"; + sha256 = "0jmwsdpmj01g78gkv4cc7l5fxxhxrzlx2lkwmj5r9klkx07fpsrg"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -7647,12 +7671,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-11-18"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "53cac3fdb5f5e4e63e243232b6eccf3c764ae18a"; - sha256 = "0qp3b6jd6khp8wmc4s8n6sc518p6m44l7f7ln8pr91jz6qh5z30p"; + rev = "93ff5824682ecc874200e338fd8ca9ccd08508f8"; + sha256 = "07wv8shiilibgnp7l0pk9b6qwydwwfvdzdv2vvwn0k0jpaxsjvmy"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -7803,12 +7827,12 @@ final: prev: swayconfig-vim = buildVimPluginFrom2Nix { pname = "swayconfig.vim"; - version = "2022-10-05"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "30014a34d0ab46f26311f47c1c11ba0b9166f1d5"; - sha256 = "03jw3w80zgmql8ngs8s1j8digwkn7206psklmcnmc1p2drb2d3pf"; + rev = "ce04a8e8c494590382d1b32a20ed3b451d608623"; + sha256 = "0lirihvrx0qn59nbg5s3sh1jgv0v3q4ag7kgvc3r7q9a2fbjg46y"; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; @@ -7840,12 +7864,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2022-08-29"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "6a3ed24c5631da7a5d418bced57c16b32af7747c"; - sha256 = "0x4jq7z54nj7p4abnaqc2cnldyi7rcl5r444n9jc82i5pmg6ck27"; + rev = "512791925d57a61c545bc303356e8a8f7869763c"; + sha256 = "11c5gr117cad9zw5c8msh7xrk1n02kmyb52vwbrzd0vd0kzy52ia"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -7864,12 +7888,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2022-12-22"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "187b604da1a6452c700ce21fdf340ffbea956298"; - sha256 = "0b61qmqzl8vqryy58p9688vhxwhfby6qsygi3720hvvgizxk9jka"; + rev = "9065c65138b59ea8182024216a5bbcf0d77baebb"; + sha256 = "0jfgg02l2872ickl3bwsm6xyh5nl5sqgn3yfk9kn45aba3kd7nvm"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -8166,12 +8190,12 @@ final: prev: telescope-manix = buildVimPluginFrom2Nix { pname = "telescope-manix"; - version = "2023-01-14"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "55f73d0743d8597ca9c7bfbebe286e0b5bbe6138"; - sha256 = "1jgl3qb92x4wnkvjwzpqbkcmw22hc4m7nmp1dpj8cy30z5yawg54"; + rev = "66feda7a276366edfc555cb0a7e56b8dd70aadc3"; + sha256 = "1n4ygj3jhgqfg7xrh3hd56x14yqk6rdy3099hy8azbrx40zx0zdw"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -8274,12 +8298,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-01-22"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "dce1156ca103b8222e4abbfc63f9c6887abf5ec6"; - sha256 = "194jkn7a4xh5733n8n1n8n9mwibvadkxj6vw44xvwd01w0db6zhx"; + rev = "d5f6c0911d6066397f1757c6b55a8bd6851bd6dc"; + sha256 = "0s6s7g1vzgk1wz6d2vqxh967da41hym9ignwi5x5khyq3xzgdf6v"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8322,12 +8346,12 @@ final: prev: term-edit-nvim = buildVimPluginFrom2Nix { pname = "term-edit.nvim"; - version = "2023-01-21"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "eb9a18b77fa54d0416e315dc0f9793f480930419"; - sha256 = "0562rlcah3czb00m9fkc1dhhy0v9zgi5lx2hc3zjprccdhw9q41j"; + rev = "9efbb3298ce63807750a415a091d7d535ff0a7e8"; + sha256 = "1qb16nnraxg1b9v2hwi8ywzzxgd6p8hxy673d5x561firnfj1zqi"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -8466,12 +8490,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "077c59586d9d0726b0696dc5680eb863f4e04bc5"; - sha256 = "1gvglhdwaqrm3anaz7wyq3k1bjikjq7nqrdaszd9nnp3n4yarmhr"; + rev = "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1"; + sha256 = "1k42l9ghpkds2fqxj8f0anlh4gkpiid28zwkhy29k2br21m7q5fq"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -8515,12 +8539,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-01-18"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "4071f7fa984859c5de7a1fd27069b99c3a0d802a"; - sha256 = "0l4ibd0bi2msj2camxls039n6pw008ll50mf5r8888265hmqzkfw"; + rev = "affb21a81e6d7de073378eb86d02864c594104d9"; + sha256 = "0q37ldqajhp46g0ikc3yfnq9bgmghqdb8884rc56sraql9g0nwmi"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8551,12 +8575,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-01-20"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "15a2262dfcd7848fbafa5afea8adec3941b83c12"; - sha256 = "1jv13wvg6jcca3cw5swirna0jq5m3mj0pq7q113cpy11hd74bzh7"; + rev = "2723d63aed0ca4564565cc2949e0d6d2bc2b8287"; + sha256 = "1bxzww9qxb442ch3i7m4bw58hn3l9lzckr0vnqp9hh55vqh7c3xk"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8587,12 +8611,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-01-19"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "b2a0afac2c319a481f0f0318963a74d672ba5766"; - sha256 = "0wjhwzk4drm1phvndbkjjcax3q1gmh9akl5i7fwd8635w8dpc9fs"; + rev = "490f7fe6d227f4f7a64f00be8c7dcd7a508ed271"; + sha256 = "1bdhn3y4zs5m66bj009lqyn5spdn36vr8yc04k35xv5434011p0i"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8635,12 +8659,12 @@ final: prev: twilight-nvim = buildVimPluginFrom2Nix { pname = "twilight.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "8bb7fa7b918baab1ca81b977102ddb54afa63512"; - sha256 = "0bqd24cv0mb288qppah5hpmjlik37hbfifgbclfjkkb7irf1va8y"; + rev = "9410252bed96887ca5a86bf16435a3a51a0e6ce5"; + sha256 = "17mw3zqlviz4jsmjfsvddjd60xgkfihc60jv391rinl1w36l79ld"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -8683,12 +8707,12 @@ final: prev: unicode-vim = buildVimPluginFrom2Nix { pname = "unicode.vim"; - version = "2022-09-25"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "4c851a24310fcfb5540a7e2b17c563f1f542e3a2"; - sha256 = "0zgycqvr1z88mjh1xfyvmr00nriwfxk7imvcfqskh9l0wy6z0m52"; + rev = "d4925c55b5d6d57003100b3ce17b82b9e44d161c"; + sha256 = "192ln697rv7m3nk4401p4w75d3afsjlcc5m4hcmf00ci3vimk7mn"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -8779,12 +8803,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-01-21"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "a9488d0803020e8d99ed13b95fd9def82941c978"; - sha256 = "0c78cr5f16vliiblafhcmmcq1xqybfnd70576drh6n7sr2fhss88"; + rev = "347d6125495ee87d6f6066e4830f70ddba18722e"; + sha256 = "1xdhyml77k5fgmd9rl8g643bd7qywgzg3hqapns0xcj8axiigmvf"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8863,12 +8887,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-01-06"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "aa3428b734ddbd0105615832843f619774a6871e"; - sha256 = "0dnv1ixhzrgafd7kqpx8hp0r1snyqfxw80psnbxsr6qcwzawb2da"; + rev = "d55c90d6c9995ccb79d2152564a4939cd84d73e9"; + sha256 = "0vfhjv7jpx15lqd6kf7jds5x5x4x5gj9cbr5rgm0cbbcn2734gji"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -9115,12 +9139,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c7460aa8836bcb05cf32331cc751739ba9392ae7"; - sha256 = "1w2r5vwll0mfmviz7s9r6n00lr0b1fav7qmkj7zbvxh8hrf2z80b"; + rev = "18b85395d32e235128b85a059dd60b562f9dbfe1"; + sha256 = "0212cazr83r9n07gmm0rbzp7mq0lh88iwbcqsdza3nw98rqp3i5z"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9511,12 +9535,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-01-22"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "5a6ff035e16c57874fbf68951b1206535733827d"; - sha256 = "1v0fxyqnbcf3x5vv5aq1z9q75m1qym6l1f9jn9iwdwg06mj581wj"; + rev = "6a90a1db48569814e73d201c95d90f38ae4aa27f"; + sha256 = "0svshn3g4w86wizxc7nybqgwkbr5nfs454vanr8q1z7ypgqax99h"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -10243,12 +10267,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "baa0206f8d1685d1239d6c10f4b53869eb84c4a0"; - sha256 = "0hmdpn548bn46ygwm8w2wm609hiyn2nwj2kqc7nsi0ypa5pkbnnb"; + rev = "2ba8af2c9682e3560db5b813d10acf3ba3415bc1"; + sha256 = "0rnyk3q6zkd6b9xi5q61jr8885mqx7xz0v7yyxb3y37lrl0wfz66"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -10748,12 +10772,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2023-01-11"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "da80f3877896adcf77f59fb0bf74e9601615d372"; - sha256 = "129r4jrdffy18yklk18gbplgxf7dkngda8cgssf9xfawizyg739v"; + rev = "4e1d43cdc39e35f495c7b39a78a349b4d5badad0"; + sha256 = "135274m0q9gclg1lqr9aw3063w3m7csmibri3jzx3lk444gqmh9v"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10832,12 +10856,12 @@ final: prev: vim-jack-in = buildVimPluginFrom2Nix { pname = "vim-jack-in"; - version = "2022-04-03"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "clojure-vim"; repo = "vim-jack-in"; - rev = "5467e00e26f15680b0a7998f8aa20d5a7dd44cd5"; - sha256 = "1wi379l8d793v6hjx11v0dhgdn8a9ihx64gv51v9wpmjlvp9xbzd"; + rev = "c7f73e6788b5a97ac700f6c1fe09c26ebfa324d0"; + sha256 = "1f95877cgv9mvln6v78sgccwdfgvbaga9wbyckxw8rrbnrikwxam"; }; meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; @@ -11133,12 +11157,12 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2022-05-11"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "244a92ceae63b8c23a74022eaf205b431745fcb6"; - sha256 = "1y56xh4k7zqagsnw86lkm747l1x4i5l95r0jks4j35d1fcmpq81i"; + rev = "6cc9f9ffaaf44b45bd5268f8a541363619bf1b13"; + sha256 = "05j14v41jrjm4p1kbqxgx3n54isv4y93w2iy679jyggrrdzi5m71"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -11181,12 +11205,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-01-15"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "3244bed52220bee01515eb6dbc7da29a66998fec"; - sha256 = "0rh5pz0m4nbhx8dw2nqvswyapyh9s8racwlqxgykaxlni89m1g23"; + rev = "ad6d61b13c64499163f2430245f410bf9e75e89e"; + sha256 = "0q1zzn73399h9zllfrdh50lgfw66n8b0swiyqaxyzyxspl882cm1"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11602,12 +11626,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-12-15"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "8d30ed73ce7583b31224ab206ec158f547dd25db"; - sha256 = "041wv3n3w1bfabgwpswwvpc4rsnmib3520cv7rkrvw7dqpywk7dn"; + rev = "4c907ef607810662c42795098d42f23a224fe6e7"; + sha256 = "1355c0kf6g0v0q6sb5xnl8rssm4hjkpkjqwbi9yb0r9sj8z7zx96"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -11986,14 +12010,14 @@ final: prev: vim-prisma = buildVimPluginFrom2Nix { pname = "vim-prisma"; - version = "2020-04-04"; + version = "2023-01-24"; src = fetchFromGitHub { - owner = "pantharshit00"; + owner = "prisma"; repo = "vim-prisma"; - rev = "e91ac5011232e1bd8ea53204db8d01203d5d0f3c"; - sha256 = "0pc203n70g1b0qfvrnfi5sxg2vr9zfw274s9lpgpxmribknpxi86"; + rev = "95c5b25066efb34c75bce78698baa371fe0ee7c2"; + sha256 = "046lpazz44f6b1lcvklaq1jl0sbyiklj6kcv580rrff89511nzsy"; }; - meta.homepage = "https://github.com/pantharshit00/vim-prisma/"; + meta.homepage = "https://github.com/prisma/vim-prisma/"; }; vim-projectionist = buildVimPluginFrom2Nix { @@ -12526,12 +12550,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2023-01-14"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "1049d2425b6d270621b48e110de37d5467a2a621"; - sha256 = "083h0dzi60p9hv2g9daydalrrpzngbw0lgyapbn1xzh3idb0hqhx"; + rev = "8f9eead6c4dfdfee9052d4ea667c1c9d8a396f80"; + sha256 = "1zpffb0f8scgsmpv0y4pbnlp09kv0lgmrn9ss8h53byrqsa14rif"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12779,12 +12803,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-01-10"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "ca2502545a8c563e15f556d0eb8a59e0f74d2864"; - sha256 = "1ijfdhnsr3dlp5bw3xarp2nxkavab59lnk563gvjcw74889alip9"; + rev = "048f15403d9edfa513a50fafd7b107306c5512e4"; + sha256 = "07vjls2cgrnrqb84vc3g00rc3c65xpvrnxyzwjm1kaprzw70wwmm"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12899,12 +12923,12 @@ final: prev: vim-tmux-clipboard = buildVimPluginFrom2Nix { pname = "vim-tmux-clipboard"; - version = "2019-04-07"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "roxma"; repo = "vim-tmux-clipboard"; - rev = "47187740b88f9dab213f44678800cc797223808e"; - sha256 = "1a7rpbvb7dgjfnrh95zg2ia6iiz2mz2xps31msb8h14hcj6dsv6y"; + rev = "21be1d22b82448292d8f290384b48e9ad372f833"; + sha256 = "09fd216nyv0b00078hipz871hilhpx9zf740s9c9lmw1cd80cs9g"; }; meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/"; }; @@ -12959,12 +12983,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-01-01"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "86f37afec5cefd75baaebf8900889dabb9789a2c"; - sha256 = "133vfipflvalyp373lmqza5p8dhh2qnnvlh5y2bsxh5abjk1jml1"; + rev = "6be01c509779b1c8a3d1747677a9203419bd11c2"; + sha256 = "17ifpbrcyfs8szdsk3j59916lsbal72mysk4ksgpw0q1paqzk75s"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -13175,12 +13199,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2023-01-10"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "b487cccc0e920e4fdf84f72d2fc1c86ef8dc3bdc"; - sha256 = "13741pp29f2pqr44sslh9fl49aw7a19l3ff78k1qm4i97ms4r0xc"; + rev = "413e9c4e44baaeb60beded33e26c37d9d22130b0"; + sha256 = "13i45y66ch7wkvrc3i4m77xhgr0klrbancd6csxn5hl2qwgn6122"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -13475,12 +13499,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-01-04"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "475d75a32e368dbfc700b580b16b351face72129"; - sha256 = "10r0n4dz8r4jbv9j583r77pp25q4yb4zd5gbrb8svxr873fja33n"; + rev = "0224789989392a9a6b958afa9fce9db5ff1e7a4f"; + sha256 = "0fvdyi9ipzk5crw4gfvvjhir7zw5g2gr3gnzgniwgap79nnhb1aq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13488,12 +13512,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-01-19"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c77ec4e15768ffcb97a96d1bf2df1ef58e94acdd"; - sha256 = "0cdc8qs1jyzxphqs11nwib0xxv4lsaiqi7w580jhg7an7w484kn0"; + rev = "13fa591e82f7fe0fedbb097e9869d32f6af207fe"; + sha256 = "040v6764iagzyy6iya1rq6zacqyqqnwd4xqv3jf15ns5bzb73lam"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13596,12 +13620,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-01-12"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "e4fa445065a2bb0bbc3cca85346b67817f28e83e"; - sha256 = "1gj1qkq1zxn9by6zxwg46rplpks51wvv3pmdjh8qr0ldkxk9yavy"; + rev = "684e96c5e8477f1ee9b3f2e9a12d802fd12c5531"; + sha256 = "0kdmv1jkkfcrhrvc6mcdy173cx39mwq5nwq3yni46zgcn5iyxiq3"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13777,24 +13801,24 @@ final: prev: zen-mode-nvim = buildVimPluginFrom2Nix { pname = "zen-mode.nvim"; - version = "2023-01-04"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "4313a5828e4d48c5f2f135f29d46f769a59dcfdc"; - sha256 = "05wn6p90ymwg0y3941c6v7zpxhkd2zn4xqg2qvvl4wyyhn4rl4wp"; + rev = "2c8f9f3758a4c430ff867e547741424ac16208bb"; + sha256 = "0iv87ixlb9ajzszkyih7ydd8644zd61njsjb0s94pwydqhxs8bsi"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; zenbones-nvim = buildVimPluginFrom2Nix { pname = "zenbones.nvim"; - version = "2023-01-20"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "13ed6d0493a1d5140995c4456ced54d0aa984f6a"; - sha256 = "1k894mxc7v4fp5zr80wbfk18zd5shcfik0j7mv1cs8c950xmahjl"; + rev = "910b8c240c6aaf5263db038db81c538602c766c3"; + sha256 = "1r84wgz4p9zvpnz247xk0svq6r92ir3pgdlsbzf73qjwgph94q7k"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -13873,12 +13897,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-01-21"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "6368edcd0b5e5cb5d9fb7cdee9d62cffe3e14f0e"; - sha256 = "1d1bb9js2i58qn2b8zjhqbawlrbjk3sn91cpkjaw43wldgm3samj"; + rev = "491f0a58ba8901258f84de94d848811a6eaf5b98"; + sha256 = "0xqvi82z2mhjb1dc4xzcmqn8h6psz1591dqr5wn15kli9vrn00id"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13897,12 +13921,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "ed78c1968dfd3b9aa2a3444fce0482c06ee65a17"; - sha256 = "1yhffffvb5ry4vcaiz68rnjv13r63v632962axkm0wgqbc5i62fc"; + rev = "d6841f9002ec98ad0ae9989e2c2f51133703f1de"; + sha256 = "00zic7fb3a3r59231fxyw2n9dw0rcsi11q97p6pk71sy4gpkq0pa"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13945,12 +13969,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-01-22"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "8516da6a9c40a1d9ab81ad56c90673be29f188f7"; - sha256 = "1l3l1w75j6bal7l4jf27rvy7w5vx1w62z5650y9xgx9wjnc1y955"; + rev = "705a8e9ae28a60a0ccb219c79085d57fdcd1b2a8"; + sha256 = "0w541cp9kqs7mfaq43r66x1dhd1hwmxpdjsxg1v3402xgsxl6hx4"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 2f2dd0416f27..5dcd51c64351 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1,6 +1,6 @@ # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchgit, fetchhg, fetchsvn }: +{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchPypi, fetchgit, fetchhg, fetchsvn }: { ada = buildGrammar { @@ -71,12 +71,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "4cbd1f0"; + version = "c68ffc4"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c"; - hash = "sha256-Uh9/yBYXNKBvdpqNv1kr5eREYmKy3Z/kvaSZQpUl+0U="; + rev = "c68ffc4c6c27eadd81dd56c66f03f4d202d4b2d7"; + hash = "sha256-MJDatUpXJMf3OB8KocA+kJi+mqNKRs7wraq33tCg3/c="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -124,6 +124,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; + capnp = buildGrammar { + language = "capnp"; + version = "740c757"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-capnp"; + rev = "740c757b9585925b1ed27cef7d61ac39b7824304"; + hash = "sha256-0zCSWV3afsEIhN6XavMnn4LrLenjerhdnTfQ/EaL4aA="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; + }; clojure = buildGrammar { language = "clojure"; version = "262d6d6"; @@ -181,12 +192,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "2d2c4ae"; + version = "56cec4c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1"; - hash = "sha256-BjNWSTpwytOSYw32lYFItNI4t3xw+uJUx/0htYo7aLs="; + rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740"; + hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -203,12 +214,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0091006"; + version = "98265a0"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "0091006d6498ee5647f080ef6c09e5b95e481078"; - hash = "sha256-t1wd32UE2Kz1VkIM4HfFFSDnttdCPGm1xOH9ZP+ATxc="; + rev = "98265a0a190c116234da73240ac8e373833ff5f7"; + hash = "sha256-AOZJ29JELZi8Jafd4StXVY9gCKZj8y2nx1Z8XVlYV9E="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -325,6 +336,17 @@ }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; + elsa = buildGrammar { + language = "elsa"; + version = "86fb3db"; + src = fetchFromGitHub { + owner = "glapa-grossklag"; + repo = "tree-sitter-elsa"; + rev = "86fb3dbe8462f299dfc9a93c718a11363d69e90f"; + hash = "sha256-OL3FJTwBkCIXdhqkSbn7BBiTylmhOC3e5KE97SfUpyA="; + }; + meta.homepage = "https://github.com/glapa-grossklag/tree-sitter-elsa"; + }; elvish = buildGrammar { language = "elvish"; version = "f32711e"; @@ -349,12 +371,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "f0e2f78"; + version = "2422bc9"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb"; - hash = "sha256-aMgKNcIQUkwA3rrzS5+gHzzGESabCtbLa9HGXmIxT90="; + rev = "2422bc9373094bfa97653ac540e08759f812523c"; + hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -459,12 +481,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "190d288"; + version = "f71b93f"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "190d288a1746bddb4abe96b597fb7d17b76e5522"; - hash = "sha256-PPdwdUfJ+2TCxVdEvexxGSBMDZmI1GW7eSfc/X3Me7Y="; + rev = "f71b93f399c9c2b315825827c95466e7405ec622"; + hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -637,12 +659,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "bd0d463"; + version = "8e2f090"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa"; - hash = "sha256-0Dafbn0+8N1MBRyOhiaZBo7KZqm8YpFzg/ZwT3SLq+g="; + rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0"; + hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -703,23 +725,23 @@ }; java = buildGrammar { language = "java"; - version = "09d650d"; + version = "dd597f1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e"; - hash = "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA="; + rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6"; + hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "7a29d06"; + version = "15e85e8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "7a29d06274b7cf87d643212a433d970b73969016"; - hash = "sha256-fMPCHdfHHyg7yNi9LDA35z+WFfPRbctrh38dZV5qZt4="; + rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c"; + hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -791,23 +813,34 @@ }; julia = buildGrammar { language = "julia"; - version = "0412178"; + version = "9d36818"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "041217800bf423099015e1654c9a4fdd75310bb1"; - hash = "sha256-DwRU4yqnMFqMIh4mAo9a57SRXhOLTnWKjO6zSaczUNU="; + rev = "9d368185be7e8139f2eda93d8b0acc2a54031718"; + hash = "sha256-6jKiqDo8fSHrUGFIizNSKWoB0CVXJv6b3XfN9YjNLJc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; + kdl = buildGrammar { + language = "kdl"; + version = "f83f394"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-kdl"; + rev = "f83f3943568c7e7b4f5e0de1b04d722223bd4d80"; + hash = "sha256-BakY6V4A2N/ZZCkyr7KU04/DWeGTAkkJua5TyZ6uNW4="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; + }; kotlin = buildGrammar { language = "kotlin"; - version = "b953dbd"; + version = "e463703"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28"; - hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY="; + rev = "e4637037a5fe6f25fe66c305669faa0855f35692"; + hash = "sha256-Xoj9RJqtyNtwag5tXRfu5iJpTnajRk1g7ClflBbFZyI="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -890,24 +923,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "16d0b5e"; + version = "63cda48"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; - hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k="; + rev = "63cda483a37c91eae817f33bc55680f228845566"; + hash = "sha256-1GJsg9R5fDWbbeLWVjLG0vQ2FCg0qiG3NRNEFZm3lqg="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "16d0b5e"; + version = "63cda48"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; - hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k="; + rev = "63cda483a37c91eae817f33bc55680f228845566"; + hash = "sha256-1GJsg9R5fDWbbeLWVjLG0vQ2FCg0qiG3NRNEFZm3lqg="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -947,12 +980,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "092e901"; + version = "d6c7eeb"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "092e90142667482996880044d2c04837d3d1c266"; - hash = "sha256-y0Lx6HdkoC7rOzm8fOfLBUt6672qe7AHe1SI6YY/aHE="; + rev = "d6c7eeb751038f934b5b1aa7ff236376d0235c56"; + hash = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -1091,6 +1124,17 @@ }; meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm"; }; + poe_filter = buildGrammar { + language = "poe_filter"; + version = "80dc101"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-poe-filter"; + rev = "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b"; + hash = "sha256-KDsi8eLrTnZaD9XwyF24edmBNHre3FoTiD7RE/MpvEQ="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; + }; prisma = buildGrammar { language = "prisma"; version = "eca2596"; @@ -1269,12 +1313,12 @@ }; scala = buildGrammar { language = "scala"; - version = "067ee61"; + version = "628e0aa"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20"; - hash = "sha256-KyxlDQla/XTBHccJG+rTqN9EO90OElZd7y21f1HTibI="; + rev = "628e0aab6c2f7d31cf3b7d730f964d4fd9b340ee"; + hash = "sha256-LbVebyhVPKobPxosLDl21NGGtNlZ5gUhJN6fGX87iak="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1346,12 +1390,12 @@ }; sql = buildGrammar { language = "sql"; - version = "9d98029"; + version = "4fe05b2"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "9d9802991aa1d1bc00eee7713a838dab1eb4f149"; - hash = "sha256-Iy5rqNZem1r++aI7vGITzBSFGjdDLGHFOgBWqIgKZX0="; + rev = "4fe05b2d81565ddb689d2f415e07afdacc515c52"; + hash = "sha256-rfx4jBKC2zXo+zWBBb2WkFopF00KB7WHzz7LZ3M026M="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1450,12 +1494,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "999a27d"; + version = "634a73f"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633"; - hash = "sha256-9aadAYFKeBv0gc4SHCYH+m77BB0c4qXpmg1mOeKp6mw="; + rev = "634a73fd2c80e169f302917ba665c07ec0b6ff7b"; + hash = "sha256-pB7zd48aonYYKdvD3+35zsD76+F/lqBYveFBxBQISvA="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; @@ -1472,12 +1516,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "d3ef05e"; + version = "6fd16d8"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "d3ef05eec4473094e2d691243aa243ce63de6406"; - hash = "sha256-k5O6VheS8RBrSNk/GBjP3Qun4wY8cbPXxEFU0tCKbuU="; + rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7"; + hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -1505,12 +1549,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "faad909"; + version = "5d20856"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; - hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0="; + rev = "5d20856f34315b068c41edaee2ac8a100081d259"; + hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1539,24 +1583,24 @@ }; typescript = buildGrammar { language = "typescript"; - version = "faad909"; + version = "5d20856"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; - hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0="; + rev = "5d20856f34315b068c41edaee2ac8a100081d259"; + hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; v = buildGrammar { language = "v"; - version = "0b03983"; + version = "7ef1f12"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "0b039830a33e759f0c9ee978b47ad10b82d37349"; - hash = "sha256-sQxq/tWNN/aWD3ZmNhil45cnjzfy/2AXn2X/NhzvnKk="; + rev = "7ef1f120c1c8950c7a3e1cdffe655bdd7220321b"; + hash = "sha256-2oVvuJsvEgv8J3abkV5ezAt0YdIkNNA4psqrcr4K+jo="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 5cdf4b1d658a..173a9f2eb6bb 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -68,6 +68,9 @@ # nvim-treesitter dependencies , callPackage + # sg.nvim dependencies +, darwin + # sved dependencies , glib , gobject-introspection @@ -744,6 +747,34 @@ self: super: { ]; }); + sg-nvim = super.sg-nvim.overrideAttrs (old: + let + sg-nvim-rust = rustPlatform.buildRustPackage { + pname = "sg-nvim-rust"; + inherit (old) version src; + + cargoHash = "sha256-nm9muH4RC92HdUiytmcW0WNyMQJcIH6dgwjUrwcqq4I="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + cargoBuildFlags = [ "--workspace" ]; + + # tests are broken + doCheck = false; + }; + in + { + dependencies = with self; [ plenary-nvim ]; + postInstall = '' + mkdir -p $out/target/debug + ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug + ''; + }); + skim = buildVimPluginFrom2Nix { pname = "skim"; inherit (skim) version; @@ -1052,7 +1083,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-v9RXW5RSPMotRVR/9ljBJ9VNbrLnSkU3zlEU79Xem28="; + cargoSha256 = "sha256-jpO26OXaYcWirQ5tTKIwlva7dHIfdmnruF4WdwSq0nI="; }; in '' diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 1cd0de9f1249..8838a6489f65 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -478,6 +478,7 @@ https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, https://github.com/catppuccin/nvim/,,catppuccin-nvim +https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, https://github.com/nathanmsmith/nvim-ale-diagnostic/,, https://github.com/windwp/nvim-autopairs/,, https://github.com/RRethy/nvim-base16/,, @@ -622,6 +623,7 @@ https://github.com/megaannum/self/,, https://github.com/jaxbot/semantic-highlight.vim/,, https://github.com/numirias/semshi/,, https://github.com/junegunn/seoul256.vim/,, +https://github.com/tjdevries/sg.nvim/,HEAD, https://github.com/osyo-manga/shabadou.vim/,, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a1f830f0e53d..9e4548ad0fe1 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -546,8 +546,8 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.14.2"; - sha256 = "RZyAY2d3imnLhm1mLur+wTx/quxrNWYR9PCjC+co1FE="; + version = "1.17.4"; + sha256 = "sha256-jJnALJJc8G4/0L7WMmKSZ7I+7Usmyj+WhufBdSzcEK0="; }; meta = with lib; { license = licenses.mit; @@ -624,8 +624,8 @@ let mktplcRef = { name = "catppuccin-vsc"; publisher = "catppuccin"; - version = "2.2.1"; - sha256 = "sha256-vS+hz3RxG71F5QoO4LQOgOgFh6GQ8QX/+4mMD0KC1kA="; + version = "2.5.0"; + sha256 = "sha256-+dM6MKIjzPdYoRe1DYJ08A+nHHlkTsm+I6CYmnmSRj4="; }; meta = with lib; { description = "Soothing pastel theme for VSCode"; @@ -1351,8 +1351,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.33.1"; - sha256 = "0dsjxs04dchw1dbzf45ryhxsb5xhalqwy40xw6cngxkp69lhf91g"; + version = "0.37.1"; + sha256 = "sha256-xOiMVUkcgwkMjYfNzFB3Qhfg26jf5nssaTfw0U+sAX0="; }; meta = { license = lib.licenses.mit; @@ -1504,8 +1504,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.4.4"; - sha256 = "sha256-EA3OABn80GciNecXwLcorWP7K3+jI+wgujpmvvFcNOA="; + version = "9.5.0"; + sha256 = "sha256-Av4RYnCh0gXQ+uRByl3Can+hvYD8Pc3x0Ec2jDcP6Fk="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -1520,8 +1520,8 @@ let mktplcRef = { name = "gruvbox"; publisher = "jdinhlife"; - version = "1.5.1"; - sha256 = "sha256-0ghB0E+Wa9W2bNFFiH2Q3pUJ9HV5+JfKohX4cRyevC8="; + version = "1.8.0"; + sha256 = "sha256-P4FbbcRcKWbnC86TSnzQaGn2gHWkDM9I4hj4GiHNPS4="; }; meta = with lib; { description = "Gruvbox Theme"; @@ -1790,8 +1790,8 @@ let mktplcRef = { name = "marp-vscode"; publisher = "marp-team"; - version = "1.5.0"; - sha256 = "0wqsj8rp58vl3nafkjvyw394h5j4jd7d24ra6hkvfpnlzrgv4yhs"; + version = "2.4.1"; + sha256 = "sha256-h59OmFreja9IdFzH2zZaXXh+pnODirL2fPkUmvAgDyA="; }; meta = { license = lib.licenses.mit; @@ -2941,8 +2941,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.24.1"; - sha256 = "00gq6mqqwqipc6d7di2x9mmi1lya11vhkkww9563avchavczb9sv"; + version = "1.24.3"; + sha256 = "sha256-4fPoRBttWVE8Z3e4O6Yrkf04iOu9ElspQFP57HOPVAk="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index d2668c473a62..202d49c19add 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -14,29 +14,30 @@ }: let + version = "2.7.3"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; - rev = "v2.6.6"; - sha256 = "cCXH1GTRqJQ57/6sWIxik366YBx/ii3nzQwx4YpEh1w="; + rev = "v${version}"; + sha256 = "sha256-lMqYfSA3sI7+glRE+eUf03uLfbf7lipmoqgt74FUaJQ="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v2.6.6"; - sha256 = "VzIqvf83k121DxuH5zgZfFS9smipDonyqqhVgj2kgYw="; + rev = "v${version}"; + sha256 = "sha256-t76Yltx7vHNoAAFvNpYLKuwFja4On6M20upmG6w3C1M="; }; in stdenv.mkDerivation rec { pname = "craftos-pc"; - version = "2.6.6"; + inherit version; src = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "9lpAWYFli3/OBfmu2dQxKi+/TaHaBQNpZsCURvl0h/E="; + sha256 = "sha256-a7oMLfjZUkEWPjxDDywlSW4qLhcQrCXPPY2BEOgiafU="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://www.craftos-pc.cc"; license = with licenses; [ mit free ]; platforms = platforms.linux; - maintainers = [ maintainers.siraben ]; + maintainers = with maintainers; [ siraben tomodachi94 ]; mainProgram = "craftos"; }; } diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 93d7a58e3cf4..a97114a07a57 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 = "14599-d3183708e"; - rpcs3Version = "0.0.26-14599-d3183708e"; - rpcs3Revision = "d3183708e81ba2707d39829cc1c0cb226dd9e50e"; - rpcs3Sha256 = "0lx9v614r9afmfknw9qdwawwayg3z0fj6chbhnfghm2j2zgqqbpi"; + rpcs3GitVersion = "14637-c471120a8"; + rpcs3Version = "0.0.26-14637-c471120a8"; + rpcs3Revision = "c471120a80ec6f12cd4489e1a9be073d7d9c96f2"; + rpcs3Sha256 = "1fl7zarxbjaz6mi3lqv55kdwpvjfz8d02qfl0655zihwm6zzdny5"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index a3d3fda59122..1f78d5398596 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.22.14"; + version = "3.22.15"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-VT85cVeKuHQCGQokID9yrbents7ewHK1j7I17oFTvlo="; + hash = "sha256-0hly1yZ7NAcSe84XMwDlcmZPunPcNXYzvAhd0Z5rB0Q="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 929a40d6daab..18603e38ec53 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.28.2"; + version = "3.28.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-ndwDN/DH+Y+dc8aNa45cSIM8yQUmIWq0jx6xWsZo4rk="; + hash = "sha256-nXauZSC78BX1fcx0SXniwQpRmdSLfoqZ5jlbXeHgRGI="; }; passthru = { diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index e09de1b25023..1f05f8e9fa66 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -116,5 +116,25 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; license = licenses.asl20; + knownVulnerabilities = [ + "CVE-2018-16328" + "CVE-2018-16329" + "CVE-2019-13136" + "CVE-2019-17547" + "CVE-2020-25663" + "CVE-2020-27768" + "CVE-2021-3596" + "CVE-2021-3596" + "CVE-2021-3596" + "CVE-2021-3610" + "CVE-2021-20244" + "CVE-2021-20244" + "CVE-2021-20310" + "CVE-2021-20311" + "CVE-2021-20312" + "CVE-2021-20313" + "CVE-2022-0284" + "CVE-2022-2719" + ]; }; } diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index 41999239af1a..8b4411ad04b3 100644 --- a/pkgs/applications/graphics/eyedropper/default.nix +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { pname = "eyedropper"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; rev = "v${version}"; - hash = "sha256-sDrMIryVFkjMGHbYvNDmKb1HyJNGb3Hd+muxUJKhogE="; + hash = "sha256-kc/UREQpmw3suA6bYEr9fCIwMzNMrEY9E5qf+rhKsC4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mztc44hHdqzR3WbG6tkCL38EfgBajRLlpMC8ElpXnlo="; + hash = "sha256-/eas1PObrj9IuDIzlBVbfhEhH8eDyZ7CD871JmAqnyY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 535b177bd7bd..971ce42c03f9 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -22,26 +22,6 @@ , zlib }: let - libs = [ - alsa-lib - bzip2 - fftw - freeglut - freetype - glew - libjack2 - libGL - libGLU - libjpeg - liblo - libpng - libsndfile - libtiff - ode - openal - openssl - zlib - ]; racket = racket_7_9; in stdenv.mkDerivation rec { @@ -77,7 +57,6 @@ stdenv.mkDerivation rec { "RacketPrefix=${racket}" "RacketInclude=${racket}/include/racket" "RacketLib=${racket}/lib/racket" - "LIBPATH=${lib.makeLibraryPath libs}" "DESTDIR=build" ]; configurePhase = '' diff --git a/pkgs/applications/graphics/fluxus/fix-build.patch b/pkgs/applications/graphics/fluxus/fix-build.patch index b19ed9c2cbc7..b44327520e65 100644 --- a/pkgs/applications/graphics/fluxus/fix-build.patch +++ b/pkgs/applications/graphics/fluxus/fix-build.patch @@ -1,5 +1,10 @@ -diff --git a/SConstruct b/SConstruct -index 32cb644..650333a 100644 +scons does not use os environment by default: + https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html + +nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables +to be passed through like NIX_CFLAGS_COMPILE_BEFORE. + +While at it ported to python3-style print(). --- a/SConstruct +++ b/SConstruct @@ -6,7 +6,7 @@ @@ -11,16 +16,15 @@ index 32cb644..650333a 100644 MajorVersion = "0" MinorVersion = "19" -@@ -225,13 +225,18 @@ if env['PLATFORM'] == 'posix': - ["asound", "alsa/asoundlib.h"], - ["openal", "AL/al.h"]] +@@ -100,6 +100,7 @@ IncludePaths = [ + paranoid = ' -W -Wcast-qual -Wwrite-strings -Wcast-align -Wpointer-arith -Wconversion -Wredundant-decls -Wunreachable-code -Winline -Wlarger-than-256' -+env.Append(ENV={'PATH': ' ' + os.environ['PATH'], }) -+env.Append(LIBPATH=ARGUMENTS.get('LIBPATH', '').split(':')) -+env.Append(CCFLAGS=' ' + os.environ.get('NIX_CFLAGS_COMPILE','')) -+env.Append(CCFLAGS=' -DNULL=0') -+ - ################################################################################ + env = Environment(CCFLAGS = '-ggdb -pipe -Wall -O3 -ffast-math -Wno-unused -fPIC -pthread', ++ ENV = os.environ, + VERSION_NUM = FluxusVersion) + env.MergeFlags(ARGUMENTS.get('CCFLAGS', '').split()) + env.MergeFlags(ARGUMENTS.get('LDFLAGS', '').split()) +@@ -229,9 +230,9 @@ if env['PLATFORM'] == 'posix': # Make sure we have these libraries availible if not GetOption('clean'): @@ -33,7 +37,7 @@ index 32cb644..650333a 100644 # detect ode precision if not GetOption('clean'): try: -@@ -240,27 +245,27 @@ if not GetOption('clean'): +@@ -240,27 +241,27 @@ if not GetOption('clean'): if isinstance(ode_str[0], str): env.MergeFlags(ode_str[0]) except: @@ -65,7 +69,7 @@ index 32cb644..650333a 100644 Exit(1) if not conf.CheckFunc("dInitODE2"): -@@ -334,7 +339,7 @@ if not GetOption('clean'): +@@ -334,7 +335,7 @@ if not GetOption('clean'): ]) if raco_status != 0: @@ -74,7 +78,7 @@ index 32cb644..650333a 100644 Exit(1) -@@ -377,8 +382,8 @@ if not GetOption('clean') and static_modules: +@@ -377,8 +378,8 @@ if not GetOption('clean') and static_modules: app_env['LIBS'].remove("pthread") app_env['LIBS'].remove("dl") @@ -85,7 +89,7 @@ index 32cb644..650333a 100644 # now go through the rest of the libs, removing them from # the environment at the same time -@@ -425,7 +430,7 @@ SConscript(dirs = build_dirs, +@@ -425,7 +426,7 @@ SConscript(dirs = build_dirs, if not GetOption('clean'): helpmap_status = subprocess.call(["racket", "makehelpmap.scm"], cwd="docs/helpmap") if helpmap_status != 0: diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index b6e03baace81..9cf2e50ea3b2 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -2,7 +2,7 @@ , mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig , dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim # Qt 5 subpackages -, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt +, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qt3d, mlt }: stdenv.mkDerivation rec { @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { qtserialbus qtvirtualkeyboard qtmultimedia - qtwebkit ] ++ (with xorg; [ libX11 libXdamage diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix index 38b4bdee2a13..c6acd02a541c 100644 --- a/pkgs/applications/graphics/vkdt/default.nix +++ b/pkgs/applications/graphics/vkdt/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "vkdt"; - version = "0.5.1"; + version = "0.5.3"; src = fetchurl { url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs="; + sha256 = "sha256-7b9mowMOdA4holdb5zUIqOGkB0/xB6AvJOfxA6IIfRc="; }; strictDeps = true; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 051fee4f6fb6..59f71a3f88c2 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.6.1"; + version = "3.6.2"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-lr3ffyAL8LBj7mt4EmN2Kq2pxvW4P7zd66gU9X4qzJw="; + sha256 = "sha256-c7uwXqmMrWDYZ9CpGuVoo1e5yWHsoNd0zihZKdCTg7E="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 9890ea9ad8db..360c97d4a297 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18622"; + version = "18646"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-AtV7Lj+z1GOCEl8xUaumYcN848pMsLIfMGmBXved6WU="; + hash = "sha256-nncN1cGpuVy4O3JeH56iQfwZGM5/xs3U/V+gVZbChOE="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-q3Kr0YWe6Jm6wO6h7fMANKLCWKfU0zDpBZjRH662eSg="; + hash = "sha256-ihBEOl6WnIaA7x40D2HTdVIDb30BYnhlh0sQrbNA/SU="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index ea855f3d30be..9a9db9d70f94 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,8 +2,8 @@ , stdenv , fetchurl , appimageTools +, appimage-run , makeWrapper -, electron , git }: @@ -30,30 +30,23 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/${pname}/resources/app/icons + cp -a ${appimageContents}/resources/app/icons/logseq.png $out/share/${pname}/resources/app/icons/logseq.png cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop - # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git - chmod +w $out/share/${pname}/resources/app/node_modules/dugite - rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git - chmod -w $out/share/${pname}/resources/app/node_modules/dugite + # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs + makeWrapper ${appimage-run}/bin/appimage-run $out/bin/logseq \ + --set "LOCAL_GIT_DIRECTORY" ${git} \ + --add-flags ${src} + # Make the desktop entry run the app using appimage-run substituteInPlace $out/share/applications/${pname}.desktop \ - --replace Exec=Logseq Exec=${pname} \ + --replace Exec=Logseq "Exec=$out/bin/logseq" \ --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png runHook postInstall ''; - postFixup = '' - # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --set "LOCAL_GIT_DIRECTORY" ${git} \ - --add-flags $out/share/${pname}/resources/app - ''; - passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/applications/misc/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix deleted file mode 100644 index b1118cfc5977..000000000000 --- a/pkgs/applications/misc/mps-youtube/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub }: - -with python3Packages; - -buildPythonApplication rec { - pname = "mps-youtube"; - version = "unstable-2020-01-28"; - - src = fetchFromGitHub { - owner = "mps-youtube"; - repo = "mps-youtube"; - rev = "b808697133ec2ad7654953232d1e841b20aa7cc3"; - sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv"; - }; - - propagatedBuildInputs = [ pafy ]; - - # disabled due to error in loading unittest - # don't know how to make test from: - doCheck = false; - - # before check create a directory and redirect XDG_CONFIG_HOME to it - preCheck = '' - mkdir -p check-phase - export XDG_CONFIG_HOME=$(pwd)/check-phase - ''; - - meta = with lib; { - description = "Terminal based YouTube player and downloader"; - homepage = "https://github.com/mps-youtube/mps-youtube"; - license = licenses.gpl3; - maintainers = with maintainers; [ koral odi ]; - }; -} diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index 2bb14c1b2988..23edd6e2742f 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OcOF43SOlseb6UGTxLtGH0MRokZob0x+cczpdJc8Hq4="; + sha256 = "sha256-34C0JmsPuDqR3QGmGf14naGOu9xPtPbpdWUvkbilkqs="; }; vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 51841f9852a5..45ca034b7471 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -2,7 +2,7 @@ , fetchurl , lib , makeWrapper -, electron_18 +, electron_21 , makeDesktopItem , graphicsmagick , writeScript @@ -50,7 +50,7 @@ let installPhase = '' runHook preInstall mkdir -p $out/bin - makeWrapper ${electron_18}/bin/electron $out/bin/obsidian \ + makeWrapper ${electron_21}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" install -m 444 -D resources/app.asar $out/share/obsidian/app.asar diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 3d6e42bd628d..56490754e172 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.1.11"; + version = "0.2.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-O4fVEYstDkVHn7fBVOGu1ok9K9xiO9uLx0+vb6qMZoA="; + sha256 = "sha256-CsfzQN7n/LsNIivJShDG02cHwPktkXl/0udBSPz0i2U="; }; - cargoHash = "sha256-LSMAE24E8Is/ejUE/2vogP0GmpF+9oO2pJoQOZ8OfU8="; + cargoHash = "sha256-FSuhG+ZSQzwj1YB3xs3A1uFWPhwK8FIfVfUY9V/J2Z8="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 36e95ee8f098..f71841c1af9a 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.29.7"; + version = "0.40.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-gVXil6Gc65/6VMuONfVyxU6SSV0vCbJKXDvtG4a+pbU="; + hash = "sha256-8gyALVW+ort76r/zevWAhZlJ/fg5DBmwUNvjZ21wWKY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-fL12Rx/0TF2jjciSHgfIDfrqdQxxm2JiGfgO3Dgz81M="; + vendorHash = "sha256-rbGKFZY9YEcBAFFxG6v3xaVLQxVoqIehN0LgINku3Xo="; doCheck = false; diff --git a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch b/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch deleted file mode 100644 index 1fbf5ec3f101..000000000000 --- a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix compatibility with Qt 5.15. - -Patch copied from upstream source repository: - -https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - ---- a/sources/model.h 2017-04-19 21:01:25 +0000 -+++ b/sources/model.h 2020-06-09 06:24:11 +0000 -@@ -24,6 +24,7 @@ - #define DOCUMENTMODEL_H - - #include -+#include - #include - #include - #include - diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index e7a693b4ca49..50e8a2ea10d8 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron_21}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; meta = with lib; { diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 9300bc3c228d..4911556086c7 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.6"; + version = "0.13.8"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-FmwsiCXSnTEvA1oAScJhnl1ZG7WTfbNQyJBULnNt9/c="; + hash = "sha256-oNsA9VM6MN2czeZSTFGvmCWX0T3iVaAhQk1mVRyKgWw="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-lla+smDg6nNNQZYEQI5xY3iRw4gm6WCDh8gDZ6N9lqk="; + vendorHash = "sha256-LG5gTHXB1ItDZFbTBHyZGHZLaSYb8wekIHkahTMXzkk="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix index 9440c2368100..078d6abccf50 100644 --- a/pkgs/applications/misc/ydict/default.nix +++ b/pkgs/applications/misc/ydict/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, mpg123 +}: buildGoModule rec { pname = "ydict"; @@ -13,16 +18,26 @@ buildGoModule rec { vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; - ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X=main.Version=${version}" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/${pname} \ + --prefix PATH ":" "${lib.makeBinPath [ mpg123 ]}"; + ''; # has no tests doCheck = false; meta = with lib; { - description = "A command-line Chinese dictionary"; + description = "Yet another command-line Youdao Chinese dictionary"; homepage = "https://github.com/TimothyYe/ydict"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ zendo ]; }; } diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix new file mode 100644 index 000000000000..f217c7b0e9a5 --- /dev/null +++ b/pkgs/applications/misc/yewtube/default.nix @@ -0,0 +1,48 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "yewtube"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = "iamtalhaasghar"; + repo = "yewtube"; + rev = "v${version}"; + hash = "sha256-8GL2ZvRHtnnLZ07nQk3irJUj+XLL+pyUUA+JJPICPRA="; + }; + + postPatch = '' + # Don't try to detect the version at runtime with pip + substituteInPlace mps_youtube/__init__.py \ + --replace "from pip._vendor import pkg_resources" "" \ + --replace "__version__ =" "__version__ = '${version}' #" + # https://github.com/iamtalhaasghar/yewtube/pull/105 + sed -ie '/pyreadline/d' requirements.txt + ''; + + propagatedBuildInputs = with python3Packages; [ + pyperclip + requests + youtube-search-python + yt-dlp + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + dbus-python + pygobject3 + ]; + + preCheck = '' + export XDG_CONFIG_HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "mps_youtube" ]; + + meta = with lib; { + description = "Terminal based YouTube player and downloader, forked from mps-youtube"; + homepage = "https://github.com/iamtalhaasghar/yewtube"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz koral ]; + }; +} diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index 0840aad4f2f0..0cf50c96ada9 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.9.0"; + version = "0.10.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Z47BkBTKdzfjBJKjelJFu0tOU5bdjhLviDQ2fJQAlXE="; + sha256 = "sha256-hkBQ9WaWJrDhGAt35yueINutc7sAMbgbr8Iw5h0Ey4I="; }; - cargoSha256 = "sha256-sEIuilAjPZupSJojAu5DLtgToLCgMJKlJXWIAGcLeCQ="; + cargoSha256 = "sha256-rY7WHgd5wyx7TUgJamzre8HjeI0BRtaM14V3doCkfVY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 28e84e2b3421..5c987bb22543 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "110.0b5"; + version = "110.0b7"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ach/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ach/firefox-110.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "5faba52087f38e86cade09d6565892e3f152af90e5dabc7e38ac0cf1eca0b373"; + sha256 = "92b620e6ab603758a48f1ebb1a860675f4034e994e15c8eb260f838f65eef0b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/af/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/af/firefox-110.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "43503068dc19572d95db53fabea57866375aa820f5bfb2575faf0a0a512f8ce7"; + sha256 = "f20e60796b489b2a4755708fdebf430e4d436ff9710ac5bbb0f7311b8b3479f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/an/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/an/firefox-110.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "17f2a72a9c053c734b047cdad54da987e0a6a1261182b67ea9ac3bf45fbe1379"; + sha256 = "087a34a9354d6150f0fd4363a3b848389f5f069b57bdb0314f6c588e111abadf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ar/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ar/firefox-110.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "78d6e0416d43dfc810ad86e1ba09adf49c0f256f0989400a51579c3f1b209bb7"; + sha256 = "bb3146c66f6ce2850cb987495f83b606bda37d60f6426485d7fe495070e79a15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ast/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ast/firefox-110.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "cc0ce2c002104e58a388ebdf040b3eb3fa14ac5d99500a4e552c19b6084b8e45"; + sha256 = "93e455dcaf9b03b427035a9f0d0bee7806c2497896bac44605eddb60c759881e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/az/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/az/firefox-110.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "7d40a1bd08a46933bcb9a9078f345a70229fbf95fc8401475ad4226428a2dd11"; + sha256 = "7b557d4ebf83e252aaf19e70fea793d3cc4bf73c9f2510bd2a2abe3a63440b40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/be/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/be/firefox-110.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "43cf22f0ba69b95b546e59b624bc131c90a3486685970ca86c967f96f6c10f16"; + sha256 = "f8b8e8fe66d5cf2d747e331b2d0b1fd2720c7bebcf3dbd6142e3efbde0ea8acf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/bg/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/bg/firefox-110.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "4a18ebe443058330656224082276e0f55593b00c7c7c06fc705d5d70dada4c1f"; + sha256 = "fda68c558eb5f70ff7ac0f5cb564c7492144b779b9eb94cdbf550c70542e3496"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/bn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/bn/firefox-110.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "d0daabd0d00bbdbd61abf5c83a16ca27a696b2a1270c568008965b16b9aaa382"; + sha256 = "4c1b0b87706625cc65c2d060c04eed441f009f75ebe6f6c781f935caf191983e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/br/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/br/firefox-110.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2331eb31f1946e6f24de07c00731a6cd4fead2bbb8cc5f284b53f865d51b7319"; + sha256 = "ccd26c778dbe49ad3d63d4ae9e36f9476e046e57d29478bc6c5fd4459949ad3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/bs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/bs/firefox-110.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "4c5d13bc01951bcb2b449401fe4e162d1a1ac2c9fce2f67bd1b7f6d31a7de7a3"; + sha256 = "7528eb97210348d167c11ef7816c12f1324f11d3f2109c96a6be908442d5b186"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ca-valencia/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ca-valencia/firefox-110.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "86852bce8c63622fa496aa91bb552bf8534e5480e12b51fb464e77ed72ece3aa"; + sha256 = "ca2f352ff998355404dd21c45478257e481fc25ae5490060c781181bc260f60d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ca/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ca/firefox-110.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "417d3c22d17f6d26513628d481bc59bc0301d41f9f2a1da4164faa8e5233e6ef"; + sha256 = "4b8c2be81e6aee03987a126d44f647d7d681d53190d61c9dd6199323f6d4414c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/cak/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/cak/firefox-110.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "13d31e6c75fcf72d6c0febe984288dd2b6846ca3e8bab12b302f490b35bb5c64"; + sha256 = "f44cabf1d06ecd47b49e071cbe9be1863ca9e171c5d45ccc37e45ff741d26336"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/cs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/cs/firefox-110.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "9b1637f815fb2edfc4c240d562624934375c45ae3d990d6de1b3606282e42406"; + sha256 = "424c4bcf3a61799f9f5218e44621ed1c910895126538177a572302fdbae01635"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/cy/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/cy/firefox-110.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "16c75ccf745f27df957b106e1c606994526e95b5b413d96766896a47ad96b043"; + sha256 = "471a1ab92ec953428b24f7136ce065fac53ed91df00b9d762116d7d2959ed9c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/da/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/da/firefox-110.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "531f8a44b40b93d8e0f988c9e654e67045683e330a826531dad1867e4e6efdc2"; + sha256 = "ec86bd2ccabc745749f13aa5125411347279db84f275870e606f83afe3c9a32b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/de/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/de/firefox-110.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b3ca2487ebac8be1553ad1a17cf59ae68872a86b7e864a8e06b9dd91267909a3"; + sha256 = "323d3ae9bfe4c14a7e1bfc93ceb6416e7716583d9556848b9a9a88730e085f86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/dsb/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/dsb/firefox-110.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e406e570d40156d30662f02589962304ee03b6ea2e6455e5522186d98085b592"; + sha256 = "04392a0ce88feb26e2447d013c8504ed228ca77aeaf4909e2cb38a70998ad576"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/el/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/el/firefox-110.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "bb90e349c3faf700626052109c2407e23f06ca60c00c37d2ae903e6bd7675b52"; + sha256 = "7dac7a1393def3a3e24ef5f1c51c40d226cf77b9a1f77b33bcae39ad4b422db4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/en-CA/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/en-CA/firefox-110.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "445e3b76d018094303fc0ef1ec53d0c53f9d792a0d7e62284734a9555afa5664"; + sha256 = "baa9a459c7686ea2c6ed74d976fef6bf00af83fa2ad71c0b644a60cb8c5db2ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/en-GB/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/en-GB/firefox-110.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "f4acb943b8afe0d0ae302a918b2cfafac83474a46b6fde40ddc01d6470016316"; + sha256 = "54b25f31e8292b56a360cf36550d7263c916adbe835c831434f11ed931e0d5d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/en-US/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/en-US/firefox-110.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "8f9587d6a66ba0f20f0b47e148990fcce40bfc0fba45a484404636f80ca8fd71"; + sha256 = "ffd6f0fe0cd9dceeeff8b5a7373de41849896706d2856a8c89d39e546594fb8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/eo/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/eo/firefox-110.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "4bf28f6b65949df3cd977c235cfadac83a976ace0dea490e69074ace18ecddb8"; + sha256 = "ea02d09fc67b6bd3468c04a8d72b9927f905a396211b584203530847bca57540"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/es-AR/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/es-AR/firefox-110.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3e038bb8e6a2ab714babe0e399a6b4f2a9b86cd981af184cc7edc8e49a2b2019"; + sha256 = "651111ca6dd6b83fc10d5d72d17144b1ba496531b4fa5820bed51af344b6aff8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/es-CL/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/es-CL/firefox-110.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3de9bed4ee2c8fb0977adcf0f426fb4aa274f197d963424d81a079fa9feece2f"; + sha256 = "45a45b30dd8b4a2edf7f0b497a47dfdb3b0e07aa8aa59d8be77d1a1a398f2147"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/es-ES/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/es-ES/firefox-110.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "01309cf1f4281ccb0a6165e95e46d2177d953298493e65266c5f8846b54b82f1"; + sha256 = "f6fdbf3e3feb70e3e69f19645544726e79a50462040ab91892c18522d41c1c42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/es-MX/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/es-MX/firefox-110.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "76904d409670943141977850bcc3c5aba346295cf5b351b8216cf7da9c3f7f3a"; + sha256 = "77ce45e0cfe689de99fc91d4a16e0fd442a42b19fd3606fb67b1213050686fe3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/et/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/et/firefox-110.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e24aced26a31f26aa6bd6527f9f454aefeaf08b77dab3436c051753b4dc8a50d"; + sha256 = "56a0d02ce080d1e3dc67a44f39cd96f8aa8238077482dd52a8e3d6648c8acb4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/eu/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/eu/firefox-110.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "458b90ecf2d8f82a776a39e3148b1e03800e3769e22cfb6d936ea97ca4691b24"; + sha256 = "340e9353f49de3ea88da3e861f184a2d4ebb6aae6031b0b475afd6bcecc0157e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/fa/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/fa/firefox-110.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "ef96d01db6c973c7923b5062004ef78f73a5b9284bacd0f7c952b80ad9d21572"; + sha256 = "d2588f3ea6d97253f1a8718cc95399ec1222fef5826547522846c01023616ea1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ff/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ff/firefox-110.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b22e267c88159fd2dac1899e5f8e89109ab856852bcd14a4b0559d66df0e52ec"; + sha256 = "c469ec84c739b7e865a116a3a3ad746c165eac531cb0c18c203fc1c634e66cac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/fi/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/fi/firefox-110.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "bfa55a101712a9f4d4b350c9adaddd9e840645b10eb7364ffbec7a82108f5a98"; + sha256 = "a4efd03aa334b2d52ce7c504c5a83f7ed3fde2bfa79783e09aeea77ef4b4e032"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/fr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/fr/firefox-110.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "908683b1a4ae48d071c9f31bb3a35cd6db2bc9bcba1bdc7e41836e977701ac2d"; + sha256 = "bb721c623fde67a8438694066301fd2823b56930b0e8972a116c599fdf472e9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/fy-NL/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/fy-NL/firefox-110.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d2829fc8a7c27efc8e4000a9db73a9cb73d3795badde462e0afd129b0a6be15a"; + sha256 = "f9eb091431be5dee981377c6c7d97559f5cfceb2202b46f4f3baa37701c54088"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ga-IE/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ga-IE/firefox-110.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "608addc863b2d83406622f9a184e7fbfe6c3f478f4c73f4f24f6161153b194ea"; + sha256 = "9a99e94cd50ec52d16c777de65b992992f70916a7a188918d942d89afbbf3668"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/gd/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/gd/firefox-110.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "4ea66f7148370590fdbffa0b245f0050c895cf3474d35ca0dfde235f9e519cbe"; + sha256 = "2ed55b6dc2f4a24f4bb78ead431652dcd9049ae9907ac37bd8025eca62241a08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/gl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/gl/firefox-110.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ac02858be7499f652831b03a97356007c2881a9bf38bd0a87da3cd36a044e2c8"; + sha256 = "5aa8cb191c29d134d19baa1e3bc4d26d4bcfe7778bcb895f7612165ee74197e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/gn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/gn/firefox-110.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "854480c0026c38f02b14a4c282ed511cc0402afb61d079ca0d9ba81220cd0210"; + sha256 = "94dfa7584da128d2e79c9d4156b24e229cd1146509192b177693e9d315935f24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/gu-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/gu-IN/firefox-110.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ec0ae524f8325e1748906be463a5ebb574c557d7e6867a8029c9123b90483604"; + sha256 = "60669f8b91b050d605e80ac2185fda57a8d374c92c30e6dc4281bf7f3b815b25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/he/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/he/firefox-110.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8a4fed02aac861844953e53eba95ab1084fca69410e15537851fd77cc17e8cdd"; + sha256 = "1c34580e1e058a6a3969c000eeb5718895cb74f48de5f8dde78bd9b38c7647f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/hi-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/hi-IN/firefox-110.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b3c9b57be4b1087a1a1a88aafaef25ca93563eec3788d28783166e2c50433cd2"; + sha256 = "05ae118bcd2ecc6993ef9122b4417c3563713cb2eb217218ddfce97839ae8595"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/hr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/hr/firefox-110.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ef21e486b5031f6a9eb6d6a61c31447e1a840608bc5c0af824d2f83f567a9e19"; + sha256 = "f46d78482713a7cb29bd8ef33307a3aad5eca15b7c3fb0836b5b8085431daf45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/hsb/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/hsb/firefox-110.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2a4a2e4994106fb37ed8905c3d996385c595d5cd53781a0e25498756e5a3b497"; + sha256 = "12067c08e4b9f34f58195d1a0ffd7977db696c95990bedc8ea34f67e3fbadcc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/hu/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/hu/firefox-110.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "cf940a4b06b3405fe90fe93a91cf6ac56e040bdbd16dddc2d4568e32b53846b9"; + sha256 = "1515f75f0219b988e9c78d581179a175e699da6e7706fc8cef730f17acd62397"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/hy-AM/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/hy-AM/firefox-110.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "68a9fa5a4f50224d275584fcf1a099d4edc6ebf953a945754077c4fc7b573413"; + sha256 = "f8194fed507e073ba5d1bd9988a538f7023c95964e78e742780541ba2a6a8c93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ia/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ia/firefox-110.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "53cfbba2fde705143612f1e55c55635bb559a52f5d0d1010f1984be3bf85c485"; + sha256 = "ee8bba43ce0d4206bec6f418b47375a87d4212a7b8d5d87424561130a6bfe655"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/id/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/id/firefox-110.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6b0169bedea193730b7ca81acc4b9c61ecdc97caf6c047b731e6704146cb271a"; + sha256 = "329f87790197514b1a7b702b55fa0bc851b444f771f8eb573461fce54f83a496"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/is/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/is/firefox-110.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c65ff5834eb4fd15f4230ca161ab1c3ef87c01a3e7481958ae3a18654a21573a"; + sha256 = "940f6e07ea316f1354d032ea49f9d24dd128f3fcb16276427ce0828d01b2bbc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/it/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/it/firefox-110.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "83d35c158003f8b23ecaae75ecd023e17899dfdfca6f237f67564b134c870065"; + sha256 = "cd77be4ab24dd05e32004df01761d61897cc8b873349344fb6e8cba33a9f1c50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ja/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ja/firefox-110.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e8fd34dfb536adde41fb79e9aa47c1c6e74a6e8a74bc654f103a236051cea6b6"; + sha256 = "05ea39fbf1f8f961210d7c0edaa0fcb6906ab5d2adad58e9018e95d1d9b30bd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ka/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ka/firefox-110.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b2163ca337067880a2c063c33f0d98c5e6e807d73d4e227f2bb881f55e1293cb"; + sha256 = "0bdac10f673a073e39e14b2d85cab7047c9e20415ad6747244e62de9389f04f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/kab/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/kab/firefox-110.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "348818c66666d64bfe97c63fe1c2e4581e690e5ba86518b61b46e7884b211e4d"; + sha256 = "3601101bd8b4106609d59ab843a6a55b04c46ad3811ba4e08adb425228ce90ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/kk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/kk/firefox-110.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4730c46c538419c7b1ceaffc201b96d417741f656ea4fe27f600a9ba7223aa4d"; + sha256 = "e131df51351beeec1cebbe06da1a6293d4c6bff33eb75d0d9ae40d01ca486f45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/km/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/km/firefox-110.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "e4e4656c099533585969e300aa142b30768c218f519901098c30757a3f6cc511"; + sha256 = "3bbd68a9dac8a5949daaf98556d4d0a1c2948f932e3f6eae04cc6cbb3d1539c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/kn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/kn/firefox-110.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c19003aac7906191f505bbb9c88ac445be10dd36ca85a20cdb64b271047d33b3"; + sha256 = "7d680235f84143dd580f80349761963b3dbccc31bc1e38c5dc8df8a8210409ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ko/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ko/firefox-110.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "76c33115944c1c4ced46be24fb6abd4831dfd196a0a8c2106bc05199a4b9efa0"; + sha256 = "ef80407630660ca8ab9f0d0406b46c755d0cf78e996ba2f69abbb90b996026fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/lij/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/lij/firefox-110.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "1f2f8475f83b174c7111a8c17c51b24376ed3fdab8ab1b36cbce6f98a3861225"; + sha256 = "d9d2525745a262300f7d650e28e0bf1ea22aea28c6359f5d0af093ee8a4e3ab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/lt/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/lt/firefox-110.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "1327ef1d3304ef21cd7ad7b1ba15e302999ebac6615d34b600d77d1e9d5d2593"; + sha256 = "5020f41d503258fe25cba1feba4ce079b365cc05446bec561083507599f08127"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/lv/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/lv/firefox-110.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "fd0f80a932e58f4ea45cb4e847c9d4afcb519fa354bccba3862f937d74a77d1d"; + sha256 = "4b88c5fecbc4cab7f741b55cec75cf6442b142632469efe8e00a424a4d86695e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/mk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/mk/firefox-110.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "f0826813288a764460a403e512d9f4b25d5d3c23069e0ae6e5abc2f04a69c966"; + sha256 = "10f54c0c1ac4df041fec2f1f014491eb18e564dac4226127bf699b49ee2f1a18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/mr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/mr/firefox-110.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "6659308b97de101a7264d867e165d63044e8dff6009e472dddf41f32757f5ce8"; + sha256 = "3666ba4c4662d07cae1fff56da955990c64b8569066e15bca1323598099d4648"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ms/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ms/firefox-110.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0274ea11012c19d2b36ad8106457ce3c35fb6b52d305d659a9c05991e6463a5d"; + sha256 = "436263d531bba64f556f38afd86468adb4e496611504f5a3698cc5b2febf430e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/my/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/my/firefox-110.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "05035a9d31dab8069743b052cbb02807398b08719de321f09048255e9bde3de2"; + sha256 = "54f399a622cb8273fdb32b53b759f3b4465a4bd81ca89e5810315846c8443e23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/nb-NO/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/nb-NO/firefox-110.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "98ed94dd476474afc6aa45932236c41c5349c766ffca48dd109bb3235c586551"; + sha256 = "3e5392688830c8fa7c129c79619efc8da24dc6ed98708f019c1c66fc8dd29a12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ne-NP/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ne-NP/firefox-110.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "9091b6d5e2aa5d494dfaccc3b18b116fbf4452235e638db73350847c880afbbe"; + sha256 = "adebf0d50f0829d872b6072d6e004fbef29e0433674ad51d9f4dc589bb8d8df3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/nl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/nl/firefox-110.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "87cef9ce2532b86a9a65738bd8ddd3c748d1ab45a5da8014edccc1f68a479b64"; + sha256 = "66b2db5baef45dc7db2a8b8561913e8efc052ff1370da778f714d4d14da1acf7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/nn-NO/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/nn-NO/firefox-110.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "97fc45ffd9f4f4d0e63ff32459465f760fe69cc81ca1cbca05b909f480cc1acd"; + sha256 = "3421744a83f405e528190596c3ae3abeaa43bf4a1b59e33246783c1ef9a9ab70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/oc/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/oc/firefox-110.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9644f2ddc7339a502dcf87fb12034d770e7be3befae95f82ef814f3a90093545"; + sha256 = "ae30959bfea5d80701e666bb6960ed1550046e4da36ebf8fa136db0021ef6021"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/pa-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/pa-IN/firefox-110.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a6bb7be95f0043bd387c9bc1a4e2587d5ad2d7960c67b96a198bc28d94a5301a"; + sha256 = "b7210a8df3f53bdca8a69e6c7492bfdd8485371e4d8d3ec5110467ff613b48f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/pl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/pl/firefox-110.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4ad7a2de09c61cd33dca2f69b28d1ad7cfb7cc55bea727a683f5fe1f8441ff84"; + sha256 = "08b657a39414bf6be79961489075b37ba1c561d1a6d9198f5923d418599ca5ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/pt-BR/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/pt-BR/firefox-110.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "285c0e2767589dca92ceaaee2ee768f4ca3293425f4043d6f80f48eb748b9f51"; + sha256 = "ca698a71e4d375acce90f9215fbf0a9b7faa2323d58e4bf89b13abeb7a3b9220"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/pt-PT/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/pt-PT/firefox-110.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "de1f9fa9682f1b4c810182761aace0216b7e0302354d3540987e04621e35c697"; + sha256 = "492d61314ea59aea023e5738bc7ee849f47a745e41b3093b91c7d929e35658a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/rm/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/rm/firefox-110.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4c49a5a412791da4593634642682eeaa2c641a3159d9f44942f9c677548a1fcf"; + sha256 = "97b9bdbe16d9fa67d74a834867f9df0958022e6d65f83757cdbe7194b0f025ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ro/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ro/firefox-110.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f92be652337f35d0a58e0ecc59ab207425a42e92ce033ef89faadb120f2f3fca"; + sha256 = "df3bc82768768bc35f73a4d14aaa7dcb4c5bfd6238176a9ed82149a700de679f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ru/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ru/firefox-110.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "4134cb7d42c7c2c96dbb0e8e2836ef6be4d3532107c8a29664a90ab71366a723"; + sha256 = "879792662def74af3ad11b8b9c44c0b7bd822e883c338124f7dcb0a11e6d225f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sco/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sco/firefox-110.0b7.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "407d8057ba130a7918e513cec48ca56e0034ceeb2684cc769174052c08349e1c"; + sha256 = "3e592ef8306d7cc157122e723fb03503b6bb7fb5884e37d6abd39f03afd38a95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/si/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/si/firefox-110.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3e05c77abb34ad4c14300b864d5e12d929049cd688ef2f5b5b4372f18a6becd1"; + sha256 = "076ca9ea7d32a2fe67f854dbd87902a7c5154c2ac3132ced57864e60e14fd254"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sk/firefox-110.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6cbe096aaba3195ed73b5a6df23a96e05e0d505cdc1930c4f3dfcf3afacc6e15"; + sha256 = "bc3af5564f432ce4399aca59b0861fdf54d2725ab32ee6b3a998915ebbf9f0b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sl/firefox-110.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "db6f60c01d83d70e0c32de9f13cb2296846856c342fba1cd2edca43cf2a6dbb8"; + sha256 = "f965c9735c3468d5830554a51a78c329769ff922fa5d90945bad776710452d1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/son/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/son/firefox-110.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3175585c37ea553850c23d4c8b23193f06d083dca3b98ee25f15c35891eacd2a"; + sha256 = "901942b73373c6b89e7a278a5f2b3a8bf88220bbd4fb77ab86454ead0a43e090"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sq/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sq/firefox-110.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "166db2fdf0e0daaa1481776e786dc6ca61471dcc8e8cf6844d41eac2f5a949fb"; + sha256 = "e933c921694e03357c2872f16cf29bf1f4ad62297943d6a8c9182b9be603daab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sr/firefox-110.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7d419fe0a1a509d0839f67543a055ec5d9ae83cdb4b08c412cbe4b3f5c3387cc"; + sha256 = "2d6d34e90d2e1149056d5e4920ea21824401d1975df7d17a143944bedb0b22f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/sv-SE/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/sv-SE/firefox-110.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d20624af01871714937981e9631837d95c0c81960b7085e7f19ffd62f46334b3"; + sha256 = "93623693ac414ab424320f863b36b6513ff0f30b27dcbcc248837cce2599c4c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/szl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/szl/firefox-110.0b7.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "4aba339773a21ed6e88b32409ada3391af29b3f91f1f58af5e6f9f84a319c814"; + sha256 = "a56417926df43aae7a716628ad9a3095d21840859c465616ace4fc21da40269c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ta/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ta/firefox-110.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "e21a22b00a8b575c15b2003db079c519e9a9137ee5e90ce92c9f3e49c2b6c9db"; + sha256 = "ca44efb45b39c75c08973d140b724f852b017b64cc1d759485bd98e0491488d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/te/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/te/firefox-110.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "0e5f4b62e85f3f497a9d16a553e636125fac660cd81297206c3592c3c394d017"; + sha256 = "31f8b5e3900889a4832498fe4056f27ec6645191d7d962d4d491cd6a25f3c7ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/th/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/th/firefox-110.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3480a9ec8e8b702d3c36dd75634f0ca95b9a76dcbaa75ac964e8d33c469bd0ce"; + sha256 = "05615a0d71e6c313c7ab49af6be8f76e51735bf3e21c7c49abbb32d63d0408b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/tl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/tl/firefox-110.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "8f529cee1a42dac671c06c10ab30ea5f5ad845ffd5c454b726fcd8528d1e235e"; + sha256 = "977e5443033cb0c936bc90e4679fc4bcaaaf8ebf4781383dd3fd680132cea31c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/tr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/tr/firefox-110.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ba26a522a41ad123fda9986fbff4a15a6a4792a41da9b3b6278e79dee88e1c11"; + sha256 = "6d9cc515713d158653aa13b16200bc5096d266c863f4bc53bcc74e8e8fa353ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/trs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/trs/firefox-110.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "999e51a078ad1daa7888785d428b0daeb21b1a270703a7e8f5251753d98ad712"; + sha256 = "a5dd9e188dd9f78d6fd90d6a5a7765985fb219c247f414ea911b5f5f9c0f8c52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/uk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/uk/firefox-110.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "1f64175ba11b99864c5630d3c2524456bb6de472508edd7d7bc99d0bbed65923"; + sha256 = "62f00894426fc75378dda288fc2a1cd4c7be629602632b0b0e5f175d467db107"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/ur/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/ur/firefox-110.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "f8a331036c7ed98c804f3d33c67c6a644c5a7072e6b1ff6cbaa81afb817dcb75"; + sha256 = "333a1364ee4117fb40f4bdf2de0433b7fa34299770b69081b7cd05403d71872e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/uz/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/uz/firefox-110.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a6985b67b4fda3a17663b6a0189545d72f96db078e70fb6e0d44b513783b14d4"; + sha256 = "159cad78149dfaa69c6efb22bb9789fc44a7880b6d944fc099e9d89e6f54bd42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/vi/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/vi/firefox-110.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c61678fe61fe9425edf27fe96cf11c9ed12c1fe8df4bc41953355c4932d73f6e"; + sha256 = "8620db9130e7bd80613c2f2bfa3c9d4df8b9de8d59ebf8b822cceeb279ec649f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/xh/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/xh/firefox-110.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "12b969c1a8e3b29d570deca48be5bc4039d24e7d6c6062fce413ea2ee99a4cb6"; + sha256 = "3e1fbb4fb5feb39bd671cd576812d5fc2498fb0c73e0b058744e393bfd012716"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/zh-CN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/zh-CN/firefox-110.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "426d79128f32bc76c492e213f4ad5b21c5594e884c7515196e565dd56b02f952"; + sha256 = "39aad118cb71b8e7e7460c690ed914ee3892691a6d8e62153b03c479b78ada23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-x86_64/zh-TW/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-x86_64/zh-TW/firefox-110.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "305501851b71057a113c8cd63a0f0c010d00555bd025bdd52a9c958ca72607f8"; + sha256 = "1f8a4572bd8e75964b6105f3a8d3bcc68d811b92eb26080b014bc046ecc9edd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ach/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ach/firefox-110.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "d6013c04d7ca3f460673e835ed9a77b96a565a1246edca6f5a7ffc490024163d"; + sha256 = "087f33cf2fab955f017634ce780d7f5c2cb8bfa888b6ed83f99c6a9a70d6b354"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/af/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/af/firefox-110.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d38eb42e8987d980f19f10aeb714590522552697124ce702f29387cce8fbe083"; + sha256 = "1a103ba3db1cbb66de687f9c3903061c830dce1ea572511c697f1f2a8296c5c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/an/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/an/firefox-110.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "688327f1fca1a993425d183a4670ad24be4ef72c99a0b330d244a1f3c8cf88f3"; + sha256 = "a731279bda038053c3b79eebc09985d6af74c5c31ec438f13ffde59908148383"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ar/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ar/firefox-110.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "1fa7bb063f807c070592af7f1f9598ec06171a9bd198cd07096adc41a860e312"; + sha256 = "1e8ab65e878a4d4139e3b76d36e1d69b814da191052ab2c7cd41801ff73c13d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ast/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ast/firefox-110.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bf78acfaad86c3371b745c55f89c2b786be3d16a2e1f634e7f3280e3ebea61e6"; + sha256 = "f4d7176d611a93a0153e367a20c817c6bace9011bd8f0466b52769023a4077cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/az/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/az/firefox-110.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "f3dff3c2a3fbaf17beeccd97bdc2f06acc478a3c914920d72639068d9d4f9ace"; + sha256 = "0d3ceff5f5dd2143994603b707dd049c46f20c7c95513429b6749b62b1307246"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/be/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/be/firefox-110.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "95168880a935b814e45d4bb0f1da593dea18915e599bab106046ea213c3adf7e"; + sha256 = "692715493278ed1af2f14cae406b78dc78693177e0cfb7aa3d6deb786049a5fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/bg/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/bg/firefox-110.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "614578b3e9fe9b022b639b12f13711971c99bc83ebc8e255c63e5bd30b8d6178"; + sha256 = "5515025b46068c7e8e588ab7e53fc5770e3b140f9c28dabe0941c481041d9f22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/bn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/bn/firefox-110.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a98cd5fb2b924486f80426da6fa11dbb55da7392df5150f108e49bb0778e6646"; + sha256 = "fb44bc2046389982c0f2c60b80a8ac9a15a8d8888b64c63bdb2dcf6a71bfc6be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/br/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/br/firefox-110.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "c97100516020b3e6b4a54be820c635f848fc386c43ffe6434a2de16bfccc37c6"; + sha256 = "518269cec028a721d718574398abe5a5b741d0429bb5104ca14fd31139504ac8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/bs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/bs/firefox-110.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "17564fb5c74702af4a6bb98c6b93a3ad13cda5d68662255e114405f74dbfc5f5"; + sha256 = "54b5c948f0d2f9232ccc2011a272890eaf430dad483863fee486b1028f1c30d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ca-valencia/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ca-valencia/firefox-110.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b6cddc7d2553b878fa9b9b92642196c653582cf89254a431f08cef6f6220641e"; + sha256 = "c06b0fde02bbd0ae124547c38b5174848cb901eabe2a4d47efd296ce46994145"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ca/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ca/firefox-110.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e1a0a46ab1cad6252d05438f205051711632ba4af24de5b8dbd92c9e7ffb8d4e"; + sha256 = "8fbb138aeb632e47fdcd2ec435a5940f33b6718e5fa69f323e700eb299e29336"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/cak/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/cak/firefox-110.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "9f34ef2b7e9fbcdad49b0e5965c375297ba90efd9a164cbe0d5d9a8c96a97781"; + sha256 = "b4ea7698f05ed439644f6f2e6c0dc9c9deed33e7dcaa353839b713a71009db95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/cs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/cs/firefox-110.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9fb041a5c903f3715ef8314ac61c20ea8bb5da9daeff27e0b3b51c707f5d7dd7"; + sha256 = "882110d77a5a432718734cfe0b36086eb853434936d80e1e8d003a5b391eb10c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/cy/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/cy/firefox-110.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3234dfd22f23c74bcad62ba818714499f7085750b1282bf5df7ddcf42ffdc1af"; + sha256 = "52db3775d786db676fbdb14cd9630d8a89411699997f4e83eb112bf64f7d49f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/da/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/da/firefox-110.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d49b18d24628e00259129924f96d659cfdd50c31e2781e035fc0ed46e212398f"; + sha256 = "20ad2fc0e7a7a5a3299ba418824c7b7c1cc1b3d4b05fc9a71b1bbd1b24e17465"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/de/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/de/firefox-110.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "5b7a1e710ac1fd0840061b3b20b91289583ebeddfbc3b7db5410cb816bd2e62b"; + sha256 = "3aa77c6ebba69ab350dc0bbf0e2711c29ceadf519a1c720c512e72c38ca8fa1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/dsb/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/dsb/firefox-110.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "bdfbecf3a30fa7f068c90cbe5f0717959e7e3ab33ddad2da81d29be5a929212b"; + sha256 = "e2419464cb5d7b12d5adb915f59320e6268e797175e73516109de2540a1f1c0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/el/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/el/firefox-110.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b3437bd3b43b14ab0ec49752fa55afc43479093913c479a60e8454db2b284a0a"; + sha256 = "1652e24aa351f17b65e1f5aee895f28b2383ecb3df069c6a9e1dce0e7b59bde8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/en-CA/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/en-CA/firefox-110.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "fc8278d4f006be9ebef07db5eb758b25e58f66a413abd166ab06d22a85d12a4e"; + sha256 = "7973cee03a4e0395caf6d93903d3b1192133634adb9a1f468a218d2196e59d96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/en-GB/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/en-GB/firefox-110.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "16e85431ef7c0eed71417af16e5699a177a9f5042625f622ab36659925017e0c"; + sha256 = "c03ef3a829ec20a48b5fc767511e7500f2cd0a61b431feeec92249c7835060fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/en-US/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/en-US/firefox-110.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8ee312bddb658db825655a13fc94a3d2cee836f37a33e8cbb56d3196c7d2c7da"; + sha256 = "ff24f93e7f6e20e69bfb3f0498c298c0a24a2c5b6d2a3cc7dcf86efbd1ed646b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/eo/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/eo/firefox-110.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3b11772f5e213b874c8c89c064e48418ad34d8d23e611082079c127b9dda7aa4"; + sha256 = "5a8ab87d0ba32dd39c8ed2e4a96b1d9fb81a9c08e75463a3fcb832872373a700"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/es-AR/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/es-AR/firefox-110.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "041b79fffc0aadaf0cc314f53dcc831d94bdecdc1e3bbcd986b8cff9949da29e"; + sha256 = "6c47cd6618df40e918a5f1037a250c58a6c5c9aba69d61f81cf600f13fcb3246"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/es-CL/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/es-CL/firefox-110.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "5e6dcac4fc3b6613c35c003189cbaaf7db4ae3f43694c7084c569875f0ce4385"; + sha256 = "32f7e8aad08e9a47d49d1ed4a6f498649e3a1972a3bafb52302c5ffe3cc40ffc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/es-ES/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/es-ES/firefox-110.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "79a2774d63c71d0b83f6d8d1c4acb2d2334cd48f7c77adb5c7b0c61a162a6f52"; + sha256 = "7727f95d6af5d3b50a2721d3e650ee28db48f258861ecd4cd7f11ec594035864"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/es-MX/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/es-MX/firefox-110.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8e1bf4768b8bff41ae5d32c615d6cf88ff1ba3b26fff7f10e32f876167925621"; + sha256 = "bafdc566604fc9c22a0f798b8918ebaeaa88efd85f80284a05c01774eaf48e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/et/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/et/firefox-110.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "14bcdb10589dbedb1c53db9920474052117970778811a15a4819fca5f3f71765"; + sha256 = "b1b99dcce7b4bd9f9b061993e318b3167575767c9dce53ad8f523a60352bba42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/eu/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/eu/firefox-110.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a123ff879aaa638103e2ce3f5d14745cccb6005e5a30ea1f509bb6795a165da0"; + sha256 = "c780e78aef0e58d88dec5401d5b7bd11afb2dbebda3e5a5ea149d480bcd0ad8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/fa/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/fa/firefox-110.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "e73b148580c651034da75970af69a15ab59ae2f71ef8138f41e8f7d03c76443a"; + sha256 = "51f9102321077e0e4b07a95fbf4a481e812e6196db5c646687850e3e2a5da883"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ff/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ff/firefox-110.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "ddf71075817f23203796935e87244bb8367de7085837683b6b52359251466197"; + sha256 = "ee7831ea2b5a762a975bd5536682c2153f69ba414ea14ef6c5cd922c4cab80ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/fi/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/fi/firefox-110.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ef11509358e689073e2c2c6b505017454d2175842af41b8d4f34f00dbf204aa2"; + sha256 = "250b50459321ac6ea4d000770e76e9e802cda686cc1915fb115764eea60923d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/fr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/fr/firefox-110.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d661a4f37ce189042320fc4e440826ca0234d18118637cc26b69ab2c405d2a1c"; + sha256 = "e44fa4fba61be3854b63d1f8d387c84fbeffab008277246524f6eae9bcff7c3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/fy-NL/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/fy-NL/firefox-110.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "361a65f4b354619e3e9d01bb8dc51a27f39357c54a977f3a60172a9ae7ec6ab1"; + sha256 = "287893ecfa83777518d7a341beef2681921b90cb5106915fd0331066aba63979"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ga-IE/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ga-IE/firefox-110.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "53888f90d5642dbaa5a4052af51506bfbbe68f1328671a83a01563f293a2f6b8"; + sha256 = "ed42aeae5dcb79f45593ddcdc66c6b8188cb8304ed82400e355d75a4e53b03ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/gd/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/gd/firefox-110.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "217266bf4ef48d95cb77b57ded9b383d2ce761bb1a1e5f8e262556c46eaaceec"; + sha256 = "5bc49a642ce8928c6f46b2fa22bc61915aad660ab1ac5352f5cde0b5c44a8800"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/gl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/gl/firefox-110.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "b0f28a9382d7700503eecc577aabf819e2679a1d4f30e94b3b855ac66a2b3f31"; + sha256 = "9f24feee5b7fc0d13e4e17374c519ceb411cf629936b2e06700dcc6a63de74d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/gn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/gn/firefox-110.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c0567e2398d2283b7ba6a6b3ca01d37efc4e67c475d589fb44f976761ff1b32b"; + sha256 = "a64db5547fbd8451ece0d43169525289355e397c9a2af95efb42603a23422972"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/gu-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/gu-IN/firefox-110.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "630076cec0005aab9271aa2b0727b1c76e298e5c83a1ee2c8cef30e6d390f1cf"; + sha256 = "bf07cb9e3c257dd6a34a42851a78032260657c6763ccf255091fd2f3f29ba10a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/he/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/he/firefox-110.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "4dd7dad1d4ba47e9cf41ddf7c75b4fa7f85d7f5e3e3240c91ca25886dc1578f2"; + sha256 = "7112abf91af307c3304614c1c880b282ed24faab39a7111dea5cb2293328ca7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/hi-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/hi-IN/firefox-110.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "ce1c67a2decb5434084a940a19bafcd0c09868e6b1e5ddd180280af2497f447c"; + sha256 = "998da861a738665b932b014b164ca69bb047dce7b2060c005ce7525832c8000b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/hr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/hr/firefox-110.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3cdf500fc631c0c629f782fbbce6a5f206afc828d9b6a5d8d0630f4e65e2c204"; + sha256 = "29eaeb3ce5e36f3704087a7a202ab56e8c0d97bf7884e083a01ff526edb4d9f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/hsb/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/hsb/firefox-110.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "0fcaeba915b7589ef692f7c3eb90f48df36888a642840a83647d1937f731a5ba"; + sha256 = "e3ed50d7bca83a3cbc5bd5f10f93a44244e6c3f808bbaa76265f83450824b311"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/hu/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/hu/firefox-110.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b4594ef8a41868aec7b3db9d4c130c171293b6551f68efacf09a83c43a03d42d"; + sha256 = "052ba5d76c6eeb1e4d66a6c6425f37e03d6ae69e78953d1f0d335e1c6e34ba5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/hy-AM/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/hy-AM/firefox-110.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f920b8ec3015708ba9661ea046f168b98a6e9cd597e3041ff89c3ce2b073283a"; + sha256 = "8283129029aa358c15cfb58404b2d1d59e063d697bc73ecfcccc5bbc259c3871"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ia/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ia/firefox-110.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "18d492d0ecc35418fec8e3d9756278f7ab2d9a9b24c5aa500a728b55c925faf1"; + sha256 = "d72a8f87608a01e72803e728588756e76b8635fcf79895ca220d9c3c1e9e28d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/id/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/id/firefox-110.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7db9f96cc78f6fa7aa1e4e7bd77dffdb4ed6119f0b4a8722dea499c04e80cbed"; + sha256 = "d77a76b2ef8c9b2a76d05318d0a52bfb975adf68f90a6d1427859cc115240a34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/is/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/is/firefox-110.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "fa8579d6ef1c2a87979dd5f9cd0e4643f4ac1b1c0bdf611fccffc337d4aadd8b"; + sha256 = "6313e71419b14e0a80f9b4f3a6781610ffcc217e7fae8e8198eac7598170fede"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/it/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/it/firefox-110.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "749f7ea9766851168af5468e1f4bfb534b3489902d96f0a90f65b85021accde5"; + sha256 = "21d62df2f19513d6c1554f88dd089b1d8395fbe5d575b73adf53f82be75c49f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ja/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ja/firefox-110.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c2f7871933defc961d3bcbf0d347e4401fdbb49838b6fb51bced2e6921a8712f"; + sha256 = "823d5850feea222c884c70d1cd1d26e819cf3512652b0967482b4f81546f8180"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ka/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ka/firefox-110.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a3f2e95eeca515d0464ed7dc49315e6d213ff28eb10e8b8ad2db9ec9b47a9ceb"; + sha256 = "18a6328ff12f058fc982e7e5e9db18c1e01137046ff569d27e2281da60ea7642"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/kab/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/kab/firefox-110.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "3044c51a73d8e80cffc7037a59ff57ae14eea170122c641c3637745849292566"; + sha256 = "f03e001fe3456f19ce3c1ec769d938034d7b93ffbde22cf592953ecea79be08e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/kk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/kk/firefox-110.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "aa5045062385ae460b14ee9accd415e87c347f1f9a4e6e3381b6d3f5b9e17da3"; + sha256 = "ede5525fa61b020e63386562d52025579c31b9309238d1960bd0fe8e0544609d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/km/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/km/firefox-110.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "af8950167a624e4e3b83ffb75d4e77e6312894c391a7a28f52de254874d7953c"; + sha256 = "800628c8e2e3f4a79c88b86d0e35a1f95afd5f0b910e23ffe47fffce15f663d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/kn/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/kn/firefox-110.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "598e170001ae93923cd044b5490414512ea6f20915cacb52935c0c92eb18e343"; + sha256 = "e04f625d658f27b74115db26adecf5c9eecf7b10317f025bcc9a56e47f9c6309"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ko/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ko/firefox-110.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2da9a904a16d6b819ae8856a58092365e7170aa8857fbd05699562a7a7b4014d"; + sha256 = "ebca3d23397626e42f41a88ebc9271da9b25c3605e79ef3c952400e876975297"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/lij/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/lij/firefox-110.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "7c8828d0b3f7dd864c3e948fa60e022e85990061af8d5fa9f74314503b94e3c5"; + sha256 = "a6c033d120e27830f89f6fba1af6332251d3e0a820901729bf5c3f4633cf7012"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/lt/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/lt/firefox-110.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "edf1327d542580af51acb6c93ea697cca1f9c69cb8abd95d330e01bc69d26b77"; + sha256 = "34a9e7a2cb57366e4bd4732a767228208defd0880768c989c6b5b9bc94a2247e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/lv/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/lv/firefox-110.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "bd1a2d487e50ddb036b30e424da8d9f3023ca56540b4dc9f3a351b33b060c054"; + sha256 = "831ca204a770068ce4105cf1033b5586872bd0071ddbe9d9bbb0f2495efc28cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/mk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/mk/firefox-110.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "9d171cda4c9f8de11c2ac6b4c8d4eda3fcda7424c6e9d6ed776c2d6f4219ca3a"; + sha256 = "cd16ea3a977ff335bfe8636cca62c46d12d0de22ba4429eded5a2ce79a53818d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/mr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/mr/firefox-110.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8d51039f8f1f01c9a6b10f1b242225b54af650d53994186a547c543594064dab"; + sha256 = "22a12d923e87800bb0998fadf6763d0fefa4be7a0df39e85a76200f5d1e641b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ms/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ms/firefox-110.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "aba977cc1cf684e1d5092ae02d25fae98335f1c240ce38c94b3a8b5cc8a77d9a"; + sha256 = "9ebf9de1970c562b68207f7051217497059235d2c5ed12caee5144923e1e05a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/my/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/my/firefox-110.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "aadf0c69937f4b0d16a557a92c0ec720d54606ddc6efcec701a5cdeeb224f1f0"; + sha256 = "245f82a08ef506715abdd248577023d4f785a832b3dbd6190fa4bb1d60dd6fd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/nb-NO/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/nb-NO/firefox-110.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c19199e14f489f9fd71d7fae722dfa8e09d3ffa878d2465fcd92616f372c2f71"; + sha256 = "2680ba8aed6bc7e3aac9648e27045560b625948ec50a5a849130713184344038"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ne-NP/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ne-NP/firefox-110.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "16703be661a630c662941830827cb039eb12e2c1c8da14a1ba1a6e575a9213c4"; + sha256 = "9445de860d2de2154481aff7479be96e0a1c6929a6345ef8028d3c62afdd9d9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/nl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/nl/firefox-110.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "53aa215ac7864f1b358bc3be186a33fed235044b76899479793e018031094101"; + sha256 = "336c25dcf9c23c7a3e008afba5cac728f94de9b9b2dc475da416fccce815e872"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/nn-NO/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/nn-NO/firefox-110.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "c396b33f7ac2338f69c7f40ac006f58be878f5a6e2f40280b3d940f5fe778eb0"; + sha256 = "4fd7a750b4339dadb7ec606d5fb2286003e8dc435a9c691fa9ae32cb53f5e9d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/oc/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/oc/firefox-110.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "1ba49c4589a9fc52b2d8dfe96320abe87e69269c8dc8748fdf538738e2d39003"; + sha256 = "ffc7e5383d3e6fe74079b255cd2148406ba0fab1b1d0a139ab6004fe3c46309c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/pa-IN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/pa-IN/firefox-110.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a340325ae445b867d5d568c75bdcfcacbfc1806f0ab2e4abc167d2be6b619f34"; + sha256 = "863025ea1ebc894c0522cde1042866eeeb698967eec044d79c6d2eb0d76f1348"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/pl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/pl/firefox-110.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "3b7aba94e6de49fdb73d82d4faf69f8b038c22bf496a2eca6a3f1677bd71dacb"; + sha256 = "1dc6ab6b213cdf1a431c0e85879a03bacc4dc66c9c29042a678248c89800f4a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/pt-BR/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/pt-BR/firefox-110.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f790ffc8f5a0e36426cc05c36c3ce77a83038023456d0d4c603bc78d210f3c32"; + sha256 = "cb20f0107e580e27c0b226b2ebe32ea26fb7f3818703af9994be0d59020551eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/pt-PT/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/pt-PT/firefox-110.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "580ffa11e26c0824afa293afec547c2f5eaa7829fbe28effddff9bf68ab8a2d7"; + sha256 = "95001d06104329f3bc5c6228aa11bbefdd76c49b7acf2cf41d3bc77a7f9aa2f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/rm/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/rm/firefox-110.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "006be67bf0c133be88e65fba86aa66cf62424774d31ecb5862a29e735a3ab6e3"; + sha256 = "7f39d3673ba4c3ee2ddcaaee45013c0613426ffe61f46b33efd9fccf841a7f24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ro/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ro/firefox-110.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3334c6cebe29db68c63107583467f0ebf920f91d9523ca9a3c3cd856f2c034a2"; + sha256 = "d7c20ac79977897823ea0da217542bd57970eebf5406e97c2e9ae7675d69a6ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ru/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ru/firefox-110.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "93fdafef07b6b65db586e52f213878ca86edc38fc1c96971aa2d9e5a5d324ef7"; + sha256 = "dea8ef23f97436885f878a8dea2fcba2e3976c3dd07c5e8cef1988d0d22231b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sco/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sco/firefox-110.0b7.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "b73d445a8bbec12da7fa9cfb993fcd74d3da343e5c326670243a300e3a33612d"; + sha256 = "aab56b5773e2c288d01966badd966af26b63cf67eb4c83d1a2ca0e6fcae98706"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/si/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/si/firefox-110.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "2e11b7b404cd80654533fe3936d5e2b2a69d11da1189a08a1f9dec1bac8b83e3"; + sha256 = "411207727c4c48fb69f228108f3d6d370de2b5a2f74bf11aac1d161cefa83383"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sk/firefox-110.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c87d3674a4e9983c26a86260909c1b57dddda338fce576de767bac7c5b03072c"; + sha256 = "f177d85c34359e4d956e53f8f7d8ace69cbca8d67a539d763d422f4208a344fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sl/firefox-110.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "a666e6035cfcc341c2c9a90e5473550498b81e71dd4ef912372b818c4b0f5e48"; + sha256 = "7bb5820d67de6cc6a8630f22a8dc7b68069e6e2bb845dcf165aecd0fb5500076"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/son/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/son/firefox-110.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a0cbe15e6fb9ac7bc211f92985b69cce2732e89dd6c4636e744c1cd7778ef9a9"; + sha256 = "8642e3eb16df9beffda8cd73aa7a4bff48fbe8f14c912679df487e7cce4a79fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sq/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sq/firefox-110.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "7697780df08b5cf9b6926079d92318241c0dee625a25f10602f43c718a5fb78b"; + sha256 = "1d8da9e05a5ecaa73f4f0913dd8af682ebef382604b477bd72f5c6df6daa4ef3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sr/firefox-110.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b2d353398b6166b1d6b6804af6ed450f1e1afccb155e533efd2290651124ad02"; + sha256 = "7c33d0a47a03de39afc1fa0a0be1849b40b37dc0b5ca8db41d63577c2f6adf60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/sv-SE/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/sv-SE/firefox-110.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1761a9b2c1dc11800cb7796bade2ac9e0baee745b3e84552b9a576618d0ce693"; + sha256 = "b6fbe43d6d5e035211d714432791eb8a09f329a6312906566785de297db7cadf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/szl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/szl/firefox-110.0b7.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "09c90f8a3bded9abcbf56e74784d4fae47d0423a7a0415d1a08e6cd1a3c9efeb"; + sha256 = "30591017dccd546a1e15375d938656454e172677a0a42fd76cfceba990380add"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ta/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ta/firefox-110.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "0b9c1e5433eea3f273e9a7a0496ad5ac82a428b1fb8ffb7563d791827eaf570a"; + sha256 = "c53546213d604f108a8119018a32e500b6b4ff7b8ffdbf1206d8be0650634988"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/te/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/te/firefox-110.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "541fa3564426f4e90559ea64fd9813a1af69c31075958def44a78a9289407e44"; + sha256 = "3a5f91fefa03abca8f1f1f72e10bc6d178a31aca5d7d73707afe8e531842a123"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/th/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/th/firefox-110.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "52126ef9c5c422ad52fd41cd3523a6a3a514cd4e2a1f805e56c34b3680c54d76"; + sha256 = "6c56f8503ce28d77aa3a0b19165cc0a93533ded03fdddf8690bda182962769c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/tl/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/tl/firefox-110.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "7f47fdf1ddd4ecc2f98b0f66f2cba6fb348929f4133bb5117207f69d97aaa9b8"; + sha256 = "d01d4387a07c96abe24f24666fb96b1b1b50693b8a113ac607200113fd42a6fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/tr/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/tr/firefox-110.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "be87175b46d62185fa7ff06daa800b2a65bafc4e5db24403df6ddb6ea501665a"; + sha256 = "1c77d202fb5b6431f5c60aecc9c87d5d46e9b0fb54118b89f8b80264869b56fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/trs/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/trs/firefox-110.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b26fb04ea06f437e56959d3389206799d2c4d3666ac7825773b7b928dfe5d0d6"; + sha256 = "778f6752b91b0bf349602c256ed0c214e20cfbcce6012828d33c9e48e67dffff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/uk/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/uk/firefox-110.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4ee67e13d50305179ff9b4ccdde731b514b0178993c95fa2f4877462796beecc"; + sha256 = "e488fe2904dfa7fa673d0b19d218650a8897ace5ef6f642a08081221ec169b30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/ur/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/ur/firefox-110.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2247b1ba1a8dc344a6c714db8d447cd9b16e2fe507924abd3ce82274b738a00a"; + sha256 = "c3e745820f63a40213cd61d0db32af54c4a1f13bb97d32180e802e321a89fa52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/uz/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/uz/firefox-110.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "aeefd3cee58897defda55dae82c73827371d2288d5d4517c3e8abf237fd6843f"; + sha256 = "a6d316eb44cde8f9633522451374f0b972dce8899658a1f8235ee39e1253bc7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/vi/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/vi/firefox-110.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b2d3759398867423060506bf64021b0431aeac93ccaea662544790c7d8be22fc"; + sha256 = "67797131b09335e1fc28fed46c63933e953b123f004229506b01de43a830378c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/xh/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/xh/firefox-110.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "188036a5914df341e864254dc7e8e4677716332547a337c4d824aa0a30acdb48"; + sha256 = "2743d59ec8373e49528d8a16894752f60e4fb914cf0ad8b3e04a53b5ac7664c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/zh-CN/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/zh-CN/firefox-110.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "843c0fe5afb8139ccad4b5b269d275aa56142d8b047ec04bf08adbf89210d3f4"; + sha256 = "550a344dbec2ce163932e407debe69df20c12057bfa45c065c2e916138108e1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b5/linux-i686/zh-TW/firefox-110.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b7/linux-i686/zh-TW/firefox-110.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1de487e9636070d9cff1414f48bf070e380bf4200bdb8dea932f3745d3d3d6a8"; + sha256 = "f17911ebad92aa7df6f85faaa0e91f3b339c95ac1b0702f4caf2ef20dcfdca55"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5996ef9363fa..d0ea4a8b490c 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 = "109.0"; + version = "109.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ach/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ach/firefox-109.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "062f6070782a197d5509b8bc046db13f72260eb45f78a3a33b166c29af2c6438"; + sha256 = "08fb9040a6681d54863c2ac8c8ad48abbcfd5b410c8e404dbc20f425a69ae8d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/af/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/af/firefox-109.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "56fb07597494f85547b279e65222263d103ac2bc78901c3722c59f12d769c47c"; + sha256 = "20635ad665612d861c0db1f65a9b1136709e88ed689d2e2679b0560d66462df2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/an/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/an/firefox-109.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "ad460c6b6b64401562359f6ac7664dae5c87bc51ff5b5f9db95b117ec41b77d2"; + sha256 = "8c9cfd7259112727f149ae26af915e6fae9e35f0946ad052c348bc491d712651"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ar/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ar/firefox-109.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bdc967b1d2da7e49f0313710a2062a62ffd14a0e3ab8613049909c9a07a3980a"; + sha256 = "0541aaa6c8c01ad265309d5cb2a8ff886456b9fdfe2d91c86ca7fca2eca4ad5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ast/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ast/firefox-109.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b44fe9c2a93d68fd6a20e9f6000eb81635d9bcf78b0f97c526e3e7f216b2e249"; + sha256 = "0cf0e3dbd210aaf5c86620e71ae692ff2afe70fc4c23ff74bbad6f2543f1747f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/az/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/az/firefox-109.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d9f78c078b1d34928ed6c18a3c0413c6f079979545a381e001a851cc792f75fb"; + sha256 = "d241210ca9644a4bb285019b1b0df189d741330b45796b33f0ec304f2a994781"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/be/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/be/firefox-109.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "87f5fa2f8560d9f68d8d4d77d16fb3bfb20287c87769065625cd319941cede8f"; + sha256 = "1b6dee177af6899f90e37155a778db6a574aaed5bda9b17d447506d33ded9e68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bg/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bg/firefox-109.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "106d7c1fa3d37b16eaff03503e03dac0bc503d56ce49fc3718417ca3bfe1ab85"; + sha256 = "312ef6862bed28d9e7f1672d9614542c977c03dee68823b879087281fa294e8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bn/firefox-109.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "bc9be31ae2e0c36417df8c86d85f69e22c17ea1b193b214f75137de31fef6aee"; + sha256 = "a3678a881c81a74f443796662d98f516a9c38067864d14064cc8386055d88684"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/br/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/br/firefox-109.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "664fff02c73dd60df2c49ebdc4cdea3a09e999f956dcaef502561dc33f6b4ac2"; + sha256 = "3f022392be45e43edc220c4b27c027f80a157af237e94c5ca3bc201f1e43e581"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bs/firefox-109.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "547a8e9b82c014ac7098a1eda0900cd3725f5fb185d66ba2beceda1d97e79fa8"; + sha256 = "1eddb9e5fc279d5a265829ede15e09a7f254cff0a669457486f8c350a3709753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ca-valencia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ca-valencia/firefox-109.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b995776faa868cd21b1dd7c8bc2e8e6f17a7c9f032c63c3c259b967d3192ea4c"; + sha256 = "7ec65537c9b3a2432a5ee6b4491c36bc4735d0953c47fae62306e4701353a698"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ca/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ca/firefox-109.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4adbf820fb10f4982294840549ce98e87ec2d65e5b2c693e6d05c0c330167d8b"; + sha256 = "e726e7df71d65170fa9fee98de05aa5b5b6d1a3192bf0aa49f76a5a8fa2fc0ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cak/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cak/firefox-109.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b6d11e53a0163e23e3d6519d411b63476cb4cba693df7b41214ca60c813bc575"; + sha256 = "2722c5eed7b3e017cd8c0a626ee41190e0b9ec44692a1cd8fda1d27cf741acde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cs/firefox-109.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4163fb90255d52d860c17f72f7787642c6ff054c169aa6f2e9c6293e0cde109f"; + sha256 = "fa2b9278c64974f8ed61b58ddec23c7893d6b473ebd29ae900f45076944cd484"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cy/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cy/firefox-109.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dac9739e42d38bbca3627591aa2bfbc6655dcc2347a6696d96f040362f56fe68"; + sha256 = "ad6b74b20d7b4ccf7bc858133fe0f35fd7239d4eb09aee310c75828c20face8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/da/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/da/firefox-109.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "793ad841ed9da31087e42363878af022fff237a6281a711736a70e732b588de4"; + sha256 = "e8a0fba66e139ef6632b845d6c7ede425a28ac18afd916e0ff4fd89aef313578"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/de/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/de/firefox-109.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e408d6f72760e031122fec82f3d8dc21b622128650f1fc8ff811c3c696e3c48e"; + sha256 = "1688dcf426f9349a0a89e010dfe73ae6e42d590695b8955a257ff1acaf5ec95c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/dsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/dsb/firefox-109.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "ed4e02c2c324ed25cac1d6cc654d62b5b22670be82dbb3e415783af0e7a7feec"; + sha256 = "36c8e7c90e7e418ca96a2a09f85ab78e45ea733369c2f1125bd100179bada452"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/el/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/el/firefox-109.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3396a7d6d938cc7793bc876e313dd6f57c60042f93883f7bd3bbd79ef97e7e3f"; + sha256 = "5753c87b6676e2a21169ebc4748765f6a26bef8bc739a33da6421be6e0f916a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-CA/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-CA/firefox-109.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "40eb2e205a353daec0e0f07f12633c2aba09cee6372e8e3ed78cceed96611cba"; + sha256 = "5438c21484a9de673508f8d63fd61bcc58a3703fc1b1cdecdcaf30f8eac8d844"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-GB/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-GB/firefox-109.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "947b937d27c138ebf79377f17ac9cb5fe89bb59abe123a45ca1c050d13e439ee"; + sha256 = "bd19d96501d872f004b8226acc929e41fb4ae4120b287dc3504e1f0c6f733e8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-US/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-US/firefox-109.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f19775cc6adecc529003ba0239bd46e94ca70a866f19b071a367905184f6d4f2"; + sha256 = "487a18ecbb0b3b91e402b55424f429d2e4e6127696ee48bb0e60ce7f9879d581"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/eo/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/eo/firefox-109.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "6a868b2c8d4d544d69c8d3544927b2ed5f478d14d38f00854ef7d7fe3c1b29b0"; + sha256 = "a1f6f5b424d026f4e59f51a0e5669bff1bba225100673e12595ac263509ffee1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-AR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-AR/firefox-109.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "81d80d069e36f108191f1072392b438ea5eca11205b9a50d6fb1d2f550c569cf"; + sha256 = "5aded9fbe24aaf8944fc193e507cf267e964e935ead5a628d6d8638c18caa02c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-CL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-CL/firefox-109.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "57e2647d0d3b5e3e7b593a0cbb260b1927475cb7ec1f401b0f39e772aaf76570"; + sha256 = "bda21832e8f1a05266000cd730a7698f99507e536a1690b3b69387640999e3b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-ES/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-ES/firefox-109.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6958018e306b9d64a2f23db4f2ff9cb111123573e6bdcacb8789221dee7e269e"; + sha256 = "23b8e0f6fadd1523123993469c4919188166b2ecf97cd63c36fae816ee50ebe0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-MX/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-MX/firefox-109.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "bc69b78e261368d51034daee9d374e38241e228102889710b59af48afe0c9aec"; + sha256 = "c8ec680aace4a11ef6eb921466ca449d6f9f6cdc5f90ab35bd4d65a650f0322d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/et/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/et/firefox-109.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "7746ef524a271ed1095c1352b4da1edfc65a66a7f14fb164d90771fd5622d1d5"; + sha256 = "c80e1e1b9c608c9757b25ac2482ddef919fd0a6130fc11122cd9d8d975b015f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/eu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/eu/firefox-109.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "321e106491e39a0cbb9f0221a11db8cca1792d3f6135fc52766dc7e4a1adc243"; + sha256 = "e74d5916170b90af04e27cdc1a12ad0cb4037bbf56944d41089c58fc5d731a7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fa/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fa/firefox-109.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "23adbcfc211c0c16a23c5cbd89e0d42845c566a5c3736e82d2a5ff67ac0b6e11"; + sha256 = "4d22b6c6e8e197a431b7250f864837aff3538f094fd8c58179e92d00e3f52575"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ff/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ff/firefox-109.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3c7205f0be5a6018c7fd80bab737233d3c73f9013f2cfe819f4ef9633a264c7d"; + sha256 = "9569f1ec1d42b743daf74d671e42cba98cdad204ab4ca1c2c69c5c20b73e3292"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fi/firefox-109.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "11ce6ca3943c70c8d4f66fc600ad0fa16486739894c5e0621b660067daf06f25"; + sha256 = "3b4dee8164333a13591ef238d7e33dd111f5da53975ae3cf3f70d1ad852f9eb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fr/firefox-109.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3f39b2aa077f059c63901f530d54bea442dec7ad28cecda60571f9266b48e63a"; + sha256 = "4731923d8ec31c32e9d563e991ff4cdef6b36925a482b2b0dac43aa3ca17e1ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fy-NL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fy-NL/firefox-109.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9240fcf0840dc078a9076082dabb46bc16ff02e37de948e9176b6301b4b95bb3"; + sha256 = "ed36d87989fdbab969463b439a6a82a15fbf5c986942d92bef634722127b77f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ga-IE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ga-IE/firefox-109.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "92e6e5a5b1635aedf7be819e0ff31746e9b3b18ea1f7c37dc149f78d806c466b"; + sha256 = "49b9d7741cda331568cf660151173b67b09e2bb559c4c8b5398100573629bfe6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gd/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gd/firefox-109.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ff0607125dc57c5c5dffd89dfadfda99ac9a4274c4db2fd69f99bdf238bdef12"; + sha256 = "c4523729d1a51b91322fef8b8d0d7709ffd3dbc74da6ecc019c3e19d1b5e5fa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gl/firefox-109.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b1555fe9a0fd4fd9cf0d492628f88390bed5e1f97ef7debd8ef9fbd934bb2e48"; + sha256 = "2e989f3a162c52deaaf66e3631b33a275b906c402d2ab9025bba99ed1d76735e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gn/firefox-109.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "61cf8d06dc696fff4d2702c9e051e2b6139b74befe8531320898112e6791e350"; + sha256 = "aeae4daa675292d4a578d56bfa0771b02f17166747f377e2205e07ad6e11cc87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gu-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gu-IN/firefox-109.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3d81bfc292238dd2f47562f97f5712520d3d48dee7a87f97214015920885c44c"; + sha256 = "215e062675cc04c904f1f91b539c1653ba5585c030446429b63913d92b3c72b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/he/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/he/firefox-109.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f7f8650b94144ac7aca761df3f89f817b58f514f711c42c4d4f56b7a5ab0f028"; + sha256 = "9c48fc2af47849bbaa958f839b25889159265b4575d286d28d2c67382fd7c2a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hi-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hi-IN/firefox-109.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "67d8a5d54a07a27d0929d2a1f71780b7d80c44bb5e0ff6e5ffb05f10f112d5f0"; + sha256 = "b57213ad87c537626022504065209f7ba561bdfd7eef621e49d47db28cbc35d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hr/firefox-109.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "856bcf27f0c2b0c01b91898624836a24fc649e8dea105c3d3d86da14d18a9f68"; + sha256 = "49682e92d31ecd5c3690c30f756f719acb959440853abb3d42d6e87a98e8d9f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hsb/firefox-109.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3843d0d353d7514af25c16509584ecc317233d69b02ce542961797143ef92417"; + sha256 = "c1971514830d0c2ab026044cbbfcad679f82c612b2dc4d36604b9c6cdb8298bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hu/firefox-109.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0e3b6e9849ff77d992868f02fddc44f88da5c15025ffa060a77eec6cf9fe9224"; + sha256 = "a63eab963d13bde89cd6f52f5f7a35946d9a32572c6a7201ca7466a679ca1dcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hy-AM/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hy-AM/firefox-109.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "5b506130d90add811cfd56f8fee26348aac2d6f93a2807a47126afc5472628b3"; + sha256 = "c563456845b5413fcfe160f23ad0d6c6d92c540a7896c6d6e39ebb61af0d6295"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ia/firefox-109.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "98859afffcbdc36a712fd6cb8cbd4bc12e9b61948fd5b4cee719656973326f42"; + sha256 = "f9af71feb2085290fbe2f3de3dfc11bee0d0ac49348268675a5f7bbbbce00357"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/id/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/id/firefox-109.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "98b6fe2329be9c4fc275980672f31ae9d61483d7e2ef850856ebd3fc6e90fa10"; + sha256 = "9996428d29e3705cf35e060f860660778b69e726cdc57e2734a42d449c43ed4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/is/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/is/firefox-109.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0f699d8558b08864174fa7aaf5beb0ad01cda7362b9cc86594283ef9ca4b0138"; + sha256 = "a57421ce14cb264da4d8bed35dc3d0f742a15870d65548c7617fcad67a3f50cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/it/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/it/firefox-109.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2c113a10dd45abd677a7abb2b1c64a574d19845c71761e65d44870ae2f593c5c"; + sha256 = "e2f537e79f258b6ecc03715bd18565c18c10332f836ae8582e6ddbdb567e96fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ja/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ja/firefox-109.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a6d1ee0307afbf5fcb6f0ec0c899a2ea1ba67cf548f98c2d508d54c72a88e7d5"; + sha256 = "757ae63ab1d7aef781b24fdcd779aa84722a4dc0b52c35e7938158dce2b56fa5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ka/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ka/firefox-109.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7edbcda348b7d51378320d7681d591930cd963c00fcc2b80c22e4902cb30787c"; + sha256 = "ab985686cf54f50b6cb69e63d121a71c2aacfc4b1c4c22d197e0b6b4d24fd404"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kab/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kab/firefox-109.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "74aada0320298c54f607b3096a607fffc8aa7de0015b353cffc1e3b27582c4cc"; + sha256 = "e423f60a7c486422a4583dea6f454c8f43ed67cc3ebada7ee614465a5dde2871"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kk/firefox-109.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4188205963323b35fc89ba17e0fccefe3df50810d7954201a973262f303f5ce2"; + sha256 = "d79b6d73f0c01ba881ff6ab63a243955ffc60428ab6f3ebe1d8ac2890bfd81f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/km/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/km/firefox-109.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f1a92901fb0c7835ef9112f53f4109b6b82dbd0a571fcf021e791a12f38f6a93"; + sha256 = "afa093cbcacccf5e93b4305cf4cd6ce80b2183e11501d7fded6ed71b8dd61779"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kn/firefox-109.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "47a348c1e5590ba65773fc586d95516c108eebd44a597875a76a4b8d32a4e075"; + sha256 = "9bda025646837a816c5374e09ee0f6b8b3fa4401adfbb4c79bd37b9b004c1388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ko/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ko/firefox-109.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ec61b0e9f07146b797a7f224fb83a1e50751b875be0331dade5386eb916fd3ef"; + sha256 = "3f56db587b78bcf927df9f7308f4eaff8087bbb6008bb7dbc63e7cdcf4727c86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lij/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lij/firefox-109.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2652857e6007ddbb127aeed33fe6a4bdba8ed44888aafe764b81e8e150511bc3"; + sha256 = "75da1688b606f59513e21ab86775fc8cb35ce84e09bc042c6486848489e022ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lt/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lt/firefox-109.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9163745ad65e5be8d030eae894c6f9d27960abe6203649f3f18add16cbd298a9"; + sha256 = "232bfb865f1c25c8848bd8699b91e2bce6832ea82ae2e2ae647f43a83c828232"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lv/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lv/firefox-109.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "87ab351a62968471dd16fa4949f0e8fe269223ae03511c03e99b4abe03d6df72"; + sha256 = "d4834008c21d312286d6b9757bc2b61497d987451245445919aefa4a1ab91be6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/mk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/mk/firefox-109.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "533a3f586cc7c4ca38d4fc8c88c16b9595d859e8d3972387677b55cee603aec1"; + sha256 = "102169bdffa3fbb210d372844caff0fd010511fcafbae16b89453751ad9f7228"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/mr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/mr/firefox-109.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "298f5d07eea30a8dfa5e16b08151c459f72e24a0c17d6a2f8baa842483a78ee6"; + sha256 = "af85561d4db729c04b973f8c74bac790275913586c0cf5284e243c0ddcf45ad1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ms/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ms/firefox-109.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "07802a9e8c4d9ca8e2a83eecf29979d1c3123ba5f0c280017d0030696477e605"; + sha256 = "e98ff53a524ba73184bc395c25ce110ae915846a44e0ba8d8a6c594d5da33bd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/my/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/my/firefox-109.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "077ad784cbcd2a3663e4c614deaf921d66681ec5b21d5c5e759fb074de17b259"; + sha256 = "82ef41b18753d8c2203fbaf3cceb0d1bd179004113db40079a75488b3fb7217f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nb-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nb-NO/firefox-109.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "51d7c62bef495e4ff9e6261fd15001539a104041716d4a97f3195ecae479b233"; + sha256 = "daddf9f5e0e9eb654af24dc2abb210cae97e37faac8af56746f1d28f5dddffd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ne-NP/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ne-NP/firefox-109.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "2fcb5b5b2c7deaa17ec65878243345fcebb26b38b8d267ee3881f366829f86da"; + sha256 = "f1b97800986e546fac4c08576469651ef0c0f6e8729b34ec5b1876208c788876"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nl/firefox-109.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4412f358192301406602aecf7341e64ae1e4909b4a0e80701fd73c0a561ba092"; + sha256 = "30d2badf5c909890877c35dd1a397ee7947546bc97867a1369572070c3c421db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nn-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nn-NO/firefox-109.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8116120da4d557d412100fe5029cc338073f5070d90cdb3e0f9b49242f66c668"; + sha256 = "378bd3b106f63e5ed28ed150f83befb1ed0624dc6d977a56ca70d7b53999489e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/oc/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/oc/firefox-109.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "6e4115e51ec23a42ccb7f6f10caac0040d72d4448141cac68ae8f24b1ad90504"; + sha256 = "bb6eda0d45cd29e1438034a1f62422da500ff8db12790eb140fad34fb504dc22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pa-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pa-IN/firefox-109.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "640c20ccdeded7f2a25ea0ab72214a4b6f4aa2d937de24853886653684d26b8f"; + sha256 = "9537fc5b350222c8a44da6387902cd7c18ed1d9a0dd45f65ca996819cc88ef21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pl/firefox-109.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9ac0462dbb62901a5678bda5360b417a56bbe74003e912323ed1a29661cff1b1"; + sha256 = "622adb3bafab1594166856363d317d9259050c935bc6b2aa6298b664b9a8e80f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pt-BR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pt-BR/firefox-109.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "593fbf46826fb0726b25cf1469129d7c3db274e2137966e49c904ee27109e0bd"; + sha256 = "cbcdaa340edcf86abc9997c7bbc8eac879e7ffc93d9351fb1ae2c133cbdeb56e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pt-PT/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pt-PT/firefox-109.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b96d176444864c0a4814936fa5b0d67fee05739339a5ac01d76735bcee9aeb92"; + sha256 = "d5662ca239edbeb332308465d16cab2371da282dfbc750657ef3edf80030bc4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/rm/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/rm/firefox-109.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "93d375449f6f70b4043790cc66377559d85c5c6039570701e8435cbc76038e72"; + sha256 = "50db6ee90b2197bdd6a24a18722ec645844898ed0fc1551a22a0837a2ae98402"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ro/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ro/firefox-109.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fd032aed6dcf2afee5185c68e4661077b12fff708ce47147b8b297886525fb9d"; + sha256 = "6a8c6b76ab243da8317d1f1ce26c4d325b8a415098028f6162dc3523e78c0f32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ru/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ru/firefox-109.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "828c606c289b7ce94417626cdf114fed256a0cb247b3f06c46152db777324805"; + sha256 = "7d026e34d5bf90bb68e6f14b6954f1b7f9ec132d6a11507236fe9951301d7ba2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sco/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sco/firefox-109.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0a400cefa3363f357c53ede79d9538fe01ee03b1e6d1a6c9ae67b3ad32207ca7"; + sha256 = "457fe129188f2abcbb6cd1fde7fed8947b5ce3367bcbde11a6308ba9f769bb81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/si/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/si/firefox-109.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e414f9004ee3ea08c7f7b39817188fe3e3dec51b2cc258b2a8ea28cf273097e3"; + sha256 = "bbd6af1251c794090d01a0a07fccb648b8b4e210f9991a3d2937d1e663e99df8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sk/firefox-109.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "97da979bde015cf37c7eb45c78e3abdcf7ca7d92b56c322982d8574c1652b9f9"; + sha256 = "ff93a35e6be55c2a05e061d3b2c8e738a1f408d2876436c168421eabbbd9d40f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sl/firefox-109.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "016347c5c91e3ff2ceb53782121d8cefa2913464b3876d351cba418bdfe2b30b"; + sha256 = "81dded9e76f3a95d5182dcd106671bf864c33221f83b90c338aa16c72b7edd7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/son/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/son/firefox-109.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7a82c207a3ad9b1a23e3885d94c7844714a59e74ca8441894da6e3873184cc46"; + sha256 = "d70271b8199efc1507c08eaaf96b06523dc9bd6689a3884ac556b0e3a252ca60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sq/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sq/firefox-109.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e89444502f35cba552f7ba907fe2ab0aefc9e32cfc9f1d1c826242b131c0a1df"; + sha256 = "4a264563aaa4cea44e54ab9ebc528dcbc241e41e0a12d3f256b2bc15a365965e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sr/firefox-109.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0d6ac85cd35ee3dff23a7f0d1b973acda106516ef81d6b6e1fc7b6065a61c03e"; + sha256 = "ad119b58327106fcd2154b56952d746add490f77a146c7b7beb44310eabdfa80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sv-SE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sv-SE/firefox-109.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "617d72496a921013702ac3a72c6fbedb8fcb1da2a07f674c7ecfe984816fd783"; + sha256 = "34a6c91de77b89a781335c3e56326fe84fa214e7d847d6450eda76cba8479de8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/szl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/szl/firefox-109.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "44bb46f6e244f9ea94458ad84dd37545f4d5ddf3b1d7c345e61f256a1a9c8a6a"; + sha256 = "ef83c2facb462e2d02f568bb4f01817715a5df53d8ce248a222d11744e863f65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ta/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ta/firefox-109.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7a36826a160d9de16d87a18dcbd7ac8106dca32d584d79a3eb8c0ba93a06c345"; + sha256 = "a01a5ac21e4089c0a7e2c4853166f6f48f7e14d4a6a28b13231bb9afda951809"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/te/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/te/firefox-109.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "34fd96347fa0ccda294a2194a4da6f570fe04f3afb19f99369c150273be59fa0"; + sha256 = "a565cec206c2f692e704b7c7264147ce45452c82d541132a422e4a3224cbdcfe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/th/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/th/firefox-109.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "13e4cb908566d2a0a928df5832f704e4f5d9159bf187b919de05e2ef7dbab6ea"; + sha256 = "3144b8ee44c820a09197c45c4e40918283c8a7ea98c4a77f46b827cd2ea15820"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/tl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/tl/firefox-109.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "67c3fa7c129d81b16ebbbe422361406f63160f5eb0a896237bc2f2b0b2f314aa"; + sha256 = "dad4a9b1658f4eadf87ecf14156c19767294e7ce3fc9ec265d2d11cace33ab3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/tr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/tr/firefox-109.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bba8a0982c65fec9dfc86bc8103b01f5a120c199bcb22ecf904106c270686d40"; + sha256 = "1659934b3db55eb38c5a40201b111ef4e86b7ef4d2dad3e9e4528ea28101ab4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/trs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/trs/firefox-109.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "452654c105453ff942cbb5a893b411d494fe51cd96a08aaf7a034b12859dfdd3"; + sha256 = "9393d4ac66d6f4f23426f7432febee1498373dc6ef3b9395316a9c2fcb9b915e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/uk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/uk/firefox-109.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8f4f152b50df0a968fcaf0d9275b5dcf05efa98133133797874cbdeef1fb6b48"; + sha256 = "22f8886296e49d947f33f984688af663c9cf13a7afc473976e9975cdd70e67f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ur/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ur/firefox-109.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "152ae600ea8afc8314eef375436eca52045f0db788ba19142f07f330a4a13445"; + sha256 = "883271dde81dc06893d76d65b394e639ed74bada7233ddfec015c5a9c76bb9f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/uz/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/uz/firefox-109.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ad7863d60cd8cbdb5eba0eed7d982db15e92a426ea2e403cb002c71b14cf540a"; + sha256 = "bf71ae490fcd0c1e03044308e0322b993238e679d1b33f2214ccf40bf03d9075"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/vi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/vi/firefox-109.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "32cee9d8f484735a3bad323b2a37fb2fc55dad88a4a493eef777473b56aff922"; + sha256 = "07ab60fbc7a9422e37e2a606962b4f52d047a346d1560e7d88a28c58766a1cff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/xh/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xh/firefox-109.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "00a6d3877213685e35d175df3684b3024a3e0fbc7b284b1cff8ea25a1ee4cb00"; + sha256 = "55a4700c96ff4b73643422a480546201580a0cbd8314434f3a0064f992ee29a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/zh-CN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/zh-CN/firefox-109.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "75241d745d714ee885d73c802900be3606d236aa08683b4ec56887b918555a2a"; + sha256 = "645c75f0f4a39370966c959bb81bdc1f512b5c10be7d66081dfbafb978ad2851"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/zh-TW/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/zh-TW/firefox-109.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c0ecc79ebb0a989ee976f5c2c9fba5c4d63bf65706635663e2cb83667f7b8a38"; + sha256 = "91f28d74e5c626b0e2f540aa2b0a0232a9f27786a296f4bd2b4d72d7faf09b22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ach/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ach/firefox-109.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "319dcfcd2957576f02bfd28a192daf0ce87bea110c782890c4f1c7dec05d591e"; + sha256 = "7c3b5a5fd67548a8d56faeaef023f34eb7a7853e2d9f18628c9588672b9d608f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/af/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/af/firefox-109.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "14214ec48f3aef6381b3a55827d589505236fd9120df43486a39775aaaeba43d"; + sha256 = "2f3221f6718981b341655d62913f7413b75d41721ab002f3bb885dad4c40f1e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/an/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/an/firefox-109.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5694505371af1b4589abc4038f7cefe2650b9eb78ef546db83f886ef3ccd6a77"; + sha256 = "7d573fa13a00c255c5c449521162ed85c733e9648c0bf929556bb97436cc12d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ar/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ar/firefox-109.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ad21038b033aa55b7c520712f4aab50471deecc681454c7a1cc97f7604444878"; + sha256 = "a544d38f3c4693413ff3498dd6a89766154974087f966da061a9a42785e85682"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ast/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ast/firefox-109.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "7f7ea232c8249535b4f1a4f0443627f115740a39755c43e3b296da494c1705ef"; + sha256 = "325b3237da08fc1a637c0409bdb43161781c1fb7ebc811fc3a477372b34eba63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/az/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/az/firefox-109.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a37020472cd15d7ecff01ab0a732d26557a3ee665465c54f1e6d623a213f3685"; + sha256 = "ec6800b785fa3b8f4b7c2ec0bd4fd7d06e265408a12ed791ef6198b0c1786255"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/be/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/be/firefox-109.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "dd7b9fd2d267b503171d3894c238db5cbbbb003bcde623700abd8ce0d81fb8a7"; + sha256 = "aff9ef285a2b08bb3e516c30b85c6479d935cf40c998ce88c5410de077e42723"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bg/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bg/firefox-109.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "c4de3366f58998129beb1def4283fb28bc3b90464a090e3f71198862a8b4af7c"; + sha256 = "a27357ac9c019efa327406f1919eaeb1fa5a8686094026935283df4dac50e96e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bn/firefox-109.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "30e97ca633178bdd4ef10103c5b7795b0f7f5bc97cd3b3d4e2fd01138ad79fb0"; + sha256 = "1642db7e385512fbd963b48bdb38a1780cb5d4be98e30727d6d2df751fe262ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/br/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/br/firefox-109.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f4ed775564c26f45ec26fa7d1b440b30cca17849f144031929cbe1526f7c630b"; + sha256 = "9bd3bb35f392512f77013068b3bd61eafcc08fcc2716fcc13a996b54f8881469"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bs/firefox-109.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d568367dfa066d2b5eb7ab920fd16f0a66de02468cc548df8883baab27ba4e5c"; + sha256 = "8fce6f5edbe7996f8d31478b276d6e80b556a01913a158d403b8790262e26bbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ca-valencia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ca-valencia/firefox-109.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b33df0c70b943f857df218064db9f20ca21381f1217322dbfe4e6fd4f2902d95"; + sha256 = "fd8fa093fdae77f9ed588543d7bbf00b1369ba5e469199cdaac2bea990be8d5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ca/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ca/firefox-109.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "78b1e2ed95ac41994e35e94d3df2a61306e24268be86c587f6a7cadb5c62b65e"; + sha256 = "5e479179164485d1e4580dd9f25257067e4ee30ce00790f722f61024c5cc0e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cak/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cak/firefox-109.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2b9210305ad57917402d0a1eabfb188b70f582c44fbc67b84d09d1c23e18988a"; + sha256 = "00dcc222d9bb3a2e68ecb8b61e04471f03e03df7e171b03c390487a66745bea7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cs/firefox-109.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9e4ce61151c0ca0610c83d734bb619d4dce26d40efcf6efb54e42d467a5ae2f1"; + sha256 = "62a42f71706a8f02b2165603ad9ad0f6191fa4e2278ac2a09d8337ae1ae809a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cy/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cy/firefox-109.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5cb9864ef458ef304b7a6b40ad71d8131f1ff3c3a215cfeca4e811e14b362927"; + sha256 = "36afec95e09e29150ac3d6f2e75e451541ae5e223d438a3c3917473ad7d3c8a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/da/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/da/firefox-109.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0e6ea695300e68b8b6385e6a5e4022e645133ea1205c7d902ce898d59c913cc9"; + sha256 = "03f36a41a0fb306c26da2b9da19ecfaef4b78b7891dcfa23f7d95a334cb7fc39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/de/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/de/firefox-109.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8ff84702ee8f877d9628d96d828e51e7e9cd333307df8ddb2bbf58d5d8805b78"; + sha256 = "d9c4c368d31690be710648d41253481bb2f9e590d10bd8729a06a0c00b1427cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/dsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/dsb/firefox-109.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "efe721496f5d5567d7ac62d19b0510814c20b6e503c15c1740d50e7fb1a41d44"; + sha256 = "3177bc793f513a2e6a52d8d8a5dd45f0cb41257e524da9e89e292664dbff8cc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/el/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/el/firefox-109.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "95a87e1447dccf05fbab815dcebeaa213501a81c8dca244a2f63a1da300cc22a"; + sha256 = "b25dbabf9ef58de514edc92130f6ff733aa6a0d3b4b2f70e3b72c54a74a37ab2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-CA/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-CA/firefox-109.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a1d3e2f468c8c0776151a7776d6201e39beb37ff845825b1a031b2cf1a04a0da"; + sha256 = "0232243fd6bac40efd17f71295f79b172119ae58d277f3d8726df0fb7913afca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-GB/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-GB/firefox-109.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0952eb1ac27fa387678f1d9f6e64a718462652d823bd630ccb1ef39f26369270"; + sha256 = "4ecd5a129e40b9938f4c245616558e61f49c602f9257dc32417af0685d097ed3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-US/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-US/firefox-109.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "793fbbb013c18956806e9e5d1f67de94a649c3cd8d10b3a75bd388b87ddae916"; + sha256 = "4a960f440dd688eace3d4ea57d80b53ab9272e22688e08d773a3f5f7b9d53af7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/eo/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/eo/firefox-109.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "0cbe5fa5f994171a57ac84a4edb9d63adec71bb13709256c99e2b259458eadbc"; + sha256 = "07f66bd4e09b5fa459a29bb5576818437bd5e7d059504e9b0ac8eade2045d263"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-AR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-AR/firefox-109.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e6b717709cf8cc3a5dab27b0c1b9082f6d71da77faabeb13248574790a42e1fa"; + sha256 = "4d4cda4d1e4d189704f3ff43ccb247dd5d6b05ac4d74cf7cd957d0f25b2c8c5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-CL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-CL/firefox-109.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e2c6016a7e50035e8478fb0eadedd67801f0ded948171fc13586ac46d49bc914"; + sha256 = "48a18cadb63917659697f99872c40dd77c09e62d4687e5e15cb8b791d4c0a2a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-ES/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-ES/firefox-109.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2c41f6d48b07e054514aba80b3a396b70316f0fefff8c31301e5f44e3de74209"; + sha256 = "9e73d300963872b32ab69c42277ca0451c9e0df0ec3c7d7ad1ecc47232cd4388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-MX/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-MX/firefox-109.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b51ed9a76071d56cace6e7aece52efeeefa26dc26e1233fc0e2ad64317c9f4ad"; + sha256 = "2b1a4c7a40a62801e1c5b8592186abf407c4e9c7ce868263b478bc8fb352a001"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/et/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/et/firefox-109.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "8094ece309d8c55bf9432425f2a79f29eee565f7d6dc8080986b088007cfdda5"; + sha256 = "5d0296cfd5a62003b90a8b20baa8bed8edac5a0bcc093b7b99f96db02541bc46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/eu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/eu/firefox-109.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "07ed9c2af5a7e5ce0452e4fa4da38daf3d20f5f4f6f059dcfb4ac3b7ffc657b8"; + sha256 = "0b89fb09487f3ecfeddd6cee16ba4547f0a80e4afd25028b08298507977e76e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fa/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fa/firefox-109.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0dc870f5bcd2e3411fa6006aed8e2b295d99f6e47e7a3e4a88860d7001401b5a"; + sha256 = "09d98823bb9d81314668c05ef061bb2c4f576476ed74ce58f268f02f3375f58c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ff/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ff/firefox-109.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "c319ac17fba19833d16c96f848e0a1e6ddf717922648a7d3776524dc94140b88"; + sha256 = "ef929810e9b4294e8aa7f3768adecdb79634edca060e028536e61cd4f90b2445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fi/firefox-109.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "98e907dd0d23b45c5f8360e39642e9df062d6c89cb84dea1cd62f70dae2d4d62"; + sha256 = "fd6564352704bdba7f329a70c940514f3b060d3bab75ca7e5a6198858db8c79a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fr/firefox-109.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b56c5b71df91ed86b10a66a30d24ae02ae84d75972ce367c288a27b171082b6"; + sha256 = "e1b30692bb0dd98adb3e3f057e988d88ef671bfe84316b7003e465a7d5dcb007"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fy-NL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fy-NL/firefox-109.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5edaf14de80f9cdcceea8e2f291425a74f714bac482fd83d046ffab6e5ff4530"; + sha256 = "16bc416044cc23ec59a08216f1c18f9d027e141a96f05782eb46d96d799c2b19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ga-IE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ga-IE/firefox-109.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ea2815b2ed95be115252e25d0a1893a5d9f6865c16e7b8f0acdb6f05e9447f9d"; + sha256 = "64a13f28131b37f84f37b82a0d07371228a20b0f9c8a1e228c47a8d5dbf0e730"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gd/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gd/firefox-109.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c4da99ff08acd9f6af5975223f8fdc675fca53138b1dd089ce1e5d98641624a2"; + sha256 = "6fb5531c93043ea2c11b029d13e88fb8eb4f1c95263c1fc324a3d8b7f545262e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gl/firefox-109.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e77e5c5e23dd7cfe8d6310b30c4a1e3302ce0d8e5a7ea332eacf5f8735107ff9"; + sha256 = "15bb2baabedb79fd3bab8dce240ce2d0c88f6eb986ae467d1ee8e43ffd077195"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gn/firefox-109.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "97fec0c7a9caa8f598ee28b149e8010f39d649c7beffccaeab56757c0d4312d5"; + sha256 = "48d50a8cc2bc3608c447b7744093166d4c2f740e8c519d9b6f3931e1021875d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gu-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gu-IN/firefox-109.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "7d303a03ec303693f627604e3b419d949a8cf7f903ae813d18c2c5449d9480ac"; + sha256 = "e6e4f86dc0b65e3238f613c68432ba9b4768224bf834c471fb064213cdcffd9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/he/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/he/firefox-109.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7f64f45a8654aaf4fd8b29f980b01d0746d205baf498734416667cee3ac3e70c"; + sha256 = "e45ddc3357d75000afbf65b850531e23ad5563234e457007cfd1992fa4efc114"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hi-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hi-IN/firefox-109.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "17446de5dbf9c6fdf7b7967f36c329ffeef97faa1fc4c2fdb64f932da30c759c"; + sha256 = "2b37c00298ce599143e2639dbc245b5f558349438d7e1f282dfc299720842588"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hr/firefox-109.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2059f6e3a10f0bc2f1cff8179d294c75476dbe21b31c5830a7da933a7cd60bb7"; + sha256 = "456d75b5ce6fd21c0d5177904d82d960a7258039184bf7ba8e0c71a783d4b601"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hsb/firefox-109.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "273f47c51638cd3f7dbce9678b52e6a99fba46502bc56587a0eec1b1cbc858ff"; + sha256 = "c9e835676d1eab60932b2dac810c25fddb61aca134eeb1fb842fb7f3e1ebcf25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hu/firefox-109.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d00e86d775419bb5ac5e9016dd839d41dd8fc9ac73cbef71ac01e9f40b1fd752"; + sha256 = "4706f3eaf40cf7eb4ecc6f6efcd64cd76cb1228bedd9286b4cc9235ebcec7ec6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hy-AM/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hy-AM/firefox-109.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e8e877347b98c65294ab695f1074995aa54067b97ab655dcb794b66bff84b7df"; + sha256 = "bec66380c9ed8d132d84cd68c01989fcbd48afb881d8616017c603dcb7e176fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ia/firefox-109.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "0cdf2c81a5dc30155c67ae1decf3f36377e732f2a8b0529554241a16e9e7a125"; + sha256 = "dac076b82ed64857f048383c427776354c75bbe14a8f2ba4aa62978546cd6901"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/id/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/id/firefox-109.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "92604c3f8e4691bfde59cc9f2f22cb1828d0de5efd5ce58bd2e140016116cfb2"; + sha256 = "c41633c777da109384ab97049b0058fc5783359ac414674eb929fd19bf2d625c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/is/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/is/firefox-109.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d4cd9389342f390786d4045dfff5e81d6a06cbc3d008c3d0e7fe38ad285111c6"; + sha256 = "1c86162d0ed17742cb3c51c39cc6526ca4bac5f9dae9b3091d8fb4b9f62450fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/it/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/it/firefox-109.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c8d102823192b2b4ebed1b587c87067738227392df6629f865f5294070018c45"; + sha256 = "88619c601a1e5cd2a63adb00f3f1383b7dfb59bbad526209fdf563c1a7c74fe1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ja/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ja/firefox-109.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e00c6bc9778d92618ed4349f8006667d249f2d621496a7002853ec51064c0b6c"; + sha256 = "3dab393bc047ec868e18ef3088787ff3fad07979ff629b5b673f0ffad4e84bf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ka/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ka/firefox-109.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c0116995e70225b71ca02ace86a571944fe998a748ae6e0c628a2e2525c3d4a6"; + sha256 = "1f646449054056c528aa04722c0945b008c72471b2b6a7000afdb54e9e14a51d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kab/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kab/firefox-109.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c6c4a7a503ff8c136b7c0dff132b3ae63326aa8c4271dd85f8c10f09755d7c23"; + sha256 = "2ee51ba2291b12549cab7fde5007205927465ee592ecd15158b5cd0c5c071391"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kk/firefox-109.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d5b185c6676eb01aa6c10e2b604d385cd2bab24ad19a8f561606b46cae1d90c5"; + sha256 = "bc761d52486af47d637f2a982de38481db245f98d48fbd0c3710f7282e5eb0cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/km/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/km/firefox-109.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2e3565182881dab53c55af1f02f09fb77f2c60949f7a7c7fa5d43dd69f3d47b9"; + sha256 = "ff584ebbf260a5907d47533d03a844b11852e2a66e1873cbb9f97488dcf26805"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kn/firefox-109.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "696ad3222dd83d3e5f2351a6b062fde5e6f756403593a37396f95de5db3f6aa2"; + sha256 = "205c2a232c468cd00096f9b3e0e37ee6cd6cab2a89c64fc5e7090892129a2ce1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ko/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ko/firefox-109.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "fe249e81f407cf7bfffd6bd13d828bfddb805a5ce06a0ee8ea7cb1e9273011cd"; + sha256 = "b8d262276c6f67bde4bda7dde9f44fc9d663408df85b3be836da03b9c923a551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lij/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lij/firefox-109.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "a1f8cba2592421e82d4d5a13052d2f48bc3217d91d68cd7699182c40a42c49a4"; + sha256 = "fc8c42a338cf8074d77acaa967e5c470b813da87c9790eafe7aa36bda676cba8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lt/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lt/firefox-109.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "56810f8dcfaf802e9d93f23294d713fd867c48cfd9baf1400a93e0c9dbe09b6e"; + sha256 = "2eaedf0027937f9f3de113d0f9a819a09d001c24458a4006c7d78f5581e151ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lv/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lv/firefox-109.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "47d4b1517b101e62e4aa1e39da57ce53792e024fd0ea2ab06e06182cc83636ed"; + sha256 = "c2bfe7e376deac1df14f29a6c06c6ad80249f3b1d1e08855299ef96f3f8d9790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/mk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/mk/firefox-109.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "95644ffb52b917a82b5cfa3a15fa8540f310342fbf840aad367f7b7ba2eb2865"; + sha256 = "fc681082b2c0d73e2fe8c8aebe648dca6c172c31bf0319d7fcd26af6cbb67467"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/mr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/mr/firefox-109.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "5dd79eef34d39d828e0bde386b0a7bc2e34ff65b6e2c84c19c50affd560be86f"; + sha256 = "03703982fd431a087d1b2a4584862f9c45784d1809ea21121f495afea2b9951f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ms/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ms/firefox-109.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "1c34352dd995aa5593826ec6509a9a571fef56c7cc5492091037797a264c9079"; + sha256 = "fb41c14f3f8f6050a874475a4619834e91a93e18694117d97164cf8d65929f2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/my/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/my/firefox-109.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b6a8f8c5ad88ecb6225f7f1a084d207773cf55cfad23ab75bda3b6de2e1a5b8a"; + sha256 = "d28d4ab28a45abf6e430ec2ed014e73606dbe4ea54318995565efe0722725188"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nb-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nb-NO/firefox-109.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2bf5f1181ee86090e75679a08e361556facf8c07b06501e8f3c6029798b3334c"; + sha256 = "d7cda4dca1b8ed107174b1ec8486f04741161c5e95eac55f291a0d6376c83bc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ne-NP/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ne-NP/firefox-109.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3021f8bf36270a7bc708ed790d628ea624daca8f0023d5abdfb5843b83b0573a"; + sha256 = "5562fee4fea2956a346bcb23c2c2340cd16a816ef3f8a874d259e1f6a6f70ff6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nl/firefox-109.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f1928dfca113a782f085890bf9dfafaa9baaef79ed8162ceccd6c90cf38990b7"; + sha256 = "2c9feee4d1c3079232768c9c8ca2e841e7c26685ad4b9dd609d3eabe478d8154"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nn-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nn-NO/firefox-109.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "fcc01179902449f16d6724179378d8d8c251fa4dabec4ca78506b750bf7a157f"; + sha256 = "9d48f0a887015ffd0c75db18e0e2e79aaad177cc114797758cec33f33f08861c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/oc/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/oc/firefox-109.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ad48b0b59681fcd32ec5d889c4ccd12c9015a446077baf18516b038d4267ca55"; + sha256 = "59cea9cc6edd8d6e92741bf8201cd135d3218ba1020579f6a6325e2e1697fd92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pa-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pa-IN/firefox-109.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "44e54441e9d082a44eb1b1e3a29d65d75658afbf3b4b04fbea427c4d621fb630"; + sha256 = "bfe9329826c927d22e3fab539e2564c72958c91330dfb036bcaa6784e2882864"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pl/firefox-109.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "fbd8bef9474e6bff05cea3d434b48caacf24b7d74fb7289372cd0ce4d6b3455d"; + sha256 = "da8f8f87f49efcd6512b28a5dcefd0e7910e704ebb79b7c88810933e135239b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pt-BR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pt-BR/firefox-109.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "dcb42a3248e7bdfd6de2325f0aa287e94f6a78705fb8d42d0b94213df4aafd7d"; + sha256 = "221ba38616c0a5e10d91a39e58f194aef13b5bc3afdd07e3261dc3dae168b77c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pt-PT/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pt-PT/firefox-109.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "95f41a8bd3c7954664fbb42a23d5f5022e36a853d2152ce268f32fb08bc25566"; + sha256 = "0fa1e27f38f32d2ce835924b9b6e2987ea506bc440c7ed5268c5010b34882d99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/rm/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/rm/firefox-109.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8164d8494080384dc4f78823b777e3d2b8a09b163d5e7847304b7edcf421b94b"; + sha256 = "83f4a241f541b08f1340cf474128546a4a0f3962c419f227f060b30e8ec70315"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ro/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ro/firefox-109.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "28269a8aa45459cb0774d1ec859bab026075bc7353f4363b4808c12dac731c35"; + sha256 = "8922ab444d2f439dc96c1cff06142171922dec180ba81aa3d286afb53c635953"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ru/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ru/firefox-109.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c1f3f0fd7ad91593ed1ceb34d54225e3c1c16f57017c5a406bd1b91b6f9e321f"; + sha256 = "22be977b6c5e9f0ca73292fd36183412b2a98bbe44f7e5edeb9be5bf85951631"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sco/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sco/firefox-109.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "9724c6631121e21d9488fcbaa4ae86ea521b5a61dbb0de2e26bf6af9a9b7c68b"; + sha256 = "91274de4fa273cc4ec05ae8b40be5367ed280d8e64b1cd68db604ec13360ad2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/si/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/si/firefox-109.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "33ff8d8ffd16893f068772c98c115389b0a4286d390709495a811dcef01fb8a8"; + sha256 = "489d874123773bf5f3e94746e4c7242d73742dafded32a07c20bb91c7e544328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sk/firefox-109.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "cc34d8293b7166eb96ab4d96cb9bba7e5aa7d4f15f04ddf2d34704c207f48949"; + sha256 = "66f1e39014a6c246572daa6f0c6a3230862e7274b5a32213c7397643caec8130"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sl/firefox-109.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1cec19b6eba4aad9aa75ea747bb750333b9a0f335adc125eeef95e5b6fa767be"; + sha256 = "ad7bdce055f140497dc79bc67107d5e6f99dd292f09446304dd49d0dbb039d03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/son/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/son/firefox-109.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "6b4765482ac58f176a52643df225df8b3458003e14a47cbf18cbb36c7e1f34f6"; + sha256 = "db3da11990c0f401a72122c162cbe371c65d9b07a42e781251f082dc2b99b0d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sq/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sq/firefox-109.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "817fc0345699467e3f4fb1fdbd850361c66ff5c82aaf93ea9a33d1075f72632b"; + sha256 = "55b73a202acbb180073e8cb583100391e63d4d41516f1f241547dd72c9d64ca4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sr/firefox-109.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "708c949b5f1bb394b493b990bdf1da3cf9bfebcaa6aba549bcd5858b20e8c1f8"; + sha256 = "d79e42379228bd7d8c67bfbb475e0865aede6e8cd3a5c630f961507c3ec9162a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sv-SE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sv-SE/firefox-109.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "39c2407ff8b0bc638ab884faa1f6d86bfe071fb143a63fb81229e5312142213b"; + sha256 = "83af8bc35f47c7f51872d6a50f1df6cc329418ebf4c756cf894afbe544ce2018"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/szl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/szl/firefox-109.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "15fd363256e36bdfab2bad4d1544c191d74a8d4d4a180c9a7d12b5e64a0f0d8f"; + sha256 = "09bc6aa2ec127f5ac9c04cf83b2e760b17439c8ffd3d2b904149b759e8a1c5f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ta/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ta/firefox-109.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "548693e96ac123f33e12c3016dd7b0e7fbb9f3a403dab9682d4498a6d82a00ee"; + sha256 = "f1aec8972ce8baf6e0b6c88bac92651a266bcb2e2bb5b57dbf91ef88c0999681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/te/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/te/firefox-109.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e01a856488bf18c4d345db891909fe8813649f463bbf1171c2099de03556ba7a"; + sha256 = "23cca1765464d740d409e8fbad0909b969db9028581ca8c079be7df671e25216"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/th/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/th/firefox-109.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c2320b7f67f35778049023cbef382b208b68a0e18ab133fd806b4081a8c49a3a"; + sha256 = "01826ca896e4e8ab9aae14c9b68532339a10c908d469e66be9dfb44f850c4ae9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/tl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/tl/firefox-109.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ca5fae50ed972e07a340fd575ff72fb6908e1cf5810e3302fe6de286f2354040"; + sha256 = "aa52050e375977f6dc3c09fd91afc5f2383015990cc5c2d2891fd354b2e214c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/tr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/tr/firefox-109.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b8d9d4c422db8378d3df478dace847e2ce9c7c7a9250fb9f7f10dc3890f33dba"; + sha256 = "96362f9c7f919676e715ba7d4a20266e4e534c75bf5b4dec87ef49585a3e5e46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/trs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/trs/firefox-109.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b40b8f0c453b6ac332b8869491fa201ef015aeac0d1675dd75e4cdffcb8c406c"; + sha256 = "00ede759629983fc674a728a3f8c39b7b42bf132398b9077b623282809321f6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/uk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/uk/firefox-109.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d0fcdf9bc345bb37906805c123b9f262b14624cf19ff2f25714246d0330818cf"; + sha256 = "054de96778b01b75459f1e391326dadbab5eabbc1ee2f0a464bb27b34ce15619"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ur/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ur/firefox-109.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e5a34fc5bf63aa6e5ce478204dfd5f598b7ae1af64a52b9b07803b6ab49ece5c"; + sha256 = "eb9d0ace110b7b5f0ba6ecf0e3d2acf90ccc0c5c8af88625f9ecf0aa4e010ffd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/uz/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/uz/firefox-109.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "dfd51f2d04a3cd1686a7e07860c39d01fe351d8dca6a6952386fd453b8cbc08d"; + sha256 = "d8a3429895051133ed8b93e7af9294340ca23b3570729fda4dc8127715898407"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/vi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/vi/firefox-109.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "338973416fc1724a46ea35725620f0fab14a816914b6d5e1ab6da8cf3edd6733"; + sha256 = "a1180810cd4cbd14a2de895735505c8d7f98fb167bc874816eaf0817bbc98388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/xh/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/xh/firefox-109.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "8bdb1fb5e397edc1a66d74306cbaf3eb9ef6bdc547ee77543d9615438f6630a4"; + sha256 = "c9cc91a22984dab35e254e5b2d299df311be6a55cd4f27cd49e68f668bf673d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/zh-CN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/zh-CN/firefox-109.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9f9a94fd32c7ab92f2ccf149ee6f3422d159151b48451b245eebd5fcf46d1632"; + sha256 = "ffdd75e46d51f3287aee918e06c5ea389ae9e5fa8b642abf66c5041f0d3b2c5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/zh-TW/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/zh-TW/firefox-109.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a0b5b5d3774fe3d2717271fdaac2fca1723e20340af4ee93e90e8fe32a8eb6a5"; + sha256 = "fc8848b76084c6df1c4e4932ec8f4f0d14d2bb565bb87dc30b3b759fe90d0924"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 13645e542640..948b32172489 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -525,7 +525,7 @@ buildStdenv.mkDerivation ({ fi # Extract the debug info. - header "separating debug info from $i (build ID $id)" + echo "separating debug info from $i (build ID $id)" mkdir -p "$dst/''${id:0:2}" $OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index de0ac8eb7a1d..6340a0a14e0b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "109.0"; + version = "109.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7"; + sha512 = "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 378fe1f4039b..06bd49facb81 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -15,6 +15,7 @@ , pciutils , sndio , libjack2 +, speechd }: ## configurability of the wrapper itself @@ -82,6 +83,7 @@ let ++ lib.optional sndioSupport sndio ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc + ++ lib.optional (cfg.speechSynthesisSupport or false) speechd ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk3 ]; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 92afe2f4baa0..2de8192150ec 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -41,27 +41,30 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook +, qt5 +, proprietaryCodecs ? false +, vivaldi-ffmpeg-codecs }: let - mirror = "https://get.geo.opera.com/pub/opera/desktop"; - -in stdenv.mkDerivation rec { - +in +stdenv.mkDerivation rec { pname = "opera"; - version = "90.0.4480.84"; + version = "94.0.4606.54"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-GMcBTY3Ab8lYWv1IPdCeKPZwbY19NPHYmK7ATzvq0cg="; + hash = "sha256-IMWIkJHKaE7n5Rll4ZExE6PQB9a2fz0hLx4vckbROgk="; }; - unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; + unpackPhase = "dpkg-deb -x $src ."; nativeBuildInputs = [ + dpkg autoPatchelfHook wrapGAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -115,16 +118,22 @@ in stdenv.mkDerivation rec { # "Illegal instruction (core dumped)" gtk3 gtk4 + ] ++ lib.optional proprietaryCodecs [ + vivaldi-ffmpeg-codecs ]; + dontWrapQtApps = true; + installPhase = '' - mkdir -p $out - cp -r . $out/ + mkdir -p $out/bin + cp -r usr $out + cp -r usr/share $out/share + ln -s $out/usr/bin/opera $out/bin/opera ''; meta = with lib; { homepage = "https://www.opera.com"; - description = "Web browser"; + description = "Faster, safer and smarter web browser"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/networking/cluster/acorn/default.nix b/pkgs/applications/networking/cluster/acorn/default.nix index ce0f07f9ec10..e30e78daf7cf 100644 --- a/pkgs/applications/networking/cluster/acorn/default.nix +++ b/pkgs/applications/networking/cluster/acorn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "acorn"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "acorn-io"; repo = pname; rev = "v${version}"; - hash = "sha256-IzjCYVQ9RhuAmgloue421F43ARviaHW7mTkLhLW/VPM="; + hash = "sha256-wrtuBme12pilFKDyzKWlZFUu99NQKgwnx2fUOfL+VAY="; }; - vendorHash = "sha256-z2ya/CgH9AcxHe73Yt9XWbJqH4OrZWt0bRDsna5hYeo="; + vendorHash = "sha256-9cq64397RB4KWVatuKXi1EwjolGEpwAc+tC1zs3boQ4="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 8eb6d94f389c..b028512dd7c9 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.8"; + version = "2.5.9"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-4L0xj4+NLThSLzXTncUnUILOsV3qr9+f8osv19OW6oI="; + sha256 = "sha256-RZ3bcuJmUUnucD2lhfxLU8vbrorVUowF8hAW9NGSmbI="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 97fff7f9bbb3..4aeb491410bd 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -65,7 +65,7 @@ in buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 jlesquembre ]; + maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; mainProgram = "flux"; }; } diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 5f8781665f4c..5c47c602c33f 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.3"; + version = "1.13.4"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-nxClmCY/joLJw87IQx9DvAZLv5LgOLGlp9Unh37OKgg="; + hash = "sha256-eyfMWum1fZUq4iF77Q+0FP2Rdq2P+xK0au3ytN8MS+k="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorHash = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; + vendorHash = "sha256-sQv6g0Xgs+6jgxacWJwE3dK3GimfiPHly0Z0rvdKNE4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 74c3e1ccdf57..74f54d28d594 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -75,7 +75,7 @@ let description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 ]; + maintainers = with maintainers; [ euank mic92 superherointj ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index de9dd27b5264..141a17e34e2f 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.26.7"; + version = "0.27.0"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-TshUQJIwGSqVP+YUJvSHSczvnvzr1kX761oIbfQzVzw="; + sha256 = "sha256-optEMGB6izGlpcq2AJOY4lTt8igYBilE0Bg8KxE8AsU="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorSha256 = "sha256-W0yU5rMUuO2JtKRZpexsCqIUy3h+2hSDRcq/lp0UHX8="; + vendorHash = "sha256-57JrBmund2hwcgqWkLos/h1EOgZQb9HfKUf1BX0MYGQ="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index bf35eac948d4..b01dac8dc17c 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-xVYhZT4yqbSmxGH5DaarXzrGYMS1BuTaQ2T+huWYLBw="; + hash = "sha256-toN/pIvmmMwIARhY1i/2nmrC5ZVyTR7pttqkyXNuMaE="; }; - vendorHash = "sha256-rlvAQ99/3+3VotyYAR2TgWG8ZdTKUT2XRv4hTF+QFpI="; + vendorHash = "sha256-TE+VPOhkTPqQTapxAcJzlQzRZfmb1J4pAWUKiTGLnZE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 031fa0c21b77..995125d25033 100644 --- a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "kubectl-node-shell"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "kvaps"; repo = "kubectl-node-shell"; rev = "v${version}"; - sha256 = "sha256-dAsNgvHgquXdb2HhLDYLk9IALneKkOxQxKb7BD90+1E="; + sha256 = "sha256-TCd/VipsUT/h88CevqCLUUjN7wAJKYxxq63IpEF2P1Y="; }; strictDeps = true; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 997b52434b82..e05e7847cfd4 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.28.0"; + version = "1.29.0"; - vendorSha256 = "sha256-CyIpzwSYHbv96UoQ/SZXOl6v3xn3pvT39ZO+RpVHU5I="; + vendorHash = "sha256-wRCSUDzz+1e4/ijwAnIM8a/AlnNNdVkiz3WO4Nhuy+M="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-Gn/RXZedID0sh5qTcBNg7GeLtI1JZYKXEWg2RZGXlDw="; + sha256 = "sha256-rdcMgL7bzdlxrelui+V1APJik0v/4YyUqj9QlMRq1nI="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index e508ee0006f8..bc57c87b2f87 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 = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i178AN8LDm1SmCx3G8uLmW1+/F3B8DQsrkawSBoefGw="; + hash = "sha256-6AXki9/gJVlHpA3iSS1GqkLWaUqE0c+X8alWdMyCFiU="; }; - vendorSha256 = "sha256-0EWrFc55I3EmrAmmIYdsYtvO6xqDHbo5Uo6XC+NezZI="; + vendorHash = "sha256-28Wt9uQ7+PEWe+RaNv4HLz7HQbO7hXlX3O7s9SooLu8="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 08846a4ffe89..cbdbd5327dbe 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -442,22 +442,22 @@ "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" }, "google": { - "hash": "sha256-R104jYttXER/Pzd3ePHh9ZOvpcziuVQK0JcFqdbWtG0=", + "hash": "sha256-yxw+LtrBhfZlTVh36o3uUdt3zGo7VLTjk5Cc8xoqhio=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.50.0", + "rev": "v4.51.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "google-beta": { - "hash": "sha256-OrotSvDNK7PC6nyHEAvmTOYgdYFiHEE8YwfWcOAbPsk=", + "hash": "sha256-KQxIi9EF59FTcWoiE5oTZx+lVV+Pb+PH0QIz02PztN4=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.50.0", + "rev": "v4.51.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, @@ -571,13 +571,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-DvJow7KDyv1wGBw0QIQQ4MoLgQIT8+Cf6fjc7w4W7Ds=", + "hash": "sha256-Qdb5HpamjCNGlqSf3etFv0++Skrk/jm6UVBFsKGU+jw=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.49.0", + "rev": "v1.50.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Vt1AKXJ8KRoDESFvUeZPTjUFm7gwP/Uji4hyU16GhjY=" + "vendorHash": "sha256-JkmfZ9yz3r26j1SHIwnyNA+nYWAy4DoaWEMfFUTzD3Y=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -734,13 +734,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { - "hash": "sha256-QMaK/c4Rv7rChiVVGY8JizqTfLY98HwONyu5qU/LPGQ=", + "hash": "sha256-dfbmjl5gqffSE1sg5QEwzzbMXoL4bEKSFxU1bEdSMPs=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v1.10.0", + "rev": "v1.11.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-w/1eNrXK4Zpt80J1FidnhMAD0lhSskHMt/hrdrgfSYw=" + "vendorHash": "sha256-M2MlZNS4o1/GhQYiI72JVuhgfbNwa5ERFJjhB3nTpmE=" }, "mongodbatlas": { "hash": "sha256-OR9bvtg3DoJ4hFP/iqzQ1cFwWZYrUrzykN6sycd0Z6o=", @@ -843,11 +843,11 @@ "vendorHash": null }, "opennebula": { - "hash": "sha256-+EbEVwgo2HWmVhff7u5ohSJW8wuxK1kvWfvRWRwIP4o=", + "hash": "sha256-r8z5rpSvjNSDuvcRLtnOUFnBFFNAlcvfCbmW6LLHP5E=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", "repo": "terraform-provider-opennebula", - "rev": "v1.1.0", + "rev": "v1.1.1", "spdx": "MPL-2.0", "vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk=" }, @@ -870,11 +870,11 @@ "vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ=" }, "opsgenie": { - "hash": "sha256-NMaTTZQyEJ0vb+eDNTGRozTrme78Vo+/GuIR43AeDbU=", + "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.19", + "rev": "v0.6.20", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 2a1bb79b655e..7adcfc8a9a57 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.24.0"; + version = "3.25.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+fOcFu52f2PiynF0B8r3zAW/ANypXx9inLnf4ZtwI2M="; + sha256 = "sha256-XH9o1DTwG5ne5TZDgsS4HfC5WqLXc16JtjkKQtiE8z0="; }; - vendorSha256 = "sha256-+43UegjFjh86vXjH1A4jbORk8xTDZaJRc41RhFPcESk="; + vendorSha256 = "sha256-iVyLNPvmzkI46Cp0SgbxK6xIQspJjpYjqPf3mOMoZvU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index e9ae4556588f..807444696f08 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 = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - hash = "sha256-Q6f24LRYCxdgAguUVl7jf7srkd2L1IptiBgHJQq2dHE="; + hash = "sha256-BqxEZgI9uxoUpl/CJ2jSWjNIpfP2N392C4h/muBlhZY="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 805aadfc40a9..3d9fc7627b60 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -21,17 +21,17 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.106.0"; + version = "1.107.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc="; + hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs="; + hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o="; }; }); esbuild' = esbuild.override { @@ -48,24 +48,16 @@ let }; in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.34.2"; + version = "1.34.3"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-XOGfKa0eGVZKKKC0Pm2kw48XWWcrxCyDdYzCSKp+wco="; + hash = "sha256-6WZJD8lMsk1WNguMkXygBCTVpOzNkNuVZJ3Ygv6VBkM="; }; - patches = [ - (fetchpatch { - name = "bump-electron-to-22.1.0.patch"; - url = "https://github.com/deltachat/deltachat-desktop/commit/944d2735cda6cd5a95cb83c57484fbaf16720a9c.patch"; - hash = "sha256-kaKi32eFQ3hGLZLjiXmH9qs4GXezcDQ7zTdT2+D8NcQ="; - }) - ]; - - npmDepsHash = "sha256-J3/S/jYQvO/U8StDtYI+jozon0d4VCdeqFX6x1hHzMo="; + npmDepsHash = "sha256-B91yQ/xi8+uyOllqYR7lZTfLBpJvZat1cIIJk9TkM/c="; nativeBuildInputs = [ makeWrapper @@ -137,8 +129,6 @@ in buildNpmPackage rec { ]; }); - passthru.updateScript = ./update.sh; - meta = with lib; { description = "Email-based instant messaging for Desktop"; homepage = "https://github.com/deltachat/deltachat-desktop"; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh deleted file mode 100755 index f31279cf4f0e..000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ /dev/null @@ -1,32 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch prefetch-npm-deps - -set -euo pipefail -cd "$(dirname "$0")" - -owner=deltachat -repo=deltachat-desktop -nixpkgs=../../../../.. - -rev=$( - curl -s "https://api.github.com/repos/$owner/$repo/releases" | - jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output -) -ver=$(echo "$rev" | sed 's/^v//') -old_ver=$(tac default.nix | sed -n 's/.*\bversion = "\(.*\)".*/\1/p' | head -1) -if [ "$ver" = "$old_ver" ]; then - echo "Up to date: $ver" - exit -fi -echo "$old_ver -> $ver" - -hash=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev") -tac default.nix \ - | sed -e "0,/version = \".*\"/s//version = \"$ver\"/" \ - -e "0,/hash = \".*\"/s//hash = \"${hash//\//\\/}\"/" \ - | tac \ - | sponge default.nix - -src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) -hash=$(prefetch-npm-deps $src/package-lock.json) -sed -i "s,npmDepsHash = \".*\",npmDepsHash = \"$hash\"," default.nix diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 73d386b379d5..2869401b5969 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "4.4.10"; + version = "5.0.8"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA="; + hash = "sha256-e/0yGHtOHMgPhaF5xELodKS9/v/mbnT3ZpE12lXAocU="; }; patches = [ @@ -54,7 +54,7 @@ mkDerivation rec { postPatch = '' echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake substituteInPlace linphone-app/src/app/AppController.cpp \ - --replace "LINPHONE_QT_GIT_VERSION" "\"${version}\"" + --replace "APPLICATION_SEMVER" "\"${version}\"" ''; # TODO: After linphone-desktop and liblinphone split into separate packages, diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index f5d2479bdaa1..2023997aa811 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -9,11 +9,11 @@ let unwrapped = stdenv.mkDerivation rec { pname = "pidgin"; - version = "2.14.10"; + version = "2.14.12"; src = fetchurl { url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; - sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA="; + sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc="; }; nativeBuildInputs = [ makeWrapper intltool ]; diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 446c483f5bc0..904e47695d5b 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 = "20230109-1"; + version = "20230128-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-wPx1W0eaQHpA/jcZ+A7YFL5FwPqz12j/jPgxa1JeEM8="; + sha256 = "sha256-wYhftShCL9XozK0c7OLijqzveDvEvv9stpw+6CQND/Y="; }; postPatch = '' diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 15dc909aa646..dc8c5729ddf8 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, dpkg , alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa -, xorg, autoPatchelfHook, systemd, libnotify, libappindicator +, wayland, xorg, autoPatchelfHook, systemd, libnotify, libappindicator , makeWrapper }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; - runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ]; + runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator wayland ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index b1fb3b2054f5..b29d9f494b04 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-slang=${slang.dev}" "--with-ssl=${openssl.dev}" + "--with-slrnpull" ]; buildInputs = [ slang ncurses openssl ]; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index c87e54e09154..61c607c422e8 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -1,6 +1,8 @@ { lib -, fetchurl +, fetchFromGitHub +, buildNpmPackage , nixosTests +, gettext , python3 , ghostscript , imagemagickBig @@ -12,10 +14,18 @@ , unpaper , poppler_utils , liberation_ttf -, fetchFromGitHub }: let + version = "1.12.2"; + + src = fetchFromGitHub { + owner = "paperless-ngx"; + repo = "paperless-ngx"; + rev = "refs/tags/v${version}"; + hash = "sha256-1QufnRD2Nbc4twRZ4Yrf3ae1BRGves8tJ/M7coWnRPI="; + }; + # Use specific package versions required by paperless-ngx python = python3.override { packageOverrides = self: super: { @@ -78,36 +88,67 @@ let unpaper poppler_utils ]; -in -python.pkgs.pythonPackages.buildPythonApplication rec { - pname = "paperless-ngx"; - version = "1.11.3"; - # Fetch the release tarball instead of a git ref because it contains the prebuilt frontend - src = fetchurl { - url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-wGNkdczgV+UDd9ZO+BXMSWotpetE/+c/jJAAH+6SXps="; + frontend = buildNpmPackage { + pname = "paperless-ngx-frontend"; + inherit version src; + + npmDepsHash = "sha256-fp0Gy3018u2y6jaUM9bmXU0SVjyEJdsvkBqbmb8S10Y="; + + nativeBuildInputs = [ + python3 + ]; + + postPatch = '' + cd src-ui + ''; + + CYPRESS_INSTALL_BINARY = "0"; + NG_CLI_ANALYTICS = "false"; + + npmBuildFlags = [ + "--" "--configuration" "production" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/paperless-ui + mv ../src/documents/static/frontend $out/lib/paperless-ui/ + runHook postInstall + ''; }; - +in +python.pkgs.buildPythonApplication rec { + pname = "paperless-ngx"; format = "other"; - propagatedBuildInputs = with python.pkgs.pythonPackages; [ + inherit version src; + + nativeBuildInputs = [ + gettext + ]; + + propagatedBuildInputs = with python.pkgs; [ aioredis - arrow + amqp + anyio asgiref async-timeout attrs autobahn automat + billiard bleach - blessed celery certifi cffi channels-redis channels - chardet + charset-normalizer click + click-didyoumean + click-plugins + click-repl coloredlogs concurrent-log-handler constantly @@ -118,18 +159,16 @@ python.pkgs.pythonPackages.buildPythonApplication rec { django-cors-headers django-extensions django-filter - django-picklefield django djangorestframework filelock - fuzzywuzzy gunicorn h11 hiredis httptools humanfriendly + humanize hyperlink - imagehash idna imap-tools img2pdf @@ -140,9 +179,11 @@ python.pkgs.pythonPackages.buildPythonApplication rec { langdetect lxml msgpack + mysqlclient nltk numpy ocrmypdf + packaging pathvalidate pdf2image pdfminer-six @@ -150,6 +191,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { pillow pluggy portalocker + prompt-toolkit psycopg2 pyasn1-modules pyasn1 @@ -158,7 +200,6 @@ python.pkgs.pythonPackages.buildPythonApplication rec { python-dateutil python-dotenv python-gnupg - levenshtein python-magic pytz pyyaml @@ -171,36 +212,51 @@ python.pkgs.pythonPackages.buildPythonApplication rec { scikit-learn scipy service-identity - six - sortedcontainers + setproctitle + sniffio sqlparse threadpoolctl tika + tornado tqdm - twisted.optional-dependencies.tls + twisted txaio + tzdata tzlocal urllib3 uvicorn uvloop + vine watchdog - watchgod + watchfiles wcwidth + webencodings websockets whitenoise whoosh + zipp zope_interface - ]; + ] + ++ redis.optional-dependencies.hiredis + ++ twisted.optional-dependencies.tls + ++ uvicorn.optional-dependencies.standard; - # Compile manually because `pythonRecompileBytecodeHook` only works for - # files in `python.sitePackages` postBuild = '' + # Compile manually because `pythonRecompileBytecodeHook` only works + # for files in `python.sitePackages` ${python.interpreter} -OO -m compileall src + + # Collect static files + ${python.interpreter} src/manage.py collectstatic --clear --no-input + + # Compile string translations using gettext + ${python.interpreter} src/manage.py compilemessages ''; installPhase = '' - mkdir -p $out/lib - cp -r . $out/lib/paperless-ngx + mkdir -p $out/lib/paperless-ngx + cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx + ln -s ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/ chmod +x $out/lib/paperless-ngx/src/manage.py makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "$PYTHONPATH" \ @@ -210,12 +266,17 @@ python.pkgs.pythonPackages.buildPythonApplication rec { --prefix PATH : "${path}" ''; - nativeCheckInputs = with python.pkgs.pythonPackages; [ + postFixup = '' + # Remove tests with samples (~14M) + find $out/lib/paperless-ngx -type d -name tests -exec rm -rv {} + + ''; + + nativeCheckInputs = with python.pkgs; [ + factory_boy + imagehash pytest-django pytest-env - pytest-sugar pytest-xdist - factory_boy pytestCheckHook ]; @@ -250,13 +311,14 @@ python.pkgs.pythonPackages.buildPythonApplication rec { ]; passthru = { - inherit python path; + inherit python path frontend; tests = { inherit (nixosTests) paperless; }; }; meta = with lib; { description = "Tool to scan, index, and archive all of your physical documents"; homepage = "https://paperless-ngx.readthedocs.io/"; + changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ lukegb gador erikarvstedt ]; }; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix similarity index 77% rename from pkgs/applications/misc/qpdfview/default.nix rename to pkgs/applications/office/qpdfview/default.nix index db5995149c08..6cc26c95a05b 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/office/qpdfview/default.nix @@ -12,19 +12,21 @@ , file , ghostscript }: + mkDerivation rec { pname = "qpdfview"; - version = "0.4.18"; + version = "0.5.0"; src = fetchurl { - url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"; + url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-0.5.tar.gz"; + hash = "sha256-RO/EQKRhy911eps5bxRh7novQ2ToHfVb0CIfkQIZvpk="; }; - # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - patches = [ ./qpdfview-qt515-compat.patch ]; + nativeBuildInputs = [ + qmake + pkg-config + ]; - nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtsvg @@ -35,6 +37,7 @@ mkDerivation rec { file ghostscript ]; + preConfigure = '' qmakeFlags+=(*.pro) ''; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 08084bfbf7ac..35b9b694c091 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, copyDesktopItems, libxshmfence, wrapGAppsHook }: +{ lib, callPackage, ... }: let metaCommon = with lib; { @@ -7,117 +7,11 @@ let license = licenses.agpl3Plus; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ fliegendewurst ]; + maintainers = with maintainers; [ fliegendewurst eliandoran ]; }; - - version = "0.58.7"; - - desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; - - serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka"; - in { - trilium-desktop = stdenv.mkDerivation rec { - pname = "trilium-desktop"; - inherit version; - meta = metaCommon // { - mainProgram = "trilium"; - }; + trilium-desktop = callPackage ./desktop.nix { metaCommon = metaCommon; }; + trilium-server = callPackage ./server.nix { metaCommon = metaCommon; }; - src = fetchurl desktopSource; - - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - wrapGAppsHook - copyDesktopItems - ]; - - buildInputs = atomEnv.packages ++ [ libxshmfence ]; - - desktopItems = [ - (makeDesktopItem { - name = "Trilium"; - exec = "trilium"; - icon = "trilium"; - comment = meta.description; - desktopName = "Trilium Notes"; - categories = [ "Office" ]; - }) - ]; - - # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch - postPatch = '' - rm ./trilium-portable.sh - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium - mkdir -p $out/share/icons/hicolor/128x128/apps - - cp -r ./* $out/share/trilium - ln -s $out/share/trilium/trilium $out/bin/trilium - - ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png - runHook postInstall - ''; - - # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) - ''; - - dontStrip = true; - - passthru.updateScript = ./update.sh; - }; - - - trilium-server = stdenv.mkDerivation rec { - pname = "trilium-server"; - inherit version; - meta = metaCommon; - - src = fetchurl serverSource; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - stdenv.cc.cc.lib - ]; - - patches = [ - # patch logger to use console instead of rolling files - ./0001-Use-console-logger-instead-of-rolling-files.patch - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium-server - - cp -r ./* $out/share/trilium-server - runHook postInstall - ''; - - postFixup = '' - cat > $out/bin/trilium-server < $out/bin/trilium-server < perlSupport; assert svnSupport -> perlSupport; let - version = "2.39.0"; + version = "2.39.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-uhmbE/tamco97JF7C9c2vA61qd+Hc31DXt398Q1pJls="; + sha256 = "sha256-QKOKCEezDDcbNYc7OvzxI4hd1B6j7Lv1EO+pfzzlwWE="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 07a0a5803ca0..03e9996a1004 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -4,21 +4,21 @@ , lib , gnugrep , gnused -, curl -, openssl +, wget +, fzf , mpv , aria2 }: stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "3.4"; + version = "4.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - sha256 = "sha256-Xb7MNL7YKbvyRR5ZppUfCYeYpjNAiJWNOjIFk5fUvpY="; + hash = "sha256-1yhBlQ/abT+/BKEIskgnAh+cmKCzXuS9hu6apaangVk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { install -Dm755 ani-cli $out/bin/ani-cli wrapProgram $out/bin/ani-cli \ - --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl openssl mpv aria2 ]} + --prefix PATH : ${lib.makeBinPath [ gnugrep gnused wget fzf mpv aria2 ]} runHook postInstall ''; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 0ce0623ec9d9..972a68e04f03 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation { pname = "cinelerra-cv"; - version = "unstable-2021-02-14"; + version = "unstable-2023-01-29"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; repo = "cinelerra-cv"; - rev = "7d0e8ede557d0cdf3606e0a8d97166a22f88d89e"; - sha256 = "0n84y2wp47y89drc48cm1609gads5c6saw6c6bqcf5c5wcg1yfbj"; + rev = "bb00ac6b70fcf3cf419348b56f9b264bc01c1a89"; + sha256 = "11965kb3d7xcvlcf8p7jlzk9swk5i78x7wja4s3043wlzmqmwv0q"; }; preConfigure = '' diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 4052c968d2ba..af033781ac2c 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mpvacious"; - version = "0.18"; + version = "0.20"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-FiYEpZVaeJQVSXa9obFYSKNVASJolOBm5D3faOlCzNY="; + sha256 = "sha256-9Lf7MVaJ5eC5Gb1PdGBvtENU8AAVq2jsUkY3wJfztt8="; }; postPatch = '' diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 0c46b4c2ba85..35f5fcb549f1 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -3,13 +3,13 @@ # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` stdenvNoCC.mkDerivation { pname = "mpv_sponsorblock"; - version = "unstable-2022-09-24"; + version = "unstable-2023-01-30"; src = fetchFromGitHub { owner = "po5"; repo = "mpv_sponsorblock"; - rev = "248d108c1280e05de551c42867aebb72cf0c83b9"; - sha256 = "1aacchyci34xyx7rcyd2r02i4rlqq8q61l6dcci8yd4g4hjiqqld"; + rev = "7785c1477103f2fafabfd65fdcf28ef26e6d7f0d"; + sha256 = "sha256-iUXaTWWFEdxhxClu2NYbQcThlvYty3A2dEYGooeAVAQ="; }; dontBuild = true; diff --git a/pkgs/applications/video/w_scan2/default.nix b/pkgs/applications/video/w_scan2/default.nix new file mode 100644 index 000000000000..56000407fce6 --- /dev/null +++ b/pkgs/applications/video/w_scan2/default.nix @@ -0,0 +1,25 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "w_scan2"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "stefantalpalaru"; + repo = "w_scan2"; + rev = version; + sha256 = "sha256-fDFAJ4EMwu4X1Go3jkRjwA66xDY4tJ5wCKlEdZUT4qQ="; + }; + + meta = { + description = "A small channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T/T2 channels.conf files"; + homepage = "https://github.com/stefantalpalaru/w_scan2"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ _0x4A6F ] ; + license = lib.licenses.gpl2Only; + }; +} diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix index 59a2de96e9dd..ef25427c4a23 100644 --- a/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VwVJWf9tKZ5rVF8tXDf35zsS2PipqC8FPbXUpOzsw/Y="; + sha256 = "sha256-mngs5ivRyMJ927VV00mFNIG+nD9EuE3qLyN+OHMMkHQ="; }; nativeBuildInputs = [ capnproto protobuf ]; doCheck = false; - cargoSha256 = "sha256-zY9fsZK1C3HnCxeNA5dCbQQHYx3IVDMHCHYwFh5ev2k="; + cargoSha256 = "sha256-ruChRz2rnPalBiXcpco/WS/eDgg52ckPBLBuoQa9us4="; meta = with lib; { description = "An OCI container runtime monitor written in Rust"; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index c116a581103b..bbefed66fae3 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,21 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, makeBinaryWrapper }: buildGoModule rec { pname = "docker-slim"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { - owner = "docker-slim"; - repo = "docker-slim"; + owner = "slimtoolkit"; + repo = "slim"; rev = version; - sha256 = "sha256-CN3mvXjI6c10yvXM2owWASngsU2PjgLhd1N55vxubw0="; + sha256 = "sha256-KbwkZIGkAdzPPo5CrWKnKzFsD8OUONk6JWo1wzwti3s="; }; vendorSha256 = null; - subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; + subPackages = [ "cmd/slim" "cmd/slim-sensor" ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; ldflags = [ "-s" @@ -27,13 +27,13 @@ buildGoModule rec { # docker-slim tries to create its state dir next to the binary (inside the nix # store), so we set it to use the working directory at the time of invocation postInstall = '' - wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"' + wrapProgram "$out/bin/slim" --add-flags '--state-path "$(pwd)"' ''; meta = with lib; { description = "Minify and secure Docker containers"; - homepage = "https://dockersl.im/"; - changelog = "https://github.com/docker-slim/docker-slim/raw/${version}/CHANGELOG.md"; + homepage = "https://slimtoolkit.org/"; + changelog = "https://github.com/slimtoolkit/slim/raw/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ]; }; diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 95170b79326d..251092049c9a 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -1,36 +1,42 @@ { lib , stdenv , fetchFromGitHub +, installShellFiles +, libX11 , libinput , libxcb , libxkbcommon , pixman , pkg-config +, substituteAll , wayland , wayland-protocols -, wlroots +, wlroots_0_16 , writeText -, enable-xwayland ? true, xwayland, libX11 +, xcbutilwm +, xwayland +, enableXWayland ? true , conf ? null -, patches ? [ ] }: let - totalPatches = patches ++ [ ]; + wlroots = wlroots_0_16; in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "dwl"; - version = "0.3.1"; + version = "0.4"; src = fetchFromGitHub { owner = "djpohly"; - repo = pname; - rev = "v${version}"; - hash = "sha256-VHxBjjnzJNmtJxrm3ywJzvt2bNHGk/Cx8TICw6SaoiQ="; + repo = "dwl"; + rev = "v${self.version}"; + hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; buildInputs = [ libinput @@ -40,18 +46,13 @@ stdenv.mkDerivation rec { wayland wayland-protocols wlroots - ] ++ lib.optionals enable-xwayland [ + ] ++ lib.optionals enableXWayland [ libX11 + xcbutilwm xwayland ]; - # Allow users to set their own list of patches - patches = totalPatches; - - # Last line of config.mk enables XWayland - prePatch = lib.optionalString enable-xwayland '' - sed -i -e '$ s|^#||' config.mk - ''; + outputs = [ "out" "man" ]; # Allow users to set an alternative config.def.h postPatch = let @@ -60,21 +61,19 @@ stdenv.mkDerivation rec { else writeText "config.def.h" conf; in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; - NIX_CFLAGS_COMPILE = [ - # https://github.com/djpohly/dwl/issues/186 - "-Wno-error=unused-result" - ]; - - dontConfigure = true; - - installPhase = '' - runHook preInstall - install -d $out/bin - install -m755 dwl $out/bin - runHook postInstall + preBuild = '' + makeFlagsArray+=( + XWAYLAND=${if enableXWayland then "-DXWAYLAND" else ""} + XLIBS=${if enableXWayland then "xcb\\ xcb-icccm" else ""} + ) ''; - meta = with lib; { + installFlags = [ + "PREFIX=$(out)" + "MANDIR=$(man)/share/man/man1" + ]; + + meta = { homepage = "https://github.com/djpohly/dwl/"; description = "Dynamic window manager for Wayland"; longDescription = '' @@ -88,9 +87,10 @@ stdenv.mkDerivation rec { - Limited to 2000 SLOC to promote hackability - Tied to as few external dependencies as possible ''; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + changelog = "https://github.com/djpohly/dwl/releases/tag/v${self.version}"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.AndersonTorres ]; inherit (wayland.meta) platforms; }; -} +}) # TODO: custom patches from upstream website diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index ad2ed5bf3461..52a213cda86f 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-Zl7ob0JcFN8sl8Zuf2aB7l7q3W8GmvVBoI1W3aLLXfU="; + hash = "sha256-2gEZRkym21X4rvj6kzZh9WChZUkfqgS1wiWh7LBioZM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index 8bd0691450c7..adf3facb99b2 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -23,15 +23,15 @@ let wlroots = wlroots_0_16; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "labwc"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; - rev = finalAttrs.version; - hash = "sha256-P1hKYTW++dpV3kdmI5nBGun080gVTrKzi2WOJKR84j4="; + rev = self.version; + hash = "sha256-PfvtNbSAz1vt0+ko4zRPyRRN+lhQoA2kJ2xoJy5o4So="; }; nativeBuildInputs = [ @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/labwc/labwc"; description = "A Wayland stacking compositor, similar to Openbox"; + changelog = "https://raw.githubusercontent.com/labwc/labwc/${self.version}/NEWS.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; diff --git a/pkgs/applications/window-managers/leftwm/0001-patch-version.patch b/pkgs/applications/window-managers/leftwm/0001-patch-version.patch new file mode 100644 index 000000000000..8c28f0c22abe --- /dev/null +++ b/pkgs/applications/window-managers/leftwm/0001-patch-version.patch @@ -0,0 +1,22 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ac3125a..c02b11d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -431,7 +431,7 @@ dependencies = [ + + [[package]] + name = "leftwm" +-version = "0.4.0" ++version = "0.4.1" + dependencies = [ + "anyhow", + "clap", +@@ -467,7 +467,7 @@ dependencies = [ + + [[package]] + name = "leftwm-core" +-version = "0.4.0" ++version = "0.4.1" + dependencies = [ + "dirs-next", + "futures", diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index fe3e46f7b47a..70d7476432a2 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,20 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-4f9YOVkOXn7+TzTUZS2Lultgj9WhiOPUa/fHUeyLBUU="; + sha256 = "sha256-ZAlX8Vu4JAwQlwBOHT435Bz3g3qqK5ePm9v0cDqP8Q4="; }; - cargoSha256 = "sha256-D00IFTELRlqeKQ7zheJKTvu5FBgYQXsZ+OnPnVzweC4="; + cargoSha256 = "sha256-nn/P9ZZNf1Zts4JiJ2kXWAAG/HT1GnlYHXcPijYiBlU="; + + cargoPatches = [ + ./0001-patch-version.patch + ]; buildInputs = rpathLibs; @@ -33,7 +37,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/leftwm/leftwm"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ yanganto ]; changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG"; }; } diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index 2ec46e42cbf3..f2d0e1d484d7 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -16,14 +16,14 @@ , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "pekwm"; version = "0.3.0"; src = fetchFromGitHub { owner = "pekdon"; repo = "pekwm"; - rev = "release-${version}"; + rev = "release-${self.version}"; hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ="; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libpng ]; - meta = with lib; { + meta = { homepage = "https://www.pekwm.se/"; description = "A lightweight window manager"; longDescription = '' @@ -65,8 +65,9 @@ stdenv.mkDerivation rec { they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${self.version}/NEWS.md"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 55be5f3a9d0a..33df804d5efe 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -321,6 +321,11 @@ stdenv.mkDerivation { && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs != null) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags + + # Pull in 'cc.out' target to get 'libstdc++fs.a'. It should be in + # 'cc.lib'. But it's a gcc package bug. + # TODO(trofi): remove once gcc is fixed to move libraries to .lib output. + echo "-L${gccForLibs}/${optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"}/lib" >> $out/nix-support/cc-ldflags '' ## @@ -338,11 +343,18 @@ stdenv.mkDerivation { # compile, because it uses "#include_next " to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. + # + # We use --sysroot=/nix/store/does/not/exist to drop embedded default + # path to glibc headers gcc was built against. Without it -idirafter + # only appends to the list and outdated glibc headers end up being + # used. 'cc-cflags-before' is used to allow user's --sysroot= option + # to override our default. + optionalString (libc != null) ('' touch "$out/nix-support/libc-cflags" touch "$out/nix-support/libc-ldflags" echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags '' + optionalString (!(cc.langD or false)) '' + echo "--sysroot=/nix/store/does/not/exist" >> $out/nix-support/cc-cflags-before echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags '' + optionalString (isGNU && (!(cc.langD or false))) '' for dir in "${cc}"/lib/gcc/*/*/include-fixed; do diff --git a/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/pkgs/build-support/deterministic-uname/deterministic-uname.sh index 134bd467bce3..5272bb5b3fe1 100644 --- a/pkgs/build-support/deterministic-uname/deterministic-uname.sh +++ b/pkgs/build-support/deterministic-uname/deterministic-uname.sh @@ -133,7 +133,7 @@ fi # NixOS: # Linux *nodename* 6.0.13 #1-NixOS SMP PREEMPT_DYNAMIC Wed Dec 14 10:41:06 UTC 2022 x86_64 GNU/Linux if [[ "$all" = "1" ]]; then - echo -n "$KERNEL_NAME_VAL $NODENAME_VAL $KERNEL_RELEASE_VAL $KERNEL_VERSION_VAL $MACHINE_VAL" + echo -n "$KERNEL_NAME_VAL $NODENAME_VAL $KERNEL_RELEASE_VAL $KERNEL_VERSION_VAL $MACHINE_VAL " # in help: except omit -p and -i if unknown. #echo -n "$PROCESSOR_VAL $HARDWARE_PLATFORM_VAL\n" echo -n "$OPERATING_SYSTEM_VAL" diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index 163f6fc60eea..380642a5e681 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -1,10 +1,8 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source "$stdenv/setup" -header "exporting \`$url' (revision $rev) into \`$out'" +echo "exporting \`$url' (revision $rev) into \`$out'" # Perform a lightweight checkout so that we don't end up importing # all the repository's history. BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" - -stopNest diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 90363275b973..4b49e9676ec0 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -24,5 +24,3 @@ else fi (cd export && cvs -f -z0 -d "$cvsRoot" export $tag "$module") mv export/* $out - -stopNest diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index 018852770504..ce5537f46f40 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -11,10 +11,8 @@ elif test -n "$context"; then tagflags="--context=$context" fi -header "getting $url $partial ${tagtext} into $out" +echo "getting $url $partial ${tagtext} into $out" darcs get --lazy $tagflags "$url" "$out" # remove metadata, because it can change rm -rf "$out/_darcs" - -stopNest diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh index e5a1a61b78d3..4eb70f672d48 100644 --- a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -1,6 +1,6 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source "${stdenv}/setup" -header "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" +echo "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" mkdir -p "${out}" cat < "${out}/compositeImage.sh" @@ -26,4 +26,3 @@ ${gnutar}/bin/tar \ -c "${manifest}" "${repositories}" -T "${imageFileStorePaths}" EOF chmod +x "${out}/compositeImage.sh" -stopNest diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix index 3b0c33770467..6a7b977db29f 100644 --- a/pkgs/build-support/fetchdocker/generic-fetcher.nix +++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { inherit name; builder = writeText "${fetcher}-builder.sh" '' source "$stdenv/setup" - header "${fetcher} exporting to $out" + echo "${fetcher} exporting to $out" declare -A creds @@ -49,7 +49,7 @@ stdenv.mkDerivation { fi if [ -f "$dockerCredentialsFile" ]; then - header "using credentials from $dockerCredentialsFile" + echo "using credentials from $dockerCredentialsFile" CREDSFILE=$(cat "$dockerCredentialsFile") creds[token]=$(${awk} -F'=' '/DOCKER_TOKEN/ {print $2}' <<< "$CREDSFILE" | head -n1) @@ -77,8 +77,6 @@ stdenv.mkDerivation { ${layerDigestFlag} \ "${repository}/${imageName}" \ "${tag}" - - stopNest ''; buildInputs = [ haskellPackages.hocker ]; diff --git a/pkgs/build-support/fetchfirefoxaddon/default.nix b/pkgs/build-support/fetchfirefoxaddon/default.nix index 0fa51e69840c..fe9ff5c469ba 100644 --- a/pkgs/build-support/fetchfirefoxaddon/default.nix +++ b/pkgs/build-support/fetchfirefoxaddon/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { builder = writeScript "xpibuilder" '' source $stdenv/setup - header "firefox addon $name into $out" + echo "firefox addon $name into $out" UUID="${extid}" mkdir -p "$out/$UUID" diff --git a/pkgs/build-support/fetchfossil/builder.sh b/pkgs/build-support/fetchfossil/builder.sh index 009b23c406d6..36b758ab574e 100644 --- a/pkgs/build-support/fetchfossil/builder.sh +++ b/pkgs/build-support/fetchfossil/builder.sh @@ -1,6 +1,6 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "Cloning Fossil $url [$rev] into $out" +echo "Cloning Fossil $url [$rev] into $out" # Fossil, bless its adorable little heart, wants to write global configuration # to $HOME/.fossil. AFAICT, there is no way to disable this functionality. @@ -19,5 +19,3 @@ popd # Just nuke the checkout file. rm $out/.fslckout - -stopNest diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index acb970639ab1..77f6381b09ab 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -6,7 +6,7 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting $url (rev $rev) into $out" +echo "exporting $url (rev $rev) into $out" $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ @@ -18,4 +18,3 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${branchName:+--branch-name "$branchName"} runHook postFetch -stopNest diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index cec0e441f229..1ce294757713 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -1,10 +1,8 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "getting $url${rev:+ ($rev)} into $out" +echo "getting $url${rev:+ ($rev)} into $out" hg clone --insecure "$url" hg-clone hg archive -q$subrepoClause -y ${rev:+-r "$rev"} --cwd hg-clone $out rm -f $out/.hg_archival.txt - -stopNest diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index 7db66730dab8..1aabd7949ee1 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -8,7 +8,7 @@ if ! [ -f "$cacheDB" ]; then mtn --db "$cacheDB" db init fi -header "getting revision $selector"; +echo "getting revision $selector"; done=; for source in $dbs; do @@ -32,9 +32,7 @@ for source in $dbs; do fi; done; -stopNest; - -header "checking out the revision $revision"; +echo "checking out the revision $revision"; if test -n "$done"; then mtn checkout --db "$cacheDB" -r "$revision" "$out" -b "${branch}" @@ -43,10 +41,6 @@ else exit 1; fi; -stopNest - -header "clearing _MTN in the output" +echo "clearing _MTN in the output" rm -rf "$out/_MTN" - -stopNest diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index b58e5a88b3cd..aa4d049aba43 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -1,7 +1,7 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting $url (r$rev) into $out" +echo "exporting $url (r$rev) into $out" if test -n "$http_proxy"; then # Configure proxy @@ -22,5 +22,3 @@ fi; svn export --trust-server-cert --non-interactive \ ${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \ -r "$rev" "$url" "$out" - -stopNest diff --git a/pkgs/build-support/fetchsvnssh/builder.sh b/pkgs/build-support/fetchsvnssh/builder.sh index b0441299dd2c..5782151524f7 100644 --- a/pkgs/build-support/fetchsvnssh/builder.sh +++ b/pkgs/build-support/fetchsvnssh/builder.sh @@ -1,7 +1,7 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting $url (r$rev) into $out" +echo "exporting $url (r$rev) into $out" if test "$sshSupport"; then export SVN_SSH="$openssh/bin/ssh" @@ -12,5 +12,3 @@ fi # whether the server is being spoofed --- only the cryptographic # hash of the output matters. expect -f $sshSubversion "$username" "$password" "$rev" "$url" $out - -stopNest diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index dd987f41b446..e8eaba934858 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -37,7 +37,7 @@ if [ -n "$downloadToTemp" ]; then downloadedFile="$TMPDIR/file"; fi tryDownload() { local url="$1" echo - header "trying $url" + echo "trying $url" local curlexit=18; success= diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index ca14a4495fed..f68597662608 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -46,14 +46,11 @@ stdenv.mkDerivation { strictDeps = true; dontBuild = true; dontConfigure = true; + dontUnpack = true; # Additional flags passed to pkg-config. addFlags = lib.optional stdenv.targetPlatform.isStatic "--static"; - unpackPhase = '' - src=$PWD - ''; - installPhase = '' mkdir -p $out/bin $out/nix-support diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 9104bf2dce5c..679adad827da 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -43,9 +43,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( [ ! -f /etc/lsb-release ] || (source /etc/lsb-release; echo "OS release: $DISTRIB_DESCRIPTION") echo "System/kernel: $(uname -a)" if test -e /etc/debian_version; then echo "Debian release: $(cat /etc/debian_version)"; fi - header "installed Debian packages" + echo "installed Debian packages" dpkg-query --list - stopNest ''; installPhase = '' @@ -73,11 +72,10 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( [ "$(echo $out/debs/*.deb)" != "" ] for i in $out/debs/*.deb; do - header "Generated DEB package: $i" + echo "Generated DEB package: $i" dpkg-deb --info "$i" pkgName=$(dpkg-deb -W "$i" | awk '{print $1}') echo "file deb $i" >> $out/nix-support/hydra-build-products - stopNest done dpkg -i $out/debs/*.deb diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 5ed2b0752efc..9578fbf482f2 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -74,10 +74,9 @@ stdenv.mkDerivation ( if test -n "$succeedOnFailure"; then if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" - header "Copying build directory to $KEEPBUILDDIR" + echo "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR cp -R "$TMPDIR/"* $KEEPBUILDDIR - stopNest fi fi ''; diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 742cce13b7bf..d624d071cc21 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -64,10 +64,9 @@ stdenv.mkDerivation ( if test -n "$succeedOnFailure"; then if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" - header "Copying build directory to $KEEPBUILDDIR" + echo "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR cp -R "$TMPDIR/"* $KEEPBUILDDIR - stopNest fi fi ''; diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh index 9c03bc2ee935..36714178156b 100644 --- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh +++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh @@ -13,7 +13,7 @@ auditTmpdir() { local dir="$1" [ -e "$dir" ] || return 0 - header "checking for references to $TMPDIR/ in $dir..." + echo "checking for references to $TMPDIR/ in $dir..." local i find "$dir" -type f -print0 | while IFS= read -r -d $'\0' i; do @@ -36,6 +36,4 @@ auditTmpdir() { fi done - - stopNest } diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.py b/pkgs/build-support/setup-hooks/auto-patchelf.py index efb65a809962..e731feb1b125 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.py +++ b/pkgs/build-support/setup-hooks/auto-patchelf.py @@ -131,7 +131,14 @@ def populate_cache(initial: List[Path], recursive: bool =False) -> None: if not path.is_file(): continue + # As an optimisation, resolve the symlinks here, as the target is unique + # XXX: (layus, 2022-07-25) is this really an optimisation in all cases ? + # It could make the rpath bigger or break the fragile precedence of $out. resolved = path.resolve() + # Do not use resolved paths when names do not match + if resolved.name != path.name: + resolved = path + try: with open_elf(path) as elf: osabi = get_osabi(elf) diff --git a/pkgs/build-support/setup-hooks/canonicalize-jars.sh b/pkgs/build-support/setup-hooks/canonicalize-jars.sh index 8c55810748ea..5137bfc94b01 100644 --- a/pkgs/build-support/setup-hooks/canonicalize-jars.sh +++ b/pkgs/build-support/setup-hooks/canonicalize-jars.sh @@ -6,12 +6,11 @@ fixupOutputHooks+=('if [ -z "$dontCanonicalizeJars" -a -e "$prefix" ]; then cano canonicalizeJarsIn() { local dir="$1" - header "canonicalizing jars in $dir" + echo "canonicalizing jars in $dir" dir="$(realpath -sm -- "$dir")" while IFS= read -rd '' f; do canonicalizeJar "$f" done < <(find -- "$dir" -type f -name '*.jar' -print0) - stopNest } source @canonicalize_jar@ diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix index c9b03b75cd03..c81a253b0de8 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix @@ -10,6 +10,8 @@ }: makeSetupHook { + name = "make-binary-wrapper-hook"; + deps = [ dieHook ] # https://github.com/NixOS/nixpkgs/issues/148189 ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc; diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh index cd9c2eaa2d80..f34353a7617b 100644 --- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh +++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh @@ -6,8 +6,8 @@ postFixupHooks+=(_makeSymlinksRelative) _makeSymlinksRelative() { local symlinkTarget - if [ -n "${dontRewriteSymlinks-}" ]; then - return 0 + if [ "${dontRewriteSymlinks-}" ] || [ ! -e "$prefix" ]; then + return fi while IFS= read -r -d $'\0' f; do diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 8a2fc2f915e9..3a318933f138 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -4,16 +4,32 @@ preFixupHooks+=(_multioutDocs) preFixupHooks+=(_multioutDevs) postFixupHooks+=(_multioutPropagateDev) -# Assign the first string containing nonempty variable to the variable named $1 +# _assignFirst varName otherVarNames* +# +# Set the value of the variable named $varName to the first of otherVarNames +# that refers to a non-empty variable name. +# +# If none of otherVarNames refers to a non-empty variable, the error message is +# specific to this function's use case, which is setting up the output variables. _assignFirst() { local varName="$1" local REMOVE=REMOVE # slightly hacky - we allow REMOVE (i.e. not a variable name) shift - while (( $# )); do - if [ -n "${!1-}" ]; then eval "${varName}"="$1"; return; fi - shift + for var in "$@"; do + if [ -n "${!var-}" ]; then eval "${varName}"="${var}"; return; fi done - echo "Error: _assignFirst found no valid variant!" + echo + echo "error: _assignFirst: could not find a non-empty variable to assign to ${varName}." + echo " The following variables were all unset or empty:" + echo " $*" + if [ -z "${out:-}" ]; then + echo ' If you do not want an "out" output in your derivation, make sure to define' + echo ' the other specific required outputs. This can be achieved by picking one' + echo " of the above as an output." + echo ' You do not have to remove "out" if you want to have a different default' + echo ' output, because the first output is taken as a default.' + echo + fi return 1 # none found } diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 04ebcd2cc64e..a26113abea88 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -100,8 +100,6 @@ patchShebangs() { fi fi done < <(find "$@" -type f -perm -0100 -print0) - - stopNest } patchShebangsAuto () { diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh index 8131304cccf9..3eec67d60feb 100644 --- a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh +++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh @@ -53,7 +53,7 @@ EOF echo >&2 'initdb not found. Did you add postgresql to the nativeCheckInputs?' false fi - header 'initializing postgresql' + echo 'initializing postgresql' initdb -U postgres # Move the socket @@ -65,10 +65,10 @@ EOF echo "listen_addresses = ''" >>"$PGDATA/postgresql.conf" fi - header 'starting postgresql' + echo 'starting postgresql' eval "${postgresqlStartCommands:-pg_ctl start}" - header 'setting up postgresql' + echo 'setting up postgresql' eval "$postgresqlTestSetupCommands" runHook postgresqlTestSetupPost @@ -76,6 +76,6 @@ EOF } postgresqlStop() { - header 'stopping postgresql' + echo 'stopping postgresql' pg_ctl stop } diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index be94af545be1..3c8c9c294c3e 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -26,7 +26,7 @@ _separateDebugInfo() { fi # Extract the debug info. - header "separating debug info from $i (build ID $id)" + echo "separating debug info from $i (build ID $id)" mkdir -p "$dst/${id:0:2}" # This may fail, e.g. if the binary is for a different diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index 104b5515b3db..f5e3bdced699 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -36,7 +36,7 @@ _doStrip() { local -n ranlibCmd="${ranlibCmds[$i]}" # `dontStrip` disables them all - if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null + if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null 1>&2 then continue; fi stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S}" diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 6ab0ee843cb0..15694162edde 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -121,4 +121,6 @@ in nixosTesting.simpleTest calledTest; + hasPkgConfigModule = callPackage ./hasPkgConfigModule/tester.nix { }; + } diff --git a/pkgs/build-support/testers/hasPkgConfigModule/tester.nix b/pkgs/build-support/testers/hasPkgConfigModule/tester.nix new file mode 100644 index 000000000000..c8342cdd5c3b --- /dev/null +++ b/pkgs/build-support/testers/hasPkgConfigModule/tester.nix @@ -0,0 +1,47 @@ +# Static arguments +{ runCommand, pkg-config }: + +# Tester arguments +{ package, + moduleName, + testName ? "check-pkg-config-${moduleName}", +}: + +runCommand testName { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ package ]; + inherit moduleName; + meta = { + description = "Test whether ${package.name} exposes pkg-config module ${moduleName}"; + } + # Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org, + # as hydra can't check this meta info in dependencies. + # The test itself is just Nixpkgs, with MIT license. + // builtins.intersectAttrs + { + available = throw "unused"; + broken = throw "unused"; + insecure = throw "unused"; + license = throw "unused"; + maintainers = throw "unused"; + platforms = throw "unused"; + unfree = throw "unused"; + unsupported = throw "unused"; + } + package.meta; + } '' + echo "checking pkg-config module $moduleName in $buildInputs" + set +e + version="$(pkg-config --modversion $moduleName)" + r=$? + set -e + if [[ $r = 0 ]]; then + echo "✅ pkg-config module $moduleName exists and has version $version" + echo "$version" > $out + else + echo "These modules were available in the input propagation closure:" + pkg-config --list-all + echo "❌ pkg-config module $moduleName was not found" + false + fi + '' diff --git a/pkgs/build-support/testers/hasPkgConfigModule/tests.nix b/pkgs/build-support/testers/hasPkgConfigModule/tests.nix new file mode 100644 index 000000000000..8005c3f93709 --- /dev/null +++ b/pkgs/build-support/testers/hasPkgConfigModule/tests.nix @@ -0,0 +1,36 @@ +# cd nixpkgs +# nix-build -A tests.testers.hasPkgConfigModule +{ lib, testers, zlib, runCommand }: + +lib.recurseIntoAttrs { + + zlib-has-zlib = testers.hasPkgConfigModule { + package = zlib; + moduleName = "zlib"; + }; + + zlib-does-not-have-ylib = runCommand "zlib-does-not-have-ylib" { + failed = testers.testBuildFailure ( + testers.hasPkgConfigModule { + package = zlib; + moduleName = "ylib"; + } + ); + } '' + echo 'it logs a relevant error message' + { + grep -F "pkg-config module ylib was not found" $failed/testBuildFailure.log + } + + echo 'it logs which pkg-config modules are available, to be helpful' + { + # grep -v: the string zlib does also occur in a store path in an earlier message, which isn't particularly helpful + grep -v "checking pkg-config module" < $failed/testBuildFailure.log \ + | grep -F "zlib" + } + + # done + touch $out + ''; + +} diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix index 0a5381b2b738..313c556737fb 100644 --- a/pkgs/build-support/testers/test/default.nix +++ b/pkgs/build-support/testers/test/default.nix @@ -12,6 +12,8 @@ let in lib.recurseIntoAttrs { + hasPkgConfigModule = pkgs.callPackage ../hasPkgConfigModule/tests.nix { }; + # Check that the wiring of nixosTest is correct. # Correct operation of the NixOS test driver should be asserted elsewhere. nixosTest-example = pkgs-with-overlay.testers.nixosTest ({ lib, pkgs, figlet, ... }: { diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 80c3214f06a3..3de041636f05 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -546,6 +546,7 @@ rec { * # writes a Linux-exclusive setup hook where @bash@ myscript.sh is substituted for the * # bash interpreter. * myhellohookSub = makeSetupHook { + * name = "myscript-hook"; * deps = [ hello ]; * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; * meta.platforms = lib.platforms.linux; @@ -553,13 +554,21 @@ rec { * * # setup hook with a package test * myhellohookTested = makeSetupHook { + * name = "myscript-hook"; * deps = [ hello ]; * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; * meta.platforms = lib.platforms.linux; * passthru.tests.greeting = callPackage ./test { }; * } ./myscript.sh; */ - makeSetupHook = { name ? "hook", deps ? [], substitutions ? {}, meta ? {}, passthru ? {} }: script: + makeSetupHook = + { name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook" + , deps ? [] + , substitutions ? {} + , meta ? {} + , passthru ? {} + }: + script: runCommand name (substitutions // { inherit meta; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 7bae2fc7cfb2..84754e580302 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -527,9 +527,8 @@ rec { echo "System/kernel: $(uname -a)" if test -e /etc/fedora-release; then echo "Fedora release: $(cat /etc/fedora-release)"; fi if test -e /etc/SuSE-release; then echo "SUSE release: $(cat /etc/SuSE-release)"; fi - header "installed RPM packages" + echo "installed RPM packages" rpm -qa --qf "%{Name}-%{Version}-%{Release} (%{Arch}; %{Distribution}; %{Vendor})\n" - stopNest ''; buildPhase = '' @@ -559,9 +558,8 @@ rec { find $rpmout -name "*.rpm" -exec cp {} $out/$outDir \; for i in $out/$outDir/*.rpm; do - header "Generated RPM/SRPM: $i" + echo "Generated RPM/SRPM: $i" rpm -qip $i - stopNest done eval "$postInstall" diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index 259ac0141b2b..81a175b944b8 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "arkpandora"; version = "2.04"; -in fetchurl { - name = "arkpandora-${version}"; - urls = [ - "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" - "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" - "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" - ]; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 + src = fetchurl { + urls = [ + "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" + "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" + "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" + ]; + hash = "sha256-ofyVPJjQD8w+8WgETF2UcJlfbSsKQgBsH3ob+yjvrpo="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "177k0fbs0787al0snkl8w68d2qkg7snnnq6qp28j9s98vaabs04k"; meta = { description = "Font, metrically identical to Arial and Times New Roman"; diff --git a/pkgs/data/fonts/atkinson-hyperlegible/default.nix b/pkgs/data/fonts/atkinson-hyperlegible/default.nix index 8b2b04553726..e8b09cfb637c 100644 --- a/pkgs/data/fonts/atkinson-hyperlegible/default.nix +++ b/pkgs/data/fonts/atkinson-hyperlegible/default.nix @@ -1,21 +1,22 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "atkinson-hyperlegible"; version = "unstable-2021-04-29"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "googlefonts"; - repo = "atkinson-hyperlegible"; - rev = "1cb311624b2ddf88e9e37873999d165a8cd28b46"; - sha256 = "sha256-urSTqC3rfDRM8IMG+edwKEe7NPiTuDZph3heGHzLDks="; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "atkinson-hyperlegible"; + rev = "1cb311624b2ddf88e9e37873999d165a8cd28b46"; + hash = "sha256-RN4m5gyY2OiPzRXgFVQ3pq6JdkPcMxV4fRlX2EK+gOM="; + }; - postFetch = '' - install -Dm644 -t $out/share/fonts/opentype $out/fonts/otf/* - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/share/fonts/opentype fonts/otf/* + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index 50f456373c69..f1ee19b3b157 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "aurulent-sans-0.1"; - owner = "deepfire"; - repo = "hartke-aurulent-sans"; - rev = name; - postFetch = '' - mkdir -p $out/share/fonts - tar xf $downloadedFile -C $out/share/fonts --strip=1 +stdenvNoCC.mkDerivation rec { + pname = "aurulent-sans"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "deepfire"; + repo = "hartke-aurulent-sans"; + rev = "${pname}-${version}"; + hash = "sha256-M/duhgqxXZJq5su9FrsGjZdm+wtO5B5meoDomde+GwY="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts + + runHook postInstall ''; - sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li"; meta = { description = "Aurulent Sans"; diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix index c38329227f02..b78f3a9e85bf 100644 --- a/pkgs/data/fonts/b612/default.nix +++ b/pkgs/data/fonts/b612/default.nix @@ -1,25 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { +stdenvNoCC.mkDerivation rec { pname = "b612"; version = "1.008"; - owner = "polarsys"; - repo = "b612"; - rev = version; + src = fetchFromGitHub { + owner = "polarsys"; + repo = "b612"; + rev = version; + hash = "sha256-uyBC8UNOwztCHXhR9XZuWDwrty0eClbo0E+gI1PmjEg="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype + mv fonts/ttf/*.ttf $out/share/fonts/truetype - mv $out/fonts/ttf/*.ttf $out/share/fonts/truetype - - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; - hash = "sha256-aJ3XzWQauPsWwEDAHT2rD9a8RvLv1kqU3krFXprmypk="; - meta = with lib; { homepage = "https://b612-font.com/"; description = "Highly legible font family for use on aircraft cockpit screens"; @@ -36,8 +36,8 @@ fetchFromGitHub rec { variants of the font. This one, baptized B612 in reference to the imaginary asteroid of the aviator Saint‑Exupéry, benefited from a complete hinting on all the characters. - ''; - license = with licenses; [ ofl epl10 bsd3 ] ; + ''; + license = with licenses; [ ofl epl10 bsd3 ]; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix index be6ed005b166..143975f28db7 100644 --- a/pkgs/data/fonts/behdad-fonts/default.nix +++ b/pkgs/data/fonts/behdad-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "behdad-fonts"; version = "0.0.3"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "font-store"; - repo = "BehdadFont"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "font-store"; + repo = "BehdadFont"; + rev = "v${version}"; + hash = "sha256-gKfzxo3/bCMKXl2d6SP07ahIiNrUyrk/SN5XLND2lWY="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/behrad-fonts {} \; + + runHook postInstall ''; - sha256 = "0c57232462cv1jrfn0m2bl7jzcfkacirrdd2qimrc8iqhkz0ajfz"; meta = with lib; { homepage = "https://github.com/font-store/BehdadFont"; diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix index e68d429db2e8..186a5359c44f 100644 --- a/pkgs/data/fonts/cabin/default.nix +++ b/pkgs/data/fonts/cabin/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "cabin-1.005"; +stdenvNoCC.mkDerivation rec { + pname = "cabin"; + version = "1.005"; - owner = "impallari"; - repo = "Cabin"; - rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Cabin"; + rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + hash = "sha256-9l4QcwCot340Bq41ER68HSZGQ9h0opyzgG3DG/fVZ5s="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype fonts/OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "1bl7h217m695jn4rbniialfk573aa44fslp2rjxnhkicakpcm44h"; + runHook postInstall + ''; meta = with lib; { description = "A humanist sans with 4 weights and true italics"; diff --git a/pkgs/data/fonts/ccsymbols/default.nix b/pkgs/data/fonts/ccsymbols/default.nix index a32d35a08852..f31dc65a8a56 100644 --- a/pkgs/data/fonts/ccsymbols/default.nix +++ b/pkgs/data/fonts/ccsymbols/default.nix @@ -1,23 +1,24 @@ -{ lib, fetchurl, unzip }: +{ lib, stdenvNoCC, fetchurl, unzip }: -let +stdenvNoCC.mkDerivation rec { pname = "ccsymbols"; version = "2020-04-19"; -in -fetchurl rec { - name = "${pname}-${version}"; + src = fetchurl { + url = "https://www.ctrl.blog/file/${version}_cc-symbols.zip"; + hash = "sha256-hkARhb8T6VgGAybYkVuPuebjhuk1dwiBJ1bZMwvYpMY="; + }; - url = "https://www.ctrl.blog/file/${version}_cc-symbols.zip"; - sha256 = "sha256-mrNgTS6BAVJrIz9fHOjf8pkSbZtZ55UjyoL9tQ1fiA8="; - recursiveHash = true; + sourceRoot = "."; nativeBuildInputs = [ unzip ]; - downloadToTemp = true; - postFetch = '' - mkdir -p "$out/share/fonts/ccsymbols" - unzip -d "$out/share/fonts/ccsymbols" "$downloadedFile" + installPhase = '' + runHook preInstall + + install -Dm644 CCSymbols.* -t $out/share/fonts/ccsymbols + + runHook postInstall ''; passthru = { inherit pname version; }; diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/pkgs/data/fonts/cnstrokeorder/default.nix index 965bf119f6e7..66803b1b63ff 100644 --- a/pkgs/data/fonts/cnstrokeorder/default.nix +++ b/pkgs/data/fonts/cnstrokeorder/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "cnstrokeorder"; version = "0.0.4.7"; -in fetchurl { - name = "cnstrokeorder-${version}"; - url = "http://rtega.be/chmn/CNstrokeorder-${version}.ttf"; + src = fetchurl { + url = "http://rtega.be/chmn/CNstrokeorder-${version}.ttf"; + hash = "sha256-YYtOcUvt1V0DwAs/vf9KltcmYCFJNirvwjGyOK4JpIY="; + }; - recursiveHash = true; - downloadToTemp = true; + dontUnpack = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/truetype/CNstrokeorder-${version}.ttf + installPhase = '' + runHook preInstall + + install -D $src $out/share/fonts/truetype/CNstrokeorder-${version}.ttf + + runHook postInstall ''; - sha256 = "0cizgfdgbq9av5c8234mysr2q54iw9pkxrmq5ga8gv32hxhl5bx4"; - meta = with lib; { description = "Chinese font that shows stroke order for HSK 1-4"; homepage = "http://rtega.be/chmn/index.php?subpage=68"; diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index fc7ce56f7965..f47da9fc5306 100644 --- a/pkgs/data/fonts/comfortaa/default.nix +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -1,28 +1,37 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "2021-07-29"; -in fetchFromGitHub rec { - name = "comfortaa-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "comfortaa"; + version = "unstable-2021-07-29"; - owner = "googlefonts"; - repo = "comfortaa"; - rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b"; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = pname; + rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b"; + postFetch = '' + # Remove the OTF fonts as they are not needed and cause a hash mismatch + rm -rf $out/fonts/{OTF,otf} + ''; + hash = "sha256-4ZBRaQyYlnt9l4NgBHezuCnR3rKTJ37L41RTbGAhd0M="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype $out/share/doc/comfortaa cp fonts/TTF/*.ttf $out/share/fonts/truetype cp FONTLOG.txt README.md $out/share/doc/comfortaa - ''; - sha256 = "12ad7qy11q49iv9h3l2d7x7y7kf0hxbqhclb92bzwig8dzly9n2k"; + runHook postInstall + ''; meta = with lib; { homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949"; description = "A clean and modern font suitable for headings and logos"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/comic-mono/default.nix b/pkgs/data/fonts/comic-mono/default.nix index 0c915f21c132..fc3b8d6085be 100644 --- a/pkgs/data/fonts/comic-mono/default.nix +++ b/pkgs/data/fonts/comic-mono/default.nix @@ -1,23 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "comic-mono-font"; version = "2020-12-28"; -in fetchFromGitHub { - name = "comic-mono-font-${version}"; - owner = "dtinth"; - repo = "comic-mono-font"; - rev = "9a96d04cdd2919964169192e7d9de5012ef66de4"; + src = fetchFromGitHub { + owner = "dtinth"; + repo = "comic-mono-font"; + rev = "9a96d04cdd2919964169192e7d9de5012ef66de4"; + hash = "sha256-q8NxrluWuH23FfRlntIS0MDdl3TkkGE7umcU2plS6eU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts - tar -z -f $downloadedFile --wildcards -x \*.ttf --one-top-level=$out/share/fonts + cp *.ttf $out/share/fonts mkdir -p $out/etc/fonts/conf.d ln -s ${./comic-mono-weight.conf} $out/etc/fonts/conf.d/30-comic-mono.conf - ''; - hash = "sha256-poMU+WfDZcsyWyFiiXKJ284X22CJlxQIzcJtApnIdAY="; + runHook postInstall + ''; meta = with lib; { description = "A legible monospace font that looks like Comic Sans"; diff --git a/pkgs/data/fonts/curie/default.nix b/pkgs/data/fonts/curie/default.nix index fd21d1964a21..4f3ab7eb013a 100644 --- a/pkgs/data/fonts/curie/default.nix +++ b/pkgs/data/fonts/curie/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "curie"; version = "1.0"; -in fetchurl rec { - name = "curie-${version}"; - url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz"; + src = fetchurl { + url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz"; + hash = "sha256-B89GNbOmm3lY/cRWQJEFu/5morCM/WrRQb/m6covbt8="; + }; - downloadToTemp = true; + sourceRoot = "."; - recursiveHash = true; + installPhase = '' + runHook preInstall - sha256 = "sha256-twPAzsbTveYW0rQd7FYZz5AMZgvPbNmn5c7Nfzn7B0A="; - - postFetch = '' - tar xzf $downloadedFile mkdir -p $out/share/fonts/misc install *.otb $out/share/fonts/misc + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/dancing-script/default.nix b/pkgs/data/fonts/dancing-script/default.nix index 5129f4bc5a5e..796069195990 100644 --- a/pkgs/data/fonts/dancing-script/default.nix +++ b/pkgs/data/fonts/dancing-script/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "dancing-script"; version = "2.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "impallari"; - repo = "DancingScript"; - rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; - sha256 = "dfFvh8h+oMhAQL9XKMrNr07VUkdQdxAsA8+q27KWWCA="; + src = fetchFromGitHub { + owner = "impallari"; + repo = "DancingScript"; + rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; + hash = "sha256-B9oAZFPH3dG/Nt5FfKfFVJYtfUKGK0AXNkQHRC7IgdU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix index 918996c5f644..a33f086c9bbe 100644 --- a/pkgs/data/fonts/dosis/default.nix +++ b/pkgs/data/fonts/dosis/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "dosis-1.007"; +stdenvNoCC.mkDerivation rec { + pname = "dosis"; + version = "1.007"; - owner = "impallari"; - repo = "Dosis"; - rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Dosis"; + rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + hash = "sha256-rZ49uNBlI+NWkiZykpyXzOonXlbVB6Vf6a/8A56Plj4="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \; - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0vz25w45i8flfvppymr5h83pa2n1r37da20v7691p44018fdsdny"; + runHook postInstall + ''; meta = with lib; { description = "A very simple, rounded, sans serif family"; diff --git a/pkgs/data/fonts/edwin/default.nix b/pkgs/data/fonts/edwin/default.nix index 4b1688dbc55e..d46db86faa13 100644 --- a/pkgs/data/fonts/edwin/default.nix +++ b/pkgs/data/fonts/edwin/default.nix @@ -1,22 +1,21 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "edwin"; version = "0.52"; -in fetchurl { - name = "edwin-${version}"; - url = "https://github.com/MuseScoreFonts/Edwin/archive/refs/tags/v${version}.tar.gz"; + src = fetchurl { + url = "https://github.com/MuseScoreFonts/Edwin/archive/refs/tags/v${version}.tar.gz"; + hash = "sha256-7yQUiLZupGc+RCZdhyO08JWqhROYqMOZ9wRdGJ6uixU="; + }; - downloadToTemp = true; + installPhase = '' + runHook preInstall - recursiveHash = true; - - sha256 = "sha256-e0ADK72ECl+QMvLWtFJfeHBmuEwzr9M+Kqvkd5Z2mmo="; - - postFetch = '' - tar xzf $downloadedFile mkdir -p $out/share/fonts/opentype - install Edwin-${version}/*.otf $out/share/fonts/opentype + install *.otf $out/share/fonts/opentype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix index c410826b2fb5..d1b59e2cdc0f 100644 --- a/pkgs/data/fonts/et-book/default.nix +++ b/pkgs/data/fonts/et-book/default.nix @@ -1,16 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; - name = "et-book-${builtins.substring 0 6 rev}"; - owner = "edwardtufte"; - repo = "et-book"; - sha256 = "1bfb1l8k7fzgk2l8cikiyfn5x9m0fiwrnsbc1483p8w3qp58s5n2"; +stdenvNoCC.mkDerivation rec { + pname = "et-book"; + version = "unstable-2015-10-05"; + + src = fetchFromGitHub { + owner = "edwardtufte"; + repo = pname; + rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; + hash = "sha256-B6ryC9ibNop08TJC/w9LSHHwqV/81EezXsTUJFq8xpo="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzf $downloadedFile mkdir -p $out/share/fonts/truetype - cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf + cp -t $out/share/fonts/truetype source/4-ttf/*.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 039c5099b56e..89af9fb7b7c3 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "fira"; version = "4.202"; -in fetchFromGitHub { - name = "fira-${version}"; - owner = "mozilla"; - repo = "Fira"; - rev = version; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "Fira"; + rev = version; + hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/opentype cp otf/*.otf $out/share/fonts/opentype - ''; - sha256 = "1iwxbp7kw5kghh5nbycb05zby7p2ib61mywva3h6giv2wd4lpxnz"; + runHook postInstall + ''; meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index cb9d5e73ed2a..53592152a333 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchurl } : +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "fixedsys-excelsior"; version = "3.00"; -in fetchurl rec { - name = "fixedsys-excelsior-${version}"; - url = "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf"; + src = fetchurl { + url = "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf"; + hash = "sha256-buDzVzvF4z6TthbvYoL0m8DiJ6Map1Osdu0uPz0CBW0="; + }; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -m444 -D $downloadedFile $out/share/fonts/truetype/${name}.ttf + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -m444 -D $src $out/share/fonts/truetype/${pname}-${version}.ttf + + runHook postInstall ''; - sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37"; - meta = { homepage = "http://www.fixedsysexcelsior.com/"; description = "Pan-unicode version of Fixedsys, a classic DOS font"; diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index 973df59e408b..a6f748f2f07f 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: let - font-awesome = { version, sha256, rev ? version }: fetchFromGitHub { - name = "font-awesome-${version}"; + font-awesome = { version, hash, rev ? version }: stdenvNoCC.mkDerivation { + pname = "font-awesome"; + inherit version; + src = fetchFromGitHub { + owner = "FortAwesome"; + repo = "Font-Awesome"; + inherit rev hash; + }; - owner = "FortAwesome"; - repo = "Font-Awesome"; - inherit rev; + installPhase = '' + runHook preInstall - postFetch = '' - install -m444 -Dt $out/share/fonts/opentype $out/{fonts,otfs}/*.otf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf + + runHook postInstall ''; - inherit sha256; - meta = with lib; { description = "Font Awesome - OTF font"; longDescription = '' @@ -40,14 +41,14 @@ in v4 = font-awesome { version = "4.7.0"; rev = "v4.7.0"; - sha256 = "sha256-qdrIwxAB+z+4PXrKrj6bBuiJY0DYQuHm2DRng5sYEck="; + hash = "sha256-LL9zWFC+76wH74nqKszPQf2ZDfXq8BiH6tuiK43wYHA="; }; v5 = font-awesome { version = "5.15.3"; - sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0="; + hash = "sha256-CFXGsl70o/gXUCEKu8Wkv4EBRhrrcMIq8NpfWzcxEus="; }; v6 = font-awesome { version = "6.1.1"; - sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA="; + hash = "sha256-rujqhKI33Pi2xugMKGoTJDkPkCDK407+Da6yNJP2yAc="; }; } diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/data/fonts/gandom-fonts/default.nix index 1b8b3307eb35..53ea5558c1f1 100644 --- a/pkgs/data/fonts/gandom-fonts/default.nix +++ b/pkgs/data/fonts/gandom-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "gandom-fonts"; version = "0.8"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "gandom-font"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "gandom-font"; + rev = "v${version}"; + hash = "sha256-nez8T0TtRLyXxIIR69LrVGde5ThCvA0fLXkYLyYQRV8="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/gandom-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-EDS3wwKwe2BIcOCxu7DxkVLCoEoTPP31k5ID51lqn3M="; meta = with lib; { homepage = "https://github.com/rastikerdar/gandom-font"; diff --git a/pkgs/data/fonts/gelasio/default.nix b/pkgs/data/fonts/gelasio/default.nix index c8cf655a18cf..cea8e439d36b 100644 --- a/pkgs/data/fonts/gelasio/default.nix +++ b/pkgs/data/fonts/gelasio/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "unstable-2018-08-12"; -in fetchFromGitHub { - name = "gelasio-${version}"; - owner = "SorkinType"; - repo = "Gelasio"; - rev = "5bced461d54bcf8e900bb3ba69455af35b0d2ff1"; - sha256 = "0dfskz2vpwsmd88rxqsxf0f01g4f2hm6073afcm424x5gc297n39"; +stdenvNoCC.mkDerivation { + pname = "gelasio"; + version = "unstable-2022-06-09"; + + src = fetchFromGitHub { + owner = "SorkinType"; + repo = "Gelasio"; + rev = "a75c6d30a35f74cdbaea1813bdbcdb64bb11d3d5"; + hash = "sha256-ncm0lSDPPPREdxTx3dGl6OGBn4FGAjFTlQpA6oDCdMI="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype/ + cp fonts/ttf/*.ttf $out/share/fonts/truetype/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/i-dot-ming/default.nix b/pkgs/data/fonts/i-dot-ming/default.nix index d15d7bcc245e..fb2679b2eba2 100644 --- a/pkgs/data/fonts/i-dot-ming/default.nix +++ b/pkgs/data/fonts/i-dot-ming/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchurl, writeScript }: +{ lib, stdenvNoCC, fetchurl, writeScript }: -let +stdenvNoCC.mkDerivation rec { + pname = "i.ming"; version = "8.00"; -in -fetchurl { - name = "i.ming-${version}"; - url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; - hash = "sha256-JGu9H0+IdJL6QQtLwvqlFLEaJdq1JVRiqLm5zptwjyE="; - recursiveHash = true; - downloadToTemp = true; - postFetch = '' - install -DT -m444 $downloadedFile $out/share/fonts/truetype/I.Ming/I.Ming.ttf + src = fetchurl { + url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; + hash = "sha256-6345629OdKz6lTnD3Vjtp6DzsYy0ojaL0naXGrtdZvw="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -DT -m444 $src $out/share/fonts/truetype/I.Ming/I.Ming.ttf + + runHook postInstall ''; passthru = { diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/data/fonts/ia-writer-duospace/default.nix index 6da80a1bf830..483ed98737d0 100644 --- a/pkgs/data/fonts/ia-writer-duospace/default.nix +++ b/pkgs/data/fonts/ia-writer-duospace/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "20180721"; -in fetchFromGitHub { - name = "ia-writer-duospace-${version}"; +stdenvNoCC.mkDerivation { + pname = "ia-writer-duospace"; + version = "unstable-2018-07-21"; - owner = "iaolo"; - repo = "iA-Fonts"; - rev = "55edf60f544078ab1e14987bc67e9029a200e0eb"; - sha256 = "0932lcxf861vb3hz52z1xj8r99ag9sdyqsnq9brv7gc4kp2l339c"; + src = fetchFromGitHub { + owner = "iaolo"; + repo = "iA-Fonts"; + rev = "55edf60f544078ab1e14987bc67e9029a200e0eb"; + hash = "sha256-/ifzOScILLuFkjFIgpy0ArCcelgealbpypKvZ46xApU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar --strip-components=1 -xzvf $downloadedFile mkdir -p $out/share/fonts/opentype cp "iA Writer Duospace/OTF (Mac)/"*.otf $out/share/fonts/opentype/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 9909f8f5a3e0..0de1f38a0ff8 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "ibm-plex"; - version = "6.0.1"; + version = "6.1.1"; src = fetchzip { url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; - hash = "sha256-n13NuKrZUc0JGvDf2PLZkxogefDkEHaOZk4JN42/C74="; + hash = "sha256-PZ7KPtaXZFVD5uMc7i+GQMA4DU5PsspeAodiU/FrTpY="; }; installPhase = '' diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix index d8127b851274..1ca1ce2f9098 100644 --- a/pkgs/data/fonts/inriafonts/default.nix +++ b/pkgs/data/fonts/inriafonts/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "inriafonts"; version = "1.200"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "BlackFoundry"; - repo = "InriaFonts"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "BlackFoundry"; + repo = "InriaFonts"; + rev = "v${version}"; + hash = "sha256-CMKkwGuUEVYavnFi15FCk7Xloyk97w+LhAZ6mpIv5xg="; + }; + + installPhase = '' + runHook preInstall + install -m444 -Dt $out/share/fonts/truetype fonts/*/TTF/*.ttf install -m444 -Dt $out/share/fonts/opentype fonts/*/OTF/*.otf + + runHook postInstall ''; - sha256 = "0wrwcyycyzvgvgnlmwi1ncdvwb8f6bbclynd1105rsyxgrz5dd70"; meta = with lib; { homepage = "https://black-foundry.com/work/inria"; diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index 2e535255cc6b..d59c111c96b7 100644 --- a/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "ir-standard-fonts"; - version = "unstable-2017-01-21"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "morealaz"; - repo = pname; - rev = "d36727d6c38c23c01b3074565667a2fe231fe18f"; + version = "20170121"; + + src = fetchFromGitHub { + owner = "molaeiali"; + repo = pname; + rev = version; + hash = "sha256-o1d8SBX3nf7g6Gh4OP+JRS+LNrHTQOIiHhW3VNCkDV0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/ir-standard-fonts {} \; + + runHook postInstall ''; - sha256 = "0i2vzhwk77pm6fx5z5gxl026z9f35rhh3cvl003mry2lcg1x5rhp"; meta = with lib; { homepage = "https://github.com/morealaz/ir-standard-fonts"; diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 5f5ce1048c5e..4e42cf1c4174 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,23 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "junicode"; version = "1.003"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "psb1558"; - repo = "Junicode-font"; - rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; + src = fetchFromGitHub { + owner = "psb1558"; + repo = "Junicode-font"; + rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; + hash = "sha256-eTiMgI8prnpR4H6sqKRaB3Gcnt4C5QWZalRajWW49G4="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' local out_ttf=$out/share/fonts/junicode-ttf mkdir -p $out_ttf - tar -f $downloadedFile -C $out_ttf --wildcards -x '*.ttf' --strip=2 - ''; + cp legacy/*.ttf $out_ttf - sha256 = "1v334gljmidh58kmrarz5pf348b0ac7vh25f1xs3gyvn78khh5nw"; + runHook postInstall + ''; meta = { homepage = "https://github.com/psb1558/Junicode-font"; diff --git a/pkgs/data/fonts/kreative-square-fonts/default.nix b/pkgs/data/fonts/kreative-square-fonts/default.nix index c9e51319733f..f6a0023bd11f 100644 --- a/pkgs/data/fonts/kreative-square-fonts/default.nix +++ b/pkgs/data/fonts/kreative-square-fonts/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "kreative-square-fonts"; version = "unstable-2021-01-29"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "kreativekorp"; - repo = "open-relay"; - rev = "084f05af3602307499981651eca56851bec01fca"; + src = fetchFromGitHub { + owner = "kreativekorp"; + repo = "open-relay"; + rev = "084f05af3602307499981651eca56851bec01fca"; + hash = "sha256-+ihosENczaGal3BGDIaJ/de0pf8txdtelSYMxPok6ww="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquare.ttf install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquareSM.ttf + + runHook postInstall ''; - sha256 = "15vvbbzv6b3jh7lxg77viycdd7yf3y8lxy54vs3rsrsxwncg0pak"; meta = with lib; { description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters"; diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/data/fonts/lalezar-fonts/default.nix index 31a857bfda05..f54c17b51f3d 100644 --- a/pkgs/data/fonts/lalezar-fonts/default.nix +++ b/pkgs/data/fonts/lalezar-fonts/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "lalezar-fonts"; version = "unstable-2017-02-28"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "BornaIz"; - repo = "Lalezar"; - rev = "238701c4241f207e92515f845a199be9131c1109"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "BornaIz"; + repo = "Lalezar"; + rev = "238701c4241f207e92515f845a199be9131c1109"; + hash = "sha256-95z58ABTx53aREXRpj9xgclX9kuGiQiiKBwqwnF6f8g="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/lalezar-fonts cp -v $( find . -name '*.ttf') $out/share/fonts/lalezar-fonts + + runHook postInstall ''; - sha256 = "0jmwhr2dqgj3vn0v26jh6c0id6n3wd6as3bq39xa870zlk7v307b"; meta = with lib; { homepage = "https://github.com/BornaIz/Lalezar"; diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/data/fonts/last-resort/default.nix index 7b298c73169f..1932fd6da8a9 100644 --- a/pkgs/data/fonts/last-resort/default.nix +++ b/pkgs/data/fonts/last-resort/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "last-resort"; version = "15.000"; -in fetchurl { - name = "last-resort-${version}"; - url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf"; - downloadToTemp = true; + src = fetchurl { + url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf"; + hash = "sha256-Qyo/tuBvBHnG/LW8sUAy62xpeqlXfyfwjUCbr4vJEag="; + }; - postFetch = '' - install -D -m 0644 $downloadedFile $out/share/fonts/truetype/LastResortHE-Regular.ttf + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -D -m 0644 $src $out/share/fonts/truetype/LastResortHE-Regular.ttf + + runHook postInstall ''; - recursiveHash = true; - sha256 = "sha256-mkRIA6Hajl5e9j/qb3WSKaIaHmekjl5wGUSszWMfmjw="; - meta = with lib; { description = "Fallback font of last resort"; homepage = "https://github.com/unicode-org/last-resort-font"; diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 8f58cb92baa4..cc60f8096531 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -1,18 +1,20 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "libertinus"; version = "7.040"; -in fetchurl rec { - name = "libertinus-${version}"; - url = "https://github.com/alerque/libertinus/releases/download/v${version}/Libertinus-${version}.tar.xz"; - sha256 = "0z658r88p52dyrcslv0wlccw0sw7m5jz8nbqizv95nf7bfw96iyk"; - downloadToTemp = true; - recursiveHash = true; + src = fetchurl { + url = "https://github.com/alerque/libertinus/releases/download/v${version}/Libertinus-${version}.tar.xz"; + hash = "sha256-f+nwInItHBzGfcLCihELO7VbrjV1GWFg0kIsiTM7OFA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m644 -Dt $out/share/fonts/opentype static/OTF/*.otf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix index a4be7b5b3e6b..56d83554e9ca 100644 --- a/pkgs/data/fonts/libre-baskerville/default.nix +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-baskerville-1.000"; +stdenvNoCC.mkDerivation rec { + pname = "libre-baskerville"; + version = "1.000"; - owner = "impallari"; - repo = "Libre-Baskerville"; - rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Baskerville"; + rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + hash = "sha256-1EXi1hxFpc7pFsLbEj1xs9LqjeIf3XBol/8HdKNROUU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/truetype *.ttf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "1kpji85d1mgwq8b4fh1isznrhsrv32la3wf058rwjmhx5a3l7yaj"; + runHook postInstall + ''; meta = with lib; { description = "A webfont family optimized for body text"; diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix index 63bbf8eba724..cd55c10d2e64 100644 --- a/pkgs/data/fonts/libre-bodoni/default.nix +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-bodoni-2.000"; +stdenvNoCC.mkDerivation rec { + pname = "libre-bodoni"; + version = "2.000"; - owner = "impallari"; - repo = "Libre-Bodoni"; - rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Bodoni"; + rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + hash = "sha256-yfqVeT/JiAT+fsqkXUxqlz4sEEFwEJUdvFTAzuqejtk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype */v2000\ -\ initial\ glyphs\ migration/OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0my0i5a7f0d27m6dcdirjmlcnswqqfp8gl3ccxa5f2wkn3qlzkvz"; + runHook postInstall + ''; meta = with lib; { description = "Bodoni fonts adapted for today's web requirements"; diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix index b41ae8878cc2..f6fe791743cd 100644 --- a/pkgs/data/fonts/libre-franklin/default.nix +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-franklin-1.014"; +stdenvNoCC.mkDerivation rec { + pname = "libre-franklin"; + version = "1.014"; - owner = "impallari"; - repo = "Libre-Franklin"; - rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Franklin"; + rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + hash = "sha256-GR1KHiQ1lTOmU8eAPR2pxUlMpWiW2EDMG78VDjELxDU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype */OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0aq280m01pbirkzga432340aknf2m5ggalw0yddf40sqz7falykf"; + runHook postInstall + ''; meta = with lib; { description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; diff --git a/pkgs/data/fonts/linja-pi-pu-lukin/default.nix b/pkgs/data/fonts/linja-pi-pu-lukin/default.nix index 426acd2668d7..40f330cec7c4 100644 --- a/pkgs/data/fonts/linja-pi-pu-lukin/default.nix +++ b/pkgs/data/fonts/linja-pi-pu-lukin/default.nix @@ -1,16 +1,22 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -fetchurl { +stdenvNoCC.mkDerivation { pname = "linja-pi-pu-lukin"; version = "unstable-2021-10-29"; - url = "https://web.archive.org/web/20211029000000/https://jansa-tp.github.io/linja-pi-pu-lukin/PuLukin.otf"; - hash = "sha256-VPdrMHWpiokFYON4S8zT+pSs4TsB17S8TZRtkjqIqU8="; + src = fetchurl { + url = "https://web.archive.org/web/20211029000000/https://jansa-tp.github.io/linja-pi-pu-lukin/PuLukin.otf"; + hash = "sha256-Mf7P9fLGiG7L555Q3wRaI/PRv/TIs0njLq2IzIbc5Wo="; + }; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/opentype/linja-pi-pu-lukin.otf + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -D $src $out/share/fonts/opentype/linja-pi-pu-lukin.otf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix index 9bf4f32caeb2..7c9ab17a79d1 100644 --- a/pkgs/data/fonts/manrope/default.nix +++ b/pkgs/data/fonts/manrope/default.nix @@ -1,18 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "manrope"; version = "3"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "sharanda"; - repo = pname; - rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9"; - sha256 = "1h4chkfbp75hrrqqarf28ld4yb7hfrr7q4w5yz96ivg94lbwlnld"; - postFetch = '' - tar xf $downloadedFile --strip=1 + + src = fetchFromGitHub { + owner = "sharanda"; + repo = pname; + rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9"; + hash = "sha256-Gm7mUD/Ud2Rf8mA3jwUL7RE8clCmb6SETOskuj6r1sw="; + }; + + installPhase = '' + runHook preInstall + install -Dm644 -t $out/share/fonts/opentype "desktop font"/* + + runHook postInstall ''; + meta = with lib; { description = "Open-source modern sans-serif font family"; homepage = "https://github.com/sharanda/manrope"; diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index b8dd5492a56f..7f6bedc75e8b 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "marathi-cursive"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; - hash = "sha256-JE9T3UMSYn/JfEWuWHikDJIlt4nZl6GzY98v3vG6di4="; + hash = "sha256-C/z8ALV9bht0SaYqACO5ulSVCk1d6wBwvpVC4ZLgtek="; }; installPhase = '' diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix index 656be1b153eb..f03e8683e509 100644 --- a/pkgs/data/fonts/material-icons/default.nix +++ b/pkgs/data/fonts/material-icons/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "material-icons"; version = "3.0.1"; -in fetchFromGitHub { - name = "material-icons-${version}"; - owner = "google"; - repo = "material-design-icons"; - rev = version; + src = fetchFromGitHub { + owner = "google"; + repo = "material-design-icons"; + rev = version; + hash = "sha256-4FphNJCsaLWzlVR4TmXnDBid0EVj39fkeoh5j1leBZ8="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype cp iconfont/*.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "1syy6v941lb8nqxhdf7mfx28v05lwrfnq53r3c1ym13x05l9kchp"; meta = with lib; { description = "System status icons by Google, featuring material design"; diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index cb396080e49f..6074018f5545 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -1,25 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { +stdenvNoCC.mkDerivation rec { pname = "montserrat"; version = "7.222"; - owner = "JulietaUla"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0="; + src = fetchFromGitHub { + owner = "JulietaUla"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eVCRn2OtNI5NuYZBQy06HKnMMXhPPnFxI8m8kguZjg0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/{otf,ttf,woff,woff2} - mv $out/fonts/otf/*.otf $out/share/fonts/otf - mv $out/fonts/ttf/*.ttf $out/share/fonts/ttf - mv $out/fonts/webfonts/*.woff $out/share/fonts/woff - mv $out/fonts/webfonts/*.woff2 $out/share/fonts/woff2 + mv fonts/otf/*.otf $out/share/fonts/otf + mv fonts/ttf/*.ttf $out/share/fonts/ttf + mv fonts/webfonts/*.woff $out/share/fonts/woff + mv fonts/webfonts/*.woff2 $out/share/fonts/woff2 - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix index c36292eb0014..5d8aa43a5b21 100644 --- a/pkgs/data/fonts/myrica/default.nix +++ b/pkgs/data/fonts/myrica/default.nix @@ -1,18 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "myrica-2.011.20160403"; +stdenvNoCC.mkDerivation { + pname = "myrica"; + version = "2.011.20160403"; - owner = "tomokuni"; - repo = "Myrica"; - # commit does not exist on any branch on the target repository - rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; - sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12"; + src = fetchFromGitHub { + owner = "tomokuni"; + repo = "Myrica"; + # commit does not exist on any branch on the target repository + rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; + hash = "sha256-kx+adbN2DsO81KJFt+FGAPZN+1NpE9xiagKZ4KyaJV0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar --strip-components=1 -xzvf $downloadedFile mkdir -p $out/share/fonts/truetype cp product/*.TTC $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/pkgs/data/fonts/nahid-fonts/default.nix index fbceb3c927dc..d036eed35c96 100644 --- a/pkgs/data/fonts/nahid-fonts/default.nix +++ b/pkgs/data/fonts/nahid-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "nahid-fonts"; version = "0.3.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "nahid-font"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "nahid-font"; + rev = "v${version}"; + hash = "sha256-r8/W0/pJV6OX954spIITvW7M6lIbZRpbsvEHErnXglg="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nahid-fonts {} \; + + runHook postInstall ''; - sha256 = "0df169sibq14j2mj727sq86c00jm1nz8565v85hkvh4zgz2plb7c"; meta = with lib; { homepage = "https://github.com/rastikerdar/nahid-font"; diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix index f497a184be01..f5076f3c93cb 100644 --- a/pkgs/data/fonts/nika-fonts/default.nix +++ b/pkgs/data/fonts/nika-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "nika-fonts"; version = "1.0.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "font-store"; - repo = "NikaFont"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "font-store"; + repo = "NikaFont"; + rev = "v${version}"; + hash = "sha256-jDemm8IyjhoCOg4Bfsp0tzUR7m+JaswL5d7Kug+asJk="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nika-fonts {} \; + + runHook postInstall ''; - sha256 = "1x34b2dqn1dymi1vmj5vrjcy2z8s0f3rr6cniyrz85plvid6x40i"; meta = with lib; { homepage = "https://github.com/font-store/NikaFont/"; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 6161f711958c..b3e4d7d67bce 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -230,15 +230,22 @@ rec { pname = "noto-fonts-emoji-blob-bin"; version = "14.0.1"; in - fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; - sha256 = "sha256-wSH9kRJ8y2i5ZDqzeT96dJcEJnHDSpU8bOhmxaT+UCg="; + stdenvNoCC.mkDerivation { + inherit pname version; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -Dm 444 $downloadedFile $out/share/fonts/blobmoji/Blobmoji.ttf + src = fetchurl { + url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; + hash = "sha256-w9s7uF6E6nomdDmeKB4ATcGB/5A4sTwDvwHT3YGXz8g="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm 444 $src $out/share/fonts/blobmoji/Blobmoji.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/pkgs/data/fonts/office-code-pro/default.nix index 0513baf48680..f05a7ddd319c 100644 --- a/pkgs/data/fonts/office-code-pro/default.nix +++ b/pkgs/data/fonts/office-code-pro/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "office-code-pro"; version = "1.004"; -in fetchFromGitHub rec { - name = "${pname}-${version}"; - owner = "nathco"; - repo = "Office-Code-Pro"; - rev = version; + src = fetchFromGitHub { + owner = "nathco"; + repo = "Office-Code-Pro"; + rev = version; + hash = "sha256-qzKTXYswkithZUJT0a3IifCq4RJFeKciZAPhYr2U1X4="; + }; - postFetch = '' - tar xf $downloadedFile --strip=1 - install -m644 -Dt $out/share/doc/${name} README.md + installPhase = '' + runHook preInstall + + install -m644 -Dt $out/share/doc/${pname}-${version} README.md install -m444 -Dt $out/share/fonts/opentype 'Fonts/Office Code Pro/OTF/'*.otf 'Fonts/Office Code Pro D/OTF/'*.otf + + runHook postInstall ''; - sha256 = "1bagwcaicn6q8qkqazz6wb3x30y4apmkga0mkv8fh6890hfhywr9"; meta = with lib; { description = "A customized version of Source Code Pro"; diff --git a/pkgs/data/fonts/open-fonts/default.nix b/pkgs/data/fonts/open-fonts/default.nix index e503b1143033..6a628174f2e4 100644 --- a/pkgs/data/fonts/open-fonts/default.nix +++ b/pkgs/data/fonts/open-fonts/default.nix @@ -1,21 +1,21 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { pname = "open-fonts"; version = "0.7.0"; -in -fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/kiwi0fruit/open-fonts/releases/download/${version}/open-fonts.tar.xz"; - downloadToTemp = true; - recursiveHash = true; - sha256 = "sha256-bSP9Flotoo3E5vRU3eKOUAPD2fmkWseWYWG4y0S07+4="; + src = fetchurl { + url = "https://github.com/kiwi0fruit/open-fonts/releases/download/${version}/open-fonts.tar.xz"; + hash = "sha256-NJKbdrvgZz9G7mjAJYzN7rU/fo2xRFZA2BbQ+A56iPw="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile mkdir -p $out/share/fonts/truetype - install open-fonts/*.ttf $out/share/fonts/truetype + install *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix index 0c7f8dce57a3..4883cd818b1c 100644 --- a/pkgs/data/fonts/open-sans/default.nix +++ b/pkgs/data/fonts/open-sans/default.nix @@ -1,21 +1,25 @@ -{ lib, fetchFromGitLab }: +{ lib, stdenvNoCC, fetchFromGitLab }: -let +stdenvNoCC.mkDerivation { pname = "open-sans"; version = "1.11"; -in fetchFromGitLab { - name = "${pname}-${version}"; - domain = "salsa.debian.org"; - owner = "fonts-team"; - repo = "fonts-open-sans"; - rev = "debian/1.11-1"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "fonts-team"; + repo = "fonts-open-sans"; + rev = "debian/1.11-1"; + hash = "sha256-gkq5RPa83dND91q1hiA9Qokq1iA8gLQ8XvCNWe+e8Bw="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "146ginwx18z624z582lrnhil8jvi9bjg6843265bgxxrfmf75vhp"; meta = with lib; { description = "Open Sans fonts"; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index f4a0a9600a15..973c79f667a3 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -1,42 +1,45 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "orbitron"; version = "20110526"; -in fetchFromGitHub { - name = "orbitron-${version}"; - owner = "theleagueof"; - repo = "orbitron"; - rev = "13e6a52"; + src = fetchFromGitHub { + owner = "theleagueof"; + repo = "orbitron"; + rev = "13e6a52"; + hash = "sha256-zjNPVrDUxcQbrsg1/8fFa6Wenu1yuG/XDfKA7NVZ0rA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype/orbitron *.otf install -m444 -Dt $out/share/fonts/ttf/orbitron *.ttf - ''; - sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv"; + runHook postInstall + ''; meta = with lib; { homepage = "https://www.theleagueofmoveabletype.com/orbitron"; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; description = "Geometric sans-serif for display purposes by Matt McInerney"; longDescription = '' - Orbitron is a geometric sans-serif typeface intended for display - purposes. It features four weights (light, medium, bold, and - black), a stylistic alternative, small caps, and a ton of - alternate glyphs. + Orbitron is a geometric sans-serif typeface intended for display + purposes. It features four weights (light, medium, bold, and + black), a stylistic alternative, small caps, and a ton of + alternate glyphs. - Orbitron was designed so that graphic designers in the future - will have some alternative to typefaces like Eurostile or Bank - Gothic. If you’ve ever seen a futuristic sci-fi movie, you have - may noticed that all other fonts have been lost or destroyed in - the apocalypse that led humans to flee earth. Only those very few - geometric typefaces have survived to be used on spaceship - exteriors, space station signage, monopolistic corporate - branding, uniforms featuring aerodynamic shoulder pads, etc. Of - course Orbitron could also be used on the posters for the movies - portraying this inevitable future. + Orbitron was designed so that graphic designers in the future + will have some alternative to typefaces like Eurostile or Bank + Gothic. If you’ve ever seen a futuristic sci-fi movie, you have + may noticed that all other fonts have been lost or destroyed in + the apocalypse that led humans to flee earth. Only those very few + geometric typefaces have survived to be used on spaceship + exteriors, space station signage, monopolistic corporate + branding, uniforms featuring aerodynamic shoulder pads, etc. Of + course Orbitron could also be used on the posters for the movies + portraying this inevitable future. ''; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix index e34e49d98147..32d9273d6390 100644 --- a/pkgs/data/fonts/oxygenfonts/default.nix +++ b/pkgs/data/fonts/oxygenfonts/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "oxygenfonts-20160824"; +stdenvNoCC.mkDerivation rec { + pname = "oxygenfonts"; + version = "20160824"; - owner = "vernnobile"; - repo = "oxygenFont"; - rev = "62db0ebe3488c936406685485071a54e3d18473b"; + src = fetchFromGitHub { + owner = "vernnobile"; + repo = "oxygenFont"; + rev = "62db0ebe3488c936406685485071a54e3d18473b"; + hash = "sha256-0LKq8nChkDAb6U1sOUyga/DvzpDmIjoRn+2PB9rok4w="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype cp */Oxygen-Sans.ttf */Oxygen-Sans-Bold.ttf */OxygenMono-Regular.ttf $out/share/fonts/truetype - ''; - sha256 = "17m86p1s7a7d90zqjsr46h5bpmas4vxsgj7kd0j5c8cb7lw92jyf"; + runHook postInstall + ''; meta = with lib; { description = "Desktop/gui font for integrated use with the KDE desktop"; diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix index a3d273bb8ae1..a91596a66e51 100644 --- a/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/pkgs/data/fonts/parastoo-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "parastoo-fonts"; version = "2.0.1"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "parastoo-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "parastoo-font"; + rev = "v${version}"; + hash = "sha256-E94B9R2h227D49dscCBsprmb7w0GrQ+2tWOWRf8FH30="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-4smobLS43DB7ISmbWDWX0IrtaeiyXpi1QpAiL8NyXoQ="; meta = with lib; { homepage = "https://github.com/rastikerdar/parastoo-font"; diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index f0bdbc3ea004..568363889ff2 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -1,29 +1,30 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation { + pname = "pecita"; version = "5.4"; -in -fetchurl { - name = "pecita-${version}"; + src = fetchurl { + url = "http://pecita.eu/b/Pecita.otf"; + hash = "sha256-D9IZ+p4UFHUNt9me7D4vv0x6rMK9IaViKPliCEyX6t4="; + }; - url = "http://pecita.eu/b/Pecita.otf"; + dontUnpack = true; - downloadToTemp = true; + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - cp -v $downloadedFile $out/share/fonts/opentype/Pecita.otf - ''; + cp -v $src $out/share/fonts/opentype/Pecita.otf - recursiveHash = true; - sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; + runHook postInstall + ''; meta = with lib; { homepage = "http://pecita.eu/police-en.php"; description = "Handwritten font with connected glyphs"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 3a2ae92c1e5a..ea2da0fe2ecf 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,22 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "powerline-fonts-2018-11-11"; +stdenvNoCC.mkDerivation { + pname = "powerline-fonts"; + version = "unstable-2018-11-11"; - owner = "powerline"; - repo = "fonts"; - rev = "e80e3eba9091dac0655a0a77472e10f53e754bb0"; + src = fetchFromGitHub { + owner = "powerline"; + repo = "fonts"; + rev = "e80e3eba9091dac0655a0a77472e10f53e754bb0"; + hash = "sha256-GGfON6Z/0czCUAGxnqtndgDnaZGONFTU9/Hu4BGDHlk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.otf' -exec install -Dt $out/share/fonts/opentype {} \; find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \; find . -name '*.bdf' -exec install -Dt $out/share/fonts/bdf {} \; find . -name '*.pcf.gz' -exec install -Dt $out/share/fonts/pcf {} \; find . -name '*.psf.gz' -exec install -Dt $out/share/consolefonts {} \; - ''; - sha256 = "0r8p4z3db17f5p8jr7sv80nglmjxhg83ncfvwg1dszldswr0dhvr"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/powerline/fonts"; diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index ddded71a6fa2..935fde722ed9 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "raleway"; version = "2016-08-30"; -in fetchFromGitHub { - name = "raleway-${version}"; - owner = "impallari"; - repo = "Raleway"; - rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Raleway"; + rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; + hash = "sha256-mcIpE+iqG6M43I5TT95oV+5kNgphunmyxC+Jaj0JysQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name "*-Original.otf" -exec install -Dt $out/share/fonts/opentype {} \; - cp *.txt *.md -d $out - ''; - sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60"; + runHook postInstall + ''; meta = { description = "Raleway is an elegant sans-serif typeface family"; diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index 9daaffd0b4ba..fd732b401bea 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchFromGitHub }: -let +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "redhat-official"; version = "4.0.2"; -in -fetchFromGitHub { - name = "redhat-official-${version}"; - owner = "RedHatOfficial"; - repo = "RedHatFont"; - rev = version; + src = fetchFromGitHub { + owner = "RedHatOfficial"; + repo = "RedHatFont"; + rev = version; + hash = "sha256-p5RS/57CDApwnRDwMi0gIEJYTDAtibIyyU2w/pnbHJI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 for kind in mono proportional; do install -m444 -Dt $out/share/fonts/opentype fonts/$kind/static/otf/*.otf install -m444 -Dt $out/share/fonts/truetype fonts/$kind/static/ttf/*.ttf done - ''; - sha256 = "sha256-904uQtbAdLx9MJudLk/vVk/+uK0nsPbWbAeXrWxTHm8="; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/RedHatOfficial/RedHatFont"; diff --git a/pkgs/data/fonts/rhodium-libre/default.nix b/pkgs/data/fonts/rhodium-libre/default.nix index fc89d6525922..1c36f41b4839 100644 --- a/pkgs/data/fonts/rhodium-libre/default.nix +++ b/pkgs/data/fonts/rhodium-libre/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "RhodiumLibre"; version = "1.2.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "DunwichType"; - repo = pname; - rev = version; + src = fetchFromGitHub { + owner = "DunwichType"; + repo = pname; + rev = version; + hash = "sha256-YCQvUdjEAj4G71WCRCM0+NwiqRqwt1Ggeg9jb/oWEsY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm444 -t $out/share/fonts/opentype/ RhodiumLibre-Regular.otf install -Dm444 -t $out/share/fonts/truetype/ RhodiumLibre-Regular.ttf - ''; - sha256 = "04ax6bri5vsji465806p8d7zbdf12r5bpvcm9nb8isfqm81ggj0r"; + runHook postInstall + ''; meta = with lib; { description = "F/OSS/Libre font for Latin and Devanagari"; diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index 9079ba7fada0..860a0066270d 100644 --- a/pkgs/data/fonts/sahel-fonts/default.nix +++ b/pkgs/data/fonts/sahel-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "sahel-fonts"; version = "3.4.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "sahel-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "sahel-font"; + rev = "v${version}"; + hash = "sha256-U4tIICXZFK9pk7zdzRwBPIPYFUlYXPSebnItUJUgGJY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/sahel-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-MrKSgz9WpVgLS37uH/7S0LPBD/n3GLXeUCMBD7x5CG8="; meta = with lib; { homepage = "https://github.com/rastikerdar/sahel-font"; diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix index b29114e6b1c4..2117cc0e6383 100644 --- a/pkgs/data/fonts/samim-fonts/default.nix +++ b/pkgs/data/fonts/samim-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "samim-fonts"; version = "4.0.4"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "samim-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "samim-font"; + rev = "v${version}"; + hash = "sha256-erT8iV5YHbEN47nEE5p5CbQYUgm8daOjymLAWF4fpVk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-WYSJ2mAzAe5H0EaMYU3qNVcQ0lRuHsjZ11YmLnZ2FCo="; meta = with lib; { homepage = "https://github.com/rastikerdar/samim-font"; diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 9bfe95518dc1..c874afde34ac 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,21 +1,27 @@ -{ lib, fetchurl, libarchive }: +{ lib, stdenvNoCC, fetchurl, p7zip }: -let +stdenvNoCC.mkDerivation rec { + pname = "sarasa-gothic"; version = "0.38.0"; -in fetchurl { - name = "sarasa-gothic-${version}"; - # Use the 'ttc' files here for a smaller closure size. - # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) - url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "sha256-lGkb3e2EFHkDLm+/KArfOQ50qBFRThlpcID06g0t4aI="; + src = fetchurl { + # Use the 'ttc' files here for a smaller closure size. + # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) + url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; + hash = "sha256-UXWstk1vIoaFqa8nVxfJcAtN7BzWevzgfMx1gyXu0k8="; + }; - recursiveHash = true; - downloadToTemp = true; + sourceRoot = "."; + + nativeBuildInputs = [ p7zip ]; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - ${libarchive}/bin/bsdtar -xf $downloadedFile -C $out/share/fonts/truetype + cp *.ttc $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/data/fonts/scientifica/default.nix index bf5b887cc771..1f946ecb17af 100644 --- a/pkgs/data/fonts/scientifica/default.nix +++ b/pkgs/data/fonts/scientifica/default.nix @@ -1,25 +1,24 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "scientifica"; version = "2.3"; -in fetchurl rec { - name = "scientifica-${version}"; - url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar"; + src = fetchurl { + url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar"; + hash = "sha256-8IV4aaDoRsbxddy4U90fEZ6henUhjmO38HNtWo4ein8="; + }; - downloadToTemp = true; + installPhase = '' + runHook preInstall - recursiveHash = true; - - sha256 = "sha256-pVWkj/2lFpmWk0PPDrIMU4Gey7/m/9tzUsuD3ZDUAdc="; - - postFetch = '' - tar xf $downloadedFile mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/misc - install scientifica/ttf/*.ttf $out/share/fonts/truetype - install scientifica/otb/*.otb $out/share/fonts/misc - install scientifica/bdf/*.bdf $out/share/fonts/misc + install ttf/*.ttf $out/share/fonts/truetype + install otb/*.otb $out/share/fonts/misc + install bdf/*.bdf $out/share/fonts/misc + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index d5e7e2b243c3..c5f5e00e023a 100644 --- a/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "shabnam-fonts"; version = "5.0.1"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "shabnam-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "shabnam-font"; + rev = "v${version}"; + hash = "sha256-H03GTKRVPiwU4edkr4x5upW4JCy6320Lo+cKK9FRMQs="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-m4G4UtW/0S9CsvaSF7QfthfIxGQ02E7SucdDm5s3G7A="; meta = with lib; { homepage = "https://github.com/rastikerdar/shabnam-font"; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 737a799438fc..ec2a1da08489 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -1,25 +1,31 @@ -{ lib, fetchurl, xorg }: +{ lib, stdenvNoCC, fetchurl, xorg }: -let +stdenvNoCC.mkDerivation rec { pname = "spleen"; version = "1.9.1"; -in fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - tar xvf $downloadedFile --strip=1 + src = fetchurl { + url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; + hash = "sha256-fvWcTgKkXp3e1ryhi1Oc3w8OtJ5svLJXhY2lasXapiI="; + }; + + nativeBuildInputs = [ xorg.mkfontscale ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + d="$out/share/fonts/misc" install -D -m 644 *.{pcf,bdf,otf} -t "$d" install -D -m 644 *.psfu -t "$out/share/consolefonts" install -m644 fonts.alias-spleen $d/fonts.alias # create fonts.dir so NixOS xorg module adds to fp - ${xorg.mkfontscale}/bin/mkfontdir "$d" + mkfontdir "$d" + + runHook postInstall ''; - sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94="; meta = with lib; { description = "Monospaced bitmap fonts"; diff --git a/pkgs/data/fonts/tt2020/default.nix b/pkgs/data/fonts/tt2020/default.nix index c92e86032733..63b4e1834a3b 100644 --- a/pkgs/data/fonts/tt2020/default.nix +++ b/pkgs/data/fonts/tt2020/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "TT2020"; - version = "2020-01-05"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "ctrlcctrlv"; - repo = pname; - rev = "2b418fab5f99f72a18b3b2e7e2745ac4e03aa612"; - sha256 = "1z0nizvs0gp0xl7pn6xcjvsysxhnfm7aqfamplkyvya3fxvhncds"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "ctrlcctrlv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eAJzaookHcQ/7QNq/HUKA/O2liyKynJNdo6QuZ1Bv6k="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm644 -t $out/share/fonts/truetype dist/*.ttf install -Dm644 -t $out/share/fonts/woff2 dist/*.woff2 + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index 9c605668845b..3e3087c6abc8 100644 --- a/pkgs/data/fonts/undefined-medium/default.nix +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "undefined-medium"; - version = "1.0"; + version = "1.1"; src = fetchzip { - url = "https://github.com/andirueckel/undefined-medium/archive/v1.0.zip"; - hash = "sha256-HG+V7jR7dDI6LeoiCg/8F38lW8Zdo6CyLj2DXy/ff64="; + url = "https://github.com/andirueckel/undefined-medium/archive/v1.1.zip"; + hash = "sha256-iquxt7lo92y4AQZf23Ij5Qzg2U7buL3kGLksQSR6vac="; }; installPhase = '' diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 026a262a8455..aa8720683025 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "unifont_upper"; version = "15.0.01"; -in fetchurl rec { - name = "unifont_upper-${version}"; - url = "mirror://gnu/unifont/unifont-${version}/${name}.ttf"; + src = fetchurl { + url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf"; + hash = "sha256-o6ItW9fME+f4t2cvhj96r3ZG9nKLAUznn/pdukFYnxw="; + }; - downloadToTemp = true; + dontUnpack = true; - recursiveHash = true; + installPhase = '' + runHook preInstall - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; + install -Dm644 $src $out/share/fonts/truetype/unifont_upper.ttf - hash = "sha256-cGX9umTGRfrQT3gwPgNqxPHB7Un3ZT3b7hPy4IP45Fk="; + runHook postInstall + ''; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/data/fonts/vazir-code-font/default.nix b/pkgs/data/fonts/vazir-code-font/default.nix index 6702fd1b0220..6ba69b57feaf 100644 --- a/pkgs/data/fonts/vazir-code-font/default.nix +++ b/pkgs/data/fonts/vazir-code-font/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "vazir-code-font"; version = "1.1.2"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "vazir-code-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-code-font"; + rev = "v${version}"; + hash = "sha256-iBojse3eHr4ucZtPfpkN+mmO6sEExY8WcAallyPgMsI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + runHook postInstall ''; - sha256 = "0ivwpn9xm2zwhwgg9mghyiy5v66cn4786w9j6rkff5cmzshv279r"; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-code-font"; diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index b8885298c084..787d250068b7 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -1,20 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "vazir-fonts"; version = "32.0.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "vazir-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-font"; + rev = "v${version}"; + hash = "sha256-lkjlSW3Sfr1bJ9/IOsZl9yOVh9mYKhoV5XcLkqcQ71g="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + runHook postInstall ''; - sha256 = "sha256-Uy8hgBtCcTLwXu9FkLN1WavUfP74Jf53ChxVGS3UBVM="; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-font"; diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix index cfdd3c0eae0b..c1ddbe9fae6c 100644 --- a/pkgs/data/fonts/xkcd-font/default.nix +++ b/pkgs/data/fonts/xkcd-font/default.nix @@ -1,24 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "xkcd-font"; version = "unstable-2017-08-24"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "ipython"; - repo = pname; - rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d"; + src = fetchFromGitHub { + owner = "ipython"; + repo = pname; + rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d"; + hash = "sha256-1DgSx2L+OpXuPVSXbbl/hcZUyBK9ikPyGWuk6wNzlwc="; + }; - postFetch = '' - install -Dm444 -t $out/share/fonts/opentype/ $out/xkcd/build/xkcd.otf - install -Dm444 -t $out/share/fonts/truetype/ $out/xkcd-script/font/xkcd-script.ttf + installPhase = '' + runHook preInstall - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf + install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf + + runHook postInstall ''; - sha256 = "sha256-ITsJPs+ZXwUWYe2AmwyVZib8RV7bpiWHOUD8qEZRHHY="; meta = with lib; { description = "The xkcd font"; diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index cb55697fa50b..eee3a425b709 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-11-06"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "ybp+r0Ru2lJg1WipFHIowvRO5XjppI0cUxKc6kPn0lM="; + sha256 = "J3opK+5xGmV81ubA60BZw9+9IifylrRYo+5cRLWd6Xs="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 6396b7c6c51e..dcc5c7f7cf3d 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -130,7 +130,7 @@ let kdeplasma-addons = callPackage ./kdeplasma-addons.nix { }; kgamma5 = callPackage ./kgamma5.nix { }; khotkeys = callPackage ./khotkeys.nix { }; - kinfocenter = callPackage ./kinfocenter.nix { }; + kinfocenter = callPackage ./kinfocenter { }; kmenuedit = callPackage ./kmenuedit.nix { }; kpipewire = callPackage ./kpipewire.nix { }; kscreen = callPackage ./kscreen.nix { }; diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix deleted file mode 100644 index c63d22858a55..000000000000 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ mkDerivation -, lib -, extra-cmake-modules -, kdoctools -, qtbase -, kcmutils -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdeclarative -, ki18n -, kiconthemes -, kio -, kirigami2 -, kpackage -, kservice -, kwayland -, kwidgetsaddons -, kxmlgui -, solid -, systemsettings -, libraw1394 -, libGLU -, pciutils -}: - -mkDerivation { - pname = "kinfocenter"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcmutils - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - ki18n - kiconthemes - kio - kirigami2 - kpackage - kservice - kwayland - kwidgetsaddons - kxmlgui - solid - systemsettings - - libraw1394 - libGLU - pciutils - ]; - preFixup = '' - # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in - # the same directory, while it is actually located in a completely different - # store path - ln -sf ${lib.getBin systemsettings}/bin/systemsettings5 $out/bin/kinfocenter - ''; -} diff --git a/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch b/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch new file mode 100644 index 000000000000..c6cf9bd8d6df --- /dev/null +++ b/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch @@ -0,0 +1,51 @@ +diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +index f591b9c..e883212 100644 +--- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in ++++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +@@ -63,6 +63,6 @@ + "Name[x-test]": "xxWindow Managerxx", + "Name[zh_CN]": "窗口管理器" + }, +- "TryExec": "@QtBinariesDir@/qdbus", ++ "TryExec": "@qdbus@", + "X-KDE-KInfoCenter-Category": "graphical_information" + } +diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp +index 667c079..b727b67 100644 +--- a/Modules/kwinsupportinfo/main.cpp ++++ b/Modules/kwinsupportinfo/main.cpp +@@ -19,7 +19,7 @@ public: + explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data, const QVariantList &args) + : ConfigModule(parent, data, args) + { +- auto outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"), ++ auto outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"), + {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")}, + parent); + qmlRegisterSingletonInstance("org.kde.kinfocenter.kwinsupportinfo.private", 1, 0, "InfoOutputContext", outputContext); +diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json +index 04acd6b..24b8f36 100644 +--- a/Modules/xserver/kcm_xserver.json ++++ b/Modules/xserver/kcm_xserver.json +@@ -130,7 +130,7 @@ + "Name[zh_CN]": "X 服务器", + "Name[zh_TW]": "X 伺服器" + }, +- "TryExec": "xdpyinfo", ++ "TryExec": "@xdpyinfo@", + "X-DocPath": "kinfocenter/graphical.html#xserver", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information", +diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp +index c406ff7..a261b90 100644 +--- a/Modules/xserver/main.cpp ++++ b/Modules/xserver/main.cpp +@@ -17,7 +17,7 @@ public: + explicit KCMXServer(QObject *parent, const KPluginMetaData &data, const QVariantList &args) + : ConfigModule(parent, data, args) + { +- auto outputContext = new CommandOutputContext(QStringLiteral("xdpyinfo"), {}, parent); ++ auto outputContext = new CommandOutputContext(QStringLiteral("@xdpyinfo@"), {}, parent); + qmlRegisterSingletonInstance("org.kde.kinfocenter.xserver.private", 1, 0, "InfoOutputContext", outputContext); + + auto *about = new KAboutData(QStringLiteral("kcm_xserver"), i18nc("@label kcm name", "X-Server"), QStringLiteral("1.0"), QString(), KAboutLicense::GPL); diff --git a/pkgs/desktops/plasma-5/kinfocenter/default.nix b/pkgs/desktops/plasma-5/kinfocenter/default.nix new file mode 100644 index 000000000000..222e78558264 --- /dev/null +++ b/pkgs/desktops/plasma-5/kinfocenter/default.nix @@ -0,0 +1,104 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtbase +, qttools +, kcmutils +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kio +, kirigami2 +, kpackage +, kservice +, kwayland +, kwidgetsaddons +, kxmlgui +, solid +, systemsettings +, dmidecode +, fwupd +, libraw1394 +, libusb1 +, libGLU +, pciutils +, smartmontools +, util-linux +, vulkan-tools +, wayland-utils +, xdpyinfo +}: + +let + inherit (lib) getBin getExe; + + qdbus = "${getBin qttools}/bin/qdbus"; + +in +mkDerivation { + pname = "kinfocenter"; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + buildInputs = [ + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdeclarative + ki18n + kiconthemes + kio + kirigami2 + kpackage + kservice + kwayland + kwidgetsaddons + kxmlgui + solid + systemsettings + + dmidecode + fwupd + libraw1394 + libusb1 + libGLU + pciutils + smartmontools + util-linux + vulkan-tools + wayland-utils + xdpyinfo + ]; + + patches = [ + ./0001-tool-paths.patch + ]; + + postPatch = '' + for f in Modules/kwinsupportinfo/{kcm_kwinsupportinfo.json.in,main.cpp}; do + substituteInPlace $f \ + --replace "@qdbus@" "${qdbus}" + done + + for f in Modules/xserver/{kcm_xserver.json,main.cpp}; do + substituteInPlace $f \ + --replace "@xdpyinfo@" "${getExe xdpyinfo}" + done + ''; + + # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in + # the same directory, while it is actually located in a completely different + # store path + preFixup = '' + ln -sf ${lib.getExe systemsettings} $out/bin/kinfocenter + ''; +} diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 94d8f92ac4f9..1c438df1b82f 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -45,4 +45,5 @@ mkDerivation { plasma-workspace ]; outputs = [ "bin" "dev" "out" ]; + meta.mainProgram = "systemsettings5"; } diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 6ac119931424..5dc21338a72c 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -25,7 +25,9 @@ makeScopeWithSplicing mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; - automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; + automakeAddFlags = pkgs.makeSetupHook { + name = "xfce-automake-add-flags-hook"; + } ./automakeAddFlags.sh; #### CORE diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index 5f41a36263a9..cb56eabc5d78 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,10 +1,8 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting egg ${eggName} (version $version) into $out" +echo "exporting egg ${eggName} (version $version) into $out" mkdir -p $out chicken-install -r "${eggName}:${version}" cp -r ${eggName}/* $out/ - -stopNest diff --git a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh index f02e01757787..34c9de37233d 100644 --- a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh @@ -1,11 +1,9 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting egg ${eggName} (version $version) into $out" +echo "exporting egg ${eggName} (version $version) into $out" mkdir -p $out CHICKEN_EGG_CACHE=. chicken-install -r "${eggName}:${version}" rm ${eggName}/{STATUS,TIMESTAMP} cp -r ${eggName}/* $out/ - -stopNest diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index 3f8871df4f96..c1fb9abf77d7 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -151,6 +151,13 @@ stdenv.mkDerivation rec { git ]; + # Workaround cc-wrapper's --sysroot= value for `staging-next`: it + # breaks library lookup via RUNPATH: + # ld: warning: libm.so.6, needed by ./generated/linux/release/64/lib.so, not found (try using -rpath or -rpath-link) + # ld: /build/druntime/generated/linux/release/64/libdruntime.so: undefined reference to `log10@GLIBC_2.2.5' + # TODO(trofi): remove the workaround once cc-wrapper is fixed. + NIX_CFLAGS_COMPILE = [ "--sysroot=/" ]; + buildInputs = [ curl tzdata diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 2751501901f2..76374201f456 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -51,8 +51,14 @@ let majorVersion = "10"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = [ ] - ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied @@ -222,6 +228,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index dc472abec4f4..1d3dff7c6f2a 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -51,8 +51,14 @@ let majorVersion = "11"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied @@ -228,6 +234,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 7e1847ebba98..3fe6620987a3 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -270,6 +270,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 042e561a2e36..810706ed0f3d 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -227,6 +227,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 8420cfdde7d5..e25af867e537 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -247,6 +247,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 66b53c6d5b5e..450b23310337 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -64,6 +64,13 @@ let majorVersion = "6"; patches = optionals (!stdenv.targetPlatform.isRedox) [ ../use-source-date-epoch.patch ./0001-Fix-build-for-glibc-2.31.patch + + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langAda ../gnat-cflags.patch @@ -258,6 +265,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 8fd990f95ffb..a0465e8bdd60 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -56,6 +56,13 @@ let majorVersion = "7"; ./gcc8-asan-glibc-2.34.patch ./0001-Fix-build-for-glibc-2.31.patch + + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optionals targetPlatform.isNetBSD [ @@ -226,6 +233,7 @@ stdenv.mkDerivation ({ ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 2dc141b529fc..03fb9fb1205c 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -46,8 +46,14 @@ let majorVersion = "8"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied @@ -206,6 +212,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 9b5f4504db8e..317c77ea835f 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -55,9 +55,14 @@ let majorVersion = "9"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - [ ] - ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv-gcc9.patch @@ -221,6 +226,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 113bd83ea53f..dd5a8de76e2a 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -203,6 +203,17 @@ preInstall() { ln -s lib "$out/${targetConfig}/lib32" ln -s lib "${!outputLib}/${targetConfig}/lib32" fi + + # cc-wrappers uses --sysroot=/nix/store/does/not/exist as a way to + # drop default sysheaders search path. Unfortunately that switches + # clang++ into searching libraries in gcc in cross-compiler paths: + # from ${!outputLib}/lib (native) + # to ${!outputLib}/${targetPlatformConfig}/lib + # We create the symlink to make both native and cross paths + # available even if the toolchain is not the cross-compiler. + if [ ! -e ${!outputLib}/${targetPlatformConfig} ] ; then + ln -s . ${!outputLib}/${targetPlatformConfig} + fi } @@ -240,25 +251,6 @@ postInstall() { # More dependencies with the previous gcc or some libs (gccbug stores the build command line) rm -rf $out/bin/gccbug - if [[ buildConfig == *"linux"* ]]; then - # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out - for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do - PREV_RPATH=`patchelf --print-rpath "$i"` - NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'` - patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done - fi - - if [[ targetConfig == *"linux"* ]]; then - # For some reason, when building for linux on darwin, the libs retain - # RPATH to $out. - for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do - PREV_RPATH=`patchelf --print-rpath "$i"` - NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` - patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done - fi - if type "install_name_tool"; then for i in "${!outputLib}"/lib/*.*.dylib "${!outputLib}"/lib/*.so.[0-9]; do install_name_tool -id "$i" "$i" || true diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index 27223e6dea6e..84a6059581e7 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.4"; + version = "1.19.5"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-7adNtKxJSACj5m7nhOSVv7ubjlNd+SSosBsagCi382g="; + sha256 = "sha256-jkhujoWigfxc4/C+3FudLb9idtfbCyXT7ANPMT2gN18="; }; strictDeps = true; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 074ec0a47469..bdd8022e69de 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -262,7 +262,7 @@ in { runHook postBuild ''; - wrapperArgs = [ + wrapperArgs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${ placeholder "out" }/bin" diff --git a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix index 3afa59739a37..b50097d5e66b 100644 --- a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix +++ b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix @@ -1,12 +1,9 @@ -{ lib, writeShellApplication, cargo, cargo-auditable }: +{ lib, writeShellScriptBin, cargo, cargo-auditable }: -(writeShellApplication { - name = "cargo"; - runtimeInputs = [ cargo cargo-auditable ]; - text = '' - CARGO_AUDITABLE_IGNORE_UNSUPPORTED=1 cargo auditable "$@" - ''; -}) // { +(writeShellScriptBin "cargo" '' + export PATH="${lib.makeBinPath [ cargo cargo-auditable ]}:$PATH" + CARGO_AUDITABLE_IGNORE_UNSUPPORTED=1 exec cargo auditable "$@" +'') // { meta = cargo-auditable.meta // { mainProgram = "cargo"; }; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 9b10767e5bff..d04eebe7eadf 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage { meta = with lib; { homepage = "https://crates.io"; description = "Downloads your Rust project's dependencies and builds your project"; - maintainers = with maintainers; [ retrry ]; + maintainers = with maintainers; [ retrry ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 64254d502529..426f13778838 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -211,7 +211,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ cstrahan globin havvy ]; + maintainers = with maintainers; [ cstrahan globin havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix new file mode 100644 index 000000000000..729c01108287 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -0,0 +1,686 @@ +{ lib +, stdenv +, callPackage +, cmake +, coreutils +, gnugrep +, perl +, ninja +, pkg-config +, clang +, bintools +, python3 +, git +, fetchpatch +, makeWrapper +, gnumake +, file +, runCommand +, writeShellScriptBin +# For lldb +, libedit +, ncurses +, swig +, libxml2 +# Linux-specific +, glibc +, libuuid +# Darwin-specific +, substituteAll +, fixDarwinDylibNames +, runCommandLocal +, xcbuild +, cctools # libtool +, sigtool +, DarwinTools +, CoreServices +, Foundation +, Combine +, MacOSX-SDK +, CLTools_Executables +}: + +let + + inherit (stdenv) hostPlatform targetPlatform; + + sources = callPackage ../sources.nix { }; + + # Tools invoked by swift at run-time. + runtimeDeps = lib.optionals stdenv.isDarwin [ + # libtool is used for static linking. This is part of cctools, but adding + # that as a build input puts an unwrapped linker in PATH, and breaks + # builds. This small derivation exposes just libtool. + # NOTE: The same applies to swift-driver, but that is currently always + # invoked via the old `swift` / `swiftc`. May change in the future. + (runCommandLocal "libtool" { } '' + mkdir -p $out/bin + ln -s ${cctools}/bin/libtool $out/bin/libtool + '') + ]; + + # There are apparently multiple naming conventions on Darwin. Swift uses the + # xcrun naming convention. See `configure_sdk_darwin` calls in CMake files. + swiftOs = if targetPlatform.isDarwin + then { + "macos" = "macosx"; + "ios" = "iphoneos"; + #iphonesimulator + #appletvos + #appletvsimulator + #watchos + #watchsimulator + }.${targetPlatform.darwinPlatform} + or (throw "Cannot build Swift for target Darwin platform '${targetPlatform.darwinPlatform}'") + else targetPlatform.parsed.kernel.name; + + # Apple Silicon uses a different CPU name in the target triple. + swiftArch = if stdenv.isDarwin && stdenv.isAarch64 then "arm64" + else targetPlatform.parsed.cpu.name; + + # On Darwin, a `.swiftmodule` is a subdirectory in `lib/swift/`, + # containing binaries for supported archs. On other platforms, binaries are + # installed to `lib/swift//`. Note that our setup-hook also adds + # `lib/swift` for convenience. + swiftLibSubdir = "lib/swift/${swiftOs}"; + swiftModuleSubdir = if hostPlatform.isDarwin + then "lib/swift/${swiftOs}" + else "lib/swift/${swiftOs}/${swiftArch}"; + + # And then there's also a separate subtree for statically linked modules. + toStaticSubdir = lib.replaceStrings [ "/swift/" ] [ "/swift_static/" ]; + swiftStaticLibSubdir = toStaticSubdir swiftLibSubdir; + swiftStaticModuleSubdir = toStaticSubdir swiftModuleSubdir; + + # This matches _SWIFT_DEFAULT_COMPONENTS, with specific components disabled. + swiftInstallComponents = [ + "autolink-driver" + "compiler" + # "clang-builtin-headers" + "stdlib" + "sdk-overlay" + "parser-lib" + "static-mirror-lib" + "editor-integration" + # "tools" + # "testsuite-tools" + "toolchain-tools" + "toolchain-dev-tools" + "license" + (if stdenv.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") + "swift-remote-mirror" + "swift-remote-mirror-headers" + ]; + + # Build a tool used during the build to create a custom clang wrapper, with + # which we wrap the clang produced by the swift build. + # + # This is used in a `POST_BUILD` for the CMake target, so we rename the + # actual clang to clang-unwrapped, then put the wrapper in place. + # + # We replace the `exec ...` command with `exec -a "$0"` in order to + # preserve $0 for clang. This is because, unlike Nix, we don't have + # separate wrappers for clang/clang++, and clang uses $0 to detect C++. + # + # Similarly, the C++ detection in the wrapper itself also won't work for us, + # so we base it on $0 as well. + makeClangWrapper = writeShellScriptBin "nix-swift-make-clang-wrapper" '' + set -euo pipefail + + targetFile="$1" + unwrappedClang="$targetFile-unwrapped" + + mv "$targetFile" "$unwrappedClang" + sed < '${clang}/bin/clang' > "$targetFile" \ + -e 's|^\s*exec|exec -a "$0"|g' \ + -e 's|^\[\[ "${clang.cc}/bin/clang" = \*++ ]]|[[ "$0" = *++ ]]|' \ + -e "s|${clang.cc}/bin/clang|$unwrappedClang|g" + chmod a+x "$targetFile" + ''; + + # Create a tool used during the build to create a custom swift wrapper for + # each of the swift executables produced by the build. + # + # The build produces several `swift-frontend` executables during + # bootstrapping. Each of these has numerous aliases via symlinks, and the + # executable uses $0 to detect what tool is called. + wrapperParams = { + inherit bintools; + default_cc_wrapper = clang; # Instead of `@out@` in the original. + coreutils_bin = lib.getBin coreutils; + gnugrep_bin = gnugrep; + suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; + use_response_file_by_default = 1; + swiftDriver = ""; + # NOTE: @prog@ needs to be filled elsewhere. + }; + swiftWrapper = runCommand "swift-wrapper.sh" wrapperParams '' + substituteAll '${../wrapper/wrapper.sh}' "$out" + ''; + makeSwiftcWrapper = writeShellScriptBin "nix-swift-make-swift-wrapper" '' + set -euo pipefail + + targetFile="$1" + unwrappedSwift="$targetFile-unwrapped" + + mv "$targetFile" "$unwrappedSwift" + sed < '${swiftWrapper}' > "$targetFile" \ + -e "s|@prog@|'$unwrappedSwift'|g" \ + -e 's|exec "$prog"|exec -a "$0" "$prog"|g' + chmod a+x "$targetFile" + ''; + + # On Darwin, we need to use BOOTSTRAPPING-WITH-HOSTLIBS because of ABI + # stability, and have to provide the definitions for the system stdlib. + appleSwiftCore = stdenv.mkDerivation { + name = "apple-swift-core"; + dontUnpack = true; + + installPhase = '' + mkdir -p $out/lib/swift + cp -r \ + "${MacOSX-SDK}/usr/lib/swift/Swift.swiftmodule" \ + "${MacOSX-SDK}/usr/lib/swift/libswiftCore.tbd" \ + $out/lib/swift/ + ''; + }; + +in stdenv.mkDerivation { + pname = "swift"; + inherit (sources) version; + + outputs = [ "out" "lib" "dev" "doc" "man" ]; + + nativeBuildInputs = [ + cmake + git + ninja + perl # pod2man + pkg-config + python3 + makeWrapper + makeClangWrapper + makeSwiftcWrapper + ] + ++ lib.optionals stdenv.isDarwin [ + xcbuild + sigtool # codesign + DarwinTools # sw_vers + fixDarwinDylibNames + ]; + + buildInputs = [ + # For lldb + python3 + swig + libxml2 + ] + ++ lib.optionals stdenv.isLinux [ + libuuid + ] + ++ lib.optionals stdenv.isDarwin [ + CoreServices + Foundation + Combine + ]; + + # This is a partial reimplementation of our setup hook. Because we reuse + # the Swift wrapper for the Swift build itself, we need to do some of the + # same preparation. + postHook = '' + for pkg in "''${pkgsHostTarget[@]}" '${clang.libc}'; do + for subdir in ${swiftModuleSubdir} ${swiftStaticModuleSubdir} lib/swift; do + if [[ -d "$pkg/$subdir" ]]; then + export NIX_SWIFTFLAGS_COMPILE+=" -I $pkg/$subdir" + fi + done + for subdir in ${swiftLibSubdir} ${swiftStaticLibSubdir} lib/swift; do + if [[ -d "$pkg/$subdir" ]]; then + export NIX_LDFLAGS+=" -L $pkg/$subdir" + fi + done + done + ''; + + # We invoke cmakeConfigurePhase multiple times, but only need this once. + dontFixCmake = true; + # We setup custom build directories. + dontUseCmakeBuildDir = true; + + unpackPhase = let + copySource = repo: "cp -r ${sources.${repo}} ${repo}"; + in '' + mkdir src + cd src + + ${copySource "swift-cmark"} + ${copySource "llvm-project"} + ${copySource "swift"} + ${copySource "swift-experimental-string-processing"} + ${lib.optionalString + (!stdenv.isDarwin) + (copySource "swift-corelibs-libdispatch")} + + chmod -R u+w . + ''; + + patchPhase = '' + # Just patch all the things for now, we can focus this later. + # TODO: eliminate use of env. + find -type f -print0 | xargs -0 sed -i \ + ${lib.optionalString stdenv.isDarwin + "-e 's|/usr/libexec/PlistBuddy|${xcbuild}/bin/PlistBuddy|g'"} \ + -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ + -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ + -e 's|/bin/mkdir|${coreutils}/bin/mkdir|g' \ + -e 's|/bin/cp|${coreutils}/bin/cp|g' \ + -e 's|/usr/bin/file|${file}/bin/file|g' + + patch -p1 -d swift -i ${./patches/swift-wrap.patch} + patch -p1 -d swift -i ${./patches/swift-nix-resource-root.patch} + patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch} + patch -p1 -d swift -i ${substituteAll { + src = ./patches/swift-darwin-plistbuddy-workaround.patch; + inherit swiftArch; + }} + patch -p1 -d swift -i ${substituteAll { + src = ./patches/swift-prevent-sdk-dirs-warning.patch; + inherit (builtins) storeDir; + }} + substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \ + --replace '/usr/include' "${stdenv.cc.libc_dev}/include" + + # This patch needs to know the lib output location, so must be substituted + # in the same derivation as the compiler. + storeDir="${builtins.storeDir}" \ + substituteAll ${./patches/swift-separate-lib.patch} $TMPDIR/swift-separate-lib.patch + patch -p1 -d swift -i $TMPDIR/swift-separate-lib.patch + + patch -p1 -d llvm-project/llvm -i ${./patches/llvm-module-cache.patch} + + patch -p1 -d llvm-project/clang -i ${./patches/clang-toolchain-dir.patch} + patch -p1 -d llvm-project/clang -i ${./patches/clang-wrap.patch} + patch -p1 -d llvm-project/clang -i ${../../llvm/14/clang/purity.patch} + patch -p2 -d llvm-project/clang -i ${fetchpatch { + name = "clang-cmake-fix-interpreter.patch"; + url = "https://github.com/llvm/llvm-project/commit/b5eaf500f2441eff2277ea2973878fb1f171fd0a.patch"; + sha256 = "1rma1al0rbm3s3ql6bnvbcighp74lri1lcrwbyacgdqp80fgw1b6"; + }} + + ${lib.optionalString stdenv.isLinux '' + substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \ + --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \ + --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \ + --replace 'LibDir = "lib";' 'LibDir = "${glibc}/lib";' \ + --replace 'LibDir = "lib64";' 'LibDir = "${glibc}/lib";' \ + --replace 'LibDir = X32 ? "libx32" : "lib64";' 'LibDir = "${glibc}/lib";' + + # uuid.h is not part of glibc, but of libuuid. + sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' \ + swift/stdlib/public/Platform/glibc.modulemap.gyb + ''} + + # Remove tests for cross compilation, which we don't currently support. + rm swift/test/Interop/Cxx/class/constructors-copy-irgen.swift + rm swift/test/Interop/Cxx/class/constructors-irgen.swift + + # TODO: consider fixing and re-adding. This test fails due to a non-standard "install_prefix". + rm swift/validation-test/Python/build_swift.swift + + # We cannot handle the SDK location being in "Weird Location" due to Nix isolation. + rm swift/test/DebugInfo/compiler-flags.swift + + # TODO: Fix issue with ld.gold invoked from script finding crtbeginS.o and crtendS.o. + rm swift/test/IRGen/ELF-remove-autolink-section.swift + + # The following two tests fail because we use don't use the bundled libicu: + # [SOURCE_DIR/utils/build-script] ERROR: can't find source directory for libicu (tried /build/src/icu) + rm swift/validation-test/BuildSystem/default_build_still_performs_epilogue_opts_after_split.test + rm swift/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift + + # TODO: This test fails for some unknown reason + rm swift/test/Serialization/restrict-swiftmodule-to-revision.swift + + # This test was flaky in ofborg, see #186476 + rm swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift + + patchShebangs . + + ${lib.optionalString (!stdenv.isDarwin) '' + # NOTE: This interferes with ABI stability on Darwin, which uses the system + # libraries in the hardcoded path /usr/lib/swift. + fixCmakeFiles . + ''} + ''; + + configurePhase = '' + export SWIFT_SOURCE_ROOT="$PWD" + mkdir -p ../build + cd ../build + export SWIFT_BUILD_ROOT="$PWD" + + # Most builds set a target, but LLDB doesn't. Harmless on non-Darwin. + export MACOSX_DEPLOYMENT_TARGET=10.15 + ''; + + # These steps are derived from doing a normal build with. + # + # ./swift/utils/build-toolchain test --dry-run + # + # But dealing with the custom Python build system is far more trouble than + # simply invoking CMake directly. Few variables it passes to CMake are + # actually required or non-default. + # + # Using CMake directly also allows us to split up the already large build, + # and package Swift components separately. + # + # Besides `--dry-run`, another good way to compare build changes between + # Swift releases is to diff the scripts: + # + # git diff swift-5.6.3-RELEASE..swift-5.7-RELEASE -- utils/build* + # + buildPhase = '' + # Helper to build a subdirectory. + # + # Always reset cmakeFlags before calling this. The cmakeConfigurePhase + # amends flags and would otherwise keep expanding it. + function buildProject() { + mkdir -p $SWIFT_BUILD_ROOT/$1 + cd $SWIFT_BUILD_ROOT/$1 + + cmakeDir=$SWIFT_SOURCE_ROOT/''${2-$1} + cmakeConfigurePhase + + ninjaBuildPhase + } + + cmakeFlags="-GNinja" + buildProject swift-cmark + + # Some notes: + # - The Swift build just needs Clang. + # - We can further reduce targets to just our targetPlatform. + cmakeFlags=" + -GNinja + -DLLVM_ENABLE_PROJECTS=clang + -DLLVM_TARGETS_TO_BUILD=${{ + "x86_64" = "X86"; + "aarch64" = "AArch64"; + }.${targetPlatform.parsed.cpu.name}} + " + buildProject llvm llvm-project/llvm + + '' + lib.optionalString stdenv.isDarwin '' + # Add appleSwiftCore to the search paths. We can't simply add it to + # buildInputs, because it is potentially an older stdlib than the one we're + # building. We have to remove it again after the main Swift build, or later + # build steps may fail. (Specific case: Concurrency backdeploy uses the + # Sendable protocol, which appears to not be present in the macOS 11 SDK.) + OLD_NIX_SWIFTFLAGS_COMPILE="$NIX_SWIFTFLAGS_COMPILE" + OLD_NIX_LDFLAGS="$NIX_LDFLAGS" + export NIX_SWIFTFLAGS_COMPILE+=" -I ${appleSwiftCore}/lib/swift" + export NIX_LDFLAGS+=" -L ${appleSwiftCore}/lib/swift" + '' + '' + + # Some notes: + # - BOOTSTRAPPING_MODE defaults to OFF in CMake, but is enabled in standard + # builds, so we enable it as well. On Darwin, we have to use the system + # Swift libs because of ABI-stability, but this may be trouble if the + # builder is an older macOS. + # - Experimental features are OFF by default in CMake, but some are + # required to build the stdlib. + # - SWIFT_STDLIB_ENABLE_OBJC_INTEROP is set explicitely because its check + # is buggy. (Uses SWIFT_HOST_VARIANT_SDK before initialized.) + # Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232 + cmakeFlags=" + -GNinja + -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.isDarwin "-WITH-HOSTLIBS"} + -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON + -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm + -DClang_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/clang + -DSWIFT_PATH_TO_CMARK_SOURCE=$SWIFT_SOURCE_ROOT/swift-cmark + -DSWIFT_PATH_TO_CMARK_BUILD=$SWIFT_BUILD_ROOT/swift-cmark + -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE=$SWIFT_SOURCE_ROOT/swift-corelibs-libdispatch + -DEXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing + -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents} + -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.isDarwin then "ON" else "OFF"} + " + buildProject swift + + '' + lib.optionalString stdenv.isDarwin '' + # Restore search paths to remove appleSwiftCore. + export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE" + export NIX_LDFLAGS="$OLD_NIX_LDFLAGS" + '' + '' + + # These are based on flags in `utils/build-script-impl`. + # + # LLDB_USE_SYSTEM_DEBUGSERVER=ON disables the debugserver build on Darwin, + # which requires a special signature. + # + # CMAKE_BUILD_WITH_INSTALL_NAME_DIR ensures we don't use rpath on Darwin. + # + # NOTE: On Darwin, we only want ncurses in the linker search path, because + # headers are part of libsystem. Adding its headers to the search path + # causes strange mixing and errors. Note that libedit propagates ncurses, + # so we add both manually here, instead of relying on setup hooks. + # TODO: Find a better way to prevent this conflict. + cmakeFlags=" + -GNinja + -DLLDB_SWIFTC=$SWIFT_BUILD_ROOT/swift/bin/swiftc + -DLLDB_SWIFT_LIBS=$SWIFT_BUILD_ROOT/swift/lib/swift + -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm + -DClang_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/clang + -DSwift_DIR=$SWIFT_BUILD_ROOT/swift/lib/cmake/swift + -DLLDB_ENABLE_CURSES=ON + -DLLDB_ENABLE_LIBEDIT=ON + -DLLDB_ENABLE_PYTHON=ON + -DLLDB_ENABLE_LZMA=OFF + -DLLDB_ENABLE_LUA=OFF + -DLLDB_INCLUDE_TESTS=OFF + -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON + ${lib.optionalString stdenv.isDarwin '' + -DLLDB_USE_SYSTEM_DEBUGSERVER=ON + ''} + -DLibEdit_INCLUDE_DIRS=${libedit.dev}/include + -DLibEdit_LIBRARIES=${libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary} + -DCURSES_INCLUDE_DIRS=${if stdenv.isDarwin then "/var/empty" else ncurses.dev}/include + -DCURSES_LIBRARIES=${ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary} + -DPANEL_LIBRARIES=${ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary} + "; + buildProject lldb llvm-project/lldb + + ${lib.optionalString stdenv.isDarwin '' + # Need to do a standalone build of concurrency for Darwin back deployment. + # Based on: utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py + cmakeFlags=" + -GNinja + -DCMAKE_Swift_COMPILER=$SWIFT_BUILD_ROOT/swift/bin/swiftc + + -DTOOLCHAIN_DIR=/var/empty + -DSWIFT_NATIVE_LLVM_TOOLS_PATH=${stdenv.cc}/bin + -DSWIFT_NATIVE_CLANG_TOOLS_PATH=${stdenv.cc}/bin + -DSWIFT_NATIVE_SWIFT_TOOLS_PATH=$SWIFT_BUILD_ROOT/swift/bin + + -DCMAKE_CROSSCOMPILING=ON + + -DBUILD_SWIFT_CONCURRENCY_BACK_DEPLOYMENT_LIBRARIES=ON + -DSWIFT_INCLUDE_TOOLS=OFF + -DSWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT=OFF + -DSWIFT_BUILD_TEST_SUPPORT_MODULES=OFF + -DSWIFT_BUILD_STDLIB=OFF + -DSWIFT_BUILD_DYNAMIC_STDLIB=OFF + -DSWIFT_BUILD_STATIC_STDLIB=OFF + -DSWIFT_BUILD_REMOTE_MIRROR=OFF + -DSWIFT_BUILD_SDK_OVERLAY=OFF + -DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=OFF + -DSWIFT_BUILD_STATIC_SDK_OVERLAY=OFF + -DSWIFT_INCLUDE_TESTS=OFF + -DSWIFT_BUILD_PERF_TESTSUITE=OFF + + -DSWIFT_HOST_VARIANT_ARCH=${swiftArch} + -DBUILD_STANDALONE=ON + + -DSWIFT_INSTALL_COMPONENTS=back-deployment + + -DSWIFT_SDKS=${{ + "macos" = "OSX"; + "ios" = "IOS"; + #IOS_SIMULATOR + #TVOS + #TVOS_SIMULATOR + #WATCHOS + #WATCHOS_SIMULATOR + }.${targetPlatform.darwinPlatform}} + + -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm + + -DSWIFT_DEST_ROOT=$out + -DSWIFT_HOST_VARIANT_SDK=OSX + + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=10.15 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS=13.0 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST=13.0 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS=13.0 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS=6.0 + " + + # This depends on the special Clang build specific to the Swift branch. + # We also need to call a specific Ninja target. + export CC=$SWIFT_BUILD_ROOT/llvm/bin/clang + export CXX=$SWIFT_BUILD_ROOT/llvm/bin/clang++ + ninjaFlags="back-deployment" + + buildProject swift-concurrency-backdeploy swift + + export CC=$NIX_CC/bin/clang + export CXX=$NIX_CC/bin/clang++ + unset ninjaFlags + ''} + ''; + + # TODO: ~50 failing tests on x86_64-linux. Other platforms not checked. + doCheck = false; + nativeCheckInputs = [ file ]; + # TODO: consider using stress-tester and integration-test. + checkPhase = '' + cd $SWIFT_BUILD_ROOT/swift + checkTarget=check-swift-all + ninjaCheckPhase + unset checkTarget + ''; + + installPhase = '' + # Undo the clang and swift wrapping we did for the build. + # (This happened via patches to cmake files.) + cd $SWIFT_BUILD_ROOT + mv llvm/bin/clang-14{-unwrapped,} + mv swift/bin/swift-frontend{-unwrapped,} + + mkdir $out $lib + + # Install clang binaries only. We hide these with the wrapper, so they are + # for private use by Swift only. + cd $SWIFT_BUILD_ROOT/llvm + installTargets=install-clang + ninjaInstallPhase + unset installTargets + + # LLDB is also a private install. + cd $SWIFT_BUILD_ROOT/lldb + ninjaInstallPhase + + cd $SWIFT_BUILD_ROOT/swift + ninjaInstallPhase + + ${lib.optionalString stdenv.isDarwin '' + cd $SWIFT_BUILD_ROOT/swift-concurrency-backdeploy + installTargets=install-back-deployment + ninjaInstallPhase + unset installTargets + ''} + + # Separate $lib output here, because specific logic follows. + # Only move the dynamic run-time parts, to keep $lib small. Every Swift + # build will depend on it. + moveToOutput "lib/swift" "$lib" + moveToOutput "lib/libswiftDemangle.*" "$lib" + + # This link is here because various tools (swiftpm) check for stdlib + # relative to the swift compiler. It's fine if this is for build-time + # stuff, but we should patch all cases were it would end up in an output. + ln -s $lib/lib/swift $out/lib/swift + + # Swift has a separate resource root from Clang, but locates the Clang + # resource root via subdir or symlink. Provide a default here, but we also + # patch Swift to prefer NIX_CC if set. + ln -s ${clang}/resource-root $lib/lib/swift/clang + + ${lib.optionalString stdenv.isDarwin '' + # Install required library for ObjC interop. + # TODO: Is there no source code for this available? + cp -r ${CLTools_Executables}/usr/lib/arc $out/lib/arc + ''} + ''; + + preFixup = lib.optionalString stdenv.isLinux '' + # This is cheesy, but helps the patchelf hook remove /build from RPATH. + cd $SWIFT_BUILD_ROOT/.. + mv build buildx + ''; + + postFixup = lib.optionalString stdenv.isDarwin '' + # These libraries need to use the system install name. The official SDK + # does the same (as opposed to using rpath). Presumably, they are part of + # the stable ABI. Not using the system libraries at run-time is known to + # cause ObjC class conflicts and segfaults. + declare -A systemLibs=( + [libswiftCore.dylib]=1 + [libswiftDarwin.dylib]=1 + [libswiftSwiftOnoneSupport.dylib]=1 + [libswift_Concurrency.dylib]=1 + ) + + for systemLib in "''${!systemLibs[@]}"; do + install_name_tool -id /usr/lib/swift/$systemLib $lib/${swiftLibSubdir}/$systemLib + done + + for file in $out/bin/swift-frontend $lib/${swiftLibSubdir}/*.dylib; do + changeArgs="" + for dylib in $(otool -L $file | awk '{ print $1 }'); do + if [[ ''${systemLibs["$(basename $dylib)"]} ]]; then + changeArgs+=" -change $dylib /usr/lib/swift/$(basename $dylib)" + elif [[ "$dylib" = */bootstrapping1/* ]]; then + changeArgs+=" -change $dylib $lib/lib/swift/$(basename $dylib)" + fi + done + if [[ -n "$changeArgs" ]]; then + install_name_tool $changeArgs $file + fi + done + + wrapProgram $out/bin/swift-frontend \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} + ''; + + passthru = { + inherit + swiftOs swiftArch + swiftModuleSubdir swiftLibSubdir + swiftStaticModuleSubdir swiftStaticLibSubdir; + + # Internal attr for the wrapper. + _wrapperParams = wrapperParams; + }; + + meta = { + description = "The Swift Programming Language"; + homepage = "https://github.com/apple/swift"; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; linux ++ darwin; + # Swift doesn't support 32-bit Linux, unknown on other platforms. + badPlatforms = lib.platforms.i686; + timeout = 86400; # 24 hours. + }; +} diff --git a/pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch b/pkgs/development/compilers/swift/compiler/patches/clang-toolchain-dir.patch similarity index 100% rename from pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch rename to pkgs/development/compilers/swift/compiler/patches/clang-toolchain-dir.patch diff --git a/pkgs/development/compilers/swift/compiler/patches/clang-wrap.patch b/pkgs/development/compilers/swift/compiler/patches/clang-wrap.patch new file mode 100644 index 000000000000..9c6cafed3699 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/clang-wrap.patch @@ -0,0 +1,18 @@ +Wrap the clang produced during the build + +--- a/tools/driver/CMakeLists.txt ++++ b/tools/driver/CMakeLists.txt +@@ -59,6 +59,13 @@ endif() + + add_dependencies(clang clang-resource-headers) + ++# Nix: wrap the clang build. ++add_custom_command( ++ TARGET clang POST_BUILD ++ COMMAND nix-swift-make-clang-wrapper $ ++ VERBATIM ++) ++ + if(NOT CLANG_LINKS_TO_CREATE) + set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp) + endif() diff --git a/pkgs/development/compilers/swift/compiler/patches/llvm-module-cache.patch b/pkgs/development/compilers/swift/compiler/patches/llvm-module-cache.patch new file mode 100644 index 000000000000..9a22d0482ea5 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/llvm-module-cache.patch @@ -0,0 +1,30 @@ +The compiler fails if LLVM modules are enabled and it cannot write its module +cache. This patch detects and rejects the fake, non-existant $HOME used in Nix +builds. + +We could simply return false in `cache_directory`, but that completely disables +module caching, and may unnecessarily slow down builds. Instead, let it use +'/tmp/.cache'. + +--- a/lib/Support/Unix/Path.inc ++++ b/lib/Support/Unix/Path.inc +@@ -1380,6 +1380,9 @@ bool user_config_directory(SmallVectorImpl &result) { + if (!home_directory(result)) { + return false; + } ++ if (std::equal(result.begin(), result.end(), "/homeless-shelter")) { ++ return false; ++ } + append(result, ".config"); + return true; + } +@@ -1401,6 +1404,9 @@ bool cache_directory(SmallVectorImpl &result) { + if (!home_directory(result)) { + return false; + } ++ if (std::equal(result.begin(), result.end(), "/homeless-shelter")) { ++ system_temp_directory(true/*ErasedOnReboot*/, result); ++ } + append(result, ".cache"); + return true; + } diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-darwin-plistbuddy-workaround.patch b/pkgs/development/compilers/swift/compiler/patches/swift-darwin-plistbuddy-workaround.patch new file mode 100644 index 000000000000..a3cf4f60675c --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-darwin-plistbuddy-workaround.patch @@ -0,0 +1,17 @@ +CMake tries to read a list field from SDKSettings.plist, but the output of +facebook/xcbuild PlistBuddy is incompatible with Apple's. + +Simply set the supported architectures to the one target architecture we're +building for. + +--- a/cmake/modules/SwiftConfigureSDK.cmake ++++ b/cmake/modules/SwiftConfigureSDK.cmake +@@ -189,7 +189,7 @@ macro(configure_sdk_darwin + endif() + + # Remove any architectures not supported by the SDK. +- remove_sdk_unsupported_archs(${name} ${xcrun_name} ${SWIFT_SDK_${prefix}_PATH} SWIFT_SDK_${prefix}_ARCHITECTURES) ++ set(SWIFT_SDK_${prefix}_ARCHITECTURES "@swiftArch@") + + list_intersect( + "${SWIFT_DARWIN_MODULE_ARCHS}" # lhs diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-linking.patch b/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-linking.patch new file mode 100644 index 000000000000..e09d5162a93a --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-linking.patch @@ -0,0 +1,21 @@ +--- a/lib/Driver/ToolChains.cpp ++++ b/lib/Driver/ToolChains.cpp +@@ -1475,7 +1475,17 @@ const char *ToolChain::getClangLinkerDriver( + + // If there is a linker driver in the toolchain folder, use that instead. + if (auto tool = llvm::sys::findProgramByName(LinkerDriver, {toolchainPath})) +- LinkerDriver = Args.MakeArgString(tool.get()); ++ return Args.MakeArgString(tool.get()); ++ } ++ ++ // For Nix, prefer linking using the wrapped system clang, instead of using ++ // the unwrapped clang packaged with swift. The latter is unable to link, but ++ // we still want to use it for other purposes (clang importer). ++ if (auto nixCC = llvm::sys::Process::GetEnv("NIX_CC")) { ++ llvm::SmallString<128> binDir(nixCC.getValue()); ++ llvm::sys::path::append(binDir, "bin"); ++ if (auto tool = llvm::sys::findProgramByName(LinkerDriver, {binDir.str()})) ++ return Args.MakeArgString(tool.get()); + } + + return LinkerDriver; diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch b/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch new file mode 100644 index 000000000000..a68326c580b1 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch @@ -0,0 +1,67 @@ +Swift normally looks for the Clang resource dir in a subdir/symlink of its own +resource dir. We provide a symlink to the Swift build-time Clang as a default +there, but we also here patch two checks to try locate it via NIX_CC. + +The first (ClangImporter.cpp) happens when Swift code imports C modules. The +second (ToolChains.cpp) happens when Swift is used to link the final product. + +--- a/lib/ClangImporter/ClangImporter.cpp ++++ b/lib/ClangImporter/ClangImporter.cpp +@@ -68,6 +68,7 @@ + #include "llvm/Support/FileSystem.h" + #include "llvm/Support/Memory.h" + #include "llvm/Support/Path.h" ++#include "llvm/Support/Process.h" + #include "llvm/Support/YAMLParser.h" + #include "llvm/Support/YAMLTraits.h" + #include +@@ -809,6 +810,17 @@ importer::addCommonInvocationArguments( + + const std::string &overrideResourceDir = importerOpts.OverrideResourceDir; + if (overrideResourceDir.empty()) { ++ // Prefer the Clang resource directory from NIX_CC, to allow swapping in a ++ // different stdenv. ++ // TODO: Figure out how to provide a user override for this. Probably a ++ // niche use case, though, and for now a user can unset NIX_CC to work ++ // around it if necessary. ++ if (auto nixCC = llvm::sys::Process::GetEnv("NIX_CC")) { ++ llvm::SmallString<128> resourceDir(nixCC.getValue()); ++ llvm::sys::path::append(resourceDir, "resource-root"); ++ invocationArgStrs.push_back("-resource-dir"); ++ invocationArgStrs.push_back(std::string(resourceDir.str())); ++ } else { + llvm::SmallString<128> resourceDir(searchPathOpts.RuntimeResourcePath); + + // Adjust the path to refer to our copy of the Clang resource directory +@@ -824,6 +836,7 @@ importer::addCommonInvocationArguments( + // Set the Clang resource directory to the path we computed. + invocationArgStrs.push_back("-resource-dir"); + invocationArgStrs.push_back(std::string(resourceDir.str())); ++ } // nixCC + } else { + invocationArgStrs.push_back("-resource-dir"); + invocationArgStrs.push_back(overrideResourceDir); +--- a/lib/Driver/ToolChains.cpp ++++ b/lib/Driver/ToolChains.cpp +@@ -1372,10 +1372,20 @@ void ToolChain::getClangLibraryPath(const ArgList &Args, + SmallString<128> &LibPath) const { + const llvm::Triple &T = getTriple(); + ++ // Nix: We provide a `clang` symlink in the default Swift resource root, but ++ // prefer detecting the Clang resource root via NIX_CC, to allow swapping in ++ // a different stdenv. However, always honor a user-provided `-resource-dir`. ++ auto nixCC = llvm::sys::Process::GetEnv("NIX_CC"); ++ if (nixCC && !Args.hasArgNoClaim(options::OPT_resource_dir)) { ++ LibPath.assign(nixCC.getValue()); ++ llvm::sys::path::append(LibPath, "resource-root"); ++ } else { + getResourceDirPath(LibPath, Args, /*Shared=*/true); + // Remove platform name. + llvm::sys::path::remove_filename(LibPath); +- llvm::sys::path::append(LibPath, "clang", "lib", ++ llvm::sys::path::append(LibPath, "clang"); ++ } // nixCC ++ llvm::sys::path::append(LibPath, "lib", + T.isOSDarwin() ? "darwin" + : getPlatformNameForTriple(T)); + } diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-prevent-sdk-dirs-warning.patch b/pkgs/development/compilers/swift/compiler/patches/swift-prevent-sdk-dirs-warning.patch new file mode 100644 index 000000000000..987b99d74539 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-prevent-sdk-dirs-warning.patch @@ -0,0 +1,39 @@ +Prevents a user-visible warning on every compilation: + + ld: warning: directory not found for option '-L.../MacOSX11.0.sdk/usr/lib/swift' + +--- a/lib/Driver/ToolChains.cpp ++++ b/lib/Driver/ToolChains.cpp +@@ -1455,9 +1455,11 @@ void ToolChain::getRuntimeLibraryPaths(SmallVectorImpl &runtimeLibP + runtimeLibPaths.push_back(std::string(scratchPath.str())); + } + ++ if (!SDKPath.startswith("@storeDir@")) { + scratchPath = SDKPath; + llvm::sys::path::append(scratchPath, "usr", "lib", "swift"); + runtimeLibPaths.push_back(std::string(scratchPath.str())); ++ } + } + } + +--- a/lib/Frontend/CompilerInvocation.cpp ++++ b/lib/Frontend/CompilerInvocation.cpp +@@ -185,7 +185,9 @@ static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts, + RuntimeLibraryImportPaths.push_back(std::string(LibPath.str())); + } + +- LibPath = SearchPathOpts.getSDKPath(); ++ auto SDKPath = SearchPathOpts.getSDKPath(); ++ if (!SDKPath.startswith("@storeDir@")) { ++ LibPath = SDKPath; + llvm::sys::path::append(LibPath, "usr", "lib", "swift"); + if (!Triple.isOSDarwin()) { + // Use the non-architecture suffixed form with directory-layout +@@ -200,6 +202,7 @@ static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts, + llvm::sys::path::append(LibPath, swift::getMajorArchitectureName(Triple)); + } + RuntimeLibraryImportPaths.push_back(std::string(LibPath.str())); ++ } + } + SearchPathOpts.setRuntimeLibraryImportPaths(RuntimeLibraryImportPaths); + } diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-separate-lib.patch b/pkgs/development/compilers/swift/compiler/patches/swift-separate-lib.patch new file mode 100644 index 000000000000..20d81a6e8296 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-separate-lib.patch @@ -0,0 +1,26 @@ +Patch paths to use the separate 'lib' output. One of the things this patch +fixes is the output of `swift -frontend -print-target-info`, which swiftpm uses +to set rpath on Linux. + +The check if the executable path starts with 'out' is necessary for +bootstrapping, or the compiler will fail when run from the build directory. + +--- a/lib/Frontend/CompilerInvocation.cpp ++++ b/lib/Frontend/CompilerInvocation.cpp +@@ -49,11 +49,16 @@ swift::CompilerInvocation::CompilerInvocation() { + void CompilerInvocation::computeRuntimeResourcePathFromExecutablePath( + StringRef mainExecutablePath, bool shared, + llvm::SmallVectorImpl &runtimeResourcePath) { ++ if (mainExecutablePath.startswith("@storeDir@")) { ++ auto libPath = StringRef("@lib@"); ++ runtimeResourcePath.append(libPath.begin(), libPath.end()); ++ } else { + runtimeResourcePath.append(mainExecutablePath.begin(), + mainExecutablePath.end()); + + llvm::sys::path::remove_filename(runtimeResourcePath); // Remove /swift + llvm::sys::path::remove_filename(runtimeResourcePath); // Remove /bin ++ } + appendSwiftLibDir(runtimeResourcePath, shared); + } + diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-wrap.patch b/pkgs/development/compilers/swift/compiler/patches/swift-wrap.patch new file mode 100644 index 000000000000..e4697f631e70 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-wrap.patch @@ -0,0 +1,46 @@ +Wrap the swift compiler produced during the build + +--- a/tools/driver/CMakeLists.txt ++++ b/tools/driver/CMakeLists.txt +@@ -16,6 +16,13 @@ if(${LIBSWIFT_BUILD_MODE} MATCHES "BOOTSTRAPPING.*") + swiftDriverTool + libswiftStub) + ++ # Nix: wrap the swift build. ++ add_custom_command( ++ TARGET swift-frontend-bootstrapping0 POST_BUILD ++ COMMAND nix-swift-make-swift-wrapper $ ++ VERBATIM ++ ) ++ + swift_create_post_build_symlink(swift-frontend-bootstrapping0 + SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}" + DESTINATION "swiftc${CMAKE_EXECUTABLE_SUFFIX}" +@@ -34,6 +41,13 @@ if(${LIBSWIFT_BUILD_MODE} MATCHES "BOOTSTRAPPING.*") + swiftDriverTool + libswift-bootstrapping1) + ++ # Nix: wrap the swift build. ++ add_custom_command( ++ TARGET swift-frontend-bootstrapping1 POST_BUILD ++ COMMAND nix-swift-make-swift-wrapper $ ++ VERBATIM ++ ) ++ + swift_create_post_build_symlink(swift-frontend-bootstrapping1 + SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}" + DESTINATION "swiftc${CMAKE_EXECUTABLE_SUFFIX}" +@@ -50,6 +64,13 @@ target_link_libraries(swift-frontend + swiftDriverTool + libswift) + ++# Nix: wrap the swift build. ++add_custom_command( ++ TARGET swift-frontend POST_BUILD ++ COMMAND nix-swift-make-swift-wrapper $ ++ VERBATIM ++) ++ + # Create a `swift-driver` executable adjacent to the `swift-frontend` executable + # to ensure that `swiftc` forwards to the standalone driver when invoked. + swift_create_early_driver_copies(swift-frontend) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 50bc73582f1b..e8eb4d738ca9 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -1,475 +1,101 @@ -{ lib, stdenv -, cmake -, coreutils -, glibc -, gccForLibs -, which -, perl -, libedit -, ninja -, pkg-config -, sqlite -, libxml2 -, clang_13 -, python3 -, ncurses -, libuuid -, libxcrypt -, icu -, libgcc -, libblocksruntime -, curl -, rsync -, git -, libgit2 -, fetchFromGitHub -, makeWrapper -, gnumake -, file +{ lib +, pkgs +, newScope +, darwin +, llvmPackages_latest +, overrideCC }: let - # The Swift toolchain script builds projects with separate repos. By convention, some of them share - # the same version with the main Swift compiler project per release. We fetch these with - # `fetchSwiftRelease`. The rest have their own versions locked to each Swift release, as defined in the - # Swift compiler repo: - # utils/update_checkout/update_checkout-config.json. - # - # ... among projects listed in that file, we provide our own: - # - CMake - # - ninja - # - icu - # - # ... we'd like to include the following in the future: - # - stress-tester - # - integration-tests + self = rec { + + callPackage = newScope self; + + # Current versions of Swift on Darwin require macOS SDK 10.15 at least. + # Re-export this so we can rely on the minimum Swift SDK elsewhere. + apple_sdk = pkgs.darwin.apple_sdk_11_0; + + # Our current Clang on Darwin is v11, but we need at least v12. The + # following applies the newer Clang with the same libc overrides as + # `apple_sdk.stdenv`. + # + # If 'latest' becomes an issue, recommend replacing it with v14, which is + # currently closest to the official Swift builds. + clang = if pkgs.stdenv.isDarwin + then + llvmPackages_latest.clang.override rec { + libc = apple_sdk.Libsystem; + bintools = pkgs.bintools.override { inherit libc; }; + } + else + llvmPackages_latest.clang; + + # Overrides that create a useful environment for swift packages, allowing + # packaging with `swiftPackages.callPackage`. These are similar to + # `apple_sdk_11_0.callPackage`, with our clang on top. + inherit (clang) bintools; + stdenv = overrideCC pkgs.stdenv clang; + darwin = pkgs.darwin.overrideScope (_: prev: { + inherit apple_sdk; + inherit (apple_sdk) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; + CF = apple_sdk.CoreFoundation; + }); + xcodebuild = pkgs.xcbuild.override { + inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; + inherit stdenv; + sdkVer = "10.15"; + }; + xcbuild = xcodebuild; + + swift-unwrapped = callPackage ./compiler { + inherit (darwin) DarwinTools cctools sigtool; + inherit (apple_sdk) MacOSX-SDK CLTools_Executables; + inherit (apple_sdk.frameworks) CoreServices Foundation Combine; + }; + + swiftNoSwiftDriver = callPackage ./wrapper { + swift = swift-unwrapped; + useSwiftDriver = false; + }; + + Dispatch = if stdenv.isDarwin + then null # part of libsystem + else callPackage ./libdispatch { swift = swiftNoSwiftDriver; }; + + Foundation = if stdenv.isDarwin + then apple_sdk.frameworks.Foundation + else callPackage ./foundation { swift = swiftNoSwiftDriver; }; + + # TODO: Apple distributes a binary XCTest with Xcode, but it is not part of + # CLTools (or SUS), so would have to figure out how to fetch it. The binary + # version has several extra features, like a test runner and ObjC support. + XCTest = callPackage ./xctest { + inherit (darwin) DarwinTools; + swift = swiftNoSwiftDriver; + }; + + swiftpm = callPackage ./swiftpm { + inherit (darwin) DarwinTools cctools; + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + swift = swiftNoSwiftDriver; + }; + + swift-driver = callPackage ./swift-driver { + swift = swiftNoSwiftDriver; + }; + + swift = callPackage ./wrapper { + swift = swift-unwrapped; + }; + + sourcekit-lsp = callPackage ./sourcekit-lsp { + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + }; + + swift-docc = callPackage ./swift-docc { + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + }; - versions = { - swift = "5.6.2"; - yams = "4.0.2"; - argumentParser = "1.0.3"; - format = "release/5.6"; - crypto = "1.1.5"; - nio = "2.31.2"; - nio-ssl = "2.15.0"; }; - fetchAppleRepo = { repo, rev, sha256 }: - fetchFromGitHub { - owner = "apple"; - inherit repo rev sha256; - name = "${repo}-${rev}-src"; - }; - - fetchSwiftRelease = { repo, sha256, fetchSubmodules ? false }: - fetchFromGitHub { - owner = "apple"; - inherit repo sha256 fetchSubmodules; - rev = "swift-${versions.swift}-RELEASE"; - name = "${repo}-${versions.swift}-src"; - }; - - sources = { - # Projects that share `versions.swift` for each release. - - swift = fetchSwiftRelease { - repo = "swift"; - sha256 = "sha256-wiRXAXWEksJuy+YQQ+B7tzr2iLkSVkgV6o+wIz7yKJA="; - }; - cmark = fetchSwiftRelease { - repo = "swift-cmark"; - sha256 = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw="; - }; - llbuild = fetchSwiftRelease { - repo = "swift-llbuild"; - sha256 = "sha256-SQ6V0zVshIYMjayx+ZpYuLijgQ89tqRnPlXBPf2FYqM="; - }; - driver = fetchSwiftRelease { - repo = "swift-driver"; - sha256 = "sha256-D5/C4Rbv5KIsKpy6YbuMxGIGaQkn80PD4Cp0l6bPKzY="; - }; - toolsSupportCore = fetchSwiftRelease { - repo = "swift-tools-support-core"; - sha256 = "sha256-FbtQCq1sSlzrskCrgzD4iYuo5eGaXrAUUxoNX/BiOfg="; - }; - swiftpm = fetchSwiftRelease { - repo = "swift-package-manager"; - sha256 = "sha256-esO4Swz3UYngbVgxoV+fkhSC0AU3IaxVjWkgK/s3x68="; - }; - syntax = fetchSwiftRelease { - repo = "swift-syntax"; - sha256 = "sha256-C9FPCtq49BvKXtTWWeReYWNrU70pHzT2DhAv3NiTbPU="; - }; - corelibsXctest = fetchSwiftRelease { - repo = "swift-corelibs-xctest"; - sha256 = "sha256-0hizfnKJaUUA+jXuXzXWk72FmlSyc+UGEf7BTLdJrx4="; - }; - corelibsFoundation = fetchSwiftRelease { - repo = "swift-corelibs-foundation"; - sha256 = "sha256-8sCL8Ia6yb6bRsJZ52gUJH0jN3lwClM573G8jgUdEhw="; - }; - corelibsLibdispatch = fetchSwiftRelease { - repo = "swift-corelibs-libdispatch"; - sha256 = "sha256-1tIskUMnfblnvZaFDQPUMBfWTmBYG98s7rEww7PwZO8="; - fetchSubmodules = true; - }; - indexstoreDb = fetchSwiftRelease { - repo = "indexstore-db"; - sha256 = "sha256-/PO4eMiASZN3pjFjBQ1r8vYwGRn6xm3SWaB2HDZlkPs="; - }; - sourcekitLsp = fetchSwiftRelease { - repo = "sourcekit-lsp"; - sha256 = "sha256-ttgUC4ZHD3P/xLHllEbACtHVrJ6HXqeVWccXcoPMkts="; - }; - llvmProject = fetchSwiftRelease { - repo = "llvm-project"; - sha256 = "sha256-YVs3lKV2RlaovpYkdGO+vzypolrmXmbKBBP4+osNMYw="; - }; - docc = fetchSwiftRelease { - repo = "swift-docc"; - sha256 = "sha256-rWiaNamZoHTO1bKpubxuT7m1IBOl7amT5M71mNauilY="; - }; - docc-render-artifact = fetchSwiftRelease { - repo = "swift-docc-render-artifact"; - sha256 = "sha256-AX+rtDLhq8drk7N6/hoH3fQioudmmTCnEhR45bME8uU="; - }; - docc-symbolkit = fetchSwiftRelease { - repo = "swift-docc-symbolkit"; - sha256 = "sha256-Xy1TQ5ucDW+MnkeOvVznsATBmwcQ3p1x+ofQ22ofk+o="; - }; - lmdb = fetchSwiftRelease { - repo = "swift-lmdb"; - sha256 = "sha256-i2GkWRWq1W5j8rF4PiHwWgT4Dur5FCY2o44HvUU3vtQ="; - }; - markdown = fetchSwiftRelease { - repo = "swift-markdown"; - sha256 = "sha256-XtFSBiNHhmULjS4OqSpMgUetLu3peRg7l6HpjwVsTj8="; - }; - - cmark-gfm = fetchAppleRepo { - repo = "swift-cmark"; - rev = "swift-${versions.swift}-RELEASE-gfm"; - sha256 = "sha256-g28iKmMR2W0r1urf8Fk1HBxAp5OlonNYSVN3Ril66tQ="; - }; - - # Projects that have their own versions during each release - - argumentParser = fetchAppleRepo { - repo = "swift-argument-parser"; - rev = "${versions.argumentParser}"; - sha256 = "sha256-vNqkuAwSZNCWvwe6E5BqbXQdIbmIia0dENmmSQ9P8Mo="; - }; - format = fetchAppleRepo { - repo = "swift-format"; - rev = "${versions.format}"; - sha256 = "sha256-1f5sIrv9IbPB7Vnahq1VwH8gT41dcjWldRwvVEaMdto="; - }; - crypto = fetchAppleRepo { - repo = "swift-crypto"; - rev = "${versions.crypto}"; - sha256 = "sha256-jwxXQuOF+CnpLMwTZ2z52Fgx2b97yWzXiPTx0Ye8KCQ="; - }; - nio = fetchAppleRepo { - repo = "swift-nio"; - rev = versions.nio; - sha256 = "sha256-FscOA/S7on31QCR/MZFjg4ZB3FGJ+rdptZ6MRZJXexE="; - }; - nio-ssl = fetchAppleRepo { - repo = "swift-nio-ssl"; - rev = versions.nio-ssl; - sha256 = "sha256-5QGkmkCOXhG3uOdf0bd3Fo1MFekB8/WcveBXGhtVZKo="; - }; - yams = fetchFromGitHub { - owner = "jpsim"; - repo = "Yams"; - rev = versions.yams; - sha256 = "sha256-cTkCAwxxLc35laOon1ZXXV8eAxX02oDolJyPauhZado="; - name = "Yams-${versions.yams}-src"; - }; - }; - - devInputs = [ - curl - glibc - icu - libblocksruntime - libedit - libgcc - libuuid - libxcrypt - libxml2 - ncurses - sqlite - ]; - - python = (python3.withPackages (ps: [ps.six])); - - cmakeFlags = [ - "-DGLIBC_INCLUDE_PATH=${stdenv.cc.libc.dev}/include" - "-DC_INCLUDE_DIRS=${lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2" - "-DGCC_INSTALL_PREFIX=${gccForLibs}" - ]; - -in -stdenv.mkDerivation { - pname = "swift"; - version = versions.swift; - - nativeBuildInputs = [ - cmake - git - makeWrapper - ninja - perl - pkg-config - python - rsync - which - ]; - buildInputs = devInputs ++ [ - clang_13 - ]; - - # TODO: Revisit what needs to be propagated and how. - propagatedBuildInputs = [ - libgcc - libgit2 - python - ]; - propagatedUserEnvPkgs = [ git pkg-config ]; - - hardeningDisable = [ "format" ]; # for LLDB - - unpackPhase = '' - mkdir src - cd src - export SWIFT_SOURCE_ROOT=$PWD - - cp -r ${sources.swift} swift - cp -r ${sources.cmark} cmark - cp -r ${sources.llbuild} llbuild - cp -r ${sources.argumentParser} swift-argument-parser - cp -r ${sources.driver} swift-driver - cp -r ${sources.toolsSupportCore} swift-tools-support-core - cp -r ${sources.swiftpm} swiftpm - cp -r ${sources.syntax} swift-syntax - cp -r ${sources.corelibsXctest} swift-corelibs-xctest - cp -r ${sources.corelibsFoundation} swift-corelibs-foundation - cp -r ${sources.corelibsLibdispatch} swift-corelibs-libdispatch - cp -r ${sources.yams} yams - cp -r ${sources.indexstoreDb} indexstore-db - cp -r ${sources.sourcekitLsp} sourcekit-lsp - cp -r ${sources.format} swift-format - cp -r ${sources.crypto} swift-crypto - cp -r ${sources.llvmProject} llvm-project - cp -r ${sources.cmark-gfm} swift-cmark-gfm - cp -r ${sources.docc} swift-docc - cp -r ${sources.docc-render-artifact} swift-docc-render-artifact - cp -r ${sources.docc-symbolkit} swift-docc-symbolkit - cp -r ${sources.lmdb} swift-lmdb - cp -r ${sources.markdown} swift-markdown - cp -r ${sources.nio} swift-nio - cp -r ${sources.nio-ssl} swift-nio-ssl - - chmod -R u+w . - ''; - - patchPhase = '' - # Just patch all the things for now, we can focus this later. - patchShebangs $SWIFT_SOURCE_ROOT - - # TODO: eliminate use of env. - find -type f -print0 | xargs -0 sed -i \ - -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ - -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ - -e 's|/bin/mkdir|${coreutils}/bin/mkdir|g' \ - -e 's|/bin/cp|${coreutils}/bin/cp|g' \ - -e 's|/usr/bin/file|${file}/bin/file|g' - - # Build configuration patches. - patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch} - patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} - patch -p1 -d swift -i ${./patches/0003-build-presets-linux-don-t-build-extra-libs.patch} - patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} - patch -p1 -d swift -i ${./patches/0007-build-presets-linux-os-stdlib.patch} - substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \ - --replace '/usr/include' "${stdenv.cc.libc.dev}/include" - sed -i swift/utils/build-presets.ini \ - -e 's/^test-installable-package$/# \0/' \ - -e 's/^test$/# \0/' \ - -e 's/^validation-test$/# \0/' \ - -e 's/^long-test$/# \0/' \ - -e 's/^stress-test$/# \0/' \ - -e 's/^test-optimized$/# \0/' \ - -e 's/^swift-install-components=autolink.*$/\0;editor-integration/' - - # LLVM toolchain patches. - patch -p1 -d llvm-project/clang -i ${./patches/0005-clang-toolchain-dir.patch} - patch -p1 -d llvm-project/clang -i ${./patches/0006-clang-purity.patch} - substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \ - --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \ - --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \ - --replace 'LibDir = "lib";' 'LibDir = "${glibc}/lib";' \ - --replace 'LibDir = "lib64";' 'LibDir = "${glibc}/lib";' \ - --replace 'LibDir = X32 ? "libx32" : "lib64";' 'LibDir = "${glibc}/lib";' - - # Substitute ncurses for curses in llbuild. - sed -i 's/curses/ncurses/' llbuild/*/*/CMakeLists.txt - sed -i 's/curses/ncurses/' llbuild/*/*/*/CMakeLists.txt - - # uuid.h is not part of glibc, but of libuuid. - sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' swift/stdlib/public/Platform/glibc.modulemap.gyb - - # Support library build script patches. - PREFIX=''${out/#\/} - substituteInPlace swift/utils/swift_build_support/swift_build_support/products/benchmarks.py \ - --replace \ - "'--toolchain', toolchain_path," \ - "'--toolchain', '/build/install/$PREFIX'," - substituteInPlace swift/benchmark/scripts/build_script_helper.py \ - --replace \ - "swiftbuild_path = os.path.join(args.toolchain, \"usr\", \"bin\", \"swift-build\")" \ - "swiftbuild_path = os.path.join(args.toolchain, \"bin\", \"swift-build\")" - substituteInPlace swift-corelibs-xctest/build_script.py \ - --replace usr "$PREFIX" - - # Can be removed in later swift-docc versions, see - # https://github.com/apple/swift-docc/commit/bff70b847008f91ac729cfd299a85481eef3f581 - substituteInPlace swift-docc/build-script-helper.py \ - --replace \ - "subprocess.check_output(cmd, env=env).strip(), 'docc')" \ - "subprocess.check_output(cmd, env=env).strip().decode(), 'docc')" - - # Can be removed in later Swift versions, see - # https://github.com/apple/swift/pull/58755 - substituteInPlace swift/utils/process-stats-dir.py \ - --replace \ - "type=argparse.FileType('wb', 0)," \ - "type=argparse.FileType('w', 0)," - - # Apply Python 3 fix, see - # https://github.com/apple/swift/commit/ec6bc595092974628b27b114a472e84162261bbd - substituteInPlace swift/utils/swift_build_support/swift_build_support/productpipeline_list_builder.py \ - --replace \ - "filter(lambda x: x is not None, pipeline)" \ - "[p for p in pipeline if p is not None]" - ''; - - configurePhase = '' - cd .. - - mkdir build install - export SWIFT_BUILD_ROOT=$PWD/build - export SWIFT_INSTALL_DIR=$PWD/install - - export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz - export NIX_ENFORCE_PURITY= - - cd $SWIFT_BUILD_ROOT - ''; - - buildPhase = '' - # Explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib. - export NIX_CFLAGS_COMPILE="$(< ${clang_13}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" - - # During the Swift build, a full local LLVM build is performed and the resulting clang is - # invoked. This compiler is not using the Nix wrappers, so it needs some help to find things. - export NIX_LDFLAGS_BEFORE="-rpath ${gccForLibs.lib}/lib -L${gccForLibs.lib}/lib $NIX_LDFLAGS_BEFORE" - - # However, we want to use the wrapped compiler whenever possible. - export CC="${clang_13}/bin/clang" - - $SWIFT_SOURCE_ROOT/swift/utils/build-script \ - --preset=buildbot_linux \ - installable_package=$INSTALLABLE_PACKAGE \ - install_prefix=$out \ - install_destdir=$SWIFT_INSTALL_DIR \ - extra_cmake_options="${lib.concatStringsSep "," cmakeFlags}" - ''; - - doCheck = true; - - nativeCheckInputs = [ file ]; - - checkPhase = '' - # Remove compiler build system tests which fail due to our modified default build profile and - # nixpkgs-provided version of CMake. - rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/infer_implies_install_all.test - rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test - - # This test apparently requires Python 2 (strings are assumed to be bytes-like), but the build - # process overall now otherwise requires Python 3 (which is what we have updated to). A fix PR - # has been submitted upstream. - rm $SWIFT_SOURCE_ROOT/swift/validation-test/SIL/verify_all_overlays.py - - # TODO: consider fixing and re-adding. This test fails due to a non-standard "install_prefix". - rm $SWIFT_SOURCE_ROOT/swift/validation-test/Python/build_swift.swift - - # We cannot handle the SDK location being in "Weird Location" due to Nix isolation. - rm $SWIFT_SOURCE_ROOT/swift/test/DebugInfo/compiler-flags.swift - - # TODO: Fix issue with ld.gold invoked from script finding crtbeginS.o and crtendS.o. - rm $SWIFT_SOURCE_ROOT/swift/test/IRGen/ELF-remove-autolink-section.swift - - # The following two tests fail because we use don't use the bundled libicu: - # [SOURCE_DIR/utils/build-script] ERROR: can't find source directory for libicu (tried /build/src/icu) - rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/default_build_still_performs_epilogue_opts_after_split.test - rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift - - # TODO: This test fails for some unknown reason - rm $SWIFT_SOURCE_ROOT/swift/test/Serialization/restrict-swiftmodule-to-revision.swift - - # This test was flaky in ofborg, see #186476 - rm $SWIFT_SOURCE_ROOT/swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift - - # TODO: consider using stress-tester and integration-test. - - # Match the wrapped version of Swift to be installed. - export LIBRARY_PATH=${lib.makeLibraryPath [icu libgcc libuuid]}:$l - - checkTarget=check-swift-all-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name} - ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}' - ninjaCheckPhase - ''; - - installPhase = '' - mkdir -p $out - - # Extract the generated tarball into the store. - tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 ''${out/#\/} - find $out -type d -empty -delete - - # Fix installation weirdness, also present in Apple’s official tarballs. - mv $out/local/include/indexstore $out/include - rmdir $out/local/include $out/local - rm -r $out/bin/sdk-module-lists $out/bin/swift-api-checker.py - - wrapProgram $out/bin/swift \ - --set CC $out/bin/clang \ - --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} \ - --suffix PATH : ${lib.makeBinPath [ stdenv.cc.bintools ]} - - wrapProgram $out/bin/swiftc \ - --set CC $out/bin/clang \ - --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} \ - --suffix PATH : ${lib.makeBinPath [ stdenv.cc.bintools ]} - ''; - - # Hack to avoid build and install directories in RPATHs. - preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR"; - - meta = with lib; { - description = "The Swift Programming Language"; - homepage = "https://github.com/apple/swift"; - maintainers = with maintainers; [ dtzWill trepetti dduan trundle ]; - license = licenses.asl20; - # Swift doesn't support 32-bit Linux, unknown on other platforms. - platforms = platforms.linux; - badPlatforms = platforms.i686; - timeout = 86400; # 24 hours. - }; -} +in self diff --git a/pkgs/development/compilers/swift/foundation/default.nix b/pkgs/development/compilers/swift/foundation/default.nix new file mode 100644 index 000000000000..efb35bd74c9f --- /dev/null +++ b/pkgs/development/compilers/swift/foundation/default.nix @@ -0,0 +1,61 @@ +# TODO: We already package the CoreFoundation component of Foundation in: +# pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +# This is separate because the CF build is completely different and part of +# stdenv. Merging the two was kept outside of the scope of Swift work. + +{ lib +, stdenv +, callPackage +, cmake +, ninja +, swift +, Dispatch +, icu +, libxml2 +, curl +}: + +let + sources = callPackage ../sources.nix { }; +in stdenv.mkDerivation { + pname = "swift-corelibs-foundation"; + + inherit (sources) version; + src = sources.swift-corelibs-foundation; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja swift ]; + buildInputs = [ icu libxml2 curl ]; + propagatedBuildInputs = [ Dispatch ]; + + preConfigure = '' + # Fails to build with -D_FORTIFY_SOURCE. + NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} + ''; + + postInstall = '' + # Split up the output. + mkdir $dev + mv $out/lib/swift/${swift.swiftOs} $out/swiftlibs + mv $out/lib/swift $dev/include + mkdir $out/lib/swift + mv $out/swiftlibs $out/lib/swift/${swift.swiftOs} + + # Provide a CMake module. This is primarily used to glue together parts of + # the Swift toolchain. Modifying the CMake config to do this for us is + # otherwise more trouble. + mkdir -p $dev/lib/cmake/Foundation + export dylibExt="${stdenv.hostPlatform.extensions.sharedLibrary}" + export swiftOs="${swift.swiftOs}" + substituteAll ${./glue.cmake} $dev/lib/cmake/Foundation/FoundationConfig.cmake + ''; + + meta = { + description = "Core utilities, internationalization, and OS independence for Swift"; + homepage = "https://github.com/apple/swift-corelibs-foundation"; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/swift/foundation/glue.cmake b/pkgs/development/compilers/swift/foundation/glue.cmake new file mode 100644 index 000000000000..a34984d19f04 --- /dev/null +++ b/pkgs/development/compilers/swift/foundation/glue.cmake @@ -0,0 +1,8 @@ +add_library(Foundation SHARED IMPORTED) +set_property(TARGET Foundation PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libFoundation@dylibExt@") + +add_library(FoundationNetworking SHARED IMPORTED) +set_property(TARGET FoundationNetworking PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libFoundationNetworking@dylibExt@") + +add_library(FoundationXML SHARED IMPORTED) +set_property(TARGET FoundationXML PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libFoundationXML@dylibExt@") diff --git a/pkgs/development/compilers/swift/libdispatch/default.nix b/pkgs/development/compilers/swift/libdispatch/default.nix new file mode 100644 index 000000000000..4a0616ded5ac --- /dev/null +++ b/pkgs/development/compilers/swift/libdispatch/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, callPackage +, cmake +, ninja +, useSwift ? true, swift +}: + +let + sources = callPackage ../sources.nix { }; +in stdenv.mkDerivation { + pname = "swift-corelibs-libdispatch"; + + inherit (sources) version; + src = sources.swift-corelibs-libdispatch; + + outputs = [ "out" "dev" "man" ]; + + nativeBuildInputs = [ cmake ] + ++ lib.optionals useSwift [ ninja swift ]; + + patches = [ ./disable-swift-overlay.patch ]; + + cmakeFlags = lib.optional useSwift "-DENABLE_SWIFT=ON"; + + postInstall = '' + # Provide a CMake module. This is primarily used to glue together parts of + # the Swift toolchain. Modifying the CMake config to do this for us is + # otherwise more trouble. + mkdir -p $dev/lib/cmake/dispatch + export dylibExt="${stdenv.hostPlatform.extensions.sharedLibrary}" + substituteAll ${./glue.cmake} $dev/lib/cmake/dispatch/dispatchConfig.cmake + ''; + + meta = { + description = "Grand Central Dispatch"; + homepage = "https://github.com/apple/swift-corelibs-libdispatch"; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cmm dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/swift/libdispatch/disable-swift-overlay.patch b/pkgs/development/compilers/swift/libdispatch/disable-swift-overlay.patch new file mode 100644 index 000000000000..0ea1869d5528 --- /dev/null +++ b/pkgs/development/compilers/swift/libdispatch/disable-swift-overlay.patch @@ -0,0 +1,35 @@ +Enabling Swift support is normally intended for building an overlay for a +Swift SDK, which changes the installation layout. Prevent this. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -287,7 +287,7 @@ configure_file("${PROJECT_SOURCE_DIR}/cmake/config.h.in" + add_compile_definitions($<$,$>:HAVE_CONFIG_H>) + + +-if(ENABLE_SWIFT) ++if(0) + set(INSTALL_TARGET_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$>:_static>/$" CACHE PATH "Path where the libraries will be installed") + set(INSTALL_DISPATCH_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$>:_static>/dispatch" CACHE PATH "Path where the headers will be installed for libdispatch") + set(INSTALL_BLOCK_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$>:_static>/Block" CACHE PATH "Path where the headers will be installed for the blocks runtime") +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -1,6 +1,6 @@ + + # TODO(compnerd) add symlinks +-if(NOT ENABLE_SWIFT) ++if(1) + install(FILES + dispatch.3 + dispatch_after.3 +--- a/src/swift/CMakeLists.txt ++++ b/src/swift/CMakeLists.txt +@@ -47,7 +47,7 @@ get_swift_host_arch(swift_arch) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftmodule + ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftdoc +- DESTINATION ${INSTALL_TARGET_DIR}/${swift_arch}) ++ DESTINATION ${INSTALL_TARGET_DIR}/swift) + set_property(GLOBAL APPEND PROPERTY DISPATCH_EXPORTS swiftDispatch) + install(TARGETS swiftDispatch + EXPORT dispatchExports diff --git a/pkgs/development/compilers/swift/libdispatch/glue.cmake b/pkgs/development/compilers/swift/libdispatch/glue.cmake new file mode 100644 index 000000000000..dd696dc61085 --- /dev/null +++ b/pkgs/development/compilers/swift/libdispatch/glue.cmake @@ -0,0 +1,5 @@ +add_library(dispatch SHARED IMPORTED) +set_property(TARGET dispatch PROPERTY IMPORTED_LOCATION "@out@/lib/libdispatch@dylibExt@") + +add_library(swiftDispatch SHARED IMPORTED) +set_property(TARGET swiftDispatch PROPERTY IMPORTED_LOCATION "@out@/lib/libswiftDispatch@dylibExt@") diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch deleted file mode 100644 index 6c42921cd233..000000000000 --- a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch +++ /dev/null @@ -1,13 +0,0 @@ -Don't build Ninja, we use our own. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -779,7 +779,7 @@ swiftpm - - dash-dash - --build-ninja -+# build-ninja - install-llvm - install-swift - install-lldb diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch deleted file mode 100644 index 0b4c2cc55c4f..000000000000 --- a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Use custom install prefix. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -788,7 +788,7 @@ - install-swiftpm - install-xctest - install-libicu --install-prefix=/usr -+install-prefix=%(install_prefix)s - install-libcxx - install-sourcekit-lsp - build-swift-static-stdlib diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch deleted file mode 100644 index eb522ac96f7e..000000000000 --- a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch +++ /dev/null @@ -1,23 +0,0 @@ -Disable targets, where we use Nix packages. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -818,8 +818,6 @@ - swiftpm - swift-driver - xctest --libicu --libcxx - swiftdocc - - # build-ninja -@@ -830,9 +828,7 @@ - install-swiftpm - install-swift-driver - install-xctest --install-libicu - install-prefix=%(install_prefix)s --install-libcxx - install-sourcekit-lsp - install-swiftdocc - build-swift-static-stdlib diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch deleted file mode 100644 index 3cacdfc0c55e..000000000000 --- a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch +++ /dev/null @@ -1,13 +0,0 @@ -Plumb extra-cmake-options. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -812,6 +812,8 @@ - # Path to the .tar.gz package we would create. - installable-package=%(installable_package)s - -+extra-cmake-options=%(extra_cmake_options)s -+ - [preset: buildbot_linux] - mixin-preset=mixin_linux_installation - build-subdir=buildbot_linux diff --git a/pkgs/development/compilers/swift/patches/0006-clang-purity.patch b/pkgs/development/compilers/swift/patches/0006-clang-purity.patch deleted file mode 100644 index 928c1db6dee8..000000000000 --- a/pkgs/development/compilers/swift/patches/0006-clang-purity.patch +++ /dev/null @@ -1,16 +0,0 @@ -Apply the "purity" patch (updated for 5.4.2). - ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -488,11 +488,5 @@ - if (Args.hasArg(options::OPT_rdynamic)) - CmdArgs.push_back("-export-dynamic"); -- -- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) { -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + -- ToolChain.getDynamicLinker(Args))); -- } - } - - CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch b/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch deleted file mode 100644 index 46da01635540..000000000000 --- a/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -Use os-stdlib in tests. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -872,7 +872,7 @@ - indexstore-db - sourcekit-lsp - swiftdocc --lit-args=-v --time-tests -+lit-args=-v --time-tests --param use_os_stdlib - - # rdar://problem/31454823 - lldb-test-swift-only diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix new file mode 100644 index 000000000000..deb82de20add --- /dev/null +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, callPackage +, swift +, swiftpm +, swiftpm2nix +, Foundation +, XCTest +, sqlite +, ncurses +, CryptoKit +, LocalAuthentication +}: +let + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; + + # On Darwin, we only want ncurses in the linker search path, because headers + # are part of libsystem. Adding its headers to the search path causes strange + # mixing and errors. + # TODO: Find a better way to prevent this conflict. + ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; +in +stdenv.mkDerivation { + pname = "sourcekit-lsp"; + + inherit (sources) version; + src = sources.sourcekit-lsp; + + nativeBuildInputs = [ swift swiftpm ]; + buildInputs = [ + Foundation + XCTest + sqlite + ncursesInput + ] + ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + + configurePhase = generated.configure + '' + swiftpmMakeMutable indexstore-db + patch -p1 -d .build/checkouts/indexstore-db -i ${./patches/indexstore-db-macos-target.patch} + + # This toggles a section specific to Xcode XCTest, which doesn't work on + # Darwin, where we also use swift-corelibs-xctest. + substituteInPlace Sources/LSPTestSupport/PerfTestCase.swift \ + --replace '#if os(macOS)' '#if false' + + # Required to link with swift-corelibs-xctest on Darwin. + export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12 + ''; + + # TODO: BuildServerBuildSystemTests fails + #doCheck = true; + + installPhase = '' + binPath="$(swiftpmBinPath)" + mkdir -p $out/bin + cp $binPath/sourcekit-lsp $out/bin/ + ''; + + # Canary to verify output of our Swift toolchain does not depend on the Swift + # compiler itself. (Only its 'lib' output.) + disallowedRequisites = [ swift.swift ]; + + meta = { + description = "Language Server Protocol implementation for Swift and C-based languages"; + homepage = "https://github.com/apple/sourcekit-lsp"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix new file mode 100644 index 000000000000..2c822a2ead37 --- /dev/null +++ b/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix @@ -0,0 +1,16 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "indexstore-db" = "005vvkrncgpryzrn0hzgsapflpyga0n7152b2b565wislpx90cwl"; + "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; + "swift-collections" = "0l0pv16zil3n7fac7mdf5qxklxr5rwiig5bixgca1ybq7arlnv7i"; + "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313"; + "swift-driver" = "0nblvs47kh2hl1l70rmrbablx4m5i27w8l3dfrv2h7zccqr8jl0a"; + "swift-llbuild" = "1bvqbj8ji72ilh3ah2mw411jwzbbjxjyasa6sg4b8da0kqia4021"; + "swift-package-manager" = "16qvk14f1l0hf5bphx6qk51nn9d36a2iw5v3sgkvmqi8h7l4kqg5"; + "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; + "swift-tools-support-core" = "1ryd5iyx5mfv8bhyq3bf08z7nv886chzzqnmwaj16r2cry9yml7c"; + "Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76"; + }; +} diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json b/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json new file mode 100644 index 000000000000..4e8625ed0d6a --- /dev/null +++ b/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json @@ -0,0 +1,178 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "indexstore-db", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/indexstore-db.git", + "name": "IndexStoreDB" + }, + "state": { + "checkoutState": { + "branch": "main", + "revision": "2ff1c0491248cd958a2ac05da9aa613eb27a8eeb" + }, + "name": "sourceControlCheckout" + }, + "subpath": "indexstore-db" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser.git", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", + "version": "1.0.3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-collections", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-collections.git", + "name": "swift-collections" + }, + "state": { + "checkoutState": { + "revision": "f504716c27d2e5d4144fa4794b12129301d17729", + "version": "1.0.3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-collections" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-crypto", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-crypto.git", + "name": "swift-crypto" + }, + "state": { + "checkoutState": { + "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", + "version": "1.1.7" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-crypto" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-driver", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-driver.git", + "name": "swift-driver" + }, + "state": { + "checkoutState": { + "branch": "main", + "revision": "6c71f58f89d65eb79f1f6b32a707ddc39cec5ad6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-driver" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-llbuild", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-llbuild.git", + "name": "llbuild" + }, + "state": { + "checkoutState": { + "branch": "main", + "revision": "d99c31577c60a247b065d29289a44fbdd141e2be" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-llbuild" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-package-manager", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-package-manager.git", + "name": "SwiftPM" + }, + "state": { + "checkoutState": { + "branch": "main", + "revision": "f04ad469a6053d713c2fb854fbeb27ee3e6c9dee" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-package-manager" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-system", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-system.git", + "name": "swift-system" + }, + "state": { + "checkoutState": { + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-system" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-tools-support-core", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-tools-support-core.git", + "name": "swift-tools-support-core" + }, + "state": { + "checkoutState": { + "branch": "main", + "revision": "0220fc394f2ae820eeacd754fb2c7ce211e9979e" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-tools-support-core" + }, + { + "basedOn": null, + "packageRef": { + "identity": "yams", + "kind": "remoteSourceControl", + "location": "https://github.com/jpsim/Yams.git", + "name": "Yams" + }, + "state": { + "checkoutState": { + "revision": "01835dc202670b5bb90d07f3eae41867e9ed29f6", + "version": "5.0.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Yams" + } + ] + }, + "version": 5 +} diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/patches/indexstore-db-macos-target.patch b/pkgs/development/compilers/swift/sourcekit-lsp/patches/indexstore-db-macos-target.patch new file mode 100644 index 000000000000..53e790874d5d --- /dev/null +++ b/pkgs/development/compilers/swift/sourcekit-lsp/patches/indexstore-db-macos-target.patch @@ -0,0 +1,12 @@ +Raise the deployment target of IndexStoreDB so it can link against our XCTest. + +--- a/Package.swift ++++ b/Package.swift +@@ -4,6 +4,7 @@ import PackageDescription + + let package = Package( + name: "IndexStoreDB", ++ platforms: [.macOS("10.12")], + products: [ + .library( + name: "IndexStoreDB", diff --git a/pkgs/development/compilers/swift/sources.nix b/pkgs/development/compilers/swift/sources.nix new file mode 100644 index 000000000000..9c28c683406e --- /dev/null +++ b/pkgs/development/compilers/swift/sources.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub }: + +let + + # These packages are all part of the Swift toolchain, and have a single + # upstream version that should match. We also list the hashes here so a basic + # version upgrade touches only this file. + version = "5.7"; + hashes = { + llvm-project = "sha256-uW6dEAFaDOlHXnq8lFYxrKNLRPEukauZJxX4UCpWpIY="; + sourcekit-lsp = "sha256-uA3a+kAqI+XFzkDFEJ8XuRTgfYqacEuTsOU289Im+0Y="; + swift = "sha256-n8WVQYinAyIj4wmQnDhvPsH+t8ydANkGbjFJ6blfHOY="; + swift-cmark = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw="; + swift-corelibs-foundation = "sha256-6XUSC6759dcG24YapWicjRzUnmVVe0QPSsLEw4sQNjI="; + swift-corelibs-libdispatch = "sha256-1qbXiC1k9+T+L6liqXKg6EZXqem6KEEx8OctuL4Kb2o="; + swift-corelibs-xctest = "sha256-qLUO9/3tkJWorDMEHgHd8VC3ovLLq/UWXJWMtb6CMN0="; + swift-docc = "sha256-WlXJMAnrlVPCM+iCIhG0Gyho76BsC2yVBEpX3m/WiIQ="; + swift-docc-render-artifact = "sha256-ttdurN/K7OX+I4577jG3YGeRs+GLUTc7BiiEZGmFD+s="; + swift-driver = "sha256-sk7XWXYR1MGPEeVxA6eA/vxhN6Gq16iD1RHpVstL3zE="; + swift-experimental-string-processing = "sha256-Ar9fQWi8bYSvGErrS0SWrxIxwEwCjsYIZcWweZ8bV28="; + swift-package-manager = "sha256-MZah+/XfeK46YamxwuE3Kiv+u5bj7VmjEh6ztDF+0j4="; + }; + + # Create fetch derivations. + sources = lib.mapAttrs (repo: hash: fetchFromGitHub { + owner = "apple"; + inherit repo; + rev = "swift-${version}-RELEASE"; + name = "${repo}-${version}-src"; + hash = hashes.${repo}; + }) hashes; + +in sources // { inherit version; } diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix new file mode 100644 index 000000000000..f85512f84071 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, callPackage +, swift +, swiftpm +, swiftpm2nix +, Foundation +, XCTest +, CryptoKit +, LocalAuthentication +}: +let + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; +in +stdenv.mkDerivation { + pname = "swift-docc"; + + inherit (sources) version; + src = sources.swift-docc; + # TODO: We could build this from `apple/swift-docc-render` source, but that + # repository is not tagged. + renderArtifact = sources.swift-docc-render-artifact; + + nativeBuildInputs = [ swift swiftpm ]; + buildInputs = [ Foundation XCTest ] + ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + + configurePhase = generated.configure; + + # TODO: Tests depend on indexstore-db being provided by an existing Swift + # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. + #doCheck = true; + + installPhase = '' + binPath="$(swiftpmBinPath)" + mkdir -p $out/bin $out/share/docc + cp $binPath/docc $out/bin/ + ln -s $renderArtifact/dist $out/share/docc/render + ''; + + # Canary to verify output of our Swift toolchain does not depend on the Swift + # compiler itself. (Only its 'lib' output.) + disallowedRequisites = [ swift.swift ]; + + meta = { + description = "Documentation compiler for Swift"; + homepage = "https://github.com/apple/swift-docc"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/swift/swift-docc/generated/default.nix b/pkgs/development/compilers/swift/swift-docc/generated/default.nix new file mode 100644 index 000000000000..bcd873a44f89 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-docc/generated/default.nix @@ -0,0 +1,15 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "070gip241dgn3d0nxgwxva4vp6kbnf11g01q5yaq6kmflcmz58f2"; + "swift-cmark" = "0xfchdgls3070z16in8ks69y8fpiajmyk7lmp5h7ym7164isa6bb"; + "swift-crypto" = "0h054rq14jyg94aiymmp37vqz60a13dlczp5g09pln724j4ypv92"; + "swift-docc-plugin" = "11d6nhi139yzk1lxxrixsbgyj1bnvmh40wj30y725q83nqq49ljh"; + "swift-docc-symbolkit" = "14hb2wc09hisf2r2yny17z28z0m58cf4lnqaczad2x2hk4s1iayi"; + "swift-lmdb" = "1m5y6x2vs1wflcv2c57rx87gh12sy0hkwy5iy9inxmda2mcs8qcb"; + "swift-markdown" = "09270bfrwlp904cma29hsbhr1p25v8kwgvhcfi7lg2av7aaknd97"; + "swift-nio" = "04bvay94b34ynmlvgyl9a7f431l3cf8k2zr483spv8mvyh1hxiqn"; + "swift-nio-ssl" = "1ak4aldilmz0pnfgbwq1x4alr38nfyvx2pz7p2vi2plf82da80g5"; + }; +} diff --git a/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json b/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json new file mode 100644 index 000000000000..ced9a6df956c --- /dev/null +++ b/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json @@ -0,0 +1,161 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b", + "version": "1.0.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-cmark", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-cmark.git", + "name": "cmark-gfm" + }, + "state": { + "checkoutState": { + "branch": "release/5.7-gfm", + "revision": "792c1c3326327515ce9bf64c44196b7f4daab9a6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-cmark" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-crypto", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-crypto.git", + "name": "swift-crypto" + }, + "state": { + "checkoutState": { + "revision": "9680b7251cd2be22caaed8f1468bd9e8915a62fb", + "version": "1.1.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-crypto" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-docc-plugin", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-docc-plugin", + "name": "SwiftDocCPlugin" + }, + "state": { + "checkoutState": { + "revision": "3303b164430d9a7055ba484c8ead67a52f7b74f6", + "version": "1.0.0" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-docc-plugin" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-docc-symbolkit", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-docc-symbolkit", + "name": "SymbolKit" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "8682202025906dce29a8b04f9263f40ba87b89d8" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-docc-symbolkit" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-lmdb", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-lmdb.git", + "name": "CLMDB" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "6ea45a7ebf6d8f72bd299dfcc3299e284bbb92ee" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-lmdb" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-markdown", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-markdown.git", + "name": "swift-markdown" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "d6cd065a7e4b6c3fad615dcd39890e095a2f63a2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-markdown" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-nio", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-nio.git", + "name": "swift-nio" + }, + "state": { + "checkoutState": { + "revision": "1d425b0851ffa2695d488cce1d68df2539f42500", + "version": "2.31.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-nio" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-nio-ssl", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-nio-ssl.git", + "name": "swift-nio-ssl" + }, + "state": { + "checkoutState": { + "revision": "2e74773972bd6254c41ceeda827f229bccbf1c0f", + "version": "2.15.0" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-nio-ssl" + } + ] + }, + "version": 5 +} diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix new file mode 100644 index 000000000000..60fe2aeb9c92 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, callPackage +, fetchpatch +, swift +, swiftpm +, swiftpm2nix +, Foundation +, XCTest +, sqlite +, ncurses +, substituteAll +}: +let + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; + + # On Darwin, we only want ncurses in the linker search path, because headers + # are part of libsystem. Adding its headers to the search path causes strange + # mixing and errors. + # TODO: Find a better way to prevent this conflict. + ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; +in +stdenv.mkDerivation { + pname = "swift-driver"; + + inherit (sources) version; + src = sources.swift-driver; + + nativeBuildInputs = [ swift swiftpm ]; + buildInputs = [ + Foundation + XCTest + sqlite + ncursesInput + ]; + + patches = [ + ./patches/nix-resource-root.patch + ./patches/disable-catalyst.patch + ./patches/linux-fix-linking.patch + # TODO: Replace with branch patch once merged: + # https://github.com/apple/swift-driver/pull/1197 + (fetchpatch { + url = "https://github.com/apple/swift-driver/commit/d3ef9cdf4871a58eddec7ff0e28fe611130da3f9.patch"; + hash = "sha256-eVBaKN6uzj48ZnHtwGV0k5ChKjak1tDCyE+wTdyGq2c="; + }) + # Prevent a warning about SDK directories we don't have. + (substituteAll { + src = ./patches/prevent-sdk-dirs-warnings.patch; + inherit (builtins) storeDir; + }) + ]; + + configurePhase = generated.configure; + + # TODO: Tests depend on indexstore-db being provided by an existing Swift + # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. + #doCheck = true; + + # TODO: Darwin-specific installation includes more, but not sure why. + installPhase = '' + binPath="$(swiftpmBinPath)" + mkdir -p $out/bin + for executable in swift-driver swift-help swift-build-sdk-interfaces; do + cp $binPath/$executable $out/bin/ + done + ''; + + meta = { + description = "Swift compiler driver"; + homepage = "https://github.com/apple/swift-driver"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/compilers/swift/swift-driver/generated/default.nix b/pkgs/development/compilers/swift/swift-driver/generated/default.nix new file mode 100644 index 000000000000..c5ee8a8c90cb --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/generated/default.nix @@ -0,0 +1,11 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "11did5snqj8chcbdbiyx84mpif940ls2pr1iikwivvfp63i248hm"; + "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; + "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; + "swift-tools-support-core" = "1vabl1z5sm2lrd75f5c781rkrq0liinpjvnrjr6i6r8cqrp0q5jb"; + "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + }; +} diff --git a/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json b/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json new file mode 100644 index 000000000000..7671303387ec --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json @@ -0,0 +1,93 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser.git", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e1465042f195f374b94f915ba8ca49de24300a0d", + "version": "1.0.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-llbuild", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-llbuild.git", + "name": "llbuild" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-llbuild" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-system", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-system.git", + "name": "swift-system" + }, + "state": { + "checkoutState": { + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-system" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-tools-support-core", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-tools-support-core.git", + "name": "swift-tools-support-core" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "afc0938503bac012f76ceb619d031f63edc4c5f7" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-tools-support-core" + }, + { + "basedOn": null, + "packageRef": { + "identity": "yams", + "kind": "remoteSourceControl", + "location": "https://github.com/jpsim/Yams.git", + "name": "Yams" + }, + "state": { + "checkoutState": { + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Yams" + } + ] + }, + "version": 5 +} diff --git a/pkgs/development/compilers/swift/swift-driver/patches/disable-catalyst.patch b/pkgs/development/compilers/swift/swift-driver/patches/disable-catalyst.patch new file mode 100644 index 000000000000..b9eb23f21061 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/patches/disable-catalyst.patch @@ -0,0 +1,17 @@ +Tries to parse SDKSettings.plist looking for a Catalyst version map, but we +don't currently support this. + +--- a/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift ++++ b/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift +@@ -297,11 +297,7 @@ public final class DarwinToolchain: Toolchain { + debugDescription: "Malformed version string") + } + self.version = version +- if self.canonicalName.hasPrefix("macosx") { +- self.versionMap = try keyedContainer.decode(VersionMap.self, forKey: .versionMap) +- } else { + self.versionMap = VersionMap() +- } + } + + diff --git a/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch b/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch new file mode 100644 index 000000000000..c0cfe2b7d225 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch @@ -0,0 +1,40 @@ +--- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift ++++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift +@@ -9,6 +9,7 @@ + // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors + // + //===----------------------------------------------------------------------===// ++import Foundation + import TSCBasic + import SwiftOptions + +@@ -116,7 +117,20 @@ extension GenericUnixToolchain { + // just using `clang` and avoid a dependency on the C++ runtime. + let clangTool: Tool = + parsedOptions.hasArgument(.enableExperimentalCxxInterop) ? .clangxx : .clang +- var clangPath = try getToolPath(clangTool) ++ ++ // For Nix, prefer linking using the wrapped system clang, instead of using ++ // the unwrapped clang packaged with swift. The latter is unable to link, but ++ // we still want to use it for other purposes (clang importer). ++ var clangPath: AbsolutePath ++ let env = ProcessInfo.processInfo.environment ++ if let nixCC = env["NIX_CC"], ++ let binPath = try? AbsolutePath(validating: "\(nixCC)/bin"), ++ let tool = lookupExecutablePath(filename: parsedOptions.hasArgument(.enableExperimentalCxxInterop) ++ ? "clang++" : "clang", ++ searchPaths: [binPath]) { ++ clangPath = tool ++ } else { ++ clangPath = try getToolPath(clangTool) + if let toolsDirPath = parsedOptions.getLastArgument(.toolsDirectory) { + // FIXME: What if this isn't an absolute path? + let toolsDir = try AbsolutePath(validating: toolsDirPath.asSingle) +@@ -132,6 +146,7 @@ extension GenericUnixToolchain { + commandLine.appendFlag("-B") + commandLine.appendPath(toolsDir) + } ++ } // nixCC + + // Executables on Linux get -pie + if targetTriple.os == .linux && linkerOutputType == .executable { diff --git a/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch b/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch new file mode 100644 index 000000000000..6c3ae87d68c9 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch @@ -0,0 +1,28 @@ +Swift normally looks for the Clang resource dir in a subdir/symlink of its own +resource dir. We provide a symlink to the Swift build-time Clang as a default +there, but we also here patch a check to try locate it via NIX_CC. + +--- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift ++++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift +@@ -9,6 +9,7 @@ + // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors + // + //===----------------------------------------------------------------------===// ++import Foundation + import TSCBasic + import SwiftOptions + +@@ -24,6 +25,13 @@ extension Toolchain { + for targetInfo: FrontendTargetInfo, + parsedOptions: inout ParsedOptions + ) throws -> VirtualPath { ++ let env = ProcessInfo.processInfo.environment ++ if let nixCC = env["NIX_CC"] { ++ return try VirtualPath(path: nixCC) ++ .appending(components: "resource-root", "lib", ++ targetInfo.target.triple.platformName(conflatingDarwin: true)!) ++ } ++ + return VirtualPath.lookup(targetInfo.runtimeResourcePath.path) + .appending(components: "clang", "lib", + targetInfo.target.triple.platformName(conflatingDarwin: true)!) diff --git a/pkgs/development/compilers/swift/swift-driver/patches/prevent-sdk-dirs-warnings.patch b/pkgs/development/compilers/swift/swift-driver/patches/prevent-sdk-dirs-warnings.patch new file mode 100644 index 000000000000..6080865ebe37 --- /dev/null +++ b/pkgs/development/compilers/swift/swift-driver/patches/prevent-sdk-dirs-warnings.patch @@ -0,0 +1,16 @@ +Prevents a user-visible warning on every compilation: + + ld: warning: directory not found for option '-L.../MacOSX11.0.sdk/usr/lib/swift' + +--- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift ++++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift +@@ -50,7 +50,9 @@ extension Toolchain { + result.append(sdkPath.appending(components: "System", "iOSSupport", "usr", "lib", "swift")) + } + ++ if sdkPath.absolutePath?.pathString.starts(with: "@storeDir@") == false { + result.append(sdkPath.appending(components: "usr", "lib", "swift")) ++ } + } + + return result diff --git a/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix b/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix new file mode 100644 index 000000000000..f297eafd389b --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix @@ -0,0 +1,90 @@ +# SwiftPM dependencies are normally not installed using CMake, and only provide +# CMake modules to link them together in a build tree. We have separate +# derivations, so need a real install step. Here we provide our own minimal +# CMake modules to install along with the build products. +{ lib, stdenv, swift }: +let + + inherit (stdenv.hostPlatform) extensions; + + # This file exports shell snippets for use in postInstall. + mkInstallScript = module: template: '' + mkdir -p $out/lib/cmake/${module} + ( + export staticLibExt="${extensions.staticLibrary}" + export sharedLibExt="${extensions.sharedLibrary}" + export swiftOs="${swift.swiftOs}" + substituteAll \ + ${builtins.toFile "${module}Config.cmake" template} \ + $out/lib/cmake/${module}/${module}Config.cmake + ) + ''; + +in lib.mapAttrs mkInstallScript { + SwiftSystem = '' + add_library(SwiftSystem::SystemPackage STATIC IMPORTED) + set_property(TARGET SwiftSystem::SystemPackage PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libSystemPackage@staticLibExt@") + ''; + + SwiftCollections = '' + add_library(SwiftCollections::Collections STATIC IMPORTED) + set_property(TARGET SwiftCollections::Collections PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libCollections@staticLibExt@") + + add_library(SwiftCollections::DequeModule STATIC IMPORTED) + set_property(TARGET SwiftCollections::DequeModule PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libDequeModule@staticLibExt@") + + add_library(SwiftCollections::OrderedCollections STATIC IMPORTED) + set_property(TARGET SwiftCollections::OrderedCollections PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libOrderedCollections@staticLibExt@") + ''; + + TSC = '' + add_library(TSCLibc SHARED IMPORTED) + set_property(TARGET TSCLibc PROPERTY IMPORTED_LOCATION "@out@/lib/libTSCLibc@sharedLibExt@") + + add_library(TSCBasic SHARED IMPORTED) + set_property(TARGET TSCBasic PROPERTY IMPORTED_LOCATION "@out@/lib/libTSCBasic@sharedLibExt@") + + add_library(TSCUtility SHARED IMPORTED) + set_property(TARGET TSCUtility PROPERTY IMPORTED_LOCATION "@out@/lib/libTSCUtility@sharedLibExt@") + ''; + + ArgumentParser = '' + add_library(ArgumentParser SHARED IMPORTED) + set_property(TARGET ArgumentParser PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libArgumentParser@sharedLibExt@") + + add_library(ArgumentParserToolInfo SHARED IMPORTED) + set_property(TARGET ArgumentParserToolInfo PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libArgumentParserToolInfo@sharedLibExt@") + ''; + + Yams = '' + add_library(CYaml SHARED IMPORTED) + set_property(TARGET CYaml PROPERTY IMPORTED_LOCATION "@out@/lib/libCYaml@sharedLibExt@") + + add_library(Yams SHARED IMPORTED) + set_property(TARGET Yams PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libYams@sharedLibExt@") + ''; + + LLBuild = '' + add_library(libllbuild SHARED IMPORTED) + set_property(TARGET libllbuild PROPERTY IMPORTED_LOCATION "@out@/lib/libllbuild@sharedLibExt@") + + add_library(llbuildSwift SHARED IMPORTED) + set_property(TARGET llbuildSwift PROPERTY IMPORTED_LOCATION "@out@/lib/swift/pm/llbuild/libllbuildSwift@sharedLibExt@") + ''; + + SwiftDriver = '' + add_library(SwiftDriver SHARED IMPORTED) + set_property(TARGET SwiftDriver PROPERTY IMPORTED_LOCATION "@out@/lib/libSwiftDriver@sharedLibExt@") + + add_library(SwiftDriverExecution SHARED IMPORTED) + set_property(TARGET SwiftDriverExecution PROPERTY IMPORTED_LOCATION "@out@/lib/libSwiftDriverExecution@sharedLibExt@") + + add_library(SwiftOptions SHARED IMPORTED) + set_property(TARGET SwiftOptions PROPERTY IMPORTED_LOCATION "@out@/lib/libSwiftOptions@sharedLibExt@") + ''; + + SwiftCrypto = '' + add_library(Crypto SHARED IMPORTED) + set_property(TARGET Crypto PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libCrypto@sharedLibExt@") + ''; +} diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix new file mode 100644 index 000000000000..67198a3c2584 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -0,0 +1,418 @@ +{ lib +, stdenv +, callPackage +, cmake +, ninja +, git +, swift +, swiftpm2nix +, Foundation +, XCTest +, sqlite +, ncurses +, substituteAll +, runCommandLocal +, makeWrapper +, DarwinTools # sw_vers +, cctools # vtool +, xcbuild +, CryptoKit +, LocalAuthentication +}: + +let + + inherit (swift) swiftOs swiftModuleSubdir swiftStaticModuleSubdir; + sharedLibraryExt = stdenv.hostPlatform.extensions.sharedLibrary; + + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; + cmakeGlue = callPackage ./cmake-glue.nix { }; + + # Common attributes for the bootstrap swiftpm and the final swiftpm. + commonAttrs = { + inherit (sources) version; + src = sources.swift-package-manager; + nativeBuildInputs = [ makeWrapper ]; + # Required at run-time for the host platform to build package manifests. + propagatedBuildInputs = [ Foundation ]; + patches = [ + ./patches/cmake-disable-rpath.patch + ./patches/disable-sandbox.patch + ./patches/fix-clang-cxx.patch + (substituteAll { + src = ./patches/disable-xctest.patch; + inherit (builtins) storeDir; + }) + (substituteAll { + src = ./patches/fix-stdlib-path.patch; + inherit (builtins) storeDir; + swiftLib = swift.swift.lib; + }) + ]; + postPatch = '' + # The location of xcrun is hardcoded. We need PATH lookup instead. + find Sources -name '*.swift' | xargs sed -i -e 's|/usr/bin/xcrun|xcrun|g' + + # Patch the location where swiftpm looks for its API modules. + substituteInPlace Sources/PackageModel/UserToolchain.swift \ + --replace \ + 'librariesPath = applicationPath.parentDirectory' \ + "librariesPath = AbsolutePath(\"$out\")" + ''; + }; + + # Tools invoked by swiftpm at run-time. + runtimeDeps = [ git ] + ++ lib.optionals stdenv.isDarwin [ + xcbuild.xcrun + # vtool is used to determine a minimum deployment target. This is part of + # cctools, but adding that as a build input puts an unwrapped linker in + # PATH, and breaks builds. This small derivation exposes just vtool. + (runCommandLocal "vtool" { } '' + mkdir -p $out/bin + ln -s ${cctools}/bin/vtool $out/bin/vtool + '') + ]; + + # Common attributes for the bootstrap derivations. + mkBootstrapDerivation = attrs: stdenv.mkDerivation (attrs // { + nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) + ++ [ cmake ninja swift ] + ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + + buildInputs = (attrs.buildInputs or [ ]) + ++ [ Foundation ]; + + postPatch = (attrs.postPatch or "") + + lib.optionalString stdenv.isDarwin '' + # On Darwin only, Swift uses arm64 as cpu arch. + if [ -e cmake/modules/SwiftSupport.cmake ]; then + substituteInPlace cmake/modules/SwiftSupport.cmake \ + --replace '"aarch64" PARENT_SCOPE' '"arm64" PARENT_SCOPE' + fi + ''; + + preConfigure = (attrs.preConfigure or "") + + '' + # Builds often don't set a target, and our default minimum macOS deployment + # target on x86_64-darwin is too low. Harmless on non-Darwin. + export MACOSX_DEPLOYMENT_TARGET=10.15.4 + ''; + + postInstall = (attrs.postInstall or "") + + lib.optionalString stdenv.isDarwin '' + # The install name of libraries is incorrectly set to lib/ (via our + # CMake setup hook) instead of lib/swift/. This'd be easily fixed by + # fixDarwinDylibNames, but some builds create libraries that reference + # eachother, and we also have to fix those references. + dylibs="$(find $out/lib/swift* -name '*.dylib')" + changes="" + for dylib in $dylibs; do + changes+=" -change $(otool -D $dylib | tail -n 1) $dylib" + done + for dylib in $dylibs; do + install_name_tool -id $dylib $changes $dylib + done + ''; + + cmakeFlags = (attrs.cmakeFlags or [ ]) + ++ [ + # Some builds link to libraries within the same build. Make sure these + # create references to $out. None of our builds run their own products, + # so we don't have to account for that scenario. + "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + ]; + }); + + # On Darwin, we only want ncurses in the linker search path, because headers + # are part of libsystem. Adding its headers to the search path causes strange + # mixing and errors. + # TODO: Find a better way to prevent this conflict. + ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + + # Derivations for bootstrapping dependencies using CMake. + # This is based on the `swiftpm/Utilities/bootstrap` script. + # + # Some of the installation steps here are a bit hacky, because it seems like + # these packages were not really meant to be installed using CMake. The + # regular swiftpm bootstrap simply refers to the source and build + # directories. The advantage of separate builds is that we can more easily + # link libs together using existing Nixpkgs infra. + # + # In the end, we don't expose these derivations, and they only exist during + # the bootstrap phase. The final swiftpm derivation does not depend on them. + + swift-system = mkBootstrapDerivation { + name = "swift-system"; + src = generated.sources.swift-system; + + postInstall = cmakeGlue.SwiftSystem + + lib.optionalString (!stdenv.isDarwin) '' + # The cmake rules apparently only use the Darwin install convention. + # Fix up the installation so the module can be found on non-Darwin. + mkdir -p $out/${swiftStaticModuleSubdir} + mv $out/lib/swift_static/${swiftOs}/*.swiftmodule $out/${swiftStaticModuleSubdir}/ + ''; + }; + + swift-collections = mkBootstrapDerivation { + name = "swift-collections"; + src = generated.sources.swift-collections; + + postPatch = '' + # Only builds static libs on Linux, but this installation difference is a + # hassle. Because this installation is temporary for the bootstrap, may + # as well build static libs everywhere. + sed -i -e '/BUILD_SHARED_LIBS/d' CMakeLists.txt + ''; + + postInstall = cmakeGlue.SwiftCollections + + lib.optionalString (!stdenv.isDarwin) '' + # The cmake rules apparently only use the Darwin install convention. + # Fix up the installation so the module can be found on non-Darwin. + mkdir -p $out/${swiftStaticModuleSubdir} + mv $out/lib/swift_static/${swiftOs}/*.swiftmodule $out/${swiftStaticModuleSubdir}/ + ''; + }; + + swift-tools-support-core = mkBootstrapDerivation { + name = "swift-tools-support-core"; + src = generated.sources.swift-tools-support-core; + + buildInputs = [ + swift-system + sqlite + ]; + + postInstall = cmakeGlue.TSC + '' + # Swift modules are not installed. + mkdir -p $out/${swiftModuleSubdir} + cp swift/*.swift{module,doc} $out/${swiftModuleSubdir}/ + + # Static libs are not installed. + cp lib/*.a $out/lib/ + + # Headers are not installed. + mkdir -p $out/include + cp -r ../Sources/TSCclibc/include $out/include/TSC + ''; + }; + + swift-argument-parser = mkBootstrapDerivation { + name = "swift-argument-parser"; + src = generated.sources.swift-argument-parser; + + buildInputs = [ ncursesInput sqlite ]; + + cmakeFlags = [ + "-DBUILD_TESTING=NO" + "-DBUILD_EXAMPLES=NO" + ]; + + postInstall = cmakeGlue.ArgumentParser + + lib.optionalString stdenv.isLinux '' + # Fix rpath so ArgumentParserToolInfo can be found. + patchelf --add-rpath "$out/lib/swift/${swiftOs}" \ + $out/lib/swift/${swiftOs}/libArgumentParser.so + ''; + }; + + Yams = mkBootstrapDerivation { + name = "Yams"; + src = generated.sources.Yams; + + # Conflicts with BUILD file on case-insensitive filesystems. + cmakeBuildDir = "_build"; + + postInstall = cmakeGlue.Yams; + }; + + llbuild = mkBootstrapDerivation { + name = "llbuild"; + src = generated.sources.swift-llbuild; + + nativeBuildInputs = lib.optional stdenv.isDarwin xcbuild; + buildInputs = [ ncursesInput sqlite ]; + + patches = [ + ./patches/llbuild-cmake-disable-rpath.patch + ]; + + postPatch = '' + # Substitute ncurses for curses. + find . -name CMakeLists.txt | xargs sed -i -e 's/curses/ncurses/' + + # Use absolute install names instead of rpath. + substituteInPlace \ + products/libllbuild/CMakeLists.txt \ + products/llbuildSwift/CMakeLists.txt \ + --replace '@rpath' "$out/lib" + + # This subdirectory is enabled for Darwin only, but requires ObjC XCTest + # (and only Swift XCTest is open source). + substituteInPlace perftests/CMakeLists.txt \ + --replace 'add_subdirectory(Xcode/' '#add_subdirectory(Xcode/' + ''; + + cmakeFlags = [ + "-DLLBUILD_SUPPORT_BINDINGS=Swift" + ]; + + postInstall = cmakeGlue.LLBuild + '' + # Install module map. + cp ../products/libllbuild/include/module.modulemap $out/include + + # Swift modules are not installed. + mkdir -p $out/${swiftModuleSubdir} + cp products/llbuildSwift/*.swift{module,doc} $out/${swiftModuleSubdir}/ + ''; + }; + + swift-driver = mkBootstrapDerivation { + name = "swift-driver"; + src = generated.sources.swift-driver; + + buildInputs = [ + Yams + llbuild + swift-system + swift-argument-parser + swift-tools-support-core + ]; + + postInstall = cmakeGlue.SwiftDriver + '' + # Swift modules are not installed. + mkdir -p $out/${swiftModuleSubdir} + cp swift/*.swift{module,doc} $out/${swiftModuleSubdir}/ + ''; + }; + + swift-crypto = mkBootstrapDerivation { + name = "swift-crypto"; + src = generated.sources.swift-crypto; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace /usr/bin/ar $NIX_CC/bin/ar + ''; + + postInstall = cmakeGlue.SwiftCrypto + '' + # Static libs are not installed. + cp lib/*.a $out/lib/ + + # Headers are not installed. + cp -r ../Sources/CCryptoBoringSSL/include $out/include + ''; + }; + + # Build a bootrapping swiftpm using CMake. + swiftpm-bootstrap = mkBootstrapDerivation (commonAttrs // { + pname = "swiftpm-bootstrap"; + + buildInputs = [ + llbuild + swift-argument-parser + swift-collections + swift-crypto + swift-driver + swift-system + swift-tools-support-core + ]; + + cmakeFlags = [ + "-DUSE_CMAKE_INSTALL=ON" + ]; + + postInstall = '' + for program in $out/bin/swift-*; do + wrapProgram $program --prefix PATH : ${lib.makeBinPath runtimeDeps} + done + ''; + }); + +# Build the final swiftpm with the bootstrapping swiftpm. +in stdenv.mkDerivation (commonAttrs // { + pname = "swiftpm"; + + nativeBuildInputs = commonAttrs.nativeBuildInputs ++ [ + swift + swiftpm-bootstrap + ]; + buildInputs = [ + ncursesInput + sqlite + XCTest + ] + ++ lib.optionals stdenv.isDarwin [ + CryptoKit + LocalAuthentication + ]; + + configurePhase = generated.configure + '' + # Functionality provided by Xcode XCTest, but not available in + # swift-corelibs-xctest. + swiftpmMakeMutable swift-tools-support-core + substituteInPlace .build/checkouts/swift-tools-support-core/Sources/TSCTestSupport/XCTestCasePerf.swift \ + --replace 'canImport(Darwin)' 'false' + + # Prevent a warning about SDK directories we don't have. + swiftpmMakeMutable swift-driver + patch -p1 -d .build/checkouts/swift-driver -i ${substituteAll { + src = ../swift-driver/patches/prevent-sdk-dirs-warnings.patch; + inherit (builtins) storeDir; + }} + ''; + + buildPhase = '' + # Required to link with swift-corelibs-xctest on Darwin. + export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12 + + TERM=dumb swift-build -c release + ''; + + # TODO: Tests depend on indexstore-db being provided by an existing Swift + # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. + #doCheck = true; + #checkPhase = '' + # TERM=dumb swift-test -c release + #''; + + # The following is dervied from Utilities/bootstrap, see install_swiftpm. + installPhase = '' + binPath="$(swift-build --show-bin-path -c release)" + + mkdir -p $out/bin $out/lib/swift + + cp $binPath/swift-package $out/bin/ + wrapProgram $out/bin/swift-package \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} + for tool in swift-build swift-test swift-run swift-package-collection; do + ln -s $out/bin/swift-package $out/bin/$tool + done + + installSwiftpmModule() { + mkdir -p $out/lib/swift/pm/$2 + cp $binPath/lib$1${sharedLibraryExt} $out/lib/swift/pm/$2/ + + if [[ -f $binPath/$1.swiftinterface ]]; then + cp $binPath/$1.swiftinterface $out/lib/swift/pm/$2/ + else + cp -r $binPath/$1.swiftmodule $out/lib/swift/pm/$2/ + fi + cp $binPath/$1.swiftdoc $out/lib/swift/pm/$2/ + } + installSwiftpmModule PackageDescription ManifestAPI + installSwiftpmModule PackagePlugin PluginAPI + ''; + + setupHook = ./setup-hook.sh; + + meta = { + description = "The Package Manager for the Swift Programming Language"; + homepage = "https://github.com/apple/swift-package-manager"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +}) diff --git a/pkgs/development/compilers/swift/swiftpm/generated/default.nix b/pkgs/development/compilers/swift/swiftpm/generated/default.nix new file mode 100644 index 000000000000..978aee7455dc --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/generated/default.nix @@ -0,0 +1,14 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; + "swift-collections" = "0l0pv16zil3n7fac7mdf5qxklxr5rwiig5bixgca1ybq7arlnv7i"; + "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313"; + "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05"; + "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; + "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; + "swift-tools-support-core" = "1vabl1z5sm2lrd75f5c781rkrq0liinpjvnrjr6i6r8cqrp0q5jb"; + "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + }; +} diff --git a/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json b/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json new file mode 100644 index 000000000000..26219857c177 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json @@ -0,0 +1,144 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser.git", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", + "version": "1.0.3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-collections", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-collections.git", + "name": "swift-collections" + }, + "state": { + "checkoutState": { + "revision": "f504716c27d2e5d4144fa4794b12129301d17729", + "version": "1.0.3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-collections" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-crypto", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-crypto.git", + "name": "swift-crypto" + }, + "state": { + "checkoutState": { + "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", + "version": "1.1.7" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-crypto" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-driver", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-driver.git", + "name": "swift-driver" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "82b274af66cfbb8f3131677676517b34d01e30fd" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-driver" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-llbuild", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-llbuild.git", + "name": "llbuild" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-llbuild" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-system", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-system.git", + "name": "swift-system" + }, + "state": { + "checkoutState": { + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-system" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-tools-support-core", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-tools-support-core.git", + "name": "swift-tools-support-core" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "afc0938503bac012f76ceb619d031f63edc4c5f7" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-tools-support-core" + }, + { + "basedOn": null, + "packageRef": { + "identity": "yams", + "kind": "remoteSourceControl", + "location": "https://github.com/jpsim/Yams.git", + "name": "Yams" + }, + "state": { + "checkoutState": { + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Yams" + } + ] + }, + "version": 5 +} diff --git a/pkgs/development/compilers/swift/swiftpm/patches/cmake-disable-rpath.patch b/pkgs/development/compilers/swift/swiftpm/patches/cmake-disable-rpath.patch new file mode 100644 index 000000000000..9aeba452f9e8 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/cmake-disable-rpath.patch @@ -0,0 +1,36 @@ +Disable rpath for the bootstrap build with CMake. + +--- a/Sources/PackageDescription/CMakeLists.txt ++++ b/Sources/PackageDescription/CMakeLists.txt +@@ -31,14 +31,11 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin) + set(SWIFT_INTERFACE_PATH ${CMAKE_BINARY_DIR}/pm/ManifestAPI/PackageDescription.swiftinterface) + target_compile_options(PackageDescription PUBLIC + $<$:-emit-module-interface-path$${SWIFT_INTERFACE_PATH}>) +- target_link_options(PackageDescription PRIVATE +- "SHELL:-Xlinker -install_name -Xlinker @rpath/libPackageDescription.dylib") + endif() + + set_target_properties(PackageDescription PROPERTIES + Swift_MODULE_NAME PackageDescription + Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI +- INSTALL_NAME_DIR \\@rpath + OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI + OUTPUT_NAME PackageDescription + ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI +--- a/Sources/PackagePlugin/CMakeLists.txt ++++ b/Sources/PackagePlugin/CMakeLists.txt +@@ -29,14 +29,11 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin) + set(SWIFT_INTERFACE_PATH ${CMAKE_BINARY_DIR}/pm/PluginAPI/PackagePlugin.swiftinterface) + target_compile_options(PackagePlugin PUBLIC + $<$:-emit-module-interface-path$${SWIFT_INTERFACE_PATH}>) +- target_link_options(PackagePlugin PRIVATE +- "SHELL:-Xlinker -install_name -Xlinker @rpath/libPackagePlugin.dylib") + endif() + + set_target_properties(PackagePlugin PROPERTIES + Swift_MODULE_NAME PackagePlugin + Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI +- INSTALL_NAME_DIR \\@rpath + OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI + OUTPUT_NAME PackagePlugin + ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI diff --git a/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch b/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch new file mode 100644 index 000000000000..406e1d68d0e4 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch @@ -0,0 +1,21 @@ +Nix may already sandbox the build, in which case sandbox_apply will fail. + +--- a/Sources/Basics/Sandbox.swift ++++ b/Sources/Basics/Sandbox.swift +@@ -30,12 +30,14 @@ public enum Sandbox { + readOnlyDirectories: [AbsolutePath] = [] + ) -> [String] { + #if os(macOS) ++ let env = ProcessInfo.processInfo.environment ++ if env["NIX_BUILD_TOP"] == nil || env["IN_NIX_SHELL"] != nil { + let profile = macOSSandboxProfile(strictness: strictness, writableDirectories: writableDirectories, readOnlyDirectories: readOnlyDirectories) + return ["/usr/bin/sandbox-exec", "-p", profile] + command +- #else ++ } ++ #endif + // rdar://40235432, rdar://75636874 tracks implementing sandboxes for other platforms. + return command +- #endif + } + + /// Basic strictness level of a sandbox applied to a command line. diff --git a/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch b/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch new file mode 100644 index 000000000000..e24d154d2987 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch @@ -0,0 +1,48 @@ +XCTest is not fully open-source, only the Swift library parts. We don't have a +command-line runner available, so disable support. + +--- a/Sources/Commands/TestingSupport.swift ++++ b/Sources/Commands/TestingSupport.swift +@@ -60,7 +60,7 @@ enum TestingSupport { + /// - Returns: Array of TestSuite + static func getTestSuites(fromTestAt path: AbsolutePath, swiftTool: SwiftTool, swiftOptions: SwiftToolOptions) throws -> [TestSuite] { + // Run the correct tool. +- #if os(macOS) ++ #if false + let data: String = try withTemporaryFile { tempFile in + let args = [try TestingSupport.xctestHelperPath(swiftTool: swiftTool).pathString, path.pathString, tempFile.path.pathString] + var env = try TestingSupport.constructTestEnvironment(toolchain: try swiftTool.getToolchain(), options: swiftOptions, buildParameters: swiftTool.buildParametersForTest()) +--- a/Sources/swiftpm-xctest-helper/main.swift ++++ b/Sources/swiftpm-xctest-helper/main.swift +@@ -9,8 +9,11 @@ + */ + + #if os(macOS) +-import XCTest + import func Darwin.C.exit ++print("Not supported in Nix.") ++exit(1) ++#if false ++import XCTest + + /// A helper tool to get list of tests from a XCTest Bundle on macOS. + /// +@@ -132,6 +135,7 @@ do { + exit(1) + } + ++#endif // nix + #else + + #if os(Windows) +--- a/Sources/PackageModel/Destination.swift ++++ b/Sources/PackageModel/Destination.swift +@@ -174,7 +174,7 @@ public struct Destination: Encodable, Equatable { + arguments: ["/usr/bin/xcrun", "--sdk", "macosx", "--show-sdk-platform-path"], + environment: environment).spm_chomp() + +- if let platformPath = platformPath, !platformPath.isEmpty { ++ if let platformPath = platformPath, !platformPath.isEmpty && !platformPath.starts(with: "@storeDir@") { + // For XCTest framework. + let fwk = AbsolutePath(platformPath).appending( + components: "Developer", "Library", "Frameworks") diff --git a/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch b/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch new file mode 100644 index 000000000000..60c4e33eb154 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch @@ -0,0 +1,121 @@ +Swiftpm may invoke clang, not clang++, to compile C++. Our cc-wrapper also +doesn't pick up the arguments that enable C++ compilation in this case. Patch +swiftpm to properly invoke clang++. + +--- a/Sources/Build/LLBuildManifestBuilder.swift ++++ b/Sources/Build/LLBuildManifestBuilder.swift +@@ -782,7 +782,7 @@ extension LLBuildManifestBuilder { + + args += ["-c", path.source.pathString, "-o", path.object.pathString] + +- let clangCompiler = try buildParameters.toolchain.getClangCompiler().pathString ++ let clangCompiler = try buildParameters.toolchain.getClangCompiler(isCXX: isCXX).pathString + args.insert(clangCompiler, at: 0) + + let objectFileNode: Node = .file(path.object) +--- a/Sources/PackageModel/Destination.swift ++++ b/Sources/PackageModel/Destination.swift +@@ -153,7 +153,7 @@ public struct Destination: Encodable, Equatable { + + var extraCPPFlags: [String] = [] + #if os(macOS) +- extraCPPFlags += ["-lc++"] ++ extraCPPFlags += ["-lc++", "-lc++abi"] + #elseif os(Windows) + extraCPPFlags += [] + #else +--- a/Sources/PackageModel/Toolchain.swift ++++ b/Sources/PackageModel/Toolchain.swift +@@ -20,7 +20,7 @@ public protocol Toolchain { + var macosSwiftStdlib: AbsolutePath { get } + + /// Path of the `clang` compiler. +- func getClangCompiler() throws -> AbsolutePath ++ func getClangCompiler(isCXX: Bool) throws -> AbsolutePath + + // FIXME: This is a temporary API until index store is widely available in + // the OSS clang compiler. This API should not used for any other purpose. +--- a/Sources/PackageModel/UserToolchain.swift ++++ b/Sources/PackageModel/UserToolchain.swift +@@ -57,7 +57,7 @@ public final class UserToolchain: Toolchain { + /// Only use search paths, do not fall back to `xcrun`. + let useXcrun: Bool + +- private var _clangCompiler: AbsolutePath? ++ private var _clangCompiler: [Bool: AbsolutePath] = [:] + + private let environment: EnvironmentVariables + +@@ -150,29 +150,31 @@ public final class UserToolchain: Toolchain { + } + + /// Returns the path to clang compiler tool. +- public func getClangCompiler() throws -> AbsolutePath { ++ public func getClangCompiler(isCXX: Bool) throws -> AbsolutePath { + // Check if we already computed. +- if let clang = self._clangCompiler { ++ if let clang = self._clangCompiler[isCXX] { + return clang + } + + // Check in the environment variable first. +- if let toolPath = UserToolchain.lookup(variable: "CC", searchPaths: self.envSearchPaths, environment: environment) { +- self._clangCompiler = toolPath ++ let envVar = isCXX ? "CXX" : "CC"; ++ if let toolPath = UserToolchain.lookup(variable: envVar, searchPaths: self.envSearchPaths, environment: environment) { ++ self._clangCompiler[isCXX] = toolPath + return toolPath + } + + // Then, check the toolchain. ++ let tool = isCXX ? "clang++" : "clang"; + do { +- if let toolPath = try? UserToolchain.getTool("clang", binDir: self.destination.binDir) { +- self._clangCompiler = toolPath ++ if let toolPath = try? UserToolchain.getTool(tool, binDir: self.destination.binDir) { ++ self._clangCompiler[isCXX] = toolPath + return toolPath + } + } + + // Otherwise, lookup it up on the system. +- let toolPath = try UserToolchain.findTool("clang", envSearchPaths: self.envSearchPaths, useXcrun: useXcrun) +- self._clangCompiler = toolPath ++ let toolPath = try UserToolchain.findTool(tool, envSearchPaths: self.envSearchPaths, useXcrun: useXcrun) ++ self._clangCompiler[isCXX] = toolPath + return toolPath + } + +--- a/Sources/SPMBuildCore/BuildParameters.swift ++++ b/Sources/SPMBuildCore/BuildParameters.swift +@@ -342,7 +342,7 @@ private struct _Toolchain: Encodable { + public func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(toolchain.swiftCompilerPath, forKey: .swiftCompiler) +- try container.encode(toolchain.getClangCompiler(), forKey: .clangCompiler) ++ try container.encode(toolchain.getClangCompiler(isCXX: false), forKey: .clangCompiler) + + try container.encode(toolchain.extraCCFlags, forKey: .extraCCFlags) + try container.encode(toolchain.extraCPPFlags, forKey: .extraCPPFlags) +--- a/Sources/XCBuildSupport/XcodeBuildSystem.swift ++++ b/Sources/XCBuildSupport/XcodeBuildSystem.swift +@@ -172,7 +172,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem { + // Generate a table of any overriding build settings. + var settings: [String: String] = [:] + // An error with determining the override should not be fatal here. +- settings["CC"] = try? buildParameters.toolchain.getClangCompiler().pathString ++ settings["CC"] = try? buildParameters.toolchain.getClangCompiler(isCXX: false).pathString + // Always specify the path of the effective Swift compiler, which was determined in the same way as for the native build system. + settings["SWIFT_EXEC"] = buildParameters.toolchain.swiftCompilerPath.pathString + settings["LIBRARY_SEARCH_PATHS"] = "$(inherited) \(buildParameters.toolchain.toolchainLibDir.pathString)" +--- a/Tests/BuildTests/MockBuildTestHelper.swift ++++ b/Tests/BuildTests/MockBuildTestHelper.swift +@@ -15,7 +15,7 @@ struct MockToolchain: PackageModel.Toolchain { + #else + let extraCPPFlags: [String] = ["-lstdc++"] + #endif +- func getClangCompiler() throws -> AbsolutePath { ++ func getClangCompiler(isCXX: Bool) throws -> AbsolutePath { + return AbsolutePath("/fake/path/to/clang") + } + diff --git a/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch b/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch new file mode 100644 index 000000000000..327ccf37e425 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch @@ -0,0 +1,23 @@ +Swiftpm looks for the Swift stdlib relative to the swift compiler, but that's a +wrapper in our case. It wants to add the stdlib to the rpath, which is +necessary for back-deployment of some features. + +--- a/Sources/PackageModel/Toolchain.swift ++++ b/Sources/PackageModel/Toolchain.swift +@@ -43,10 +43,16 @@ extension Toolchain { + } + + public var macosSwiftStdlib: AbsolutePath { ++ if swiftCompilerPath.pathString.starts(with: "@storeDir@") { ++ return AbsolutePath("@swiftLib@/lib/swift/macosx") ++ } + return AbsolutePath("../../lib/swift/macosx", relativeTo: resolveSymlinks(swiftCompilerPath)) + } + + public var toolchainLibDir: AbsolutePath { ++ if swiftCompilerPath.pathString.starts(with: "@storeDir@") { ++ return AbsolutePath("@swiftLib@/lib") ++ } + // FIXME: Not sure if it's better to base this off of Swift compiler or our own binary. + return AbsolutePath("../../lib", relativeTo: resolveSymlinks(swiftCompilerPath)) + } diff --git a/pkgs/development/compilers/swift/swiftpm/patches/llbuild-cmake-disable-rpath.patch b/pkgs/development/compilers/swift/swiftpm/patches/llbuild-cmake-disable-rpath.patch new file mode 100644 index 000000000000..785e82cc34b6 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/llbuild-cmake-disable-rpath.patch @@ -0,0 +1,14 @@ +Specifying `-platform_version` targeting macos before 10.15 causes cctools ld +to link with `@rpath`. This may have something to do with Swift ABI stability. + +--- a/products/llbuildSwift/CMakeLists.txt ++++ b/products/llbuildSwift/CMakeLists.txt +@@ -22,7 +17,7 @@ endif() + + # TODO(compnerd) move both of these outside of the CMake into the invocation + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) +- add_compile_options(-target ${CMAKE_OSX_ARCHITECTURES}-apple-macosx10.10) ++ add_compile_options(-target ${CMAKE_OSX_ARCHITECTURES}-apple-macosx10.15) + if(NOT CMAKE_OSX_SYSROOT STREQUAL "") + add_compile_options(-sdk ${CMAKE_OSX_SYSROOT}) + endif() diff --git a/pkgs/development/compilers/swift/swiftpm/setup-hook.sh b/pkgs/development/compilers/swift/swiftpm/setup-hook.sh new file mode 100644 index 000000000000..160fbb1ccca3 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/setup-hook.sh @@ -0,0 +1,60 @@ +# Build using 'swift-build'. +swiftpmBuildPhase() { + runHook preBuild + + local buildCores=1 + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + + local flagsArray=( + -j $buildCores + -c "${swiftpmBuildConfig-release}" + $swiftpmFlags "${swiftpmFlagsArray[@]}" + ) + + echoCmd 'build flags' "${flagsArray[@]}" + TERM=dumb swift-build "${flagsArray[@]}" + + runHook postBuild +} + +if [ -z "${dontUseSwiftpmBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=swiftpmBuildPhase +fi + +# Check using 'swift-test'. +swiftpmCheckPhase() { + runHook preCheck + + local buildCores=1 + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + + local flagsArray=( + -j $buildCores + -c "${swiftpmBuildConfig-release}" + $swiftpmFlags "${swiftpmFlagsArray[@]}" + ) + + echoCmd 'check flags' "${flagsArray[@]}" + TERM=dumb swift-test "${flagsArray[@]}" + + runHook postCheck +} + +if [ -z "${dontUseSwiftpmCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=swiftpmCheckPhase +fi + +# Helper used to find the binary output path. +# Useful for performing the installPhase of swiftpm packages. +swiftpmBinPath() { + local flagsArray=( + -c "${swiftpmBuildConfig-release}" + $swiftpmFlags "${swiftpmFlagsArray[@]}" + ) + + swift-build --show-bin-path "${flagsArray[@]}" +} diff --git a/pkgs/development/compilers/swift/wrapper/default.nix b/pkgs/development/compilers/swift/wrapper/default.nix new file mode 100644 index 000000000000..a7d16cc2471a --- /dev/null +++ b/pkgs/development/compilers/swift/wrapper/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, swift +, useSwiftDriver ? true, swift-driver +}: + +stdenv.mkDerivation (swift._wrapperParams // { + pname = "swift-wrapper"; + inherit (swift) version meta; + + outputs = [ "out" "man" ]; + + # Wrapper and setup hook variables. + inherit swift; + inherit (swift) + swiftOs swiftArch + swiftModuleSubdir swiftLibSubdir + swiftStaticModuleSubdir swiftStaticLibSubdir; + swiftDriver = if useSwiftDriver + then "${swift-driver}/bin/swift-driver" else ""; + + passAsFile = [ "buildCommand" ]; + buildCommand = '' + mkdir -p $out/bin $out/nix-support + + # Symlink all Swift binaries first. + # NOTE: This specifically omits clang binaries. We want to hide these for + # private use by Swift only. + ln -s -t $out/bin/ $swift/bin/swift* + + # Replace specific binaries with wrappers. + for executable in swift swiftc swift-frontend; do + export prog=$swift/bin/$executable + rm $out/bin/$executable + substituteAll '${./wrapper.sh}' $out/bin/$executable + chmod a+x $out/bin/$executable + done + + ${lib.optionalString useSwiftDriver '' + # Symlink swift-driver executables. + ln -s -t $out/bin/ ${swift-driver}/bin/* + ''} + + ln -s ${swift.man} $man + + # This link is here because various tools (swiftpm) check for stdlib + # relative to the swift compiler. It's fine if this is for build-time + # stuff, but we should patch all cases were it would end up in an output. + ln -s ${swift.lib}/lib $out/lib + + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook + ''; + + passthru = { + inherit swift; + inherit (swift) swiftOs swiftArch swiftModuleSubdir swiftLibSubdir; + }; +}) diff --git a/pkgs/development/compilers/swift/wrapper/setup-hook.sh b/pkgs/development/compilers/swift/wrapper/setup-hook.sh new file mode 100644 index 000000000000..398f19977f66 --- /dev/null +++ b/pkgs/development/compilers/swift/wrapper/setup-hook.sh @@ -0,0 +1,28 @@ +# Add import paths for build inputs. +swiftWrapper_addImports () { + # Include subdirectories following both the Swift platform convention, and + # a simple `lib/swift` for Nix convenience. + for subdir in @swiftModuleSubdir@ @swiftStaticModuleSubdir@ lib/swift; do + if [[ -d "$1/$subdir" ]]; then + export NIX_SWIFTFLAGS_COMPILE+=" -I $1/$subdir" + fi + done + for subdir in @swiftLibSubdir@ @swiftStaticLibSubdir@ lib/swift; do + if [[ -d "$1/$subdir" ]]; then + export NIX_LDFLAGS+=" -L $1/$subdir" + fi + done +} + +addEnvHooks "$targetOffset" swiftWrapper_addImports + +# Use a postHook here because we rely on NIX_CC, which is set by the cc-wrapper +# setup hook, so delay until we're sure it was run. +swiftWrapper_postHook () { + # On Darwin, libc also contains Swift modules. + if [[ -e "$NIX_CC/nix-support/orig-libc" ]]; then + swiftWrapper_addImports "$(<$NIX_CC/nix-support/orig-libc)" + fi +} + +postHooks+=(swiftWrapper_postHook) diff --git a/pkgs/development/compilers/swift/wrapper/wrapper.sh b/pkgs/development/compilers/swift/wrapper/wrapper.sh new file mode 100644 index 000000000000..0c56e63b6f29 --- /dev/null +++ b/pkgs/development/compilers/swift/wrapper/wrapper.sh @@ -0,0 +1,291 @@ +#! @shell@ +# NOTE: This wrapper is derived from cc-wrapper.sh, and is hopefully somewhat +# diffable with the original, so changes can be merged if necessary. +set -eu -o pipefail +o posix +shopt -s nullglob + +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + +cc_wrapper="${NIX_CC:-@default_cc_wrapper@}" + +source $cc_wrapper/nix-support/utils.bash + +expandResponseParams "$@" + +# Check if we should wrap this Swift invocation at all, and how. Specifically, +# there are some internal tools we don't wrap, plus swift-frontend doesn't link +# and doesn't understand linker flags. This follows logic in +# `lib/DriverTool/driver.cpp`. +prog=@prog@ +progName="$(basename "$prog")" +firstArg="${params[0]:-}" +isFrontend=0 +isRepl=0 + +# These checks follow `shouldRunAsSubcommand`. +if [[ "$progName" == swift ]]; then + case "$firstArg" in + "" | -* | *.* | */* | repl) + ;; + *) + exec "swift-$firstArg" "${params[@]:1}" + ;; + esac +fi + +# These checks follow the first part of `run_driver`. +# +# NOTE: The original function short-circuits, but we can't here, because both +# paths must be wrapped. So we use an 'isFrontend' flag instead. +case "$firstArg" in + -frontend) + isFrontend=1 + # Ensure this stays the first argument. + params=( "${params[@]:1}" ) + extraBefore+=( "-frontend" ) + ;; + -modulewrap) + # Don't wrap this integrated tool. + exec "$prog" "${params[@]}" + ;; + repl) + isRepl=1 + params=( "${params[@]:1}" ) + ;; + --driver-mode=*) + ;; + *) + if [[ "$progName" == swift-frontend ]]; then + isFrontend=1 + fi + ;; +esac + +# For many tasks, Swift reinvokes swift-driver, the new driver implementation +# written in Swift. It needs some help finding the executable, though, and +# reimplementing the logic here is little effort. These checks follow +# `shouldDisallowNewDriver`. +if [[ + $isFrontend = 0 && + -n "@swiftDriver@" && + -z "${SWIFT_USE_OLD_DRIVER:-}" && + ( "$progName" == "swift" || "$progName" == "swiftc" ) +]]; then + prog=@swiftDriver@ + # Driver mode must be the very first argument. + extraBefore+=( "--driver-mode=$progName" ) + if [[ $isRepl = 1 ]]; then + extraBefore+=( "-repl" ) + fi + + # Ensure swift-driver invokes the unwrapped frontend (instead of finding + # the wrapped one via PATH), because we don't have to wrap a second time. + export SWIFT_DRIVER_SWIFT_FRONTEND_EXEC="@swift@/bin/swift-frontend" + + # Ensure swift-driver can find the LLDB with Swift support for the REPL. + export SWIFT_DRIVER_LLDB_EXEC="@swift@/bin/lldb" +fi + +path_backup="$PATH" + +# That @-vars are substituted separately from bash evaluation makes +# shellcheck think this, and others like it, are useless conditionals. +# shellcheck disable=SC2157 +if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then + PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" +fi + +# Parse command line options and set several variables. +# For instance, figure out if linker flags should be passed. +# GCC prints annoying warnings when they are not needed. +isCxx=0 +dontLink=$isFrontend + +for p in "${params[@]}"; do + case "$p" in + -enable-cxx-interop) + isCxx=1 ;; + esac +done + +# NOTE: We don't modify these for Swift, but sourced scripts may use them. +cxxInclude=1 +cxxLibrary=1 +cInclude=1 + +linkType=$(checkLinkType "${params[@]}") + +# Optionally filter out paths not refering to the store. +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then + kept=() + nParams=${#params[@]} + declare -i n=0 + while (( "$n" < "$nParams" )); do + p=${params[n]} + p2=${params[n+1]:-} # handle `p` being last one + n+=1 + + skipNext=false + path="" + case "$p" in + -[IL]/*) path=${p:2} ;; + -[IL]) path=$p2 skipNext=true ;; + esac + + if [[ -n $path ]] && badPath "$path"; then + skip "$path" + $skipNext && n+=1 + continue + fi + + kept+=("$p") + done + # Old bash empty array hack + params=(${kept+"${kept[@]}"}) +fi + +# Flirting with a layer violation here. +if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then + source @bintools@/nix-support/add-flags.sh +fi + +# Put this one second so libc ldflags take priority. +if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then + source $cc_wrapper/nix-support/add-flags.sh +fi + +if [[ "$isCxx" = 1 ]]; then + if [[ "$cxxInclude" = 1 ]]; then + NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" + fi + if [[ "$cxxLibrary" = 1 ]]; then + NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" + fi +fi + +source $cc_wrapper/nix-support/add-hardening.sh + +# Add the flags for the C compiler proper. +addCFlagsToList() { + declare -n list="$1" + shift + + for ((i = 1; i <= $#; i++)); do + local val="${!i}" + case "$val" in + # Pass through using -Xcc, but also convert to Swift -I. + # These have slightly different meaning for Clang, but Swift + # doesn't have exact equivalents. + -isystem | -idirafter) + i=$((i + 1)) + list+=("-Xcc" "$val" "-Xcc" "${!i}" "-I" "${!i}") + ;; + # Simple rename. + -iframework) + i=$((i + 1)) + list+=("-Fsystem" "${!i}") + ;; + # Pass through verbatim. + -I | -Fsystem) + i=$((i + 1)) + list+=("${val}" "${!i}") + ;; + -I* | -L* | -F*) + list+=("${val}") + ;; + # Pass through using -Xcc. + *) + list+=("-Xcc" "$val") + ;; + esac + done +} +for i in ${NIX_SWIFTFLAGS_COMPILE:-}; do + extraAfter+=("$i") +done +for i in ${NIX_SWIFTFLAGS_COMPILE_BEFORE:-}; do + extraBefore+=("$i") +done +addCFlagsToList extraAfter $NIX_CFLAGS_COMPILE_@suffixSalt@ +addCFlagsToList extraBefore ${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@ + +if [ "$dontLink" != 1 ]; then + + # Add the flags that should only be passed to the compiler when + # linking. + addCFlagsToList extraAfter $(filterRpathFlags "$linkType" $NIX_CFLAGS_LINK_@suffixSalt@) + + # Add the flags that should be passed to the linker (and prevent + # `ld-wrapper' from adding NIX_LDFLAGS_@suffixSalt@ again). + for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_BEFORE_@suffixSalt@); do + extraBefore+=("-Xlinker" "$i") + done + if [[ "$linkType" == dynamic && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + extraBefore+=("-Xlinker" "-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi + for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_@suffixSalt@); do + if [ "${i:0:3}" = -L/ ]; then + extraAfter+=("$i") + else + extraAfter+=("-Xlinker" "$i") + fi + done + export NIX_LINK_TYPE_@suffixSalt@=$linkType +fi + +# TODO: If we ever need to expand functionality of this hook, it may no longer +# be compatible with Swift. Right now, it is only used on Darwin to force +# -target, which also happens to work with Swift. +if [[ -e $cc_wrapper/nix-support/add-local-cc-cflags-before.sh ]]; then + source $cc_wrapper/nix-support/add-local-cc-cflags-before.sh +fi + +# May need to transform the triple injected by the above. +for ((i = 1; i < ${#extraBefore[@]}; i++)); do + if [[ "${extraBefore[i]}" = -target ]]; then + i=$((i + 1)) + # On Darwin only, need to change 'aarch64' to 'arm64'. + extraBefore[i]="${extraBefore[i]/aarch64-apple-/arm64-apple-}" + # On Darwin, Swift requires the triple to be annotated with a version. + # TODO: Assumes macOS. + extraBefore[i]="${extraBefore[i]/-apple-darwin/-apple-macosx${MACOSX_DEPLOYMENT_TARGET:-11.0}}" + break + fi +done + +# As a very special hack, if the arguments are just `-v', then don't +# add anything. This is to prevent `gcc -v' (which normally prints +# out the version number and returns exit code 0) from printing out +# `No input files specified' and returning exit code 1. +if [ "$*" = -v ]; then + extraAfter=() + extraBefore=() +fi + +# Optionally print debug info. +if (( "${NIX_DEBUG:-0}" >= 1 )); then + # Old bash workaround, see ld-wrapper for explanation. + echo "extra flags before to $prog:" >&2 + printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 + echo "original flags to $prog:" >&2 + printf " %q\n" ${params+"${params[@]}"} >&2 + echo "extra flags after to $prog:" >&2 + printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 +fi + +PATH="$path_backup" +# Old bash workaround, see above. + +if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then + exec "$prog" @<(printf "%q\n" \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"}) +else + exec "$prog" \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} +fi diff --git a/pkgs/development/compilers/swift/xctest/default.nix b/pkgs/development/compilers/swift/xctest/default.nix new file mode 100644 index 000000000000..c8003d8486f1 --- /dev/null +++ b/pkgs/development/compilers/swift/xctest/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, callPackage +, cmake +, ninja +, swift +, Foundation +, DarwinTools +}: + +let + sources = callPackage ../sources.nix { }; +in stdenv.mkDerivation { + pname = "swift-corelibs-xctest"; + + inherit (sources) version; + src = sources.swift-corelibs-xctest; + + outputs = [ "out" ]; + + nativeBuildInputs = [ cmake ninja swift ] + ++ lib.optional stdenv.isDarwin DarwinTools; # sw_vers + buildInputs = [ Foundation ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + # On Darwin only, Swift uses arm64 as cpu arch. + substituteInPlace cmake/modules/SwiftSupport.cmake \ + --replace '"aarch64" PARENT_SCOPE' '"arm64" PARENT_SCOPE' + ''; + + preConfigure = '' + # On aarch64-darwin, our minimum target is 11.0, but we can target lower, + # and some dependants require a lower target. Harmless on non-Darwin. + export MACOSX_DEPLOYMENT_TARGET=10.12 + ''; + + cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; + + postInstall = lib.optionalString stdenv.isDarwin '' + # Darwin normally uses the Xcode version of XCTest. Installing + # swift-corelibs-xctest is probably not officially supported, but we have + # no alternative. Fix up the installation here. + mv $out/lib/swift/darwin/${swift.swiftArch}/* $out/lib/swift/darwin + rmdir $out/lib/swift/darwin/${swift.swiftArch} + mv $out/lib/swift/darwin $out/lib/swift/${swift.swiftOs} + ''; + + meta = { + description = "Framework for writing unit tests in Swift"; + homepage = "https://github.com/apple/swift-corelibs-xctest"; + platforms = lib.platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 8b3020f88613..eae0337effc0 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -16,7 +16,9 @@ let # Add all dependencies in buildInputs including propagated ones to # STACK_IN_NIX_EXTRA_ARGS. - stackHook = makeSetupHook {} ./stack-hook.sh; + stackHook = makeSetupHook { + name = "stack-hook"; + } ./stack-hook.sh; in stdenv.mkDerivation (args // { diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/development/interpreters/hashlink/default.nix index e24742ac136e..dc5f153c5ee1 100644 --- a/pkgs/development/interpreters/hashlink/default.nix +++ b/pkgs/development/interpreters/hashlink/default.nix @@ -17,17 +17,15 @@ stdenv.mkDerivation rec { pname = "hashlink"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "HaxeFoundation"; repo = "hashlink"; rev = version; - sha256 = "AiUGhTxz4Pkrks4oE+SAuAQPMuC5T2B6jo3Jd3sNrkQ="; + sha256 = "lpHW0JWxbLtOBns3By56ZBn47CZsDzwOFBuW9MlERrE="; }; - patches = [ ./hashlink.patch ]; - makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ diff --git a/pkgs/development/interpreters/hashlink/hashlink.patch b/pkgs/development/interpreters/hashlink/hashlink.patch deleted file mode 100644 index 20d4eedd5a8a..000000000000 --- a/pkgs/development/interpreters/hashlink/hashlink.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -107,6 +107,7 @@ LIBFLAGS += -L/opt/libjpeg-turbo/lib64 - endif - - LIBOPENAL = -lopenal -+LIBOPENGL = -lGL - RELEASE_NAME = linux - - endif ---- a/libs/sdl/gl.c -+++ b/libs/sdl/gl.c -@@ -7,7 +7,7 @@ - # include - # define HL_GLES - #elif defined(HL_MAC) --# include -+# include - # include - # define glBindImageTexture(...) hl_error("Not supported on OSX") - # define glDispatchCompute(...) hl_error("Not supported on OSX") ---- a/libs/sdl/sdl.c -+++ b/libs/sdl/sdl.c -@@ -7,7 +7,7 @@ - # include - # include - #elif defined(HL_MAC) --# include -+# include - #else - # include - #endif diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix index 049afcd6116d..c9ef151bea3c 100644 --- a/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -7,10 +7,10 @@ # defined in trivial-builders.nix # imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput makeSetupHook { + name = "wrap-lua-hook"; deps = makeWrapper; substitutions.executable = lua.interpreter; substitutions.lua = lua; substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; } ./wrap.sh - diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 411220870e1a..8596e379e710 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -52,6 +52,15 @@ let ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" ++ optional deterministicStringIds "-DLUAJIT_SECURITY_STRID=0" ; + + # LuaJIT requires build for 32bit architectures to be build on x86 not x86_64 + # TODO support also other build architectures. The ideal way would be to use + # stdenv_32bit but that doesn't work due to host platform mismatch: + # https://github.com/NixOS/nixpkgs/issues/212494 + buildStdenv = if buildPackages.stdenv.isx86_64 && stdenv.is32bit + then buildPackages.pkgsi686Linux.buildPackages.stdenv + else buildPackages.stdenv; + in stdenv.mkDerivation rec { pname = "luajit"; @@ -88,8 +97,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "DEFAULT_CC=cc" "CROSS=${stdenv.cc.targetPrefix}" - # TODO: when pointer size differs, we would need e.g. -m32 - "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + "HOST_CC=${buildStdenv.cc}/bin/cc" ] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)"; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = XCFLAGS; diff --git a/pkgs/development/interpreters/python/wrap-python.nix b/pkgs/development/interpreters/python/wrap-python.nix index 3b450c0a85bd..83da013bfd2d 100644 --- a/pkgs/development/interpreters/python/wrap-python.nix +++ b/pkgs/development/interpreters/python/wrap-python.nix @@ -4,6 +4,7 @@ , makeWrapper }: makePythonHook { + name = "wrap-python-hook"; deps = makeWrapper; substitutions.sitePackages = python.sitePackages; substitutions.executable = python.interpreter; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 3de86d457269..2e617ef9e0ad 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "7.0.10"; + version = "7.0.11"; src = fetchurl { url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-G3H1MBGseD/G9kigS3r9TrwRk8TYi2KC1CueKhtlNzA="; + sha256 = "sha256-r+LRiu/u1qMcbrjkSr8ErnemX6zvhgvc5cLWu8AQhww="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix index a4916eecfe41..f52800e2e70c 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -12,7 +12,9 @@ libunwindSupport ? true, libunwind, pulseaudioSupport ? true, - libpulseaudio + libpulseaudio, + soxSupport ? true, + sox }: stdenv.mkDerivation rec { @@ -35,17 +37,17 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libuv - libunwind - openfec - libpulseaudio speexdsp - ]; + ] ++ lib.optional openfecSupport openfec + ++ lib.optional libunwindSupport libunwind + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional soxSupport sox; sconsFlags = [ "--build=${stdenv.buildPlatform.config}" "--host=${stdenv.hostPlatform.config}" - "--prefix=${placeholder "out"}" - "--disable-sox" ] ++ + "--prefix=${placeholder "out"}" ] ++ + lib.optional (!soxSupport) "--disable-sox" ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ (if (!openfecSupport) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 9091749db442..97072fc4ad33 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.2.0"; + version = "5.2.16"; nativeBuildInputs = [ cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-HbKo5E1K+W5tPqRbcG4+ymUXv87iqc094pTeng94Aao="; + hash = "sha256-M2apFibqSKp8ojXl82W+vQb7CUxdbWsmw8PLL/ByYuM="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 3a6ef0e3562d..4bccc0c5cf2f 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "5.1.12"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-GsHVuNXzLkbKUaHtnyXAr7bR9Emc55zcmKt3RGjCMtA="; + hash = "sha256-nrnGmJxAeobejS6zdn5Z/kOFOxyepZcxW/G4nXAt2DY="; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix index 2d050adcc5b8..853b1d7d59c6 100644 --- a/pkgs/development/libraries/catch2/3.nix +++ b/pkgs/development/libraries/catch2/3.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - hash = "sha256-e5S3K0kYCB6nVZDi/DVKzMvrVk6IgXC2g7217sr8xUo="; + hash = "sha256-f/tM8b2JGZw2OzhlhMvjzLjgvgj5qncEepYsEwSxeAI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/directx-headers/default.nix b/pkgs/development/libraries/directx-headers/default.nix new file mode 100644 index 000000000000..3ac15bb85e24 --- /dev/null +++ b/pkgs/development/libraries/directx-headers/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja }: +stdenv.mkDerivation rec { + pname = "directx-headers"; + version = "1.608.2"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "DirectX-Headers"; + rev = "v${version}"; + hash = "sha256-F0riTDJpydqe4yhE9GKSSvnRI0Sl3oY2sOP+H/vDHG0="; + }; + + nativeBuildInputs = [ meson ninja ]; + + # tests require WSL2 + mesonFlags = [ "-Dbuild-test=false" ]; + + meta = with lib; { + description = "Official D3D12 headers from Microsoft"; + homepage = "https://github.com/microsoft/DirectX-Headers"; + license = licenses.mit; + maintainers = with maintainers; [ k900 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 87d3285e64bc..5e44d2221f2a 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -62,8 +62,6 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; - buildInputs = [ gobject-introspection ]; - propagatedBuildInputs = [ glib libtiff diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 795aeb88440e..5202dc0edabc 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -8,7 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii"; }; - patches = lib.optional stdenv.hostPlatform.isDarwin + patches = [ + (fetchpatch { + name = "CVE-2022-28506.patch"; + url = "https://src.fedoraproject.org/rpms/giflib/raw/2e9917bf13df114354163f0c0211eccc00943596/f/CVE-2022-28506.patch"; + sha256 = "sha256-TBemEXkuox8FdS9RvjnWcTWPaHRo4crcwSR9czrUwBY="; + }) + ] ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { # https://sourceforge.net/p/giflib/bugs/133/ name = "darwin-soname.patch"; diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 2d7e6614cecc..9193404d0123 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -76,11 +76,19 @@ in # - clang-wrapper in cross-compilation # Last attempt: https://github.com/NixOS/nixpkgs/pull/36948 preInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then + if [ -f ${lib.getLib stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib - cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + cp ${lib.getLib stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 # the .so It used to be a symlink, but now it is a script - cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so + cp -a ${lib.getLib stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so + # wipe out reference to previous libc it was built against + chmod +w $out/lib/libgcc_s.so.1 + # rely on default RUNPATHs of the binary and other libraries + # Do no force-pull wrong glibc. + patchelf --remove-rpath $out/lib/libgcc_s.so.1 + # 'patchelf' does not remove the string itself. Wipe out + # string reference to avoid possible link to bootstrapTools + ${buildPackages.nukeReferences}/bin/nuke-refs $out/lib/libgcc_s.so.1 fi ''; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 112158a47276..1533f59b4aec 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -2,7 +2,6 @@ , stdenv , substituteAll , fetchurl -, fetchpatch2 , pkg-config , gettext , docbook-xsl-nons @@ -61,7 +60,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.35"; + version = "3.24.36"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -73,22 +72,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-7BD+bXEu8LPGO1+TJjnJ0a6Z/OlPUA9vBpZWKf72C9E="; + sha256 = "sha256-J6bvFXdDNQyAf/6lm6odcCJtvt6CpelT/9WOpgWf5pE="; }; patches = [ ./patches/3.0-immodules.cache.patch ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch - - # Add accidentally non-dist’d build file. - # https://gitlab.gnome.org/GNOME/gtk/-/commit/b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/66a199806ceb3daa5e2c7d3a5b45a86007cec46a.patch"; - includes = [ - "gdk/wayland/cursor/meson.build" - ]; - sha256 = "cOOcSB3yphff2+7l7YpFbGSswWjV8lJ2tk+Vjgl1ras="; - }) ] ++ lib.optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it @@ -121,7 +110,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection libxkbcommon (libepoxy.override { inherit x11Support; }) isocodes diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 9da8e8837bc1..782823cd6748 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 ]; - buildInputs = [ glib freetype gobject-introspection ] + buildInputs = [ glib freetype ] ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; propagatedBuildInputs = lib.optional withGraphite2 graphite2 diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 9885384e00e1..efac3690851e 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -49,8 +49,6 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; - buildInputs = [ gobject-introspection ]; - propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 7a7edc5b122e..7abbd944ed01 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -1,22 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, cmake, cmocka }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, cmocka -stdenv.mkDerivation rec { +# for passthru.tests +, libfido2 +, mysql80 +, openssh +, systemd +}: + +stdenv.mkDerivation (finalAttrs: { pname = "libcbor"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "PJK"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Wp/48yQA17mf/dTgeMcMDvPpKOPkfLhQkCnzgGLpLtk="; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-YJSIZ7o191/0QJf1fH6LUYykS2pvP17knSeRO2WcDeM="; }; nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DBUILD_SHARED_LIBS=on" + ] ++ lib.optional finalAttrs.doCheck "-DWITH_TESTS=ON"; + + # 2 tests are not 32-bit clean: overflow size_t: + # https://github.com/PJK/libcbor/issues/263 + doCheck = + !stdenv.hostPlatform.is32bit + && (!stdenv.hostPlatform.isStatic) + && stdenv.hostPlatform == stdenv.buildPlatform; nativeCheckInputs = [ cmocka ]; - doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ]; + passthru.tests = { + inherit libfido2 mysql80; + openssh = (openssh.override { withFIDO = true; }); + systemd = (systemd.override { + withFido2 = true; + withCryptsetup = true; + }); + }; meta = with lib; { description = "CBOR protocol implementation for C and others"; @@ -24,4 +52,4 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; -} +}) diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 14a20a957967..647079ae2fb4 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -7,13 +7,13 @@ in stdenv.mkDerivation rec { pname = "libclc"; - version = "14.0.6"; + version = "15.0.7"; src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = "llvmorg-${version}"; - sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; + sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; }; sourceRoot = "source/libclc"; diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index d054e223cf0d..18b8d6ba5d6f 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -6,7 +6,6 @@ # for passthru.tests , imagemagick -, imagemagick6 , libheif , imlib2Full , gst_all_1 @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit imagemagick imagemagick6 libheif imlib2Full; + inherit imagemagick libheif imlib2Full; inherit (gst_all_1) gst-plugins-bad; }; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 16ea50f6dd9a..7d8b1c95698a 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.106.0"; + version = "1.107.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc="; + hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs="; + hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 35b3fef3087d..e6808b47ab09 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.5.0"; + version = "1.5.1"; # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-lXFQo+tt56BFoPgdkTfz6WdIngeotTm+8cAGcBP6XqY="; + sha256 = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index 1c03973fff96..700223cd1a79 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -34,6 +34,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # present in master + (fetchpatch { + name = "fix-test-failure-on-ia64-ppc64-riscv64"; + url = "https://github.com/libjxl/libjxl/commit/bb8eac5d6acec223e44cf8cc72ae02f0816de311.patch"; + hash = "sha256-DuUCStWEquhWo7bOss0RgZ7ouYE4FpWrIMFywYR424s="; + }) + ]; + nativeBuildInputs = [ cmake gtest diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 10c2bfb272c8..fe3ddba36b86 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -15,11 +15,12 @@ , lib , stdenv , xercesc +, zxing-cpp }: stdenv.mkDerivation rec { pname = "liblinphone"; - version = "5.1.22"; + version = "5.2.17"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -27,10 +28,14 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-hTyp/fUA1+7J1MtqX33kH8Vn1XNjx51Wy5REvrpdJTY="; + hash = "sha256-zxp+jcClfKm+VsylRtydF2rlDCkO+sa9vw8GpwAfKHM="; }; - patches = [ ./use-normal-jsoncpp.patch ]; + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "jsoncpp_object" "jsoncpp" \ + --replace "jsoncpp_static" "jsoncpp" + ''; cmakeFlags = [ "-DENABLE_STATIC=NO" # Do not build static libraries @@ -52,6 +57,7 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite xercesc + zxing-cpp ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch b/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch deleted file mode 100644 index 4685b327ecd3..000000000000 --- a/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ea6901c9ed0f804bd2d6d09e514610518c2f4f09 Mon Sep 17 00:00:00 2001 -From: Lorenz Brun -Date: Fri, 18 Mar 2022 17:36:22 +0100 -Subject: [PATCH] Use normal jsoncpp - ---- - src/CMakeLists.txt | 6 +++--- - tester/CMakeLists.txt | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5cd87fe9a..822b2151e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) - if (XCODE) - list(APPEND LINK_LIBS jsoncpp_static) - else() -- list(APPEND LINK_LIBS jsoncpp_object) -+ list(APPEND LINK_LIBS jsoncpp) - endif() - endif() - -@@ -592,7 +592,7 @@ if(ENABLE_STATIC) - if (XCODE) - target_link_libraries(linphone PRIVATE jsoncpp_static) - else() -- target_link_libraries(linphone PRIVATE jsoncpp_object) -+ target_link_libraries(linphone PRIVATE jsoncpp) - endif() - endif() - -@@ -646,7 +646,7 @@ if(ENABLE_SHARED) - if (XCODE) - target_link_libraries(linphone PRIVATE jsoncpp_static) - else() -- target_link_libraries(linphone PRIVATE jsoncpp_object) -+ target_link_libraries(linphone PRIVATE jsoncpp) - endif() - endif() - -diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt -index b97042678..b4c5a5794 100644 ---- a/tester/CMakeLists.txt -+++ b/tester/CMakeLists.txt -@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) - if (XCODE) - list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static) - else() -- list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object) -+ list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp) - endif() - endif() - --- -2.25.1 - diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 8421a2503070..481f12e17526 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libmpc"; - version = "1.2.1"; # to avoid clash with the MPD client + version = "1.3.1"; # to avoid clash with the MPD client src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; - sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; + sha256 = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; }; strictDeps = true; diff --git a/pkgs/development/libraries/liboqs/default.nix b/pkgs/development/libraries/liboqs/default.nix new file mode 100644 index 000000000000..908554a679df --- /dev/null +++ b/pkgs/development/libraries/liboqs/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, enableStatic ? stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "liboqs"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "open-quantum-safe"; + repo = pname; + rev = version; + sha256 = "sha256-cwrTHj/WFDZ9Ez2FhjpRhEx9aC5xBnh7HR/9T+zUpZc="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}" + "-DOQS_DIST_BUILD=ON" + "-DOQS_BUILD_ONLY_LIB=ON" + ]; + + dontFixCmake = true; # fix CMake file will give an error + + meta = with lib; { + description = "C library for prototyping and experimenting with quantum-resistant cryptography"; + homepage = "https://openquantumsafe.org"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 315530bcfab2..84d0f01c1549 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-stfpyJC1AVmDh1Nk5c5Lv0j6ic2AU6mwY02L/IDr8tE="; + sha256 = "sha256-e+blEdO2KA/noW9pq56qZ0/vvtqQwiDbBJoQR0cQeds="; }; postPatch = '' diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index df753b55b08c..91b4a42d54ed 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection sqlite libpsl glib.out diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 1e88218aa0d4..0e0030558dba 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { }) ]; + configureFlags = [ "--disable-examples" ]; + outputs = [ "out" "dev" "devdoc" ]; outputDoc = "devdoc"; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index bad8e14d59e4..9f958efe71b3 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-HTwJQpDND4PjiNpUjHtTgkQdkahm2BUe71UDRQpvo6M="; + sha256 = "sha256-Vw62xgWzaaWKQWIZDYpVpOgEUQGUNToImEAo6lwiFFU="; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 13ad9eb29c2e..dff7abc7dd53 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-XX6qOWlIl8TqOQMiGpmmDVKwQnM1taG6lrqq1ZFVk5s="; + hash = "sha256-nhXkq+qKpaa75YQB/W/cRozslTIFPdXeqj1y6emQeHk="; }; configureFlags = [ diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 2d624256eabd..ed936a9d0377 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.4.1"; + version = "1.5.0"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0fbb2dyjvf71p42y2jmwdcylsvj03w52f5rb23c2d00rwahhfg4l"; + sha256 = "sha256-Vg8RxLu8oQ9JXz7306aqTKYrT4+wtS59RZ0Yom5G4Bc="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index fd6df20fb892..fade17507ca4 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "5.1.20"; + version = "5.2.16"; dontWrapQtApps = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-u8YqF5BzyYIF9+XB90Eu6DlwXuu1FDOJUzxebj0errU="; + hash = "sha256-K4EBZC3zuLKF9Qw4i24f0hYKlOgRM7MR4Ck2ZoTYi6I="; }; patches = [ diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a79c19eb2ebc..56fa74e5c0c5 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,11 +6,58 @@ , libelf, libvdpau , libglvnd, libunwind , vulkan-loader, glslang -, galliumDrivers ? ["auto"] -# upstream Mesa defaults to only enabling swrast (aka lavapipe) on aarch64 for some reason, so force building the others -, vulkanDrivers ? if (stdenv.isLinux && stdenv.isAarch64) then [ "swrast" "broadcom" "freedreno" "panfrost" ] else [ "auto" ] +, galliumDrivers ? + if stdenv.isLinux then + [ + "d3d12" # WSL emulated GPU (aka Dozen) + "kmsro" # helper driver for display-only devices + "nouveau" # Nvidia + "radeonsi" # new AMD (GCN+) + "r300" # very old AMD + "r600" # less old AMD + "swrast" # software renderer (aka LLVMPipe) + "svga" # VMWare virtualized GPU + "virgl" # QEMU virtualized GPU (aka VirGL) + "zink" # generic OpenGL over Vulkan, experimental + ] + ++ lib.optionals stdenv.isAarch64 [ + "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) + "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) + "lima" # ARM Mali 4xx + "panfrost" # ARM Mali Midgard and up (T/G series) + "tegra" # Nvidia Tegra SoCs + "v3d" # Broadcom VC5 (Raspberry Pi 4) + "vc4" # Broadcom VC4 (Raspberry Pi 0-3) + ] ++ lib.optionals stdenv.isx86_64 [ + "iris" # new Intel, could work on non-x86_64 with PCIe cards, but doesn't build as of 22.3.4 + "crocus" # Intel legacy, x86_64 only + ] + else [ "auto" ] +, vulkanDrivers ? + if stdenv.isLinux then + [ + "amd" # AMD (aka RADV) + "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) + "swrast" # software renderer (aka Lavapipe) + ] + ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ + # QEMU virtualized GPU (aka VirGL) + # Requires ATOMIC_INT_LOCK_FREE == 2. + "virtio-experimental" + ] + ++ lib.optionals stdenv.isAarch64 [ + "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) + "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) + "imagination-experimental" # PowerVR Rogue (currently N/A) + "panfrost" # ARM Mali Midgard and up (T/G series) + ] + ++ lib.optionals stdenv.isx86_64 [ + "intel" # Intel (aka ANV), could work on non-x86_64 with PCIe cards, but doesn't build as of 22.3.4 + "intel_hasvk" # Intel Haswell/Broadwell, experimental, x86_64 only + ] + else [ "auto" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] -, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" ] # No Vulkan support on Darwin +, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" "intel-nullhw" ] # No Vulkan support on Darwin , OpenGL, Xplugin , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light , enableGalliumNine ? stdenv.isLinux @@ -19,10 +66,12 @@ , enablePatentEncumberedCodecs ? true , libclc , jdupes -, cmake , rustc , rust-bindgen -, spirv-llvm-translator_14 +, spirv-llvm-translator +, zstd +, directx-headers +, udev }: /** Packaging design: @@ -39,17 +88,26 @@ let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "22.3.3"; + version = "22.3.4"; branch = lib.versions.major version; withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; + # Align all the Mesa versions used. Required to prevent explosions when + # two different LLVMs are loaded in the same process. + # FIXME: these should really go into some sort of versioned LLVM package set rust-bindgen' = rust-bindgen.override { rust-bindgen-unwrapped = rust-bindgen.unwrapped.override { clang = llvmPackages.clang; }; }; + spirv-llvm-translator' = spirv-llvm-translator.override { + inherit (llvmPackages) llvm; + }; + haveWayland = lib.elem "wayland" eglPlatforms; + haveZink = lib.elem "zink" galliumDrivers; + haveDozen = (lib.elem "d3d12" galliumDrivers) || (lib.elem "microsoft-experimental" vulkanDrivers); self = stdenv.mkDerivation { pname = "mesa"; inherit version; @@ -62,7 +120,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "sha256-vteZeIvyvZ7wedl82OCTSL9TywhoGFeOQHc7KxeBKSI="; + sha256 = "37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593"; }; # TODO: @@ -91,7 +149,11 @@ self = stdenv.mkDerivation { outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa" ++ lib.optional stdenv.isLinux "driversdev" - ++ lib.optional enableOpenCL "opencl"; + ++ lib.optional enableOpenCL "opencl" + # the Dozen drivers depend on libspirv2dxil, but link it statically, and + # libspirv2dxil itself is pretty chonky, so relocate it to its own output + # in case anything wants to use it at some point + ++ lib.optional haveDozen "spirv2dxil"; # FIXME: this fixes rusticl/iris segfaulting on startup, _somehow_. # Needs more investigating. @@ -122,6 +184,7 @@ self = stdenv.mkDerivation { "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" "-Dva-libs-path=${placeholder "drivers"}/lib/dri" "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" + "-Dgallium-nine=${lib.boolToString enableGalliumNine}" # Direct3D in Wine "-Dosmesa=${lib.boolToString enableOSMesa}" # used by wine "-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) @@ -130,8 +193,15 @@ self = stdenv.mkDerivation { "-Dgbm-backends-path=${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm" ] ++ lib.optionals stdenv.isLinux [ "-Dglvnd=true" + + # Enable RT for Intel hardware + "-Dintel-clc=enabled" ] ++ lib.optionals enableOpenCL [ - "-Dgallium-opencl=icd" # Enable the gallium OpenCL frontend + # Clover, old OpenCL frontend + "-Dgallium-opencl=icd" + "-Dopencl-spirv=true" + + # Rusticl, new OpenCL frontend "-Dgallium-rusticl=true" "-Drust_std=2021" "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" ] ++ lib.optional enablePatentEncumberedCodecs @@ -143,24 +213,23 @@ self = stdenv.mkDerivation { libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ - ] ++ lib.optionals (lib.elem "wayland" eglPlatforms) [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] + zstd + ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] + ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev ] ++ lib.optionals stdenv.isDarwin [ libunwind ] - ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator_14 ] + ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator' ] ++ lib.optional withValgrind valgrind-light - # Mesa will not build zink when gallium-drivers=auto - ++ lib.optional (lib.elem "zink" galliumDrivers) vulkan-loader; + ++ lib.optional haveZink vulkan-loader + ++ lib.optional haveDozen directx-headers; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson pkg-config ninja intltool bison flex file - python3Packages.python python3Packages.Mako + python3Packages.python python3Packages.Mako python3Packages.ply jdupes glslang - ] ++ lib.optionals (lib.elem "wayland" eglPlatforms) [ - wayland-scanner - ]; + ] ++ lib.optional haveWayland wayland-scanner; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm @@ -217,6 +286,10 @@ self = stdenv.mkDerivation { for js in $drivers/share/vulkan/{im,ex}plicit_layer.d/*.json; do substituteInPlace "$js" --replace '"libVkLayer_' '"'"$drivers/lib/libVkLayer_" done + '' + lib.optionalString haveDozen '' + mkdir -p $spirv2dxil/{bin,lib} + mv -t $spirv2dxil/lib $out/lib/libspirv_to_dxil* + mv -t $spirv2dxil/bin $out/bin/spirv2dxil ''; postFixup = lib.optionalString stdenv.isLinux '' @@ -253,6 +326,10 @@ self = stdenv.mkDerivation { NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ "-UPIPE_SEARCH_DIR" "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" + + # Work around regression from https://github.com/NixOS/nixpkgs/pull/210004 + # TODO(trofi): remove + "--sysroot=/" ]; passthru = { diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch index 02558aaa825d..fb4da5cf7a0a 100644 --- a/pkgs/development/libraries/mesa/opencl.patch +++ b/pkgs/development/libraries/mesa/opencl.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index e32338b3f9a..fae804fd41e 100644 +index 172c64a7c70..05961e56926 100644 --- a/meson.build +++ b/meson.build -@@ -1894,7 +1894,7 @@ endif +@@ -1900,7 +1900,7 @@ endif dep_clang = null_dep if with_clc @@ -29,51 +29,20 @@ index 6f307018815..ab84eb1006c 100644 'platforms', type : 'array', diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index 7af210b5693..ff6ac8c61ca 100644 +index db3586bd7fb..4d914206d21 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build -@@ -30,6 +30,7 @@ if with_ld_version_script +@@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0') + polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false) endif - llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') +-dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) +clang_libdir = get_option('clang-libdir') - opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL' ++dep_clang = cpp.find_library('clang-cpp', dirs : clang_libdir, required : false) - polly_dep = null_dep -@@ -60,19 +61,19 @@ else - endif - if not _shared_llvm or not (dep_clang.found() and dep_clang_usable) - dep_clang = [ -- cpp.find_library('clangCodeGen', dirs : llvm_libdir), -- cpp.find_library('clangFrontendTool', dirs : llvm_libdir), -- cpp.find_library('clangFrontend', dirs : llvm_libdir), -- cpp.find_library('clangDriver', dirs : llvm_libdir), -- cpp.find_library('clangSerialization', dirs : llvm_libdir), -- cpp.find_library('clangParse', dirs : llvm_libdir), -- cpp.find_library('clangSema', dirs : llvm_libdir), -- cpp.find_library('clangAnalysis', dirs : llvm_libdir), -- cpp.find_library('clangAST', dirs : llvm_libdir), -- cpp.find_library('clangASTMatchers', dirs : llvm_libdir), -- cpp.find_library('clangEdit', dirs : llvm_libdir), -- cpp.find_library('clangLex', dirs : llvm_libdir), -- cpp.find_library('clangBasic', dirs : llvm_libdir), -+ cpp.find_library('clangCodeGen', dirs : clang_libdir), -+ cpp.find_library('clangFrontendTool', dirs : clang_libdir), -+ cpp.find_library('clangFrontend', dirs : clang_libdir), -+ cpp.find_library('clangDriver', dirs : clang_libdir), -+ cpp.find_library('clangSerialization', dirs : clang_libdir), -+ cpp.find_library('clangParse', dirs : clang_libdir), -+ cpp.find_library('clangSema', dirs : clang_libdir), -+ cpp.find_library('clangAnalysis', dirs : clang_libdir), -+ cpp.find_library('clangAST', dirs : clang_libdir), -+ cpp.find_library('clangASTMatchers', dirs : clang_libdir), -+ cpp.find_library('clangEdit', dirs : clang_libdir), -+ cpp.find_library('clangLex', dirs : clang_libdir), -+ cpp.find_library('clangBasic', dirs : clang_libdir), - polly_dep, polly_isl_dep, - ] - # check clang once more -@@ -119,7 +120,7 @@ if with_opencl_icd + # meson will return clang-cpp from system dirs if it's not found in llvm_libdir + linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir) +@@ -123,7 +124,7 @@ if with_opencl_icd configuration : _config, input : 'mesa.icd.in', output : 'mesa.icd', diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 7d9e94c6f909..e0a33e27c12c 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -11,7 +11,7 @@ # files. stdenv.mkDerivation rec { - version = "4.1.1"; + version = "4.2.0"; pname = "mpfr"; src = fetchurl { @@ -19,16 +19,9 @@ stdenv.mkDerivation rec { "https://www.mpfr.org/${pname}-${version}/${pname}-${version}.tar.xz" "mirror://gnu/mpfr/${pname}-${version}.tar.xz" ]; - hash = "sha256-/9GVvVZ9uv/DuYsj/QCq0FN2gMmJYXHkT+P/eeKKwz0="; + hash = "sha256-BqN43xNQEkjBsttaqXeiyBJq6Emp2be+JUb7Spwm2ZM="; }; - patches = [ - (fetchurl { # https://gitlab.inria.fr/mpfr/mpfr/-/issues/1 - url = "https://www.mpfr.org/mpfr-4.1.1/patch01"; - hash = "sha256-gKPCcJviGsqsEqnMmYiNY6APp3+3VXbyBf6LoZhP9Eo="; - }) - ]; - outputs = [ "out" "dev" "doc" "info" ]; strictDeps = true; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 14dddf1f29fd..c4d26e009275 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.3"; + version = "4.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-F0BuqQpu1OzVvjnJ3cv6yTQ+arT3esToxevko+O2xQE="; + sha256 = "sha256-ix7GO8RMfKoq+7RXvFs81KcNvka6unABI9Z8SNxatqA="; }; configureFlags = [ diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 4a510762f7f0..9e6a45e2975a 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, evdev-proto }: stdenv.mkDerivation rec { pname = "mtdev"; @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm"; }; + buildInputs = lib.optional stdenv.hostPlatform.isFreeBSD evdev-proto; + meta = with lib; { - homepage = "http://bitmath.org/code/mtdev/"; + homepage = "https://bitmath.org/code/mtdev/"; description = "Multitouch Protocol Translation Library"; longDescription = '' The mtdev is a stand-alone library which transforms all variants of @@ -20,6 +22,6 @@ stdenv.mkDerivation rec { See the kernel documentation for further details. ''; license = licenses.mit; - platforms = platforms.linux; + platforms = with platforms; freebsd ++ linux; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 2cfe41956a4b..4caf05ef3cfe 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -11,16 +11,12 @@ }: stdenv.mkDerivation rec { - ver = "6.3"; - # We pick fresh intermediate release to get a fix for CVE-2022-29458 - # which was fixed in 20220416 patchset. - patchver = "20220507"; - version = "${ver}-p${patchver}"; + version = "6.4"; pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - url = "https://invisible-island.net/archives/ncurses/current/ncurses-${ver}-${patchver}.tgz"; - sha256 = "02y4n4my5qqhw3fdhdjv1zc9xpyglzlzmzjwq2zcwbwv738255ja"; + url = "https://invisible-island.net/archives/ncurses/ncurses-${version}.tar.gz"; + hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index d267960e36df..2fae8135124e 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -58,7 +58,10 @@ stdenv.mkDerivation rec { "--disable-examples" (lib.enableFeature enableApp "app") ] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ] - ++ lib.optionals (enablePython) [ "--with-cython=${python3Packages.cython}/bin/cython" ]; + ++ lib.optionals (enablePython) [ + "--enable-python-bindings" + "--with-cython=${python3Packages.cython}/bin/cython" + ]; # Unit tests require CUnit and setting TZDIR environment variable doCheck = enableTests; @@ -82,6 +85,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit curl libsoup; + python-nghttp2 = python3Packages.nghttp2; }; meta = with lib; { diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index dda067fd499f..d6cacc0aa7f7 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OnGzAUfIop/3/0qAAm5rgTlpCdZ/1fwWPJ/KLfGUy8U="; + sha256 = "sha256-nUUbGNxr2pGiEoYbArHppNE29rki9SM/3MZWMS9HmqY="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index 2a3b25bc5827..c3f04cf6b15b 100644 --- a/pkgs/development/libraries/nss/esr.nix +++ b/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.79.2"; - hash = "sha256-hwcHDI74CgYp2vhQyKspKQ6T/O55f6g/cZvb9z1np4E="; + version = "3.79.3"; + hash = "sha256-8fhrlMe832xWYTYVMnZE7MV20W8sMX+5hHDcAcWYSA4="; } diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 89227b78f2f7..e1b6abc5b253 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -103,11 +103,14 @@ stdenv.mkDerivation rec { runHook postBuild ''; - NIX_CFLAGS_COMPILE = - "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\" " - + lib.optionalString stdenv.hostPlatform.is64bit "-DNSS_USE_64=1" - + lib.optionalString stdenv.hostPlatform.isILP32 " -DNS_PTR_LE_32=1" # See RNG_RandomUpdate() in drdbg.c - ; + NIX_CFLAGS_COMPILE = [ + "-Wno-error" + "-DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\"" + ] ++ lib.optionals stdenv.hostPlatform.is64bit [ + "-DNSS_USE_64=1" + ] ++ lib.optionals stdenv.hostPlatform.isILP32 [ + "-DNS_PTR_LE_32=1" # See RNG_RandomUpdate() in drdbg.c + ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index e896717644aa..4a0edf08a7e8 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "5.1.55"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw="; + hash = "sha256-zGguzrWXSjjrJdFnlAeC6U6w10BucXjeUg7/2D4OxM4="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index e6d9a6d7b89d..662437659147 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi libthai - gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7dbb72d9833b..8da35364e2b8 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -2,6 +2,7 @@ , lib , buildPackages , fetchFromGitLab +, fetchpatch , python3 , meson , ninja @@ -67,7 +68,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.64"; + version = "0.3.65"; outputs = [ "out" @@ -85,7 +86,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-wIvdciLBWIQjENEipzbVID0eliOcEwqS567pLxVVOsc="; + sha256 = "sha256-O5nu58QFlOPTaN4qNi50Wp9acxM6dWNy63BD+AnVl5w="; }; patches = [ @@ -101,6 +102,13 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch + + # backport a fix to actually install the new module + # FIXME: remove after 0.3.66 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/fba7083f8ceb210c7c20aceafeb5c9a8767cf705.patch"; + hash = "sha256-aZQ4OzK0B5YPq+jQNygxPE0coG2qB0ukbYzyI8E24XM="; + }) ]; nativeBuildInputs = [ @@ -237,7 +245,7 @@ let homepage = "https://pipewire.org/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ jtojnar kranzes ]; + maintainers = with maintainers; [ jtojnar kranzes k900 ]; }; }; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index d10ebbdd4b77..67d916dd14ee 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "qca-qt5"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-a2lYgafj/ZX3Oq7m6uq5b2rRflFenCs9SzJy14Yv9cQ="; + sha256 = "sha256-kffZFqs2kr9ZkfClU7+BUxYb/doUvQBdSAorTjhDYug="; }; buildInputs = [ openssl qtbase ]; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 0e1e2bbe66a7..2829bb0be027 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -204,6 +204,7 @@ let ++ lib.optional (stdenv.isDarwin) qtmacextras); qmake = makeSetupHook { + name = "qmake-hook"; deps = [ self.qtbase.dev ]; substitutions = { inherit debug; @@ -212,6 +213,7 @@ let } ../hooks/qmake-hook.sh; wrapQtAppsHook = makeSetupHook { + name = "wrap-qt5-apps-hook"; deps = [ self.qtbase.dev buildPackages.makeWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh index dcada3649078..7225b432c574 100755 --- a/pkgs/development/libraries/qt-5/5.15/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh @@ -10,7 +10,7 @@ srcs="${here}/srcs-generated.json" while read -r module; do if [[ -z "$module" ]]; then continue; fi url="https://invent.kde.org/qt/qt/${module}.git" - nix-prefetch-git --url $url --rev refs/heads/kde/5.15 \ + nix-prefetch-git --url $url --rev refs/heads/kde/5.15 --fetch-submodules \ | jq "{key: \"${module}\", value: {url,rev,sha256}}" done < "$modules" | jq -s 'from_entries' > "${srcs}.tmp" diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 229bfabbece2..3f6c616c3948 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -2,7 +2,7 @@ "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", "rev": "c3c7e6ebc29cce466d954f72f340a257d76b5ec2", - "sha256": "0lh05j21acs8wz72g4cs092m1yglpbjkhh55ww1351fjrp5gbzrg" + "sha256": "13ixg0gx7sp90k0db2xn7r2rj1w3zw3vs84pav0v8fwfvph9ki98" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", @@ -16,8 +16,8 @@ }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "9cf586d629a04040c9414c4f9e17abbc65c644eb", - "sha256": "1jvm92m3jz34yvzyn4vnihga2phpgszb2wqk0y7pr0ww6vs9kaf6" + "rev": "fa8dee92201448cc4eaa92f222b93d0b044d8ea5", + "sha256": "16b0q0anlgmfzbdm0jyakb8cxikrr295pj7avzny26x9609lzqga" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", @@ -36,8 +36,8 @@ }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "8defe7bfcae2ac5cb6dc25bfe3678124b09cf6f9", - "sha256": "0xzdnrhqalsrc52a326c5baf3si815a4rb2p1a4djyf8anp9wcai" + "rev": "05c3f4921d81fb1b0eb497515c24ae56221d1e0a", + "sha256": "0101bbpnrj4rp51dcnn2gjcq7vw55g4c8y4lmg2nd5g69whmkl1c" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", @@ -62,7 +62,7 @@ "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", "rev": "f991e28cb0a670597f1955585c76ce8a26ce9e4b", - "sha256": "1vflnscqc0jidr68v5ikxr579rx7k5yhdik8dcmnfgvmz3fq4jlz" + "sha256": "0bvxjciisq2hixhbxxs68zdwfdyvljy8iq48rnwpynqsdrhh5rma" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", @@ -92,7 +92,7 @@ "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", "rev": "47defc8b33b7bdf1dbf289b65b301fba2def9b1c", - "sha256": "1w4f02kch7p2jhn6dlzks6jpfcsm9ik04jnnaw6qvpxpsxwvcaah" + "sha256": "0kfwkxln3yz0c5rd1kfjmw0y2drwm1gg2s7f52kajfvg4274ha9c" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", @@ -181,8 +181,8 @@ }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "63fb8da1ecf8e48262cd515690cf71a425f92bf5", - "sha256": "0kjw5dsgn67897laana4h06czr9g8555jiqf1k3pkzv4fxzcqypn" + "rev": "90f3590c3c49a0820462af9a778dd13d8df42244", + "sha256": "1dxc3imh8455vy3pggrzjflb2v5382q9ha2fwplybxawld9wdw45" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", @@ -202,6 +202,6 @@ "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", "rev": "3199d91de3f38e5ece3d36bcefe2c33b2c014f3f", - "sha256": "1hjw5ymbc1fl4r4lym7n7ilmb953izmvyp6z8g5l8l7cz9sjz4ka" + "sha256": "1l6babh2cjqwaqk12cqpkkl2qy909b1fd84p0ab19raw419ncawz" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 4bc04dbefd01..19f36c337e5c 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -14,7 +14,7 @@ let fetchgit { inherit (args) url rev sha256; fetchLFS = false; - fetchSubmodules = false; + fetchSubmodules = true; deepClone = false; leaveDotGit = false; }; @@ -22,19 +22,6 @@ let in lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) // { - qt3d = { - inherit version; - src = fetchgit { - url = "https://invent.kde.org/qt/qt/qt3d.git"; - rev = "c3c7e6ebc29cce466d954f72f340a257d76b5ec2"; - sha256 = "sha256-KMWZ4N2OO7TBVpcgvQf/gweZRT62i9XABOnq0x94PY4="; - fetchLFS = false; - fetchSubmodules = true; - deepClone = false; - leaveDotGit = false; - }; - }; - # qtwebkit does not have an official release tarball on the qt mirror and is # mostly maintained by the community. qtwebkit = rec { diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 9664f005d7ee..b09521e34e3c 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -140,10 +140,12 @@ let }; wrapQtAppsHook = makeSetupHook { + name = "wrap-qt6-apps-hook"; deps = [ buildPackages.makeWrapper ]; } ./hooks/wrap-qt-apps-hook.sh; qmake = makeSetupHook { + name = "qmake6-hook"; deps = [ self.qtbase.dev ]; substitutions = { inherit debug; diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index ae89c223d2df..2e35b5e52825 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -222,8 +222,8 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.isDarwin [ - # error: 'path' is unavailable: introduced in macOS 10.15 - "-DQT_FEATURE_cxx17_filesystem=OFF" + # build as a set of dynamic libraries + "-DFEATURE_framework=OFF" ]; NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ @@ -271,7 +271,8 @@ stdenv.mkDerivation rec { # fixup .pc file (where to find 'moc' etc.) if [ -f "$dev/lib/pkgconfig/Qt6Core.pc" ]; then sed -i "$dev/lib/pkgconfig/Qt6Core.pc" \ - -e "/^bindir=/ c bindir=$dev/bin" + -e "/^bindir=/ c bindir=$dev/bin" \ + -e "/^libexecdir=/ c libexecdir=$dev/libexec" fi patchShebangs $out $dev diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index b3e91bd3fd13..bd4dc73c1e5d 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.10"; + version = "1.13.12"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UVyjeIIS0WwnY3GoZLIYTgf7R+C8SCuykDozaxCpog0="; + sha256 = "sha256-2K5Lt2zk5MXKD9zIQ2pBt2IRx/H1Zg/S70dsrpI2mTM="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix b/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix deleted file mode 100644 index 76cc0d3e30ef..000000000000 --- a/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, clangStdenv -, fetchFromGitHub -, cmake -, ninja -, libbsd -, libsystemtap -}: - -let - version = "5.5"; -in clangStdenv.mkDerivation { - pname = "swift-corelibs-libdispatch"; - inherit version; - - outputs = [ "out" "dev" "man" ]; - - src = fetchFromGitHub { - owner = "apple"; - repo = "swift-corelibs-libdispatch"; - rev = "swift-${version}-RELEASE"; - sha256 = "sha256-MbLgmS6qRSRT+2dGqbYTNb5MTM4Wz/grDXFk1kup+jk="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - libbsd - libsystemtap - ]; - - meta = { - description = "Grand Central Dispatch"; - homepage = "https://github.com/apple/swift-corelibs-libdispatch"; - platforms = lib.platforms.linux; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.cmm ]; - }; -} diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index e5ea8b17f6aa..9027c14de90c 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection glib libxml2 sqlite diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 2ab717782e51..2c424157bb41 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "unixODBC"; - version = "2.3.9"; + version = "2.3.11"; src = fetchurl { urls = [ "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz" "http://www.unixodbc.org/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-UoM+rD1oHIsMmlpl8uvXRbOpZPII/HSPl35EAVoxsgc="; + sha256 = "sha256-2eVcjnEYNH48ZshzOIVtrRUWtJD7fHVsFWKiwmfHO1w="; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix index 3a5032efdce3..7f7fc22f549b 100644 --- a/pkgs/development/libraries/vtk/9.x.nix +++ b/pkgs/development/libraries/vtk/9.x.nix @@ -1,5 +1,5 @@ import ./generic.nix { majorVersion = "9.2"; - minorVersion = "2"; - sourceSha256 = "sha256-HFsKK+cfrJb/SDGvaeNQ96DqMWiYH3kMAAcJ3PkSEHU="; + minorVersion = "5"; + sourceSha256 = "sha256-Eo1gG6qYDpjuA0IHl0sz+zjSyYq5z0pXVu/bCe1sCUk="; } diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index d25bb93d49f4..70270a58ddf4 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.197"; + version = "0.6.199"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+elot37F8VW7BP18zB8wHbxTHLgnTlXLUJlr82/Y05w="; + sha256 = "sha256-6sEgxUDKKAFWxWQqTb8hLt+vqlkD/9f5zdj9rh3sDLM="; }; - vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8="; + vendorHash = "sha256-hpS8fyyWIw1vkWXyd1OxyorGT5j4bJ5Ey+Hh48QF0p0="; CGO_ENABLED = 0; subPackages = [ "." ]; diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md index b2480d4b098f..18d98f364f28 100644 --- a/pkgs/development/misc/resholve/README.md +++ b/pkgs/development/misc/resholve/README.md @@ -252,8 +252,23 @@ with some rules (internal to resholve) for locating sub-executions in some of the more common commands. - "execer" lore identifies whether an executable can, cannot, - or might execute its arguments. Every "can" or "might" verdict requires - either built-in rules for finding the executable, or human triage. + or might execute its arguments. Every "can" or "might" verdict requires: + - an update to the matching rules in [binlore](https://github.com/abathur/binlore) + if there's absolutely no exec in the executable and binlore just lacks + rules for understanding this + - an override in [binlore](https://github.com/abathur/binlore) if there is + exec but it isn't actually under user control + - a parser in [resholve](https://github.com/abathur/resholve) capable of + isolating the exec'd words if the command does have exec under user + control + - overriding the execer lore for the executable if manual triage indicates + that all of the invocations in the current package don't include any + commands that the executable would exec + - if manual triage turns up any commands that would be exec'd, use some + non-resholve tool to patch/substitute/replace them before or after you + run resholve on them (if before, you may need to also add keep directives + for these absolute paths) + - "wrapper" lore maps shell exec wrappers to the programs they exec so that resholve can substitute an executable's verdict for its wrapper's. diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index d9659513996d..de3ac08ec99d 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -9,8 +9,7 @@ , # py-yajl deps git , # oil deps - readline -, cmark + cmark , file , glibcLocales , six @@ -36,12 +35,12 @@ rec { py-yajl = python27.pkgs.buildPythonPackage rec { pname = "oil-pyyajl-unstable"; - version = "2019-12-05"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "oilshell"; repo = "py-yajl"; - rev = "eb561e9aea6e88095d66abcc3990f2ee1f5339df"; - sha256 = "17hcgb7r7cy8r1pwbdh8di0nvykdswlqj73c85k6z8m0filj3hbh"; + rev = "72686b0e2e9d13d3ce5fefe47ecd607c540c90a3"; + hash = "sha256-H3GKN0Pq1VFD5+SWxm8CXUVO7zAyj/ngKVmDaG/aRT4="; fetchSubmodules = true; }; # just for submodule IIRC @@ -60,9 +59,9 @@ rec { src = fetchFromGitHub { owner = "oilshell"; repo = "oil"; - # rev == present HEAD of release/0.8.12 - rev = "799c0703d1da86cb80d1f5b163edf9369ad77cf1"; - hash = "sha256-QNSISr719ycZ1Z0quxHWzCb3IvHGj9TpogaYz20hDM4="; + # rev == present HEAD of release/0.14.0 + rev = "3d0427e222f7e42ae7be90c706d7fde555efca2e"; + hash = "sha256-XMoNkBEEmD6AwNSu1uSh3OcWLfy4/ADtRckn/Pj2cP4="; /* It's not critical to drop most of these; the primary target is @@ -73,16 +72,16 @@ rec { hash on rev updates. Command will fail w/o and not print hash. */ postFetch = '' - rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp + rm -rf $out/{Python-2.7.13,metrics,py-yajl,rfc,gold,web,testdata,services,demo,devtools} ''; }; - # patch to support a python package, pass tests on macOS, etc. + # patch to support a python package, pass tests on macOS, drop deps, etc. patchSrc = fetchFromGitHub { owner = "abathur"; repo = "nix-py-dev-oil"; - rev = "v0.8.12.2"; - hash = "sha256-+dVxzPKMGNKFE+7Ggzx9iWjjvwW2Ow3UqmjjUud9Mqo="; + rev = "v0.14.0.0"; + hash = "sha256-U6uR8G6yB2xwuDE/fznco23mVFSVdCxPUNdCRYz4Mj8="; }; patches = [ "${patchSrc}/0001-add_setup_py.patch" @@ -91,13 +90,18 @@ rec { "${patchSrc}/0006-disable_failing_libc_tests.patch" "${patchSrc}/0007-namespace_via_init.patch" "${patchSrc}/0009-avoid_nix_arch64_darwin_toolchain_bug.patch" + "${patchSrc}/0010-disable-line-input.patch" + "${patchSrc}/0011-disable-fanos.patch" + "${patchSrc}/0012-disable-doc-cmark.patch" ]; - buildInputs = [ readline cmark py-yajl ]; + configureFlags = [ + "--without-readline" + ]; nativeBuildInputs = [ re2c file makeWrapper ]; - propagatedBuildInputs = [ six typing ]; + propagatedBuildInputs = [ six typing py-yajl ]; doCheck = true; @@ -106,7 +110,12 @@ rec { ''; postPatch = '' - patchShebangs asdl build core doctools frontend native oil_lang + patchShebangs asdl build core doctools frontend pyext oil_lang + substituteInPlace pyext/fastlex.c --replace '_gen/frontend' '../_gen/frontend' + substituteInPlace core/main_loop.py --replace 'import fanos' '# import fanos' + rm cpp/stdlib.h # keep modules from finding the wrong stdlib? + # work around hard parse failure documented in oilshell/oil#1468 + substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' ''; /* @@ -120,8 +129,17 @@ rec { # See earlier note on glibcLocales TODO: verify needed? LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; - # not exhaustive; just a spot-check for now - pythonImportsCheck = [ "oil" "oil._devbuild" ]; + # not exhaustive; sample what resholve uses as a sanity check + pythonImportsCheck = [ + "oil" + "oil.asdl" + "oil.core" + "oil.frontend" + "oil._devbuild" + "oil._devbuild.gen.id_kind_asdl" + "oil._devbuild.gen.syntax_asdl" + "oil.tools.osh2oil" + ]; meta = { license = with lib.licenses; [ diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix index d8f7578f68b4..70182722bde4 100644 --- a/pkgs/development/misc/resholve/source.nix +++ b/pkgs/development/misc/resholve/source.nix @@ -3,7 +3,7 @@ }: rec { - version = "0.8.5"; + version = "0.9.0"; rSrc = # local build -> `make ci`; `make clean` to restore # return to remote source @@ -14,6 +14,6 @@ rec { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-DX1xe3YC0PlhwbjsvbmUzNjrwhxFpbZW87WWbKcD0us="; + hash = "sha256-FRdCeeC2c3bMEXekEyilgW0PwFfUWGstZ5mXdmRPM5w="; }; } diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index f1a7c049d832..0df241ad3787 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.21.2"; + version = "1.21.3"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1pd38izpwr19929pmqqqw9cvyf1sqzcmrywr7cyn9q8saxs97z8z"; + sha256 = "1sphkzknz4lidj3vxzvq31x6k6si32smn2yylibccv4p4hjwvn68"; }; dontUnpack = true; diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 9c30ac4dc6d9..6b11be178ff8 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "ULSIYPy4ZPM301dfCxRz0l2GJjOwIo/PqmWonIu1bLml7UmnVQmH+juJcoyXp6E8gIRRNAjGYftJnNQlfy4vPg=="; }; }; - "@adobe/css-tools-4.0.2" = { + "@adobe/css-tools-4.1.0" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.2.tgz"; - sha512 = "Fx6tYjk2wKUgLi8uMANZr8GNZx05u44ArIJldn9VxLvolzlJVgHbTUCbwhMd6bcYky178+WUSxPHO3DAtGLWpw=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.1.0.tgz"; + sha512 = "mMVJ/j/GbZ/De4ZHWbQAQO1J6iVnjtZLc9WEdkUQb8S/Bu2cAF2bETXUgMAdvMG3/ngtKmcNBe+Zms9bg6jnQQ=="; }; }; "@akryum/winattr-3.0.0" = { @@ -148,13 +148,13 @@ let sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; }; - "@angular-devkit/architect-0.1501.1" = { + "@angular-devkit/architect-0.1501.3" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1501.1"; + version = "0.1501.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.1.tgz"; - sha512 = "2uDa/+nVGwQ5X6UJtB14V37SbD/64WSg0hKyX5z1yp6wYrSuk7PWV8hddIsiYM3aIT5wTGqfLil6NkV4G/BzQw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.3.tgz"; + sha512 = "+hvesYUgChdAkBcWSO2pseIGBzRDAATyIw36UBwOmYkL7wM65TEXpspbo5ZIfU1M/l7X/lHzDXLTzCMfb0Qxbg=="; }; }; "@angular-devkit/core-15.0.4" = { @@ -166,13 +166,13 @@ let sha512 = "4ITpRAevd652SxB+qNesIQ9qfbm7wT5UBU5kJOPPwGL77I21g8CQpkmV1n5VSacPvC9Zbz90feOWexf7w7JzcA=="; }; }; - "@angular-devkit/core-15.1.1" = { + "@angular-devkit/core-15.1.3" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "15.1.1"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.1.tgz"; - sha512 = "wss76zfw4oPHs+Dd0OIbLv8os/BXDkDErj9hCjBbycQN768EqF8z7EBNGy6SKHYhmfXJy9REUkEgt9qPMJb4CQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.3.tgz"; + sha512 = "biuS+DceyZEqcE/cLvndtslqn3Q6uCmJ0RLpACikH6ESYorvk+A91H0ofuGue6HB/2CUN/F+mPSr7sWVI1W9sA=="; }; }; "@angular-devkit/schematics-15.0.4" = { @@ -184,13 +184,13 @@ let sha512 = "/gXiLFS0+xFdx6wPoBpe/c6/K9I5edMpaASqPf4XheKtrsSvL+qTlIi3nsbfItzOiDXbaBmlbxGfkMHz/yg0Ig=="; }; }; - "@angular-devkit/schematics-15.1.1" = { + "@angular-devkit/schematics-15.1.3" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "15.1.1"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.1.tgz"; - sha512 = "ullwoxFT9aMhQR2aNwb/66A6l4HTgp4I6thbBywt86nn+ZGbJCzLKRdv2vmYh9JaxZYh1pydxWjKLEUdlycKXg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.3.tgz"; + sha512 = "IXZ56/5uFnHqnLq+80JhmFx5mflyW8LgS/8Tr2l5DYVA71Fh3b1q+vGrEZB1X2zPoFeDOGAxv3Fi+kmjcz1GZg=="; }; }; "@angular-devkit/schematics-cli-15.0.4" = { @@ -364,13 +364,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apidevtools/json-schema-ref-parser-9.1.0" = { + "@apidevtools/json-schema-ref-parser-9.1.2" = { name = "_at_apidevtools_slash_json-schema-ref-parser"; packageName = "@apidevtools/json-schema-ref-parser"; - version = "9.1.0"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.1.0.tgz"; - sha512 = "teB30tFooE3iQs2HQIKJ02D8UZA1Xy1zaczzhUjJs0CymYxeC0g+y5rCY2p8NHBM6DBUVoR8rSM4kHLj1WE9mQ=="; + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.1.2.tgz"; + sha512 = "r1w81DpR+KyRWd3f+rk6TNqMgedmAxZP5v5KWlXQWlgMUUtyEJch0DKEci1SorPMiSeM8XPl7MZ3miJ60JIpQg=="; }; }; "@apidevtools/openapi-schemas-2.1.0" = { @@ -562,85 +562,85 @@ let sha512 = "FO+EteK+Gk3zwumrBw6frpp9cJ4oQL5++hBBpfM81w16e9KaiA4sKrzvQsvVjifoZZHNvVEX4D2zoz9i8CLccQ=="; }; }; - "@aws-crypto/crc32-2.0.0" = { + "@aws-crypto/crc32-3.0.0" = { name = "_at_aws-crypto_slash_crc32"; packageName = "@aws-crypto/crc32"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-2.0.0.tgz"; - sha512 = "TvE1r2CUueyXOuHdEigYjIZVesInd9KN+K/TFFNfkkxRThiNxO6i4ZqqAVMoEjAamZZ1AA8WXJkjCz7YShHPQA=="; + url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz"; + sha512 = "IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA=="; }; }; - "@aws-crypto/crc32c-2.0.0" = { + "@aws-crypto/crc32c-3.0.0" = { name = "_at_aws-crypto_slash_crc32c"; packageName = "@aws-crypto/crc32c"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz"; - sha512 = "vF0eMdMHx3O3MoOXUfBZry8Y4ZDtcuskjjKgJz8YfIDjLStxTZrYXk+kZqtl6A0uCmmiN/Eb/JbC/CndTV1MHg=="; + url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz"; + sha512 = "ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w=="; }; }; - "@aws-crypto/ie11-detection-2.0.2" = { + "@aws-crypto/ie11-detection-3.0.0" = { name = "_at_aws-crypto_slash_ie11-detection"; packageName = "@aws-crypto/ie11-detection"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz"; - sha512 = "5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw=="; + url = "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz"; + sha512 = "341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q=="; }; }; - "@aws-crypto/sha1-browser-2.0.0" = { + "@aws-crypto/sha1-browser-3.0.0" = { name = "_at_aws-crypto_slash_sha1-browser"; packageName = "@aws-crypto/sha1-browser"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz"; - sha512 = "3fIVRjPFY8EG5HWXR+ZJZMdWNRpwbxGzJ9IH9q93FpbgCH8u8GHRi46mZXp3cYD7gealmyqpm3ThZwLKJjWJhA=="; + url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz"; + sha512 = "NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw=="; }; }; - "@aws-crypto/sha256-browser-2.0.0" = { + "@aws-crypto/sha256-browser-3.0.0" = { name = "_at_aws-crypto_slash_sha256-browser"; packageName = "@aws-crypto/sha256-browser"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz"; - sha512 = "rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A=="; + url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz"; + sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ=="; }; }; - "@aws-crypto/sha256-js-2.0.0" = { + "@aws-crypto/sha256-js-3.0.0" = { name = "_at_aws-crypto_slash_sha256-js"; packageName = "@aws-crypto/sha256-js"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz"; - sha512 = "VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig=="; + url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz"; + sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ=="; }; }; - "@aws-crypto/supports-web-crypto-2.0.2" = { + "@aws-crypto/supports-web-crypto-3.0.0" = { name = "_at_aws-crypto_slash_supports-web-crypto"; packageName = "@aws-crypto/supports-web-crypto"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz"; - sha512 = "6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ=="; + url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz"; + sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg=="; }; }; - "@aws-crypto/util-2.0.2" = { + "@aws-crypto/util-3.0.0" = { name = "_at_aws-crypto_slash_util"; packageName = "@aws-crypto/util"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/util/-/util-2.0.2.tgz"; - sha512 = "Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA=="; + url = "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz"; + sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="; }; }; - "@aws-sdk/abort-controller-3.226.0" = { + "@aws-sdk/abort-controller-3.257.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.226.0.tgz"; - sha512 = "cJVzr1xxPBd08voknXvR0RLgtZKGKt6WyDpH/BaPCu3rfSqWCDZKzwqe940eqosjmKrxC6pUZNKASIqHOQ8xxQ=="; + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.257.0.tgz"; + sha512 = "ekWy391lOerS0ZECdhp/c+X7AToJIpfNrCPjuj3bKr+GMQYckGsYsdbm6AUD4sxBmfvuaQmVniSXWovaxwcFcQ=="; }; }; "@aws-sdk/chunked-blob-reader-3.188.0" = { @@ -661,202 +661,202 @@ let sha512 = "JeOZ95PW+fJ6bbuqPySYqLqHk1n4+4ueEEraJsiUrPBV0S1ZtyvOGHcnGztKUjr2PYNaiexmpWuvUve9K12HRA=="; }; }; - "@aws-sdk/client-s3-3.252.0" = { + "@aws-sdk/client-s3-3.259.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.252.0.tgz"; - sha512 = "VsTDuztgrwwBnkTZKm3t3cyXNTnWRCxDN4fCeEabw8/GB6KKSrs1a9pYXyWXuXtuvV5lFG4tIZMcXF7UkVXqyg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.259.0.tgz"; + sha512 = "yZy7oTTqPAn5H1SxbsynzVRr6kSf5hJQYl00P1dpzsAjTJmRzV4CdHwUxsBkyfUeC6u324iJi9zir1v8HHgUJw=="; }; }; - "@aws-sdk/client-sso-3.252.0" = { + "@aws-sdk/client-sso-3.259.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.252.0.tgz"; - sha512 = "VgBqJvvCU4y9zAHJwYj5nOeNGcCxKdCO4edUxWQVHcpLsVWu49maOVtWuteq9MOrHYeWfQi8bVWGt8MPvv9+bA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.259.0.tgz"; + sha512 = "TKi9Lj0zqxsrQWOZ+e4WchNDtLDz6B+ahMzYDIOFlglDPPEzbZE//PBMZCba/AAIe6U3xaUQSnni+4mNbRLg7Q=="; }; }; - "@aws-sdk/client-sso-oidc-3.252.0" = { + "@aws-sdk/client-sso-oidc-3.259.0" = { name = "_at_aws-sdk_slash_client-sso-oidc"; packageName = "@aws-sdk/client-sso-oidc"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.252.0.tgz"; - sha512 = "OOwfEXFS+UliGZorEleARsXXUp3ObZSXo9/YY+8XF7/8froAqYjKCEi0tflghgYlh7d6qe7wzD7/6gDL1a/qgA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.259.0.tgz"; + sha512 = "TKpUX55qLM35sQXx96VnB/ZcQCcBxVU/0j0wqL8Hij+blD7fy6KrGGJPORzRphmFg8Ehf1IoCivFxrQwLrjZ6A=="; }; }; - "@aws-sdk/client-sts-3.252.0" = { + "@aws-sdk/client-sts-3.259.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.252.0.tgz"; - sha512 = "wzfsWOlDFLdmeML8R7DUJWGl9wcRKf2uiunfB1aWzpdlgms0Z7FkHWgkDYHjCPyYHL6EBm84ajGl1UkE7AcmqQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.259.0.tgz"; + sha512 = "LXqua4FoXxR30sM4BSwmPI6x0YmDTw6yQhxQQXA5hrx+YwUf8CSpa0K6Xwfv8M5+zP0uHfY1iVxx/rnT8FOEmA=="; }; }; - "@aws-sdk/config-resolver-3.234.0" = { + "@aws-sdk/config-resolver-3.259.0" = { name = "_at_aws-sdk_slash_config-resolver"; packageName = "@aws-sdk/config-resolver"; - version = "3.234.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.234.0.tgz"; - sha512 = "uZxy4wzllfvgCQxVc+Iqhde0NGAnfmV2hWR6ejadJaAFTuYNvQiRg9IqJy3pkyDPqXySiJ8Bom5PoJfgn55J/A=="; + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.259.0.tgz"; + sha512 = "gViMRsc4Ye6+nzJ0OYTZIT8m4glIAdtugN2Sr/t6P2iJW5X0bSL/EcbcHBgsve1lHjeGPeyzVkT7UnyGOZ5Z/A=="; }; }; - "@aws-sdk/credential-provider-env-3.226.0" = { + "@aws-sdk/credential-provider-env-3.257.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.226.0.tgz"; - sha512 = "sd8uK1ojbXxaZXlthzw/VXZwCPUtU3PjObOfr3Evj7MPIM2IH8h29foOlggx939MdLQGboJf9gKvLlvKDWtJRA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.257.0.tgz"; + sha512 = "GsmBi5Di6hk1JAi1iB6/LCY8o+GmlCvJoB7wuoVmXI3VxRVwptUVjuj8EtJbIrVGrF9dSuIRPCzUoSuzEzYGlg=="; }; }; - "@aws-sdk/credential-provider-imds-3.226.0" = { + "@aws-sdk/credential-provider-imds-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-imds"; packageName = "@aws-sdk/credential-provider-imds"; - version = "3.226.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.226.0.tgz"; - sha512 = "//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.259.0.tgz"; + sha512 = "yCxoYWZAaDrCUEWxRfrpB0Mp1cFgJEMYW8T6GIb/+DQ5QLpZmorgaVD/j90QXupqFrR5tlxwuskBIkdD2E9YNg=="; }; }; - "@aws-sdk/credential-provider-ini-3.252.0" = { + "@aws-sdk/credential-provider-ini-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.252.0.tgz"; - sha512 = "OfpU8xMYK7+6XQ2dUO4rN0gUhhb/ZLV7iwSL6Ji2pI9gglGhKdOSfmbn6fBfCB50kzWZRNoiQJVaBu/d0Kr0EQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.259.0.tgz"; + sha512 = "/sjZv+XvcSMnvDTsau0cHxMFcbz4f4ksvgu10JQ1PpcH5CPQJviDJjZRzzijcOuMZ3SOO0skyuYU6tjY18cgIg=="; }; }; - "@aws-sdk/credential-provider-node-3.252.0" = { + "@aws-sdk/credential-provider-node-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.252.0.tgz"; - sha512 = "Jt854JnB7izkJ/gb3S0hBFqAQPUNUP3eL8gXX2uqk9A9bQFQdS57/Ci0FXaEPwOXzJwAAPazD8dTf6HXMhnm3w=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.259.0.tgz"; + sha512 = "7doM6hCPTZD0H+A7VtElLY4Ztuhg3MbjoHs00TyPZNCym7f/AKmKi9Exiw1tGgxTJkfn/SzcAWz+TyqMP078ow=="; }; }; - "@aws-sdk/credential-provider-process-3.226.0" = { + "@aws-sdk/credential-provider-process-3.257.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.226.0.tgz"; - sha512 = "iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.257.0.tgz"; + sha512 = "xK8uYeNXaclaBCGrLi4z2pxPRngqLf5BM5jg2fn57zqvlL9V5gJF972FehrVBL0bfp1/laG0ZJtD2K2sapyWAw=="; }; }; - "@aws-sdk/credential-provider-sso-3.252.0" = { + "@aws-sdk/credential-provider-sso-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.252.0.tgz"; - sha512 = "2JGoojMOBjG9/DenctEszjdPechq0uDTpH5nx+z1xxIAugA5+HYG/ncNfpwhmUBCrnOxpRaQViTNqXddEPHlAg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.259.0.tgz"; + sha512 = "cz+8aNKxvZ8ikd0JDcB9MZredOJNRZkbco8QAM0gXfy6ziyX+23oU8+aekZljDzQR5QNRouvMz1KKmBxZLpNyg=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.226.0" = { + "@aws-sdk/credential-provider-web-identity-3.257.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.226.0.tgz"; - sha512 = "CCpv847rLB0SFOHz2igvUMFAzeT2fD3YnY4C8jltuJoEkn0ITn1Hlgt13nTJ5BUuvyti2mvyXZHmNzhMIMrIlw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.257.0.tgz"; + sha512 = "Cm0uvRv4JuIbD0Kp3W0J/vwjADIyCx8HoZi5yg+QIi5nilocuTQ3ajvLeuPVSvFvdy+yaxSc5FxNXquWt7Mngw=="; }; }; - "@aws-sdk/eventstream-codec-3.226.0" = { + "@aws-sdk/eventstream-codec-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-codec"; packageName = "@aws-sdk/eventstream-codec"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.226.0.tgz"; - sha512 = "6uPtR8vSwz3fqoZk9hrb6qBYdp3PJ22+JxV5Wimdesvow4kJXSgDQXIxEkxbv6SxB9tNRB4uJHD84RetHEi15Q=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.258.0.tgz"; + sha512 = "DTd6aggICXOH74tBQEliwLbeoXRbQ3uROBWYl7DdrbAemzHACDFzPCXXa9MTJMZcq3Tva8/E/3bv1fXuU/xkAA=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.226.0" = { + "@aws-sdk/eventstream-serde-browser-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.226.0.tgz"; - sha512 = "otYC5aZE9eJUqAlKpy8w0rPDQ1eKGvZPtgxWXmFYSO2lDVGfI1nBBNmdZ4MdHqNuQ7ucsKMQYF8BFJ65K2tYPA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.258.0.tgz"; + sha512 = "bRcNxDrBFd0UsrLh88kwpvGDHjVupZP3gPJ5b7wseCuuWJzp56/7hNI97IywgARta91rcaf4K147VxFkSNaVlw=="; }; }; - "@aws-sdk/eventstream-serde-config-resolver-3.226.0" = { + "@aws-sdk/eventstream-serde-config-resolver-3.257.0" = { name = "_at_aws-sdk_slash_eventstream-serde-config-resolver"; packageName = "@aws-sdk/eventstream-serde-config-resolver"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.226.0.tgz"; - sha512 = "A56Gypg+lyEfA5cna+EUH9XTrj0SvRG1gwNW7lrUzviN36SeA/LFTUIOEjxVML3Lowy+EPAcrSZ67h6aepoAig=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.257.0.tgz"; + sha512 = "YbUETgkcFqPJmwcBozHbx3Xloh7mPk9SunNB+Ndy8egwV3L/jNZnEzZnPOtWbD10AXSuJvSbGQ8+l4FblRqZqw=="; }; }; - "@aws-sdk/eventstream-serde-node-3.226.0" = { + "@aws-sdk/eventstream-serde-node-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.226.0.tgz"; - sha512 = "KWLnKkKDzI9RNkiK6OiSYpG/XjZfue6Bsp/vRG+H5z3fbXdHv4X2+iW+Efu2Kvn7jsUyUv82TCl57DyJ/HKYhQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.258.0.tgz"; + sha512 = "KvuitKB3fK1ZjWcB+U6d8JNv0WJtE1zvW5DXI/OabzaIR4i/LNis7469EwTsEkTqG3mV3wUa6cBA6kBSJWTVeA=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.226.0" = { + "@aws-sdk/eventstream-serde-universal-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.226.0.tgz"; - sha512 = "Q8viYM1Sv90/yIUqyWNeG1GEvyVlAI3GIrInQcCMC+xT59jS+IKGy2y7ojCvSWXnhf5/HMXKcmG092QsqeKy0Q=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.258.0.tgz"; + sha512 = "woHNrBp8YSIaf3mcRJA0SyKFnjeLX2fRudLZq9wd555Zz/U7f45AuZOpXlU66tIZiYJI1xm32VRSIYfpIwXI+A=="; }; }; - "@aws-sdk/fetch-http-handler-3.226.0" = { + "@aws-sdk/fetch-http-handler-3.257.0" = { name = "_at_aws-sdk_slash_fetch-http-handler"; packageName = "@aws-sdk/fetch-http-handler"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.226.0.tgz"; - sha512 = "JewZPMNEBXfi1xVnRa7pVtK/zgZD8/lQ/YnD8pq79WuMa2cwyhDtr8oqCoqsPW+WJT5ScXoMtuHxN78l8eKWgg=="; + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.257.0.tgz"; + sha512 = "zOF+RzQ+wfF7tq7tGUdPcqUTh3+k2f8KCVJE07A8kCopVq4nBu4NH6Eq29Tjpwdya3YlKvE+kFssuQRRRRex+Q=="; }; }; - "@aws-sdk/hash-blob-browser-3.226.0" = { + "@aws-sdk/hash-blob-browser-3.257.0" = { name = "_at_aws-sdk_slash_hash-blob-browser"; packageName = "@aws-sdk/hash-blob-browser"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.226.0.tgz"; - sha512 = "5DCvWE6L4xGoViEHyjcPFuUe1G2EtNx8TqswWaoaKgyasP/yuRm4H99Ra7rqIrjCcSTAGD9NVsUQvVVw1bGt9w=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.257.0.tgz"; + sha512 = "3Nrcci3pCCc0ZILMGa/oUMq9le6nhvgCoVxFy5skYs/mQu4QnA8HcK0u4bTueW41rBj0ZW6BHLk/2SmigIkjCQ=="; }; }; - "@aws-sdk/hash-node-3.226.0" = { + "@aws-sdk/hash-node-3.257.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.226.0.tgz"; - sha512 = "MdlJhJ9/Espwd0+gUXdZRsHuostB2WxEVAszWxobP0FTT9PnicqnfK7ExmW+DUAc0ywxtEbR3e0UND65rlSTVw=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.257.0.tgz"; + sha512 = "W/USUuea5Ep3OJ2U7Ve8/5KN1YsDun2WzOFUxc1PyxXP5pW6OgC15/op0e+bmWPG851clvp5S8ZuroUr3aKi3Q=="; }; }; - "@aws-sdk/hash-stream-node-3.226.0" = { + "@aws-sdk/hash-stream-node-3.257.0" = { name = "_at_aws-sdk_slash_hash-stream-node"; packageName = "@aws-sdk/hash-stream-node"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.226.0.tgz"; - sha512 = "cgNTGlF8SdHaQXtjEmuLXz2U8SLM2JDKtIVPku/lHTMsUsEn+fuv2C+h1f/hvd4aNw5t1zggym7sO1/h/rv56Q=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.257.0.tgz"; + sha512 = "A24+EI0sO+IYO78sQPY4vVx7vzToc6XAobQqowmBJ6GXXILK72d3MR3NVbm0lmcS4Dh6MVZEFQD/DCyKvj2C7g=="; }; }; - "@aws-sdk/invalid-dependency-3.226.0" = { + "@aws-sdk/invalid-dependency-3.257.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.226.0.tgz"; - sha512 = "QXOYFmap8g9QzRjumcRCIo2GEZkdCwd7ePQW0OABWPhKHzlJ74vvBxywjU3s39EEBEluWXtZ7Iufg6GxZM4ifw=="; + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.257.0.tgz"; + sha512 = "T68SAPRNMEhpke0wlxURgogL7q0B8dfqZsSeS20BVR/lksJxLse9+pbmCDxiu1RrXoEIsEwl5rbLN+Hw8BFFYw=="; }; }; "@aws-sdk/is-array-buffer-3.201.0" = { @@ -868,310 +868,310 @@ let sha512 = "UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg=="; }; }; - "@aws-sdk/md5-js-3.226.0" = { + "@aws-sdk/md5-js-3.258.0" = { name = "_at_aws-sdk_slash_md5-js"; packageName = "@aws-sdk/md5-js"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.226.0.tgz"; - sha512 = "ENigJRNudqyh6xsch166SZ4gggHd3XzZJ8gkCU4CWPne04HcR3BkWSO774IuWooCHt8zkaEHKecPurRz6qR+Vw=="; + url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.258.0.tgz"; + sha512 = "aLdZ43sEiT68p7YYPHwKsWU1WDC8Wf8UQfb4pzbvhYNgr5VxN46AtbWTKxLAqK2adKS4FnbyX2i66fINg2dHdw=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.226.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.259.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.226.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.226.0.tgz"; - sha512 = "A1Vq5W2X7jgTfjqcKPmjoHohF0poP+9fxwL97fQMvzcwmjhtoCV3bLEpo6CGYx0pKPiSlRJXZkRwRPj2hDHDmA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.259.0.tgz"; + sha512 = "eY4Bf7ZeiYK2c2XQ5IU0TDneEYSnZbaFk+ysgAkNmGoLKBhybXiKy7Dh8djB3uXeNtsZ+fZaazWmsU2kxf6Ntg=="; }; }; - "@aws-sdk/middleware-content-length-3.226.0" = { + "@aws-sdk/middleware-content-length-3.257.0" = { name = "_at_aws-sdk_slash_middleware-content-length"; packageName = "@aws-sdk/middleware-content-length"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.226.0.tgz"; - sha512 = "ksUzlHJN2JMuyavjA46a4sctvnrnITqt2tbGGWWrAuXY1mel2j+VbgnmJUiwHKUO6bTFBBeft5Vd1TSOb4JmiA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.257.0.tgz"; + sha512 = "yiawbV2azm6QnMY1L2ypG8PDRdjOcEIvFmT0T7y0F49rfbKJOu21j1ONAoCkLrINK6kMqcD5JSQLVCoURxiTxQ=="; }; }; - "@aws-sdk/middleware-endpoint-3.226.0" = { + "@aws-sdk/middleware-endpoint-3.257.0" = { name = "_at_aws-sdk_slash_middleware-endpoint"; packageName = "@aws-sdk/middleware-endpoint"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.226.0.tgz"; - sha512 = "EvLFafjtUxTT0AC9p3aBQu1/fjhWdIeK58jIXaNFONfZ3F8QbEYUPuF/SqZvJM6cWfOO9qwYKkRDbCSTYhprIg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.257.0.tgz"; + sha512 = "RQNQe/jeVuWZtXXfcOm+e3qMFICY6ERsXUrbt0rjHgvajZCklcrRJgxJSCwrcS7Le3nl9azFPMAMj9L7uSK28g=="; }; }; - "@aws-sdk/middleware-expect-continue-3.226.0" = { + "@aws-sdk/middleware-expect-continue-3.257.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.226.0.tgz"; - sha512 = "YxvQKTV/eA9P8AgW0hXOgj5Qa+TSnNFfyOkfeP089aP3f6p92b1cESf33TEOKsddive2mHT5LRCN6MuPcgWWrA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.257.0.tgz"; + sha512 = "7HSRA2Ta0fTq9Ewznp6fYG7CYOoqr5TeqEhKL1HyFb5i6YmsCiz88JKNJTllD5O7uFcd7Td/fJ66pK4JttfaaQ=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.226.0" = { + "@aws-sdk/middleware-flexible-checksums-3.259.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.226.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.226.0.tgz"; - sha512 = "8A9Ot9A7794UP5tMGl2MnfTW/UM/jYy1wRWF9YkR/hPIcPb7OmE0hmlwIQGzb/7grxpYw66ETKf0WeH/41YfeQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.259.0.tgz"; + sha512 = "DwY3+cWaONvzJSVYQncfX+ZnoPnLVA7LfgR0mrgcvVZJFrqCr1lJeUmJOmE2/kcOQefPfSbKB/L4BP6vg2EUMQ=="; }; }; - "@aws-sdk/middleware-host-header-3.226.0" = { + "@aws-sdk/middleware-host-header-3.257.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.226.0.tgz"; - sha512 = "haVkWVh6BUPwKgWwkL6sDvTkcZWvJjv8AgC8jiQuSl8GLZdzHTB8Qhi3IsfFta9HAuoLjxheWBE5Z/L0UrfhLA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.257.0.tgz"; + sha512 = "gEi9AJdJfRfU8Qr6HK1hfhxTzyV3Giq4B/h7um99hIFAT/GCg9xiPvAOKPo6UeuiKEv3b7RpSL4s6cBvnJMJBA=="; }; }; - "@aws-sdk/middleware-location-constraint-3.226.0" = { + "@aws-sdk/middleware-location-constraint-3.257.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.226.0.tgz"; - sha512 = "qHiYaBYPc2R37KxG2uqsUUwh4usrQMHfGkrpTUnx5d4rGzM3mC+muPsTpSHnAL63K2/yJOHQJFjss3GGwV4SSA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.257.0.tgz"; + sha512 = "pmm5rJR5aatXG0kC0KPBxkgoNn/ePcyVIYHGMEuJXRJm3ENy569QAH9UZeMFjprp3uuAbkqItQbY3MP8TYvuYA=="; }; }; - "@aws-sdk/middleware-logger-3.226.0" = { + "@aws-sdk/middleware-logger-3.257.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.226.0.tgz"; - sha512 = "m9gtLrrYnpN6yckcQ09rV7ExWOLMuq8mMPF/K3DbL/YL0TuILu9i2T1W+JuxSX+K9FMG2HrLAKivE/kMLr55xA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.257.0.tgz"; + sha512 = "8RDXW/VbMKBsXDfcCLmROZcWKyrekyiPa3J1aIaBy0tq9o4xpGoXw/lwwIrNVvISAFslb57rteup34bfn6ta6w=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.226.0" = { + "@aws-sdk/middleware-recursion-detection-3.257.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.226.0.tgz"; - sha512 = "mwRbdKEUeuNH5TEkyZ5FWxp6bL2UC1WbY+LDv6YjHxmSMKpAoOueEdtU34PqDOLrpXXxIGHDFmjeGeMfktyEcA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.257.0.tgz"; + sha512 = "rUCih6zHh8k9Edf5N5Er4s508FYbwLM0MWTD2axzlj9TjLqEQ9OKED3wHaLffXSDzodd3oTAfJCLPbWQyoZ3ZQ=="; }; }; - "@aws-sdk/middleware-retry-3.235.0" = { + "@aws-sdk/middleware-retry-3.259.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; - version = "3.235.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.235.0.tgz"; - sha512 = "50WHbJGpD3SNp9763MAlHqIhXil++JdQbKejNpHg7HsJne/ao3ub+fDOfx//mMBjpzBV25BGd5UlfL6blrClSg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.259.0.tgz"; + sha512 = "pVh1g8e84MAi7eVtWLiiiCtn82LzxOP7+LxTRHatmgIeN22yGQBZILliPDJypUPvDYlwxI1ekiK+oPTcte0Uww=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.231.0" = { + "@aws-sdk/middleware-sdk-s3-3.257.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.231.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.231.0.tgz"; - sha512 = "UGaSvevd2TanfKgStF46dDSHkh4bxOr1gdUkyHm9i+1pF5lx4KdbnBZv/5SKnn7XifhHRXrs1M3lTzemXREhTA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.257.0.tgz"; + sha512 = "l9KRlUgsDKV1MB3zfttX/syhIBsG5Z3VVslz6EW09eSqZVreCudW3TMdyeLemup57xC2veEpkgVj8igiXd/LVQ=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.226.0" = { + "@aws-sdk/middleware-sdk-sts-3.257.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.226.0.tgz"; - sha512 = "NN9T/qoSD1kZvAT+VLny3NnlqgylYQcsgV3rvi/8lYzw/G/2s8VS6sm/VTWGGZhx08wZRv20MWzYu3bftcyqUg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.257.0.tgz"; + sha512 = "d6IJCLRi3O2tm4AFK60WNhIwmMmspj1WzKR1q1TaoPzoREPG2xg+Am18wZBRkCyYuRPPrbizmkvAmAJiUolMAw=="; }; }; - "@aws-sdk/middleware-serde-3.226.0" = { + "@aws-sdk/middleware-serde-3.257.0" = { name = "_at_aws-sdk_slash_middleware-serde"; packageName = "@aws-sdk/middleware-serde"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.226.0.tgz"; - sha512 = "nPuOOAkSfx9TxzdKFx0X2bDlinOxGrqD7iof926K/AEflxGD1DBdcaDdjlYlPDW2CVE8LV/rAgbYuLxh/E/1VA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.257.0.tgz"; + sha512 = "/JasfXPWFq24mnCrx9fxW/ISBSp07RJwhsF14qzm8Qy3Z0z470C+QRM6otTwAkYuuVt1wuLjja5agq3Jtzq7dQ=="; }; }; - "@aws-sdk/middleware-signing-3.226.0" = { + "@aws-sdk/middleware-signing-3.257.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.226.0.tgz"; - sha512 = "E6HmtPcl+IjYDDzi1xI2HpCbBq2avNWcjvCriMZWuTAtRVpnA6XDDGW5GY85IfS3A8G8vuWqEVPr8JcYUcjfew=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.257.0.tgz"; + sha512 = "hCH3D83LHmm6nqmtNrGTWZCVjsQXrGHIXbd17/qrw7aPFvcAhsiiCncGFP+XsUXEKa2ZqcSNMUyPrx69ofNRZQ=="; }; }; - "@aws-sdk/middleware-ssec-3.226.0" = { + "@aws-sdk/middleware-ssec-3.257.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.226.0.tgz"; - sha512 = "DR97oWoLHiMdaUP/wu99HtzG7/ijvCrjZGDH37WBO1rxFtEti6L7T09wgHzwxMN8gtL8FJA7dU8IrffGSC9VmA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.257.0.tgz"; + sha512 = "YcZrKeZk/0bsFvnTqp2rcF+6BSmeLTA65ZtyNNP2hh7Imaxg3kAQcueOJBeK4YP/5nU7a1mtt/4Q8BqbIjc41g=="; }; }; - "@aws-sdk/middleware-stack-3.226.0" = { + "@aws-sdk/middleware-stack-3.257.0" = { name = "_at_aws-sdk_slash_middleware-stack"; packageName = "@aws-sdk/middleware-stack"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.226.0.tgz"; - sha512 = "85wF29LvPvpoed60fZGDYLwv1Zpd/cM0C22WSSFPw1SSJeqO4gtFYyCg2squfT3KI6kF43IIkOCJ+L7GtryPug=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.257.0.tgz"; + sha512 = "awg2F0SvwACBaw4HIObK8pQGfSqAc4Vy+YFzWSfZNVC35oRO6RsRdKHVU99lRC0LrT2Ptmfghl2DMPSrRDbvlQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.226.0" = { + "@aws-sdk/middleware-user-agent-3.257.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.226.0.tgz"; - sha512 = "N1WnfzCW1Y5yWhVAphf8OPGTe8Df3vmV7/LdsoQfmpkCZgLZeK2o0xITkUQhRj1mbw7yp8tVFLFV3R2lMurdAQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.257.0.tgz"; + sha512 = "37rt75LZyD0UWpbcFuxEGqwF3DZKSixQPl7AsDe6q3KtrO5gGQB+diH5vbY0txNNYyv5IK9WMwvY73mVmoWRmw=="; }; }; - "@aws-sdk/node-config-provider-3.226.0" = { + "@aws-sdk/node-config-provider-3.259.0" = { name = "_at_aws-sdk_slash_node-config-provider"; packageName = "@aws-sdk/node-config-provider"; - version = "3.226.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.226.0.tgz"; - sha512 = "B8lQDqiRk7X5izFEUMXmi8CZLOKCTWQJU9HQf3ako+sF0gexo4nHN3jhoRWyLtcgC5S3on/2jxpAcqtm7kuY3w=="; + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.259.0.tgz"; + sha512 = "DUOqr71oonBvM6yKPdhDBmraqgXHCFrVWFw7hc5ZNxL2wS/EsbKfGPJp+C+SUgpn1upIWPNnh/bNoLAbBkcLsA=="; }; }; - "@aws-sdk/node-http-handler-3.226.0" = { + "@aws-sdk/node-http-handler-3.257.0" = { name = "_at_aws-sdk_slash_node-http-handler"; packageName = "@aws-sdk/node-http-handler"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.226.0.tgz"; - sha512 = "xQCddnZNMiPmjr3W7HYM+f5ir4VfxgJh37eqZwX6EZmyItFpNNeVzKUgA920ka1VPz/ZUYB+2OFGiX3LCLkkaA=="; + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.257.0.tgz"; + sha512 = "8KnWHVVwaGKyTlkTU9BSOAiSovNDoagxemU2l10QqBbzUCVpljCUMUkABEGRJ1yoQCl6DJ7RtNkAyZ8Ne/E15A=="; }; }; - "@aws-sdk/property-provider-3.226.0" = { + "@aws-sdk/property-provider-3.257.0" = { name = "_at_aws-sdk_slash_property-provider"; packageName = "@aws-sdk/property-provider"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.226.0.tgz"; - sha512 = "TsljjG+Sg0LmdgfiAlWohluWKnxB/k8xenjeozZfzOr5bHmNHtdbWv6BtNvD/R83hw7SFXxbJHlD5H4u9p2NFg=="; + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.257.0.tgz"; + sha512 = "3rUbRAcF0GZ5PhDiXhS4yREfZ5hOEtvYEa9S/19OdM5eoypOaLU5XnFcCKfnccSP8SkdgpJujzxOMRWNWadlAQ=="; }; }; - "@aws-sdk/protocol-http-3.226.0" = { + "@aws-sdk/protocol-http-3.257.0" = { name = "_at_aws-sdk_slash_protocol-http"; packageName = "@aws-sdk/protocol-http"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.226.0.tgz"; - sha512 = "zWkVqiTA9RXL6y0hhfZc9bcU4DX2NI6Hw9IhQmSPeM59mdbPjJlY4bLlMr5YxywqO3yQ/ylNoAfrEzrDjlOSRg=="; + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.257.0.tgz"; + sha512 = "xt7LGOgZIvbLS3418AYQLacOqx+mo5j4mPiIMz7f6AaUg+/fBUgESVsncKDqxbEJVwwCXSka8Ca0cntJmoeMSw=="; }; }; - "@aws-sdk/querystring-builder-3.226.0" = { + "@aws-sdk/querystring-builder-3.257.0" = { name = "_at_aws-sdk_slash_querystring-builder"; packageName = "@aws-sdk/querystring-builder"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.226.0.tgz"; - sha512 = "LVurypuNeotO4lmirKXRC4NYrZRAyMJXuwO0f2a5ZAUJCjauwYrifKue6yCfU7bls7gut7nfcR6B99WBYpHs3g=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.257.0.tgz"; + sha512 = "mZHWLP7XIkzx1GIXO5WfX/iJ+aY9TWs02RE9FkdL2+by0HEMR65L3brQTbU1mIBJ7BjaPwYH24dljUOSABX7yg=="; }; }; - "@aws-sdk/querystring-parser-3.226.0" = { + "@aws-sdk/querystring-parser-3.257.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.226.0.tgz"; - sha512 = "FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.257.0.tgz"; + sha512 = "UDrE1dEwWrWT8dG2VCrGYrPxCWOkZ1fPTPkjpkR4KZEdQDZBqU5gYZF2xPj8Nz7pjQVHFuW2wFm3XYEk56GEjg=="; }; }; - "@aws-sdk/s3-request-presigner-3.252.0" = { + "@aws-sdk/s3-request-presigner-3.259.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.252.0.tgz"; - sha512 = "9V94Fi30Yz5pYPd3aDlbzRYMCUfe7C5D5srMeygZ/XPFsvKC+B16xGKYc2fXb74V+gm68W+6pUVCshOT/AThzA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.259.0.tgz"; + sha512 = "1qoVZk/HEnnfsbcsbBa5Y/P34T2wI209+VyEtPQzzmZbBJvOONKWySk2sAS+AJO2ZjZZur/sUS61wteuklDZEA=="; }; }; - "@aws-sdk/service-error-classification-3.229.0" = { + "@aws-sdk/service-error-classification-3.257.0" = { name = "_at_aws-sdk_slash_service-error-classification"; packageName = "@aws-sdk/service-error-classification"; - version = "3.229.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.229.0.tgz"; - sha512 = "dnzWWQ0/NoWMUZ5C0DW3dPm0wC1O76Y/SpKbuJzWPkx1EYy6r8p32Ly4D9vUzrKDbRGf48YHIF2kOkBmu21CLg=="; + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.257.0.tgz"; + sha512 = "FAyR0XsueGkkqDtkP03cTJQk52NdQ9sZelLynmmlGPUP75LApRPvFe1riKrou6+LsDbwVNVffj6mbDfIcOhaOw=="; }; }; - "@aws-sdk/shared-ini-file-loader-3.226.0" = { + "@aws-sdk/shared-ini-file-loader-3.257.0" = { name = "_at_aws-sdk_slash_shared-ini-file-loader"; packageName = "@aws-sdk/shared-ini-file-loader"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.226.0.tgz"; - sha512 = "661VQefsARxVyyV2FX9V61V+nNgImk7aN2hYlFKla6BCwZfMng+dEtD0xVGyg1PfRw0qvEv5LQyxMVgHcUSevA=="; + url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.257.0.tgz"; + sha512 = "HNjC1+Wx3xHiJc+CP14GhIdVhfQGSjroAsWseRxAhONocA9Fl1ZX4hx7+sA5c9nOoMVOovi6ivJ/6lCRPTDRrQ=="; }; }; - "@aws-sdk/signature-v4-3.226.0" = { + "@aws-sdk/signature-v4-3.257.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.226.0.tgz"; - sha512 = "/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.257.0.tgz"; + sha512 = "aLQQN59X/D0+ShzPD3Anj5ntdMA/RFeNLOUCDyDvremViGi6yxUS98usQ/8bG5Rq0sW2GGMdbFUFmrDvqdiqEQ=="; }; }; - "@aws-sdk/signature-v4-crt-3.226.0" = { + "@aws-sdk/signature-v4-crt-3.257.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.226.0.tgz"; - sha512 = "zaosVAgCnPzIv2qXPi1PGa9RrD3DZ7zfKg/ZGCsYhvFku8+zMK/Ky29+2lS+QB1OzGBW8+ddSuZxJcg0xQi36g=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.257.0.tgz"; + sha512 = "FHM/QulXKxCpAVmAgGduHLps6HAQHZvhY7nnWY+G2Q1S6+d8ijZeaG0fAl7bpZW6FrBbijkWEZV+F7p+V/AHqQ=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.226.0" = { + "@aws-sdk/signature-v4-multi-region-3.257.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.226.0.tgz"; - sha512 = "QHxNuf9ynK208v7Y3imdsa3Cz8ynYV7ZOf3sBJdItuEtHN6uy/KxaOrtvpF8I5Hyn48Hc8z5miTSMujFKT7GEw=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.257.0.tgz"; + sha512 = "4ZyJp6my6F6R8jG+zlIR+Sw3W2vZcBTcpzAnSAHI0UBWjx5/buiKU5QY7oj29H3pESDD7DovZinD7TtHvMNoZw=="; }; }; - "@aws-sdk/smithy-client-3.234.0" = { + "@aws-sdk/smithy-client-3.257.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.234.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.234.0.tgz"; - sha512 = "8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.257.0.tgz"; + sha512 = "Vy/en+llpslHG6WZ2yuN+On6u7p2hROEURwAST/lpReAwBETjbsxylkWvP8maeGKQ54u9uC6lIZAOJut2I3INw=="; }; }; - "@aws-sdk/token-providers-3.252.0" = { + "@aws-sdk/token-providers-3.259.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.252.0.tgz"; - sha512 = "xi3pUP31tyKF4lJFCOgtkwSWESE9W1vE23Vybsq53wzXEYfnRql8RP+C9FFkUouAR6ixPHEcEYplB+l92CY49g=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.259.0.tgz"; + sha512 = "61lbk+vjlHBtNK7ZOTdR0rgk9dQ6++tklHpXZY3AQWAl3xx6K4y00HsyAtcP6k24s8B356QwXlrQJrQY5nnkQQ=="; }; }; - "@aws-sdk/types-3.226.0" = { + "@aws-sdk/types-3.257.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.226.0.tgz"; - sha512 = "MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.257.0.tgz"; + sha512 = "LmqXuBQBGeaGi/3Rp7XiEX1B5IPO2UUfBVvu0wwGqVsmstT0SbOVDZGPmxygACbm64n+PRx3uTSDefRfoiWYZg=="; }; }; - "@aws-sdk/url-parser-3.226.0" = { + "@aws-sdk/url-parser-3.257.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.226.0.tgz"; - sha512 = "p5RLE0QWyP0OcTOLmFcLdVgUcUEzmEfmdrnOxyNzomcYb0p3vUagA5zfa1HVK2azsQJFBv28GfvMnba9bGhObg=="; + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.257.0.tgz"; + sha512 = "Qe/AcFe/NFZHa6cN2afXEQn9ehXxh57dWGdRjfjd2lQqNV4WW1R2pl2Tm1ZJ1dwuCNLJi4NHLMk8lrD3QQ8rdg=="; }; }; "@aws-sdk/util-arn-parser-3.208.0" = { @@ -1228,49 +1228,49 @@ let sha512 = "DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg=="; }; }; - "@aws-sdk/util-create-request-3.234.0" = { + "@aws-sdk/util-create-request-3.257.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.234.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.234.0.tgz"; - sha512 = "rKaM2q1jRru724crQx36V6cy07f8yO6KGrsAbRdXzuS2n1c6/w56vwyAw7ArUqjPeIc8pgDxZ0K99Te/RinzdQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.257.0.tgz"; + sha512 = "2s1/LuNtauhwULdYTDMlLCKKmaYZTO8AcAVGOU5n8rCe9eQYWV77xITcf0iB7ilKq/nXBstIpYsbuldq4AIqXQ=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.234.0" = { + "@aws-sdk/util-defaults-mode-browser-3.257.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.234.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.234.0.tgz"; - sha512 = "IHMKXjTbOD8XMz5+2oCOsVP94BYb9YyjXdns0aAXr2NAo7k2+RCzXQ2DebJXppGda1F6opFutoKwyVSN0cmbMw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.257.0.tgz"; + sha512 = "nkfK+MNacVd3Px/fcAvU0hDeh+r7d+RLLt3sJ5Zc0gGd+i3OQEP58V8QzR9PYMvUvSvGQP16fQVQHSbRZtuWyQ=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.234.0" = { + "@aws-sdk/util-defaults-mode-node-3.259.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.234.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.234.0.tgz"; - sha512 = "UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.259.0.tgz"; + sha512 = "wRiiwT7ayIcTYGHUg/Ho9UN/Kd4V37OAxP2IbkG9rPZJNuvtKopQJhUSMDERXaMQ47dG5US8G4YVYJIEO4cKgw=="; }; }; - "@aws-sdk/util-endpoints-3.245.0" = { + "@aws-sdk/util-endpoints-3.257.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.245.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.245.0.tgz"; - sha512 = "UNOFquB1tKx+8RT8n82Zb5tIwDyZHVPBg/m0LB0RsLETjr6krien5ASpqWezsXKIR1hftN9uaxN4bvf2dZrWHg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.257.0.tgz"; + sha512 = "3bvmRn5XGYzPPWjLuvHBKdJOb+fijnb8Ungu9bfXnTYFsng/ndHUWeHC22O/p8w3OWoRYUIMaZHxdxe27BFozg=="; }; }; - "@aws-sdk/util-format-url-3.226.0" = { + "@aws-sdk/util-format-url-3.257.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.226.0.tgz"; - sha512 = "IhuA8iuJL1urWqZZmVzW79mHnwFEEP6rMsSKgAfMmuzowhtgk9p/sT2OVPkXk0LeZL2Ghsnw1W2JfPIs8x1qVg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.257.0.tgz"; + sha512 = "Q/c1BLoEZLvnjagAE0nQryhQlFoC/a8ZrXJn4XljWPeFcFAVLpCoSzcTbQM1N4oQvDIgMvl5gBeGzp0BiW30QA=="; }; }; "@aws-sdk/util-hex-encoding-3.201.0" = { @@ -1291,40 +1291,40 @@ let sha512 = "iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg=="; }; }; - "@aws-sdk/util-middleware-3.226.0" = { + "@aws-sdk/util-middleware-3.257.0" = { name = "_at_aws-sdk_slash_util-middleware"; packageName = "@aws-sdk/util-middleware"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.226.0.tgz"; - sha512 = "B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.257.0.tgz"; + sha512 = "F9ieon8B8eGVs5tyZtAIG3DZEObDvujkspho0qRbUTHUosM0ylJLsMU800fmC/uRHLRrZvb/RSp59+kNDwSAMw=="; }; }; - "@aws-sdk/util-retry-3.229.0" = { + "@aws-sdk/util-retry-3.257.0" = { name = "_at_aws-sdk_slash_util-retry"; packageName = "@aws-sdk/util-retry"; - version = "3.229.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.229.0.tgz"; - sha512 = "0zKTqi0P1inD0LzIMuXRIYYQ/8c1lWMg/cfiqUcIAF1TpatlpZuN7umU0ierpBFud7S+zDgg0oemh+Nj8xliJw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.257.0.tgz"; + sha512 = "l9TOsOAYtZxwW3q5fQKW4rsD9t2HVaBfQ4zBamHkNTfB4vBVvCnz4oxkvSvA2MlxCA6am+K1K/oj917Tpqk53g=="; }; }; - "@aws-sdk/util-stream-browser-3.226.0" = { + "@aws-sdk/util-stream-browser-3.258.0" = { name = "_at_aws-sdk_slash_util-stream-browser"; packageName = "@aws-sdk/util-stream-browser"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.226.0.tgz"; - sha512 = "ZvjlA1ySaLd0DqUWTKmL7LsxfPhroAONpzsinaHmw9aZVL40s2cADU9eWgBdHTuAOeFklL7NP0cc6UiTFHKe8g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.258.0.tgz"; + sha512 = "MCAxHL3Hz/+eU4LZk0ZbLWAIUueH/jHpSbrloxZ3Dil2RL3w6NSJd5gE8zS7gs1B/eMcE600Brf5xSDR8kA5HA=="; }; }; - "@aws-sdk/util-stream-node-3.226.0" = { + "@aws-sdk/util-stream-node-3.257.0" = { name = "_at_aws-sdk_slash_util-stream-node"; packageName = "@aws-sdk/util-stream-node"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.226.0.tgz"; - sha512 = "HADXiIgDGoXcCLSKuPnjCLENf0iC0lzqqnymZu9H2FoACZhJB7DvJ9LnP51Pvw9lfCu+yvLzbMqSPdbXtMbRWg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.257.0.tgz"; + sha512 = "UlLEerQCNejNulYmGXm/4X463n8n21foA2d6kgJ4AUSMWWhoRBjfwrM4gI7tA30zh9U81d6xbUtoOQTqKVtMTw=="; }; }; "@aws-sdk/util-uri-escape-3.201.0" = { @@ -1336,49 +1336,49 @@ let sha512 = "TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA=="; }; }; - "@aws-sdk/util-user-agent-browser-3.226.0" = { + "@aws-sdk/util-user-agent-browser-3.257.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.226.0.tgz"; - sha512 = "PhBIu2h6sPJPcv2I7ELfFizdl5pNiL4LfxrasMCYXQkJvVnoXztHA1x+CQbXIdtZOIlpjC+6BjDcE0uhnpvfcA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.257.0.tgz"; + sha512 = "YdavWK6/8Cw6mypEgysGGX/dT9p9qnzFbnN5PQsUY+JJk2Nx8fKFydjGiQ+6rWPeW17RAv9mmbboh9uPVWxVlw=="; }; }; - "@aws-sdk/util-user-agent-node-3.226.0" = { + "@aws-sdk/util-user-agent-node-3.259.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.226.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.226.0.tgz"; - sha512 = "othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.259.0.tgz"; + sha512 = "R0VTmNs+ySDDebU98BUbsLyeIM5YmAEr9esPpy15XfSy3AWmAeru8nLlztdaLilHZzLIDzvM2t7NGk/FzZFCvA=="; }; }; - "@aws-sdk/util-utf8-browser-3.188.0" = { + "@aws-sdk/util-utf8-3.254.0" = { + name = "_at_aws-sdk_slash_util-utf8"; + packageName = "@aws-sdk/util-utf8"; + version = "3.254.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.254.0.tgz"; + sha512 = "14Kso/eIt5/qfIBmhEL9L1IfyUqswjSTqO2mY7KOzUZ9SZbwn3rpxmtkhmATkRjD7XIlLKaxBkI7tU9Zjzj8Kw=="; + }; + }; + "@aws-sdk/util-utf8-browser-3.259.0" = { name = "_at_aws-sdk_slash_util-utf8-browser"; packageName = "@aws-sdk/util-utf8-browser"; - version = "3.188.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz"; - sha512 = "jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz"; + sha512 = "UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw=="; }; }; - "@aws-sdk/util-utf8-node-3.208.0" = { - name = "_at_aws-sdk_slash_util-utf8-node"; - packageName = "@aws-sdk/util-utf8-node"; - version = "3.208.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.208.0.tgz"; - sha512 = "jKY87Acv0yWBdFxx6bveagy5FYjz+dtV8IPT7ay1E2WPWH1czoIdMAkc8tSInK31T6CRnHWkLZ1qYwCbgRfERQ=="; - }; - }; - "@aws-sdk/util-waiter-3.226.0" = { + "@aws-sdk/util-waiter-3.257.0" = { name = "_at_aws-sdk_slash_util-waiter"; packageName = "@aws-sdk/util-waiter"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.226.0.tgz"; - sha512 = "qYQMRxnu5k8qQihJXoIWMkBOj0+XkHHj/drLdbRnwL6ni6NcG8++cs9M3DSjIcxmxgF/7SLpDjn1H3sC7cYo4g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.257.0.tgz"; + sha512 = "Fr6of3EDOcXVDs5534o7VsJMXdybB0uLy2LzeFAVSwGOY3geKhIquBAiUDqCVu9B+iTldrC0rQ9NIM7ZSpPG8w=="; }; }; "@aws-sdk/xml-builder-3.201.0" = { @@ -1552,13 +1552,13 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-common-9.1.0" = { + "@azure/msal-common-9.1.1" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.0.tgz"; - sha512 = "Ai7SUJPkHOVUNAjepKp753ZXI8Haw5snTNIu+Vi6fdNPAH1KCuxSyWeBZT6hLDJSgfmYf/kazZqz7Q0BjyAGTA=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.1.tgz"; + sha512 = "we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw=="; }; }; "@azure/msal-node-1.14.6" = { @@ -1615,13 +1615,13 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.20.10" = { + "@babel/compat-data-7.20.14" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.20.10"; + version = "7.20.14"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz"; - sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz"; + sha512 = "0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw=="; }; }; "@babel/core-7.0.0" = { @@ -1642,15 +1642,6 @@ let sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; }; }; - "@babel/core-7.9.0" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz"; - sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; - }; - }; "@babel/generator-7.18.2" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -1660,13 +1651,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.20.7" = { + "@babel/generator-7.20.14" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.20.7"; + version = "7.20.14"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz"; - sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz"; + sha512 = "AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -1885,13 +1876,13 @@ let sha512 = "bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q=="; }; }; - "@babel/helpers-7.20.7" = { + "@babel/helpers-7.20.13" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz"; - sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz"; + sha512 = "nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg=="; }; }; "@babel/highlight-7.18.6" = { @@ -1930,13 +1921,13 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.20.7" = { + "@babel/parser-7.20.13" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; - sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz"; + sha512 = "gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -1993,13 +1984,13 @@ let sha512 = "AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ=="; }; }; - "@babel/plugin-proposal-decorators-7.20.7" = { + "@babel/plugin-proposal-decorators-7.20.13" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.7.tgz"; - sha512 = "JB45hbUweYpwAGjkiM7uCyXMENH2lG+9r3G2E+ttc2PRXAoEkpfd/KW5jDg4j8RS6tLtTG1jZi9LbHZVSfs1/A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.13.tgz"; + sha512 = "7T6BKHa9Cpd7lCueHBBzP0nkXNina+h5giOZw+a8ZpMfPFY19VjJAjIxyFHuWkhCWgL6QMqRiY/wB1fLXzm6Mw=="; }; }; "@babel/plugin-proposal-dynamic-import-7.18.6" = { @@ -2344,13 +2335,13 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.20.11" = { + "@babel/plugin-transform-block-scoping-7.20.14" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.20.11"; + version = "7.20.14"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.11.tgz"; - sha512 = "tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.14.tgz"; + sha512 = "sMPepQtsOs5fM1bwNvuJJHvaCfOEQfmc01FGw0ELlTpTJj5Ql/zuNRRldYhAPys4ghXdBIQJbRVYi44/7QflQQ=="; }; }; "@babel/plugin-transform-classes-7.20.7" = { @@ -2542,13 +2533,13 @@ let sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA=="; }; }; - "@babel/plugin-transform-react-jsx-7.20.7" = { + "@babel/plugin-transform-react-jsx-7.20.13" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz"; - sha512 = "Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz"; + sha512 = "MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw=="; }; }; "@babel/plugin-transform-react-jsx-development-7.18.6" = { @@ -2668,13 +2659,13 @@ let sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-typescript-7.20.7" = { + "@babel/plugin-transform-typescript-7.20.13" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz"; - sha512 = "m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.13.tgz"; + sha512 = "O7I/THxarGcDZxkgWKMUrk7NK1/WbHAg3Xx86gqS6x9MTrNL6AwIluuZ96ms4xeDe6AVx6rjHbWHP7x26EPQBA=="; }; }; "@babel/plugin-transform-unicode-escapes-7.18.10" = { @@ -2794,22 +2785,22 @@ let sha512 = "7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA=="; }; }; - "@babel/runtime-7.20.1" = { + "@babel/runtime-7.12.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.1"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz"; - sha512 = "mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"; + sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; }; }; - "@babel/runtime-7.20.7" = { + "@babel/runtime-7.20.13" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz"; - sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"; + sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA=="; }; }; "@babel/runtime-7.9.0" = { @@ -2830,15 +2821,6 @@ let sha512 = "Yww0jXgolNtkhcK+Txo5JN+DjBpNmmAtD7G99HOebhEjBzjnACG09Tip9C8lSOF6PrhA56OeJWeOZduNJaKxBA=="; }; }; - "@babel/runtime-corejs3-7.20.7" = { - name = "_at_babel_slash_runtime-corejs3"; - packageName = "@babel/runtime-corejs3"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.7.tgz"; - sha512 = "jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg=="; - }; - }; "@babel/template-7.0.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; @@ -2857,13 +2839,13 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.20.12" = { + "@babel/traverse-7.20.13" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.20.12"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz"; - sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz"; + sha512 = "kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ=="; }; }; "@babel/types-7.18.4" = { @@ -2911,40 +2893,40 @@ let sha512 = "Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg=="; }; }; - "@cdktf/cli-core-0.15.0" = { + "@cdktf/cli-core-0.15.2" = { name = "_at_cdktf_slash_cli-core"; packageName = "@cdktf/cli-core"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.15.0.tgz"; - sha512 = "1N1N66dMl1kfAXcxTgKgePO9RfhB/p5T4dCAhfMCzLe+R0rOO1xfYQcIEXWqoORwRiIE2EyW9O9OSkxLx0DuyQ=="; + url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.15.2.tgz"; + sha512 = "uiOqLik/s6LETazIOkHhwReSiBlw7sPYWGaJ/VU1btmbaVbVBpHKrLY/Nr7Vf8kRN80WsboBDAgaX4RQYpYu3Q=="; }; }; - "@cdktf/commons-0.15.0" = { + "@cdktf/commons-0.15.2" = { name = "_at_cdktf_slash_commons"; packageName = "@cdktf/commons"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.15.0.tgz"; - sha512 = "c3NB2X4OsUGUicpUMJSV9MGnmU+/nYNs0n7G98c/N7nctxWpm1oPoXkoSC8GsDbc3n44cuokBDgW2JiscB/YRA=="; + url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.15.2.tgz"; + sha512 = "4uVx5L+FJV+G5zoC545MmFSPohUWy/x3Iq9UGW/kf4U7xkVE9oYHeupEc7TSLXp54vPcze+VCuYvgLWtO5Lzpg=="; }; }; - "@cdktf/hcl2cdk-0.15.0" = { + "@cdktf/hcl2cdk-0.15.2" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.15.0.tgz"; - sha512 = "X88IejdGoYpB7DkAf09v8YLMQiYu1VTKWVvggiGkS0q7DgFb79Q/S9aFfC5RfPrMNhZSV01Jrt/pDCQdcFJQ1A=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.15.2.tgz"; + sha512 = "LF++X2n4XOuLR2boBNzv/ihRt9ZySO3feYndRdusLtgOC3HppbTKjwlS7+2xHyH2/DYZYKMWps2gtAsqhYa4IA=="; }; }; - "@cdktf/hcl2json-0.15.0" = { + "@cdktf/hcl2json-0.15.2" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.15.0.tgz"; - sha512 = "pVYjTosthO0Mro/VD5x4iUM6TcVk0hdeNzk8uaaxk49/XnJB4DiwHbvIdjKJk4BuY2YuW+bCsz6X2QjKJmz2jA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.15.2.tgz"; + sha512 = "f98sMnJEFmo2bSrMbkNGtg8gfE9sP6wBLu5G5u7qLkR747wtF0eA7mYc2751XMyeGDwAP1IwetlG5zOpENuW0g=="; }; }; "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" = { @@ -2956,13 +2938,13 @@ let sha512 = "5ysQrHJvqYLYg407KvaDNu+xx68ZGaqeF0SohXe5e4yNqJhPFPUQ536rkReQcPc2yZiF5PDmmvf5T9MOacHpSQ=="; }; }; - "@cdktf/provider-generator-0.15.0" = { + "@cdktf/provider-generator-0.15.2" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.15.0.tgz"; - sha512 = "YY2ANbC9xuhq1yXc6dhVPvMCCKMjcXNRBUP6BqvlE2smD0RWx1s0uWKAG5Tw4D4kx4Nb6EXYpvFHRIEnjVJ4wA=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.15.2.tgz"; + sha512 = "153jtaorRZsdWy3Wt56rOlTi7SoNXNWo3hl4By4v585T1WDFMa/NIsT8qBibLrJmiwmnHyh4r5KRjrn1KQpi1Q=="; }; }; "@chemzqm/msgpack-lite-0.1.29" = { @@ -3820,13 +3802,13 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-3.1.0" = { + "@cspell/dict-software-terms-3.1.1" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.0.tgz"; - sha512 = "KQVpHmuGJprkriClbwTf1TfCjkCkS+GqLBO8ytltmYylCHZumJMfA3sM10e3zmsVIlungrtNLG9xz5opIdm/2A=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.1.tgz"; + sha512 = "11vzKnocWDEUnwh03ea5Pr0vfMkGgUvDsAAjNQmnXVzDMYIjPVbttrRy54pEfBv0/RxtDFR0lDKFUAcdyjPX2w=="; }; }; "@cspell/dict-sql-2.0.1" = { @@ -3919,13 +3901,13 @@ let sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; }; }; - "@csstools/selector-specificity-2.0.2" = { + "@csstools/selector-specificity-2.1.1" = { name = "_at_csstools_slash_selector-specificity"; packageName = "@csstools/selector-specificity"; - version = "2.0.2"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz"; - sha512 = "IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg=="; + url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz"; + sha512 = "jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw=="; }; }; "@cycle/dom-18.3.0" = { @@ -4324,6 +4306,96 @@ let sha512 = "5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw=="; }; }; + "@esbuild/android-arm-0.16.17" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz"; + sha512 = "N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw=="; + }; + }; + "@esbuild/android-arm64-0.16.17" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz"; + sha512 = "MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg=="; + }; + }; + "@esbuild/android-x64-0.16.17" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz"; + sha512 = "a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ=="; + }; + }; + "@esbuild/darwin-arm64-0.16.17" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz"; + sha512 = "/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w=="; + }; + }; + "@esbuild/darwin-x64-0.16.17" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz"; + sha512 = "2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg=="; + }; + }; + "@esbuild/freebsd-arm64-0.16.17" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz"; + sha512 = "mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw=="; + }; + }; + "@esbuild/freebsd-x64-0.16.17" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz"; + sha512 = "8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug=="; + }; + }; + "@esbuild/linux-arm-0.16.17" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz"; + sha512 = "iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ=="; + }; + }; + "@esbuild/linux-arm64-0.16.17" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz"; + sha512 = "7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g=="; + }; + }; + "@esbuild/linux-ia32-0.16.17" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz"; + sha512 = "kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg=="; + }; + }; "@esbuild/linux-loong64-0.15.18" = { name = "_at_esbuild_slash_linux-loong64"; packageName = "@esbuild/linux-loong64"; @@ -4333,6 +4405,114 @@ let sha512 = "L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ=="; }; }; + "@esbuild/linux-loong64-0.16.17" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz"; + sha512 = "dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ=="; + }; + }; + "@esbuild/linux-mips64el-0.16.17" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz"; + sha512 = "ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw=="; + }; + }; + "@esbuild/linux-ppc64-0.16.17" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz"; + sha512 = "dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g=="; + }; + }; + "@esbuild/linux-riscv64-0.16.17" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz"; + sha512 = "ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw=="; + }; + }; + "@esbuild/linux-s390x-0.16.17" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz"; + sha512 = "gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w=="; + }; + }; + "@esbuild/linux-x64-0.16.17" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz"; + sha512 = "mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw=="; + }; + }; + "@esbuild/netbsd-x64-0.16.17" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz"; + sha512 = "/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA=="; + }; + }; + "@esbuild/openbsd-x64-0.16.17" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz"; + sha512 = "2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg=="; + }; + }; + "@esbuild/sunos-x64-0.16.17" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz"; + sha512 = "xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw=="; + }; + }; + "@esbuild/win32-arm64-0.16.17" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz"; + sha512 = "ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw=="; + }; + }; + "@esbuild/win32-ia32-0.16.17" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz"; + sha512 = "WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig=="; + }; + }; + "@esbuild/win32-x64-0.16.17" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz"; + sha512 = "y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q=="; + }; + }; "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -4531,6 +4711,15 @@ let sha512 = "BNhXkY1bblxKZpltzAx98G2Egj9g1Q+JRcvR7E99DOj862FTCX+ZPsAUtPTr7aHxwtrL7+fL3r0JSmM9kBm+Bw=="; }; }; + "@expo/config-6.0.20" = { + name = "_at_expo_slash_config"; + packageName = "@expo/config"; + version = "6.0.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config/-/config-6.0.20.tgz"; + sha512 = "m2T1/hB4TyLkQElOUwOajn/7gBcPaGyfVwoVsuJMEh0yrNvNFtXP+nl87Cm53g5q+VyfwJUgbewPQ3j/UXkI6Q=="; + }; + }; "@expo/config-6.0.24" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; @@ -4549,6 +4738,15 @@ let sha512 = "joVtB5o+NF40Tmsdp65UzryRtbnCuMbXkVO4wJnNJO4aaK0EYLdHCYSewORVqNcDfGN0LphQr8VTG2npbd9CJA=="; }; }; + "@expo/config-plugins-4.1.1" = { + name = "_at_expo_slash_config-plugins"; + packageName = "@expo/config-plugins"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.1.1.tgz"; + sha512 = "lo3tVxRhwM9jfxPHJcURsH5WvU26kX12h5EB3C7kjVhgdQPLkvT8Jk8Cx0KSL8MXKcry2xQvZ2uuwWLkMeplJw=="; + }; + }; "@expo/config-plugins-4.1.5" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; @@ -4567,6 +4765,15 @@ let sha512 = "vzUcVpqOMs3h+hyRdhGwk+eGIOhXa5xYdd92yO17RMNHav3v/+ekMbs7XA2c3lepMO8Yd4/5hqmRw9ZTL6jGzg=="; }; }; + "@expo/config-types-44.0.0" = { + name = "_at_expo_slash_config-types"; + packageName = "@expo/config-types"; + version = "44.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config-types/-/config-types-44.0.0.tgz"; + sha512 = "d+gpdKOAhqaD5RmcMzGgKzNtvE1w+GCqpFQNSXLliYlXjj+Tv0eL8EPeAdPtvke0vowpPFwd5McXLA90dgY6Jg=="; + }; + }; "@expo/config-types-45.0.0" = { name = "_at_expo_slash_config-types"; packageName = "@expo/config-types"; @@ -4657,6 +4864,15 @@ let sha512 = "nhUVvW0TrRE4jtWzHQl8TR4ox7kcmrc2I0itaeJGjxF5A54uk7avgA0wRt7jP1rdvqQo1Ke1lXyLYREdhN9tPw=="; }; }; + "@expo/json-file-8.2.35" = { + name = "_at_expo_slash_json-file"; + packageName = "@expo/json-file"; + version = "8.2.35"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.35.tgz"; + sha512 = "cQFLGSNRRFbN9EIhVDpMCYuzXbrHUOmKEqitBR+nrU6surjKGsOsN9Ubyn/L/LAGlFvT293E4XY5zsOtJyiPZQ=="; + }; + }; "@expo/json-file-8.2.36" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; @@ -4864,13 +5080,13 @@ let sha512 = "TI+l71+5aSKnShYclFa14Kum+hQMZ86b95SH6tQUG3qZEmLTarvWpKwqtTwQKqvlJSJrpFiSFu3eCuZokY6zWA=="; }; }; - "@expo/webpack-config-0.17.4" = { + "@expo/webpack-config-18.0.1" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.17.4"; + version = "18.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.17.4.tgz"; - sha512 = "vn37RDhYowfLc2oRaXhmbI/9FStjQFXPONG3yRLfwUnA4dRtfXapJUSKHJKRwOy4fBBmTrb2tthtsdb4zeWmsw=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-18.0.1.tgz"; + sha512 = "0C+wjmmQ0usySdhtzeRp0yYuf9zkUZ/kNgA6AHQ9N7eG4JIr0DM1c87g119smxcJTbd8N+//mv5znPxSJqBqmg=="; }; }; "@expo/xcpretty-4.2.2" = { @@ -5008,22 +5224,22 @@ let sha512 = "X4fN5zbvAETw9LE8bw9x5otKcpS3A3cB9wn/BookbTD4hkBESx06SzmX/WdabFq7qqbDqbURiQMpmdGUUlLsqw=="; }; }; - "@fluentui/font-icons-mdl2-8.5.6" = { + "@fluentui/font-icons-mdl2-8.5.7" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.5.6"; + version = "8.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.6.tgz"; - sha512 = "6yGZcc/fIeT/HDPjnn003TNuC/EUoiZTiyZQyPSSQl5PeOzkmNOqG8nq/l8s+qXHs4uZC/FH081vxPxSwA2qWA=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.7.tgz"; + sha512 = "IAZ4nLWW6JDzGsCAymLS7ncaxWpQDY48K8650IfIlcsdhxv027joQEgd+HiIIImgusMl+OS9nAQE04a68mE6Zw=="; }; }; - "@fluentui/foundation-legacy-8.2.26" = { + "@fluentui/foundation-legacy-8.2.27" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.2.26"; + version = "8.2.27"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.26.tgz"; - sha512 = "7XKz23HB7IeIIXORS1os2fIakYTLTTGFcs+mnK5f/b4xFJAOxxdte6i10f2WsPPFiTjW1kLOzICsRsfwuHAVRw=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.27.tgz"; + sha512 = "KIK7N6thJ9EzwQBLysavdsJHt6mnsA1O2ZHLI9d4yDQlx17EVa0aXrdsSNgqfa1czya3OmBDVQMFR2gqy38voQ=="; }; }; "@fluentui/keyboard-key-0.4.4" = { @@ -5044,22 +5260,22 @@ let sha512 = "+cyN28iRAn8BWlZkMSEWzXpsJJiy3wWFxdJx5UnvU3iLK1slwog94inJak/BmnQKk3dFXK9vVPtDp2s3l+2/hg=="; }; }; - "@fluentui/react-8.104.5" = { + "@fluentui/react-8.104.8" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.104.5"; + version = "8.104.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.104.5.tgz"; - sha512 = "BdyDS6yEccDuzUzYQ1h1idO2wrKLi9iMkErg1wJfODlnnqVVU5x+3x8cjkH8xHndScQ0zaVBuw84xxqP7ZCPFA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.104.8.tgz"; + sha512 = "FVpyhZwPfpkHcP9d7Q5lQ7PPeSD2tLPaWGCGNhPHBsD0BS/A5Sv1+XN2LN1E+wbJUIvKrdVfxoWmUqDaNlpZjg=="; }; }; - "@fluentui/react-focus-8.8.12" = { + "@fluentui/react-focus-8.8.13" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.8.12"; + version = "8.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.12.tgz"; - sha512 = "2uuU/CQ371YnNxKqUVfnxahW93OT3y2Tp8calmBVxzmyBwZxGpI5JF+PdNorNWhDSaruX+j31QwxoXUNz1vI9Q=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.13.tgz"; + sha512 = "Y9RlqjJdWB7of/GJt/M8Ezf5tP2JSFjfEqe7W6Ttjr7wxiZZr4X8hJISWOksPSzvWyc0CT5J9uPEX0IWBHFsFQ=="; }; }; "@fluentui/react-hooks-8.6.15" = { @@ -5098,13 +5314,13 @@ let sha512 = "v12VUrpThYcJESFrnu3LdL7/s957hoSCJ3t8C014Hp2IOmk3dnZRZJymf1k/RAOXztS4w9dF2Zhs8uP31qwcZw=="; }; }; - "@fluentui/style-utilities-8.8.5" = { + "@fluentui/style-utilities-8.9.0" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.8.5"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.8.5.tgz"; - sha512 = "qUi+1a2v0nWo3LB4c13Qf81qQH1yO9YHAgfbRNLqs4w7Oie7NDBDkq7UgRmLErpSVEafvlcCZeCSKW5pvSxz5w=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.0.tgz"; + sha512 = "n64tj38ndvT9WSwzt3tQl5MuOaRQmRBzfv7GM2dCjJ6CblWHpSV8jRXX44RnkOFr/QRCrq+gv8sEveXKsyRtag=="; }; }; "@fluentui/theme-2.6.21" = { @@ -5125,13 +5341,13 @@ let sha512 = "YusKxwTEQmsJidEWxn8blf5ehBmBDMZDrOjQkSX4piCvi/57MfigQZ57L3Bdic8kDKsabVtS1IVMHLZzGy4zcQ=="; }; }; - "@forge/api-2.9.1" = { + "@forge/api-2.10.0" = { name = "_at_forge_slash_api"; packageName = "@forge/api"; - version = "2.9.1"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/api/-/api-2.9.1.tgz"; - sha512 = "ZGW5WW9NmWkYaGXLqbZ7HwAvYO0sSCY7j8IX0ij7vMuQb7myFXk5jCFYxaA3a4uI2RnYf2v0ROZxfPx4kxd5Aw=="; + url = "https://registry.npmjs.org/@forge/api/-/api-2.10.0.tgz"; + sha512 = "o8xmjOUIJcQfGAiaKdpowO2FNdm74icD+KT0SdnMXCQ7wToLUcJE4K4vSFoebBov+HGRAQphnmlC/KbgkgWXFQ=="; }; }; "@forge/auth-0.0.1" = { @@ -5152,22 +5368,22 @@ let sha512 = "+GFtFqBhFzwKaKmeEfw1jWQgZJNX4q11CCx1fSPFJB49Fdjb7k3lx74jAyzHlX0UWnm6DMK+/cYT7j5t6G9LfA=="; }; }; - "@forge/bundler-4.2.0" = { + "@forge/bundler-4.3.0" = { name = "_at_forge_slash_bundler"; packageName = "@forge/bundler"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.2.0.tgz"; - sha512 = "4xL9ZjPVgIrrpVeg1S3187FhDbCB4EBa/9nhCBAG8abDujb+D8/zJuiapin5AmUkWl6bFS1PjTBmetanBD4gcA=="; + url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.3.0.tgz"; + sha512 = "S1XXXYpaiKXRdNV0Eqv4e6uyc1m+lwvnwRUZKoUsP5tpdBTUPNTT3W0jckKYtpCkHueuwh5BM/J4B9LGp7PpWQ=="; }; }; - "@forge/cli-shared-3.5.0" = { + "@forge/cli-shared-3.5.1" = { name = "_at_forge_slash_cli-shared"; packageName = "@forge/cli-shared"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.5.0.tgz"; - sha512 = "n7CSsL55BCAm3s4g/duDpk/khlARggcjGoTT3KhVYe0duZ0okN47XtRo2D7mSnfM/a3jHac5zCiv+BOEFyYSag=="; + url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.5.1.tgz"; + sha512 = "a88bF0v8+H/JKRpPVamfdoi0Bd59vWbAy0LISrmfcE18chCQKHEeZ4ZzOI5KDII4QxXIGc7hWzxJ0aGhQyNKIQ=="; }; }; "@forge/egress-1.1.1" = { @@ -5179,22 +5395,22 @@ let sha512 = "ycnIIOKyurzchlocjjvTwqtQNsCF98XRT+YvwVwZWwKZ0OmSzPcXPZImrIFw3dF1qySwRwRL31R0xZ1HYUEs8w=="; }; }; - "@forge/lint-3.2.12" = { + "@forge/lint-3.2.13" = { name = "_at_forge_slash_lint"; packageName = "@forge/lint"; - version = "3.2.12"; + version = "3.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.12.tgz"; - sha512 = "Z1dRnj3zRf+Rf9BMA2ompNYQdAAXYwOVw2NHBrYK0zwQjfnKC7Aco1tAyvYjkSbnyXnDSLlWAsFocgzJ7pX5Cw=="; + url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.13.tgz"; + sha512 = "kP0s77zmdyT3qWGL0auScWCU0WTaOCS6tTErpbp94IUO3yruiyLMoTLrtKdbefuFbkTLPv7vFkeXkcK7et2/tw=="; }; }; - "@forge/manifest-4.5.3" = { + "@forge/manifest-4.6.0" = { name = "_at_forge_slash_manifest"; packageName = "@forge/manifest"; - version = "4.5.3"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.5.3.tgz"; - sha512 = "px02/hJJk31JiEdMhm4kUgZwNlr6b7wAyL72cxnul2PjQ9bsMUXoP22/nSCV1uIzNznqGbXNnKJ+GKGqIhyQ1g=="; + url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.6.0.tgz"; + sha512 = "wmARdfQAZlqfmPXjgL8pbEzcXi/oYoyy7Eh5mH4k4NEa5rii/rwg9gz7S7Q1sFhUEdDOBjYgkonmUUc2X48DcQ=="; }; }; "@forge/storage-1.3.1" = { @@ -5296,13 +5512,13 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; - "@google-cloud/pubsub-3.2.1" = { + "@google-cloud/pubsub-3.3.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.2.1.tgz"; - sha512 = "TcGPqNkCYNwM3LTWBYjdryv1WQX2a4H52gaL9IAMZCp1i28r90syWjZoFhcUObowb3v3StTCL6a9YlPef4LY3g=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.3.0.tgz"; + sha512 = "pypP7JYqKnVOO7wES71TkyxQD7UluWMc/7zH5wFZ6ycLRfonLvO1XBBS3Hcg4ltMEjBlYxRC6ODbzYLfuZm9/g=="; }; }; "@grammarly/sdk-1.11.0" = { @@ -5368,13 +5584,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-9.0.22" = { + "@graphql-tools/delegate-9.0.23" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "9.0.22"; + version = "9.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-9.0.22.tgz"; - sha512 = "dWJGMN8V7KORtbI8eDAjHYTWiMyis/md27M6pPhrlYVlcsDk3U0jbNdgkswBBUEBvqumPRCv8pVOxKcLS4caKA=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-9.0.23.tgz"; + sha512 = "pTmC2ZUGRp/j4bwQRccZV+J2ETMeHYF9RmEXHHdj0S7/LOpyfFE3mGvRV2+n6MzXpPCPp+mh037LWF+q4wLcJw=="; }; }; "@graphql-tools/executor-0.0.12" = { @@ -5386,13 +5602,13 @@ let sha512 = "bWpZcYRo81jDoTVONTnxS9dDHhEkNVjxzvFCH4CRpuyzD3uL+5w3MhtxIh24QyWm4LvQ4f+Bz3eMV2xU2I5+FA=="; }; }; - "@graphql-tools/executor-graphql-ws-0.0.6" = { + "@graphql-tools/executor-graphql-ws-0.0.7" = { name = "_at_graphql-tools_slash_executor-graphql-ws"; packageName = "@graphql-tools/executor-graphql-ws"; - version = "0.0.6"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.6.tgz"; - sha512 = "n6JvIviYO8iiasV/baclimQqNkYGP7JRlkNSnphNG5LULmVpQ2WsyvbgJHV7wtlTZ8ZQ3+dILgQF83PFyLsfdA=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.7.tgz"; + sha512 = "C6EExKoukn4vu3BbvlqsqtC91F4pTLPDZvRceYjpFzTCQSGFSjfrxQGP/haGlemXVRpIDxBy7wpXoQlsF8UmFA=="; }; }; "@graphql-tools/executor-http-0.1.1" = { @@ -5467,13 +5683,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.8.9" = { + "@graphql-tools/load-7.8.10" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.8.9"; + version = "7.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.9.tgz"; - sha512 = "/eHRv6OCTI/Ir5XcbtSx0XbW3zOQVscp2MZQFGZKDzqCcGD+NVy4mLCoBwR/OsOUpvWAwMnc+Llb4SDKAYGmjQ=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.10.tgz"; + sha512 = "Mc1p7ZSxrW5yGG3BLQnhiL8RPG0HdxFVoHV7fpx2adp4o1V7BzDjKRSbCnAxShA1wA4n8wbA+n7NTC0edi4eNA=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -5494,22 +5710,22 @@ let sha512 = "BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg=="; }; }; - "@graphql-tools/merge-8.3.15" = { + "@graphql-tools/merge-8.3.16" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.3.15"; + version = "8.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.15.tgz"; - sha512 = "hYYOlsqkUlL6oOo7zzuk6hIv7xQzy+x21sgK84d5FWaiWYkLYh9As8myuDd9SD5xovWWQ9m/iRhIOVDEMSyEKA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.16.tgz"; + sha512 = "In0kcOZcPIpYOKaqdrJ3thdLPE7TutFnL9tbrHUy2zCinR2O/blpRC48jPckcs0HHrUQ0pGT4HqvzMkZUeEBAw=="; }; }; - "@graphql-tools/mock-8.7.15" = { + "@graphql-tools/mock-8.7.16" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.7.15"; + version = "8.7.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.15.tgz"; - sha512 = "0zImG5tuObhowqtijlB6TMAIVtCIBsnGGwNW8gnCOa+xZAqfGdUMsSma17tHC2XuI7xhv7A0O8pika9e3APLUg=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.16.tgz"; + sha512 = "g1BcIk6OKeqDwezbn6QOQ+UkbzfZDvcolomXOoGTaE+KNw5JV9EKKIt1COyWtKeNrwtIdPPBS/zcLAqOw1MUdQ=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -5530,13 +5746,13 @@ let sha512 = "0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg=="; }; }; - "@graphql-tools/schema-9.0.13" = { + "@graphql-tools/schema-9.0.14" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "9.0.13"; + version = "9.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.13.tgz"; - sha512 = "guRA3fwAtv+M1Kh930P4ydH9aKJTWscIkhVFcWpj/cnjYYxj88jkEJ15ZNiJX/2breNY+sbVgmlgLKb6aXi/Jg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.14.tgz"; + sha512 = "U6k+HY3Git+dsOEhq+dtWQwYg2CAgue8qBvnBXoKu5eEeH284wymMUoNm0e4IycOgMCJANVhClGEBIkLRu3FQQ=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -5548,13 +5764,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.17.2" = { + "@graphql-tools/url-loader-7.17.4" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.17.2"; + version = "7.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.2.tgz"; - sha512 = "VgCXa5vQzcM13+loJvVHLXltp3qN8PHUTeth50cImUhCm3qtRwOeuSYjpph38vllPb8DKxsZkNFxzYgzscWIow=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.4.tgz"; + sha512 = "nB2fhkn4LTYjU2qoTOBZYmWQRVYsCI0K2LScwD49QVMNAPWthg/lHao4hFUe70aTInT8oquvl8d0rIb7fRWOvA=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -5620,13 +5836,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-9.3.1" = { + "@graphql-tools/wrap-9.3.2" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "9.3.1"; + version = "9.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.1.tgz"; - sha512 = "uzY1HKc7qMErWL3ybv8bFG3hI1rTJPVYQ8WeJkCF/r/+aHEkUj0Bo2PYZrZTX1UIr3Tb4P5GyhqYBgZOXraZjw=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.2.tgz"; + sha512 = "jqBMJZyKFATxWA3alPhGRWh/ZluaPWrXFumXRaqAwK9QdCAxM24jG8Kmy3FrTfeyxNqDyzDlHZobtwwDKurm5g=="; }; }; "@graphql-typed-document-node/core-3.1.1" = { @@ -5647,15 +5863,6 @@ let sha512 = "H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog=="; }; }; - "@grpc/grpc-js-1.8.0" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.0.tgz"; - sha512 = "ySMTXQuMvvswoobvN+0LsaPf7ITO2JVfJmHxQKI4cGehNrrUms+n81BlHEX7Hl/LExji6XE3fnI9U04GSkRruA=="; - }; - }; "@grpc/grpc-js-1.8.1" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -6097,6 +6304,285 @@ let sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; }; }; + "@jimp/bmp-0.16.2" = { + name = "_at_jimp_slash_bmp"; + packageName = "@jimp/bmp"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.16.2.tgz"; + sha512 = "4g9vW45QfMoGhLVvaFj26h4e7cC+McHUQwyFQmNTLW4FfC1OonN9oUr2m/FEDGkTYKR7aqdXR5XUqqIkHWLaFw=="; + }; + }; + "@jimp/core-0.16.2" = { + name = "_at_jimp_slash_core"; + packageName = "@jimp/core"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/core/-/core-0.16.2.tgz"; + sha512 = "dp7HcyUMzjXphXYodI6PaXue+I9PXAavbb+AN+1XqFbotN22Z12DosNPEyy+UhLY/hZiQQqUkEaJHkvV31rs+w=="; + }; + }; + "@jimp/custom-0.16.2" = { + name = "_at_jimp_slash_custom"; + packageName = "@jimp/custom"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.16.2.tgz"; + sha512 = "GtNwOs4hcVS2GIbqRUf42rUuX07oLB92cj7cqxZb0ZGWwcwhnmSW0TFLAkNafXmqn9ug4VTpNvcJSUdiuECVKg=="; + }; + }; + "@jimp/gif-0.16.2" = { + name = "_at_jimp_slash_gif"; + packageName = "@jimp/gif"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.16.2.tgz"; + sha512 = "TMdyT9Q0paIKNtT7c5KzQD29CNCsI/t8ka28jMrBjEK7j5RRTvBfuoOnHv7pDJRCjCIqeUoaUSJ7QcciKic6CA=="; + }; + }; + "@jimp/jpeg-0.16.2" = { + name = "_at_jimp_slash_jpeg"; + packageName = "@jimp/jpeg"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.2.tgz"; + sha512 = "BW5gZydgq6wdIwHd+3iUNgrTklvoQc/FUKSj9meM6A0FU21lUaansRX5BDdJqHkyXJLnnlDGwDt27J+hQuBAVw=="; + }; + }; + "@jimp/plugin-blit-0.16.2" = { + name = "_at_jimp_slash_plugin-blit"; + packageName = "@jimp/plugin-blit"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.16.2.tgz"; + sha512 = "Z31rRfV80gC/r+B/bOPSVVpJEWXUV248j7MdnMOFLu4vr8DMqXVo9jYqvwU/s4LSTMAMXqm4Jg6E/jQfadPKAg=="; + }; + }; + "@jimp/plugin-blur-0.16.2" = { + name = "_at_jimp_slash_plugin-blur"; + packageName = "@jimp/plugin-blur"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.16.2.tgz"; + sha512 = "ShkJCAzRI+1fAKPuLLgEkixpSpVmKTYaKEFROUcgmrv9AansDXGNCupchqVMTdxf8zPyW8rR1ilvG3OJobufLQ=="; + }; + }; + "@jimp/plugin-circle-0.16.2" = { + name = "_at_jimp_slash_plugin-circle"; + packageName = "@jimp/plugin-circle"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.16.2.tgz"; + sha512 = "6T4z/48F4Z5+YwAVCLOvXQcyGmo0E3WztxCz6XGQf66r4JJK78+zcCDYZFLMx0BGM0091FogNK4QniP8JaOkrA=="; + }; + }; + "@jimp/plugin-color-0.16.2" = { + name = "_at_jimp_slash_plugin-color"; + packageName = "@jimp/plugin-color"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.16.2.tgz"; + sha512 = "6oBV0g0J17/7E+aTquvUsgSc85nUbUi+64tIK5eFIDzvjhlqhjGNJYlc46KJMCWIs61qRJayQoZdL/iT/iQuGQ=="; + }; + }; + "@jimp/plugin-contain-0.16.2" = { + name = "_at_jimp_slash_plugin-contain"; + packageName = "@jimp/plugin-contain"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.16.2.tgz"; + sha512 = "pLcxO3hVN3LCEhMNvpZ9B7xILHVlS433Vv16zFFJxLRqZdYvPLsc+ZzJhjAiHHuEjVblQrktHE3LGeQwGJPo0w=="; + }; + }; + "@jimp/plugin-cover-0.16.2" = { + name = "_at_jimp_slash_plugin-cover"; + packageName = "@jimp/plugin-cover"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.16.2.tgz"; + sha512 = "gzWM7VvYeI8msyiwbUZxH+sGQEgO6Vd6adGxZ0CeKX00uQOe5lDzxb1Wjx7sHcJGz8a/5fmAuwz7rdDtpDUbkw=="; + }; + }; + "@jimp/plugin-crop-0.16.2" = { + name = "_at_jimp_slash_plugin-crop"; + packageName = "@jimp/plugin-crop"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.16.2.tgz"; + sha512 = "qCd3hfMEE+Z2EuuyXewgXRTtKJGIerWzc1zLEJztsUkPz5i73IGgkOL+mrNutZwGaXZbm+8SwUaGb46sxAO6Tw=="; + }; + }; + "@jimp/plugin-displace-0.16.2" = { + name = "_at_jimp_slash_plugin-displace"; + packageName = "@jimp/plugin-displace"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.16.2.tgz"; + sha512 = "6nXdvNNjCdD95v2o3/jPeur903dz08lG4Y8gmr5oL2yVv9LSSbMonoXYrR/ASesdyXqGdXJLU4NL+yZs4zUqbQ=="; + }; + }; + "@jimp/plugin-dither-0.16.2" = { + name = "_at_jimp_slash_plugin-dither"; + packageName = "@jimp/plugin-dither"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.16.2.tgz"; + sha512 = "DERpIzy21ZanMkVsD0Tdy8HQLbD1E41OuvIzaMRoW4183PA6AgGNlrQoFTyXmzjy6FTy1SxaQgTEdouInAWZ9Q=="; + }; + }; + "@jimp/plugin-fisheye-0.16.2" = { + name = "_at_jimp_slash_plugin-fisheye"; + packageName = "@jimp/plugin-fisheye"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.2.tgz"; + sha512 = "Df7PsGIwiIpQu3EygYCnaJyTfOwvwtYV3cmYJS7yFLtdiFUuod+hlSo5GkwEPLAy+QBxhUbDuUqnsWo4NQtbiQ=="; + }; + }; + "@jimp/plugin-flip-0.16.2" = { + name = "_at_jimp_slash_plugin-flip"; + packageName = "@jimp/plugin-flip"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.16.2.tgz"; + sha512 = "+2uC8ioVQUr06mnjSWraskz2L33nJHze35LkQ8ZNsIpoZLkgvfiWatqAs5bj+1jGI/9kxoCFAaT1Is0f+a4/rw=="; + }; + }; + "@jimp/plugin-gaussian-0.16.2" = { + name = "_at_jimp_slash_plugin-gaussian"; + packageName = "@jimp/plugin-gaussian"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.2.tgz"; + sha512 = "2mnuDSg4ZEH8zcJig7DZZf4st/cYmQ5UYJKP76iGhZ+6JDACk6uejwAgT5xHecNhkVAaXMdCybA2eknH/9OE1w=="; + }; + }; + "@jimp/plugin-invert-0.16.2" = { + name = "_at_jimp_slash_plugin-invert"; + packageName = "@jimp/plugin-invert"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.16.2.tgz"; + sha512 = "xFvHbVepTY/nus+6yXiYN1iq+UBRkT0MdnObbiQPstUrAsz0Imn6MWISsnAyMvcNxHGrxaxjuU777JT/esM0gg=="; + }; + }; + "@jimp/plugin-mask-0.16.2" = { + name = "_at_jimp_slash_plugin-mask"; + packageName = "@jimp/plugin-mask"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.16.2.tgz"; + sha512 = "AbdO85xxhfgEDdxYKpUotEI9ixiCMaIpfYHD5a5O/VWeimz2kuwhcrzlHGiyq1kKAgRcl0WEneTCZAHVSyvPKA=="; + }; + }; + "@jimp/plugin-normalize-0.16.2" = { + name = "_at_jimp_slash_plugin-normalize"; + packageName = "@jimp/plugin-normalize"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.16.2.tgz"; + sha512 = "+ItBWFwmB0Od7OfOtTYT1gm543PpHUgU8/DN55z83l1JqS0OomDJAe7BmCppo2405TN6YtVm/csXo7p4iWd/SQ=="; + }; + }; + "@jimp/plugin-print-0.16.2" = { + name = "_at_jimp_slash_plugin-print"; + packageName = "@jimp/plugin-print"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.16.2.tgz"; + sha512 = "ifTGEeJ5UZTCiqC70HMeU3iXk/vsOmhWiwVGOXSFXhFeE8ZpDWvlmBsrMYnRrJGuaaogHOIrrQPI+kCdDBSBIQ=="; + }; + }; + "@jimp/plugin-resize-0.16.2" = { + name = "_at_jimp_slash_plugin-resize"; + packageName = "@jimp/plugin-resize"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.16.2.tgz"; + sha512 = "gE4N9l6xuwzacFZ2EPCGZCJ/xR+aX2V7GdMndIl/6kYIw5/eib1SFuF9AZLvIPSFuE1FnGo8+vT0pr++SSbhYg=="; + }; + }; + "@jimp/plugin-rotate-0.16.2" = { + name = "_at_jimp_slash_plugin-rotate"; + packageName = "@jimp/plugin-rotate"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.16.2.tgz"; + sha512 = "/CTEYkR1HrgmnE0VqPhhbBARbDAfFX590LWGIpxcYIYsUUGQCadl+8Qo4UX13FH0Nt8UHEtPA+O2x08uPYg9UA=="; + }; + }; + "@jimp/plugin-scale-0.16.2" = { + name = "_at_jimp_slash_plugin-scale"; + packageName = "@jimp/plugin-scale"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.16.2.tgz"; + sha512 = "3inuxfrlquyLaqFdiiiQNJUurR0WbvN5wAf1qcYX2LubG1AG8grayYD6H7XVoxfUGTZXh1kpmeirEYlqA2zxcw=="; + }; + }; + "@jimp/plugin-shadow-0.16.2" = { + name = "_at_jimp_slash_plugin-shadow"; + packageName = "@jimp/plugin-shadow"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.16.2.tgz"; + sha512 = "Q0aIs2/L6fWMcEh9Ms73u34bT1hyUMw/oxaVoIzOLo6/E8YzCs2Bi63H0/qaPS0MQpEppI++kvosPbblABY79w=="; + }; + }; + "@jimp/plugin-threshold-0.16.2" = { + name = "_at_jimp_slash_plugin-threshold"; + packageName = "@jimp/plugin-threshold"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.16.2.tgz"; + sha512 = "gyOwmBgjtMPvcuyOhkP6dOGWbQdaTfhcBRN22mYeI/k/Wh/Zh1OI21F6eKLApsVRmg15MoFnkrCz64RROC34sw=="; + }; + }; + "@jimp/plugins-0.16.2" = { + name = "_at_jimp_slash_plugins"; + packageName = "@jimp/plugins"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.16.2.tgz"; + sha512 = "zCvYtCgctmC0tkYEu+y+kSwSIZBsNznqJ3/3vkpzxdyjd6wCfNY5Qc/68MPrLc1lmdeGo4cOOTYHG7Vc6myzRw=="; + }; + }; + "@jimp/png-0.16.2" = { + name = "_at_jimp_slash_png"; + packageName = "@jimp/png"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/png/-/png-0.16.2.tgz"; + sha512 = "sFOtOSz/tzDwXEChFQ/Nxe+0+vG3Tj0eUxnZVDUG/StXE9dI8Bqmwj3MIa0EgK5s+QG3YlnDOmlPUa4JqmeYeQ=="; + }; + }; + "@jimp/tiff-0.16.2" = { + name = "_at_jimp_slash_tiff"; + packageName = "@jimp/tiff"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.16.2.tgz"; + sha512 = "ADcdqmtZF+U2YoaaHTzFX8D6NFpmN4WZUT0BPMerEuY7Cq8QoLYU22z2h034FrVW+Rbi1b3y04sB9iDiQAlf2w=="; + }; + }; + "@jimp/types-0.16.2" = { + name = "_at_jimp_slash_types"; + packageName = "@jimp/types"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/types/-/types-0.16.2.tgz"; + sha512 = "0Ue5Sq0XnDF6TirisWv5E+8uOnRcd8vRLuwocJOhF76NIlcQrz+5r2k2XWKcr3d+11n28dHLXW5TKSqrUopxhA=="; + }; + }; + "@jimp/utils-0.16.2" = { + name = "_at_jimp_slash_utils"; + packageName = "@jimp/utils"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.2.tgz"; + sha512 = "XENrPvmigiXZQ8E2nxJqO6UVvWBLzbNwyYi3Y8Q1IECoYhYI3kgOQ0fmy4G269Vz1V0omh1bNmC42r4OfXg1Jg=="; + }; + }; "@joplin/fork-htmlparser2-4.1.41" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; @@ -6313,6 +6799,24 @@ let sha512 = "h0BeA6WQfxvYl5BaacmlvB5bAIdhlgf9SInJljxtERn2eYN+VjgMyU/1iv0Ww4Lp71xMGL96bmfXpdlFgRQFEg=="; }; }; + "@json2csv/formatters-6.1.2" = { + name = "_at_json2csv_slash_formatters"; + packageName = "@json2csv/formatters"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@json2csv/formatters/-/formatters-6.1.2.tgz"; + sha512 = "l8i5EdQvHZHrtSgRFEXMkRnIn8CBopT/ecZSIyPKuee9+pm/Sxcb/r/N2jQWARnOQc7uyqQWAtpPpxU7HhZ2tg=="; + }; + }; + "@json2csv/plainjs-6.1.2" = { + name = "_at_json2csv_slash_plainjs"; + packageName = "@json2csv/plainjs"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@json2csv/plainjs/-/plainjs-6.1.2.tgz"; + sha512 = "XNcBd6W4G5mlP6ZL13idEx21diQAM5AJgIe78RxRfZctWRppaZrtpiGTzhc/sNv7UM1FpfO/aa5wel4+aQW7MQ=="; + }; + }; "@koa/multer-3.0.2" = { name = "_at_koa_slash_multer"; packageName = "@koa/multer"; @@ -7204,13 +7708,13 @@ let sha512 = "ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg=="; }; }; - "@mdn/browser-compat-data-5.2.17" = { + "@mdn/browser-compat-data-5.2.29" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "5.2.17"; + version = "5.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.2.17.tgz"; - sha512 = "aA+rFHhXmq14GVIcEWNk8OntLEOQFwEZk9ZgG5VcDquz+pQhIjJPXacR+rwL9Z0Elfg909EcRRHC96p06/CNUg=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.2.29.tgz"; + sha512 = "bEBrkTWbDAs/PB4IdRg4CtU750oBRytXHK/wC2oIDkgKZqnt76nACSooQQuHF11mK5k43f/IgFUMO5t5quRPVA=="; }; }; "@medable/mdctl-api-1.0.68" = { @@ -7393,13 +7897,13 @@ let sha512 = "W+IzEBw8a6LOOfRJM02dTT7BDZijxm+Z7lhtOAz1+y9vQm1Kdz9jlAO+qCEKsfxtUOmKilW8DIRqFw2aUgKeGg=="; }; }; - "@microsoft/rush-lib-5.88.0" = { + "@microsoft/rush-lib-5.89.1" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.88.0"; + version = "5.89.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.88.0.tgz"; - sha512 = "YgZPnp/hAD43jclvGMMy6B84JR0pB1odK+Cfe2Ag7s4omwe/+u6gJjGfHme6vzB4Hs7jpEkmRe76R3nyVKcFoA=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.89.1.tgz"; + sha512 = "yOzZ6LY0OkAp9pUB3mVA8wjWsQ1bnRRrBYpmho5/Cy3TM6cUgjdPUhEzpx4THbu8lcYtdvJ10Ivki4V1rI6Qdg=="; }; }; "@miniflare/cache-2.11.0" = { @@ -8212,31 +8716,31 @@ let sha512 = "ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ=="; }; }; - "@nrwl/cli-15.5.2" = { + "@nrwl/cli-15.6.3" = { name = "_at_nrwl_slash_cli"; packageName = "@nrwl/cli"; - version = "15.5.2"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.5.2.tgz"; - sha512 = "T0nN2hYDtkY9SsbtZqFwRSYC8Td2zPqQ7dj6FrwvjFGbHLAxN6rknVPPKN4S7Dt6feXX1Woe8XYwWouk9Cg6nw=="; + url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.6.3.tgz"; + sha512 = "K4E0spofThZXMnhA6R8hkUTdfqmwSnUE2+DlD5Y3jqsvKTAgwF5U41IFkEouFZCf+dWjy0RA20bWoX48EVFtmQ=="; }; }; - "@nrwl/devkit-15.5.2" = { + "@nrwl/devkit-15.6.3" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "15.5.2"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.5.2.tgz"; - sha512 = "rvxuiYVpGDB9RzjOAWTNm7IBPwuYG6kL24LkJMUS8gCNqLBNNlYUsdkpa0PLRt5eNeGLKqpSDB8BpA+e1ty/zA=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.6.3.tgz"; + sha512 = "/JDvdzNxUM+C1PCZPCrvmFx+OfywqZdOq1GS9QR8C0VctTLG4D/SGSFD88O1SAdcbH/f1mMiBGfEYZYd23fghQ=="; }; }; - "@nrwl/tao-15.5.2" = { + "@nrwl/tao-15.6.3" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "15.5.2"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.5.2.tgz"; - sha512 = "1thpCNcdpHfTf+o3p+VB6v8TEj6to3YVhA9d+3VhDKN9mq/RVcoMQQRIAgNOKbYWYNo8eC8MvuNqxgRPz2ESyg=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.6.3.tgz"; + sha512 = "bDZbPIbU5Mf2BvX0q8GjPxrm1WkYyfW+gp7mLuuJth2sEpZiCr47mSwuGko/y4CKXvIX46VQcAS0pKQMKugXsg=="; }; }; "@oclif/command-1.8.0" = { @@ -8248,13 +8752,13 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; - "@oclif/command-1.8.21" = { + "@oclif/command-1.8.22" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.21.tgz"; - sha512 = "kIDrRIbAcicVl+CWMzXeZkg5dRNuF1VI7koyFTAQMNYwRNZpeya5x7XDPr+fh7rDiBL7psnxc3B1+zoOWj96lQ=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.22.tgz"; + sha512 = "lystv7IKsWRmCv6K68jSvHrO/DILUPBDb5GZ3absTA5XTnNXTaMrcwVzTcMPfTf+gCrgIaPPD1bmbRStwfQxFw=="; }; }; "@oclif/config-1.17.0" = { @@ -8338,13 +8842,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.9" = { + "@oclif/parser-3.8.10" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.9"; + version = "3.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.9.tgz"; - sha512 = "1j/kThdse7yHQz6+c3v8RA1I3gD6+SGt2O7IAb/MAMoxqyBrFQDabQHH2UU4eVFGMLN7U91AiYJp11zJ9LcQAg=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.10.tgz"; + sha512 = "J4l/NcnfbIU84+NNdy6bxq9yJt4joFWNvpk59hq+uaQPUNtjmNJDVGuRvf6GUOxHNgRsVK1JRmd/Ez+v7Z9GqQ=="; }; }; "@oclif/plugin-autocomplete-0.1.5" = { @@ -8419,13 +8923,13 @@ let sha512 = "r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="; }; }; - "@octokit/auth-token-3.0.2" = { + "@octokit/auth-token-3.0.3" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.2.tgz"; - sha512 = "pq7CwIMV1kmzkFTimdwjAINCXKTajZErLB4wMLYapR2nuB/Jpr66+05wOTZMSCBXP6n4DdDWT2W19Bm17vU69Q=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.3.tgz"; + sha512 = "/aFM2M4HVDBT/jjDBa84sJniv1t9Gm/rLkalaz9htOm+L+8JMj1k9w0CkUdcxNyNxZPlTxKPVko+m1VlM58ZVA=="; }; }; "@octokit/core-3.6.0" = { @@ -8437,13 +8941,13 @@ let sha512 = "7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q=="; }; }; - "@octokit/core-4.1.0" = { + "@octokit/core-4.2.0" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/core/-/core-4.1.0.tgz"; - sha512 = "Czz/59VefU+kKDy+ZfDwtOIYIkFjExOKf+HA92aiTZJ6EfWpFzYQWw0l54ji8bVmyhc+mGaLUbSUmXazG7z5OQ=="; + url = "https://registry.npmjs.org/@octokit/core/-/core-4.2.0.tgz"; + sha512 = "AgvDRUg3COpR82P7PBdGZF/NNqGmtMq2NiPqeSsDIeCfYFOZ9gddqWNQHnFdEUf+YwOj4aZYmJnlPp7OXmDIDg=="; }; }; "@octokit/endpoint-6.0.12" = { @@ -8455,13 +8959,13 @@ let sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; }; }; - "@octokit/endpoint-7.0.3" = { + "@octokit/endpoint-7.0.5" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "7.0.3"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.3.tgz"; - sha512 = "57gRlb28bwTsdNXq+O3JTQ7ERmBTuik9+LelgcLIVfYwf235VHbN9QNo4kXExtp/h8T423cR5iJThKtFYxC7Lw=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.5.tgz"; + sha512 = "LG4o4HMY1Xoaec87IqQ41TQ+glvIeTKqfjkCEmt5AIwDZJwQeVZFIEYXrYY6yLwK+pAScb9Gj4q+Nz2qSw1roA=="; }; }; "@octokit/graphql-4.8.0" = { @@ -8473,13 +8977,13 @@ let sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="; }; }; - "@octokit/graphql-5.0.4" = { + "@octokit/graphql-5.0.5" = { name = "_at_octokit_slash_graphql"; packageName = "@octokit/graphql"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.4.tgz"; - sha512 = "amO1M5QUQgYQo09aStR/XO7KAl13xpigcy/kI8/N1PnZYSS69fgte+xA4+c2DISKqUZfsh0wwjc2FaCt99L41A=="; + url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.5.tgz"; + sha512 = "Qwfvh3xdqKtIznjX9lz2D458r7dJPP8l6r4GQkIdWQouZwHQK0mVT88uwiU2bdTU2OtT1uOlKpRciUWldpG0yQ=="; }; }; "@octokit/openapi-types-12.11.0" = { @@ -8491,13 +8995,13 @@ let sha512 = "VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="; }; }; - "@octokit/openapi-types-14.0.0" = { + "@octokit/openapi-types-16.0.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "14.0.0"; + version = "16.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-14.0.0.tgz"; - sha512 = "HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz"; + sha512 = "JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -8518,13 +9022,13 @@ let sha512 = "aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw=="; }; }; - "@octokit/plugin-paginate-rest-5.0.1" = { + "@octokit/plugin-paginate-rest-6.0.0" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-5.0.1.tgz"; - sha512 = "7A+rEkS70pH36Z6JivSlR7Zqepz3KVucEFVDnSrgHXzG7WLAzYwcHZbKdfTXHwuTHbkT1vKvz7dHl1+HNf6Qyw=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.0.0.tgz"; + sha512 = "Sq5VU1PfT6/JyuXPyt04KZNVsFOSBaYOAq2QRZUwzVlI10KFvcbUo8lR258AAQL1Et60b0WuVik+zOWKLuDZxw=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -8545,13 +9049,13 @@ let sha512 = "8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw=="; }; }; - "@octokit/plugin-rest-endpoint-methods-6.7.0" = { + "@octokit/plugin-rest-endpoint-methods-7.0.1" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "6.7.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.7.0.tgz"; - sha512 = "orxQ0fAHA7IpYhG2flD2AygztPlGYNAdlzYz8yrD8NDgelPfOYoRPROfEyIe035PlxvbYrgkfUZIhSBKju/Cvw=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.0.1.tgz"; + sha512 = "pnCaLwZBudK5xCdrR823xHGNgqOzRnJ/mpC/76YPpNP7DybdsJtP7mdOwh+wYZxK5jqeQuhu59ogMI4NRlBUvA=="; }; }; "@octokit/plugin-retry-3.0.9" = { @@ -8581,13 +9085,13 @@ let sha512 = "bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A=="; }; }; - "@octokit/request-6.2.2" = { + "@octokit/request-6.2.3" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-6.2.2.tgz"; - sha512 = "6VDqgj0HMc2FUX2awIs+sM6OwLgwHvAi4KCK3mT2H2IKRt6oH9d0fej5LluF5mck1lRR/rFWN0YIDSYXYSylbw=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-6.2.3.tgz"; + sha512 = "TNAodj5yNzrrZ/VxP+H5HiYaZep0H3GU0O7PaF+fhDrt8FPrnkei9Aal/txsN/1P7V3CPiThG0tIvpPDYUsyAA=="; }; }; "@octokit/request-error-2.1.0" = { @@ -8599,13 +9103,13 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/request-error-3.0.2" = { + "@octokit/request-error-3.0.3" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.2.tgz"; - sha512 = "WMNOFYrSaX8zXWoJg9u/pKgWPo94JXilMLb2VManNOby9EZxrQaBe/QSC4a1TzpAlpxofg2X/jMnCyZgL6y7eg=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz"; + sha512 = "crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ=="; }; }; "@octokit/rest-18.12.0" = { @@ -8617,13 +9121,13 @@ let sha512 = "gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q=="; }; }; - "@octokit/rest-19.0.5" = { + "@octokit/rest-19.0.7" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "19.0.5"; + version = "19.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.5.tgz"; - sha512 = "+4qdrUFq2lk7Va+Qff3ofREQWGBeoTKNqlJO+FGjFP35ZahP+nBenhZiGdu8USSgmq4Ky3IJ/i4u0xbLqHaeow=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.7.tgz"; + sha512 = "HRtSfjrWmWVNp2uAkEpQnuGMJsu/+dBr47dRc5QVgsCbnIc1+GFEaoKBWkYG+zjrsHpSqcAElMio+n10c0b5JA=="; }; }; "@octokit/types-6.41.0" = { @@ -8635,13 +9139,13 @@ let sha512 = "eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg=="; }; }; - "@octokit/types-8.1.1" = { + "@octokit/types-9.0.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "8.1.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-8.1.1.tgz"; - sha512 = "7tjk+6DyhYAmei8FOEwPfGKc0VE1x56CKPJ+eE44zhDbOyMT+9yan8apfQFxo8oEFsy+0O7PiBtH8w0Yo0Y9Kw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz"; + sha512 = "LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw=="; }; }; "@opencensus/core-0.0.8" = { @@ -8743,454 +9247,454 @@ let sha512 = "po7penSfQ/Z8352lRVDpaBrd9znwA5mHGqXR7nDEiVnxkDFkBIhVf/tKeAJDIq/erFpcRowKFeCsr5eqqcSyFQ=="; }; }; - "@orval/angular-6.11.0" = { + "@orval/angular-6.11.1" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.11.0.tgz"; - sha512 = "4mYJ1KIloPn8W+ZWRszNJBxiV2AE2mCQ3KfQnUa/jh4YllOOjWto03GA3sr3IRGdJXwlN3/Esp6dQNQjto5Z+w=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.11.1.tgz"; + sha512 = "L1sdQ7b7cq5jtL2OBacpyQ2MwGRUcWm1U5BEJg0R+K3eWN7LfFAQk99karMEbre1C5U/s2BXh/hxmWHK24i1+A=="; }; }; - "@orval/axios-6.11.0" = { + "@orval/axios-6.11.1" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.11.0.tgz"; - sha512 = "SSuWbS68v/nfcvxDdXntyPxRY0lCAbgMwnZ+V0cnq00G9Lgljiql2gPKOO3cnQhmpAiYIf8Zs6skSeIzrXxfiA=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.11.1.tgz"; + sha512 = "iemXAYoTuguCIgzK4yHRuUWNxIYk8umpI7FYNYCk+YZ1MJfWa+GAKeem9Fzb3EbmWWvlH4bNfFkXsygvorS1nw=="; }; }; - "@orval/core-6.11.0" = { + "@orval/core-6.11.1" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.11.0.tgz"; - sha512 = "PbH2PbpHbnLXrQWvLHUAm0lZHiD+Np7IGcVTLyXdDE9lGDpMY7jVxMLAB2aYhTZiSiyI6tIhSeaXPOykgVL8+g=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.11.1.tgz"; + sha512 = "0d8K4gmeMovYYdagRQ5pj0KsgtB8JKDYP/RjzQfr40ootAjbP6egaAjhSzogv0vfSr5GDwNPPzD+S0cK6pQsAw=="; }; }; - "@orval/msw-6.11.0" = { + "@orval/msw-6.11.1" = { name = "_at_orval_slash_msw"; packageName = "@orval/msw"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/msw/-/msw-6.11.0.tgz"; - sha512 = "g9oHX6IgqEQIJS6J0SJa3dUkDeZe/Iv6dgZ5Y0LorOgYfduAcfVjRepG/vnNu6mxmHbh5d2ZrxrSDZmxmuWU6Q=="; + url = "https://registry.npmjs.org/@orval/msw/-/msw-6.11.1.tgz"; + sha512 = "1WA9nLBhvBTu0MZ0V+UAlipNMkOmhy0vv2RfcAGrqiq8TCHkdVvVOZvrIuQkJxYkELEBAXTPfGnIzqCVwRkwiA=="; }; }; - "@orval/query-6.11.0" = { + "@orval/query-6.11.1" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.11.0.tgz"; - sha512 = "nYgHVpEc3reHGryWhyap74+NoZlCAqZh0aULKcJD5jYCIXn8+SNt3kEeB1tjIzTbiESc5DGa3pUzEP8hJ7FN9Q=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.11.1.tgz"; + sha512 = "FV5mGQ9fpyqPJl82AkGvft2WQGr0GLyrVp7k7Nrlr0I2j+F0PByvlvtvTbS0CCXY9m9ot6tE3NDXkISZEczG4w=="; }; }; - "@orval/swr-6.11.0" = { + "@orval/swr-6.11.1" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.11.0.tgz"; - sha512 = "ONwjmk6Hxt+ozVVZast4pvc/hnhBzC+KkWPmpdFdoyrpgvIkAsulkuWQV12Sgo3KwSDH5abIOvexgeha7UaZxA=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.11.1.tgz"; + sha512 = "Oi/cgNzFWU0ukXoq5RselfJLcoy9l+MmLpmgnqTghXewRq67q1iIc5ee5/8Kf9m36dLCfb7uk8m1i3e6F5LhwA=="; }; }; - "@ot-builder/bin-composite-types-1.5.5" = { + "@ot-builder/bin-composite-types-1.6.1" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.5.tgz"; - sha512 = "CK8DmpDC/BILM57mX5jq1aAKRGqHPIRknnBTOtr+kAEdyYPJ28ATAojk7jcBb+tw6WPCdDRmmAj9XvKkXfwTdg=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.6.1.tgz"; + sha512 = "xYJeoZ4vJMYv8UcWMOuuhCwsO061FHgsakr81XeKXVw2iJ5DknDvNv1Q7+ss34XlXl+Cj6vXe8i86tsa1AjU4g=="; }; }; - "@ot-builder/bin-util-1.5.5" = { + "@ot-builder/bin-util-1.6.1" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.5.tgz"; - sha512 = "YilwtBHMAcqa+C/8gCqekM4nZkIGkdS64Sd/N4Q2aw68ly3l94hgPOioNRq7Ixju+reg1HHQrn6e/ug8UJ1F4A=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.6.1.tgz"; + sha512 = "k4CKNu3i+h17S1yzYi1ih1cXSCKyKWKDuQrCgV/6igMeZ8eAMnk1Y3+/eN4EXDODCa9LrYK/jZs643lfejMr9A=="; }; }; - "@ot-builder/cli-help-shower-1.5.5" = { + "@ot-builder/cli-help-shower-1.6.1" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.5.tgz"; - sha512 = "TwopK3Xwhhsw8o9rEz4eV4Fov9AvAA4bWSfCpt7vv1E8Ri+oXGVGZKiStjnrQJSr2WaZ4KqZcEvZew8F+ZYDbQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.6.1.tgz"; + sha512 = "J3aX1FtjGN7VMWA87xPwkIrXYtCNTT60fqE6izIU8X7mpRqgJlzVgg8ePQu3dLtUqo21oH8FUDLX5z1KjwInew=="; }; }; - "@ot-builder/cli-proc-1.5.5" = { + "@ot-builder/cli-proc-1.6.1" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.5.tgz"; - sha512 = "kxwViISxgMpK00eronqF+StDAfWcqF0nIm2l84zs4qJY6ddsBbhVgSNtY19DfDDjJPEEHDoNGEOJYAeyxquRIg=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.6.1.tgz"; + sha512 = "zjXAbWIvW52/lLhMCw1STLHDiwtTV/2eF09+PGxn77PenBynw0f0+opxkL9wvrA83OEu3N2eEIK89JmRM+j89A=="; }; }; - "@ot-builder/cli-shared-1.5.5" = { + "@ot-builder/cli-shared-1.6.1" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.5.tgz"; - sha512 = "lqIaWGEJ+Xw3tJLF7faX5gH7GWaNLjRnnadiR/fK6o2wdRhjEiw+DQa4hmE9mXdBCNaAxPSDkRR3GA6hvsw4lA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.6.1.tgz"; + sha512 = "RXbC9TqfcSVwo0gpqm8k+F3IrwzVHX67lxu0Fv2NCX/9HzgmzzusmD7tzLIYIs9fIdF2hOOhjT9JVPyFJkkS9A=="; }; }; - "@ot-builder/common-impl-1.5.5" = { + "@ot-builder/common-impl-1.6.1" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.5.tgz"; - sha512 = "BhNB6m/dIaXMUbRlYLcmnEYwFoPVcvUD7fpij2wL/sbuSXh5IVj/wvcGqNDaRMJN7jWF1iApoWYb25s2cMI0eg=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.6.1.tgz"; + sha512 = "Sg8PegFN/CoekaRQ1hGvQJLcUREF1ugRIwjbewLRPGTHGECSIsEipq4gyVsmHSUiUSlQRwycwAsaQMB8l9amww=="; }; }; - "@ot-builder/errors-1.5.5" = { + "@ot-builder/errors-1.6.1" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.5.tgz"; - sha512 = "r1/31jN6MXb+sUMgFa7fl7cvh6WbyUrWHtU2aWNXo+v3ANF02pAANm3kHRYeo1A5hbsPdpYGT59eA2wKsFv6pg=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.6.1.tgz"; + sha512 = "04vPz6CI2O69Tfpby5K7dLZkRg21yQFSyAvvUJx22OU9SfDI4KTmtcwlYRwHAYBC9GFc4S+nx/+50pNZ5XJTqw=="; }; }; - "@ot-builder/io-bin-cff-1.5.5" = { + "@ot-builder/io-bin-cff-1.6.1" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.5.tgz"; - sha512 = "fZXVdnCsV2xGd12ixn/ZD7I73NUJty2RzAru0/SPcKh9+MM9+0WAaC8K2959JoK1k+uWTwkm9GfVFWBrqgkm1Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.6.1.tgz"; + sha512 = "Ce/nnjzL/tF2VaUEk22jBk1wM28UoJttXl3mTPzuurSxfJTpXNPkib3KqoHN1/PdesNlhqiQr2FCdx9uOyjedg=="; }; }; - "@ot-builder/io-bin-encoding-1.5.5" = { + "@ot-builder/io-bin-encoding-1.6.1" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.5.tgz"; - sha512 = "f9H94M2v3DaLQpWV9sG2e5vYubzI+I2AXlRCKplexfSWoIU7Wsusb3ZNXs+rWB3tFKTOVjwZ2c8prSNsKVPZWA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.6.1.tgz"; + sha512 = "3t8Yvu0rJStgmUr4T8cSx+WMkusyfc5gL2a80UVsSzofo7RTK+MIr8bvL7b2z85pEP/DkKR/GFDGzzU1mwb0AQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.5.5" = { + "@ot-builder/io-bin-ext-private-1.6.1" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.5.tgz"; - sha512 = "kuybGd55HbVW+6E05yZLmR98IhH+BiwjHgyOq2+/DiD5iSE/SCqtqHJ7Gs94UfJp16PaCCnWDXjcJdkSPMhqKg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.6.1.tgz"; + sha512 = "QrzerNSAN5TVreNeAtO6zZpMsR2Lsq8SNtAJeChSq2n2pxPwBJJnBnDr8K3If6ykucvVb1sLCqHyjEXG2D9ReA=="; }; }; - "@ot-builder/io-bin-font-1.5.5" = { + "@ot-builder/io-bin-font-1.6.1" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.5.tgz"; - sha512 = "JCAYsJIXiV0nYrWZHK9WV1YgGkz+nNbngziQyTNoO4qp8qmrvuc0cCwd6TOwuBapgfd7WJTyW2h5RVqbICxZ3g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.6.1.tgz"; + sha512 = "JXzKYXf8NR2DdUQ+BsdB9Eg5oM4HIYtFEr9aKHFTFY+E7MXRrkO+lPm43vOETB6+dWns9vJ4LIcyCO3MvBwQ5A=="; }; }; - "@ot-builder/io-bin-glyph-store-1.5.5" = { + "@ot-builder/io-bin-glyph-store-1.6.1" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.5.tgz"; - sha512 = "9NurbkwdnmlnHEKzFRcrwleTU2PL8T++Gjl8TqDUZ+O2+RoNDOjZ8j0JnARv6+yj7w1+uFZlrdDd2r+/Hox5bQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.6.1.tgz"; + sha512 = "yWnzgzgpBcyLaDevWmd48BRifNbIEl1EaEiUfuOFT8UHxwKBZharL7RyDkgOQH1v/JiS1F/bc7+dV83SU7qHtw=="; }; }; - "@ot-builder/io-bin-layout-1.5.5" = { + "@ot-builder/io-bin-layout-1.6.1" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.5.tgz"; - sha512 = "mbI3XHVw++lUJPxtiUEBP+Cxxr38cJ9fdENH00snSyBAaM4NifYUcVab51Hw1idYqGhtT+HdXUDql5fHqmGLrg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.6.1.tgz"; + sha512 = "bdkBgGZ4d/ymmZxu3J5FOErn8MgdUBJDqETs8832U96sqb8aTB3vGtP0zIWB/ORuRXJNmBgPrZEa+Hi3ff51kw=="; }; }; - "@ot-builder/io-bin-metadata-1.5.5" = { + "@ot-builder/io-bin-metadata-1.6.1" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.5.tgz"; - sha512 = "avWLjS2IQ/g1qv+rDDuNovuu7lvmQSOr6rShk9uJNcSXU+w54n0auWquLyok42RFoW7YYmmPebgsJsTypSEUDQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.6.1.tgz"; + sha512 = "fKj2w5rXUNtOo69iY+4+I025ij+VSthpIWbp44dvQpwGHRDP2nAMZRDjdwpksKefKrHF0xUOZncoVk8cWUKnLQ=="; }; }; - "@ot-builder/io-bin-metric-1.5.5" = { + "@ot-builder/io-bin-metric-1.6.1" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.5.tgz"; - sha512 = "jjfyuHLwgQhyZEHP7hHVl3jX20i3dPbmDb2E7X3GbTmW+rTxodXrHN6OqnEzT+qluK+6RcQs5jdJ5GTW9r21wA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.6.1.tgz"; + sha512 = "W9qUW3Ldw7cz/MPp0NFJ0UlbccTZ0jjjLJdAJgUjRmNemnLSJINy76gJKQPcLqQzWf0g+ZaqFIBpzo2kbJFXXQ=="; }; }; - "@ot-builder/io-bin-name-1.5.5" = { + "@ot-builder/io-bin-name-1.6.1" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.5.tgz"; - sha512 = "pUjKYAXczvqsFfwki8IGJe6PkdxO28GR+4nLrIxyiK6ZSePtMjauDfTUC/mWAVHQZ0uI+tr7n9Un5BONM5PPOg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.6.1.tgz"; + sha512 = "5Ifb2iWM9CXwArQNT973YpWkClh7MxjjBJDaS2lt7WZl/CT2btBzHcZFubxxdplWloRMQQBsG+dM471BIs0gow=="; }; }; - "@ot-builder/io-bin-sfnt-1.5.5" = { + "@ot-builder/io-bin-sfnt-1.6.1" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.5.tgz"; - sha512 = "SiZRMR1jXhFFPQvBZgJuOb4kSrpaWtwAOQaq13Atmxsc855rTbC5u/p7ll55lj8RGcLBsZjwsw9fe4l/0NEJDw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.6.1.tgz"; + sha512 = "/dQ6XGGZMyB79kivB5ZNi2s6Q0sSPjGZNGn+Wv+S5Z1qSuoSZYE3HyQ6c2pPpmLDrats9KqxVXWFTJVEQsuYng=="; }; }; - "@ot-builder/io-bin-ttf-1.5.5" = { + "@ot-builder/io-bin-ttf-1.6.1" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.5.tgz"; - sha512 = "6idmtX8UHM7mqUt4J2o/I/102RksvitKlinOrvUUNj64JtS/Mjy82ugFObLPDZAhXm0CjQIuIOYDS7ULHMtQqg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.6.1.tgz"; + sha512 = "K6Bf183nGPuDeGfDNTK0B2o0Ohe/HnV79tUdQxlNX0YWkehtinp5uK8BcwrBzl1oKr64HCU4/4MJzfYDzGZLPw=="; }; }; - "@ot-builder/io-bin-vtt-private-1.5.5" = { + "@ot-builder/io-bin-vtt-private-1.6.1" = { name = "_at_ot-builder_slash_io-bin-vtt-private"; packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.5.tgz"; - sha512 = "TAdtW8L8iBOUY8L5HfiNo1fGVKbugw4Oy0k5jomA+nob4Jt87G1MCNof03Tzudw+ncTI0WfhqMAqpp/Z5DIqIw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.6.1.tgz"; + sha512 = "kQ7YzNU7Uji6wMF7zWptHrlU8/pGuFdhQSQAUxEh/20lMh3p6gKImI+EA91TOB4WPn9K1pNYIwc4Bbg2l/KoKw=="; }; }; - "@ot-builder/ot-1.5.5" = { + "@ot-builder/ot-1.6.1" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.5.tgz"; - sha512 = "Kbn1lGkQi/jfKdOU/72KZe5joNLtCIkuS/+RM37OimOGSBCZqrnHyldCBv3U+ANPXREUqoBsSug4ar53fwROIQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.6.1.tgz"; + sha512 = "QAsa5t+L2ud/Rfy7RGM47jJPVfsjhu1VSZhjqJlztjA2dYaWpesQPF5tacYuCz21UQHODdy3iumTAdugwZQYQw=="; }; }; - "@ot-builder/ot-encoding-1.5.5" = { + "@ot-builder/ot-encoding-1.6.1" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.5.tgz"; - sha512 = "WvtRzUCkYZ1t6hc6tBYFdgECuYGUT2sJ00qV0RHA/4k5KfofblavvduMD7DaTjMG+CP13lK1Hf2nZthY6Sjwvg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.6.1.tgz"; + sha512 = "1N544+6WkMCSp06WYyWe7TvF19NbiikTeJxH0LU1VSvBOaWI5syg3G7uSPzoLTezIkCV7nE5tj+tKOC6Lr45Ng=="; }; }; - "@ot-builder/ot-ext-private-1.5.5" = { + "@ot-builder/ot-ext-private-1.6.1" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.5.tgz"; - sha512 = "kJ7/bR83V73+WMDE59Uy22zb4po54/gCnrUDoWTDdo8jnhri9wHtFpuL5W1RMQSsegI9PnYTFgTXwAuCmX8EBg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.6.1.tgz"; + sha512 = "6hvBv2AGOAwJ9xOP2pHq1VLSmSggotRsyFGTOGLHSzpufSdfiWmshKPE3uw472nSQ4M3Bd+mK/WuxH1jVvogZw=="; }; }; - "@ot-builder/ot-glyphs-1.5.5" = { + "@ot-builder/ot-glyphs-1.6.1" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.5.tgz"; - sha512 = "8BIjHFzzsRjF0N+lRzna6mwmcQS61MIBFrRY2/hKzQVNqfmXfDRKPkFhbn/5tRb1mmvqNnLM7DrnQcz2r7sMew=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.6.1.tgz"; + sha512 = "O4r4fEcmioDGkO3QYeKH/IZFXToRZQkX4jqFQB4yq5qUiwjLJMKfi/giVnFK5jsu73NW+Ikq1mNNmxq4QpdtRQ=="; }; }; - "@ot-builder/ot-layout-1.5.5" = { + "@ot-builder/ot-layout-1.6.1" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.5.tgz"; - sha512 = "ABRaW09S1ynrEa61ZF5LuznpDqv6Q/zWVocrU4zaO6v42b5ZR87shbXDuYBTu10Ho+ieveMJkIgomjWWHSW4OQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.6.1.tgz"; + sha512 = "4Bnmr8Gz60HgGCBD0cHFeXea8cbH454oDDzfozu2t3xmE2TJV6x/xIW9MXyl+W88BOUlAOu9+hxOPkfxPvoASg=="; }; }; - "@ot-builder/ot-metadata-1.5.5" = { + "@ot-builder/ot-metadata-1.6.1" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.5.tgz"; - sha512 = "PHg5FS/4ayQcbRL2leT5PfWj/tw7hQsCJGYL0RNg+QvkY/IeExq+fHKzbC5HwLYZFCsVKdi5++cWM1rSaPCJIQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.6.1.tgz"; + sha512 = "ZXx0wx/cO/mivhGH5UbvfFe2QsTT74fw1N9NUCjmyupLz8og6kX//Lhj33/sjQqc9p+kBcjp9qVzL99D5tbx8A=="; }; }; - "@ot-builder/ot-name-1.5.5" = { + "@ot-builder/ot-name-1.6.1" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.5.tgz"; - sha512 = "HNHZbc2TFzFyJ1FHVlxV3sGQJqGQjdlTBW4CfgVxxHhbSe59/DMsX1oiplRQ3w7kYQ6SCfU2qp1JXVSXgVBPZw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.6.1.tgz"; + sha512 = "CdCmblvnr/M3PrQT4W0/12df5LhSQxM+eZbE64NLY7ZKekJK7C8MpSuo0lBTAduAQAczAmN3+HfQ2v1xXtBNOg=="; }; }; - "@ot-builder/ot-sfnt-1.5.5" = { + "@ot-builder/ot-sfnt-1.6.1" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.5.tgz"; - sha512 = "B3vMza3hSdGyOlzhIKsNVUHe6knOKpQlWuAZUQXIQCTuKdLGcDAsYBFuTEZEtLhpRzm+jSfEyGZ87V0YV2nUBg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.6.1.tgz"; + sha512 = "jKc2TnfTvQu/958TJrZwG9MxwTRbmcRc9ZvW1MjEK9FK7OqfjxiNAUXJLZm9x2ETxW5pMnkcrkCSD2QaLpuV7w=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.5.5" = { + "@ot-builder/ot-standard-glyph-namer-1.6.1" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.5.tgz"; - sha512 = "L+quAs3jQ1I4U3byONrPp9i8jTf8YT7CuF4ONUiExGyJnK9WIvD5NaVKdI/MPkxVUb1Udc9SaBYtoUm9ImUHQQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.6.1.tgz"; + sha512 = "qU5+2fzE0iana0BJQOuclGwDCA5BboJIc6e651+6SKfdg/lY+KhmdJR5IvjKSARz3c4Uk9r1bbtOjuiFAlnePQ=="; }; }; - "@ot-builder/ot-vtt-private-1.5.5" = { + "@ot-builder/ot-vtt-private-1.6.1" = { name = "_at_ot-builder_slash_ot-vtt-private"; packageName = "@ot-builder/ot-vtt-private"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.5.tgz"; - sha512 = "l8lY6BD1dzlHTW93TlBLcAxxRLHUjlRuFN7w+1Akmtfq/l15AWEW3OqxzxrGAw7TX7Q9Np7HhN0QGbTYjrul3g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.6.1.tgz"; + sha512 = "tBCs7mK3+Potn4DLEOABd1xRZLhG9X7AOASeAJwPOGBNi831DyYuODLeFIE9BKZThoP5GlbTpn5zt2w51Spy8g=="; }; }; - "@ot-builder/prelude-1.5.5" = { + "@ot-builder/prelude-1.6.1" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.5.tgz"; - sha512 = "sTecdvnGlYdQ6Qbu4NSyYIzil72k7gwGaVJiFRZyudNouGiurijHt5F+RiWl05U83zrlcdpcN7iiXzHfr5NnWQ=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.6.1.tgz"; + sha512 = "EeO5vzAEpoRHrA9U39mANa5eoFk/LdS7zhSDiqe4wuDjw9MMcTlkPT1O9aKNNBWdC/ErMutM+AR5b7YWzgSFZw=="; }; }; - "@ot-builder/primitive-1.5.5" = { + "@ot-builder/primitive-1.6.1" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.5.tgz"; - sha512 = "AKrFDof1e6r7K5EC71wGhOfAjujf9GuJ0g56CKGps4FfDw7CwFg77KFwpqsFWjyt6t1fmvFAlKdhVXuNyH4c2Q=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.6.1.tgz"; + sha512 = "1NJpEeaRxrLdjA5nIr92U4DL7bfTMHJgJRIlBu2tGHYttnCOmBWqyRVA+g+prwwUR06EH8I7Dv3q042uc5Ji0A=="; }; }; - "@ot-builder/rectify-1.5.5" = { + "@ot-builder/rectify-1.6.1" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.5.tgz"; - sha512 = "nrx6Ubt7IX9IKUMJcAmNrHyi0kC83laGpnHKCGiBWGVfn/BdmFogRUGNR0NUpEImIVWTq0Y8Ae/tf/i9yI5eZQ=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.6.1.tgz"; + sha512 = "JFSO1YbH9G0pBqBk5xT01YvurUXiHH7k6daP4ceWfKp0Ch6cZCtgvxHIDvtSNxhYnlhBkBWye2+UyZSBlIu77w=="; }; }; - "@ot-builder/stat-glyphs-1.5.5" = { + "@ot-builder/stat-glyphs-1.6.1" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.5.tgz"; - sha512 = "DgWbUPy5de/2fL0JJ94UXJ5fibvDAtVWtjHUmgy38i+3vHYcQ14WPjq3sLxyOKRrrvBQ7CK7Z92N9JjBN+a5ZQ=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.6.1.tgz"; + sha512 = "IGZkR9QdVjPAEBXAe4qixlp4DvHioxD/bp/d+jlIUVgUGZzo/wpwUV/ktT/zjZXDdNpVSdTa/RSG5mUtWHqf8w=="; }; }; - "@ot-builder/trace-1.5.5" = { + "@ot-builder/trace-1.6.1" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.5.tgz"; - sha512 = "hOH55nKImSbq/5ZgZ8pya1/yIvC3IDRfqfWL/3Uz0Zp0StD6/9xhegK+9bM3Qs/llmDXZd7JYOsyWETw8f1iIg=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.6.1.tgz"; + sha512 = "r18ahZoSFv2bWl9oQCDM4IT4aPr8krMjHJHj0brHoMKhrPH/iE9k+d97UaqXUd+I8ZliTfihK/AzOArjIv2ZqQ=="; }; }; - "@ot-builder/var-store-1.5.5" = { + "@ot-builder/var-store-1.6.1" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.5.tgz"; - sha512 = "H18j0yR9qrwXC665lHDq07DBRKkxxlB3mcjUXYX8xElkv/UcD42FOI5lTlvLYV39e3f8uBTf9IhVYPNTYtZHmg=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.6.1.tgz"; + sha512 = "SHkiufkRd07hE4Y75lr013yN0TKdebCqe9VpY/W05EwFL+0DBX2w1cE8FYqiVeS2EYA2hE727BpxTJbTHcRa2Q=="; }; }; - "@ot-builder/variance-1.5.5" = { + "@ot-builder/variance-1.6.1" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.5.tgz"; - sha512 = "Jp20Ro43mLR32erJkLolduF1Q+jBYwDJitcEaGztVEmNGLbJNHb++jFIQSswIFDUrmj/3pKgret4ASiLc4WIkw=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.6.1.tgz"; + sha512 = "RQ9H+jCcshoEUOYjpaOhxSJ31uiKJ8FAOqAvd8JdmDNJAHmmQmaNINOUr+amR0bJk6GqbKnuK48Xs3+8OiAgcw=="; }; }; - "@parcel/bundler-default-2.8.2" = { + "@parcel/bundler-default-2.8.3" = { name = "_at_parcel_slash_bundler-default"; packageName = "@parcel/bundler-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.8.2.tgz"; - sha512 = "/7ao0vc/v8WGHZaS1SyS5R8wzqmmXEr9mhIIB2cbLQ4LA2WUtKsYcvZ2gjJuiAAN1CHC6GxqwYjIJScQCk/QXg=="; + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.8.3.tgz"; + sha512 = "yJvRsNWWu5fVydsWk3O2L4yIy3UZiKWO2cPDukGOIWMgp/Vbpp+2Ct5IygVRtE22bnseW/E/oe0PV3d2IkEJGg=="; }; }; - "@parcel/cache-2.8.2" = { + "@parcel/cache-2.8.3" = { name = "_at_parcel_slash_cache"; packageName = "@parcel/cache"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.8.2.tgz"; - sha512 = "kiyoOgh1RXp5qp+wlb8Pi/Z7o9D82Oj5RlHnKSAauyR7jgnI8Vq8JTeBmlLqrf+kHxcDcp2p86hidSeANhlQNg=="; + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.8.3.tgz"; + sha512 = "k7xv5vSQrJLdXuglo+Hv3yF4BCSs1tQ/8Vbd6CHTkOhf7LcGg6CPtLw053R/KdMpd/4GPn0QrAsOLdATm1ELtQ=="; }; }; - "@parcel/codeframe-2.8.2" = { + "@parcel/codeframe-2.8.3" = { name = "_at_parcel_slash_codeframe"; packageName = "@parcel/codeframe"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.8.2.tgz"; - sha512 = "U2GT9gq1Zs3Gr83j8JIs10bLbGOHFl57Y8D57nrdR05F4iilV/UR6K7jkhdoiFc9WiHh3ewvrko5+pSdAVFPgQ=="; + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.8.3.tgz"; + sha512 = "FE7sY53D6n/+2Pgg6M9iuEC6F5fvmyBkRE4d9VdnOoxhTXtkEqpqYgX7RJ12FAQwNlxKq4suBJQMgQHMF2Kjeg=="; }; }; - "@parcel/compressor-raw-2.8.2" = { + "@parcel/compressor-raw-2.8.3" = { name = "_at_parcel_slash_compressor-raw"; packageName = "@parcel/compressor-raw"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.8.2.tgz"; - sha512 = "EFPTer/P+3axifH6LtYHS3E6ABgdZnjZomJZ/Nl19lypZh/NgZzmMZlINlEVqyYhCggoKfXzgeTgkIHPN2d5Vw=="; + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.8.3.tgz"; + sha512 = "bVDsqleBUxRdKMakWSlWC9ZjOcqDKE60BE+Gh3JSN6WJrycJ02P5wxjTVF4CStNP/G7X17U+nkENxSlMG77ySg=="; }; }; - "@parcel/config-default-2.8.2" = { + "@parcel/config-default-2.8.3" = { name = "_at_parcel_slash_config-default"; packageName = "@parcel/config-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.8.2.tgz"; - sha512 = "1ELJAHx37fKSZZkYKWy6UdcuLRv5vrZJc89tVS6eRvvMt+udbIoSgIUzPXu7XemkcchF7Tryw3u2pRyxyLyL3w=="; + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.8.3.tgz"; + sha512 = "o/A/mbrO6X/BfGS65Sib8d6SSG45NYrNooNBkH/o7zbOBSRQxwyTlysleK1/3Wa35YpvFyLOwgfakqCtbGy4fw=="; }; }; - "@parcel/core-2.8.2" = { + "@parcel/core-2.8.3" = { name = "_at_parcel_slash_core"; packageName = "@parcel/core"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/core/-/core-2.8.2.tgz"; - sha512 = "ZGuq6p+Lzx6fgufaVsuOBwgpU3hgskTvIDIMdIDi9gOZyhGPK7U2srXdX+VYUL5ZSGbX04/P6QlB9FMAXK+nEg=="; + url = "https://registry.npmjs.org/@parcel/core/-/core-2.8.3.tgz"; + sha512 = "Euf/un4ZAiClnlUXqPB9phQlKbveU+2CotZv7m7i+qkgvFn5nAGnrV4h1OzQU42j9dpgOxWi7AttUDMrvkbhCQ=="; }; }; - "@parcel/diagnostic-2.8.2" = { + "@parcel/diagnostic-2.8.3" = { name = "_at_parcel_slash_diagnostic"; packageName = "@parcel/diagnostic"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.8.2.tgz"; - sha512 = "tGSMwM2rSYLjJW0fCd9gb3tNjfCX/83PZ10/5u2E33UZVkk8OIHsQmsrtq2H2g4oQL3rFxkfEx6nGPDGHwlx7A=="; + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.8.3.tgz"; + sha512 = "u7wSzuMhLGWZjVNYJZq/SOViS3uFG0xwIcqXw12w54Uozd6BH8JlhVtVyAsq9kqnn7YFkw6pXHqAo5Tzh4FqsQ=="; }; }; - "@parcel/events-2.8.2" = { + "@parcel/events-2.8.3" = { name = "_at_parcel_slash_events"; packageName = "@parcel/events"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/events/-/events-2.8.2.tgz"; - sha512 = "o5etrsKm16y8iRPnjtEBNy4lD0WAigD66yt/RZl9Rx0vPVDly/63Rr9+BrXWVW7bJ7x0S0VVpWW4j3f/qZOsXg=="; + url = "https://registry.npmjs.org/@parcel/events/-/events-2.8.3.tgz"; + sha512 = "hoIS4tAxWp8FJk3628bsgKxEvR7bq2scCVYHSqZ4fTi/s0+VymEATrRCUqf+12e5H47uw1/ZjoqrGtBI02pz4w=="; }; }; "@parcel/fs-1.11.0" = { @@ -9202,40 +9706,40 @@ let sha512 = "86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA=="; }; }; - "@parcel/fs-2.8.2" = { + "@parcel/fs-2.8.3" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.8.2.tgz"; - sha512 = "aN8znbMndSqn1xwZEmMblzqmJsxcExv2jKLl/a9RUHAP7LaPYcPZIykDL3YwGCiKTCzjmRpXnNoyosjFFeBaHA=="; + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.8.3.tgz"; + sha512 = "y+i+oXbT7lP0e0pJZi/YSm1vg0LDsbycFuHZIL80pNwdEppUAtibfJZCp606B7HOjMAlNZOBo48e3hPG3d8jgQ=="; }; }; - "@parcel/fs-search-2.8.2" = { + "@parcel/fs-search-2.8.3" = { name = "_at_parcel_slash_fs-search"; packageName = "@parcel/fs-search"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.8.2.tgz"; - sha512 = "ovQnupRm/MoE/tbgH0Ivknk0QYenXAewjcog+T5umDmUlTmnIRZjURrgDf5Xtw8T/CD5Xv+HmIXpJ9Ez/LzJpw=="; + url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.8.3.tgz"; + sha512 = "DJBT2N8knfN7Na6PP2mett3spQLTqxFrvl0gv+TJRp61T8Ljc4VuUTb0hqBj+belaASIp3Q+e8+SgaFQu7wLiQ=="; }; }; - "@parcel/graph-2.8.2" = { + "@parcel/graph-2.8.3" = { name = "_at_parcel_slash_graph"; packageName = "@parcel/graph"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.8.2.tgz"; - sha512 = "SLEvBQBgfkXgU4EBu30+CNanpuKjcNuEv/x8SwobCF0i3Rk+QKbe7T36bNR7727mao++2Ha69q93Dd9dTPw0kQ=="; + url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.8.3.tgz"; + sha512 = "26GL8fYZPdsRhSXCZ0ZWliloK6DHlMJPWh6Z+3VVZ5mnDSbYg/rRKWmrkhnr99ZWmL9rJsv4G74ZwvDEXTMPBg=="; }; }; - "@parcel/hash-2.8.2" = { + "@parcel/hash-2.8.3" = { name = "_at_parcel_slash_hash"; packageName = "@parcel/hash"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.8.2.tgz"; - sha512 = "NBnP8Hu0xvAqAfZXRaMM66i8nJyxpKS86BbhwkbgTGbwO1OY87GERliHeREJfcER0E0ZzwNow7MNR8ZDm6IvJQ=="; + url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.8.3.tgz"; + sha512 = "FVItqzjWmnyP4ZsVgX+G00+6U2IzOvqDtdwQIWisCcVoXJFCqZJDy6oa2qDDFz96xCCCynjRjPdQx2jYBCpfYw=="; }; }; "@parcel/logger-1.11.1" = { @@ -9247,211 +9751,211 @@ let sha512 = "9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA=="; }; }; - "@parcel/logger-2.8.2" = { + "@parcel/logger-2.8.3" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.8.2.tgz"; - sha512 = "zlhK6QHxfFJMlVJxxcCw0xxBDrYPFPOhMxSD6p6b0z9Yct1l3NdpmfabgjKX8wnZmHokFsil6daleM+M80n2Ew=="; + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.8.3.tgz"; + sha512 = "Kpxd3O/Vs7nYJIzkdmB6Bvp3l/85ydIxaZaPfGSGTYOfaffSOTkhcW9l6WemsxUrlts4za6CaEWcc4DOvaMOPA=="; }; }; - "@parcel/markdown-ansi-2.8.2" = { + "@parcel/markdown-ansi-2.8.3" = { name = "_at_parcel_slash_markdown-ansi"; packageName = "@parcel/markdown-ansi"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.8.2.tgz"; - sha512 = "5y29TXgRgG0ybuXaDsDk4Aofg/nDUeAAyVl9/toYCDDhxpQV4yZt8WNPu4PaNYKGLuNgXwsmz+ryZQHGmfbAIQ=="; + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.8.3.tgz"; + sha512 = "4v+pjyoh9f5zuU/gJlNvNFGEAb6J90sOBwpKJYJhdWXLZMNFCVzSigxrYO+vCsi8G4rl6/B2c0LcwIMjGPHmFQ=="; }; }; - "@parcel/namer-default-2.8.2" = { + "@parcel/namer-default-2.8.3" = { name = "_at_parcel_slash_namer-default"; packageName = "@parcel/namer-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.8.2.tgz"; - sha512 = "sMLW/bDWXA6IE7TQKOsBnA5agZGNvZ9qIXKZEUTsTloUjMdAWI8NYA1s0i9HovnGxI5uGlgevrftK4S5V4AdkA=="; + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.8.3.tgz"; + sha512 = "tJ7JehZviS5QwnxbARd8Uh63rkikZdZs1QOyivUhEvhN+DddSAVEdQLHGPzkl3YRk0tjFhbqo+Jci7TpezuAMw=="; }; }; - "@parcel/node-resolver-core-2.8.2" = { + "@parcel/node-resolver-core-2.8.3" = { name = "_at_parcel_slash_node-resolver-core"; packageName = "@parcel/node-resolver-core"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.8.2.tgz"; - sha512 = "D/NJEz/h/C3RmUOWSTg0cLwG3uRVHY9PL+3YGO/c8tKu8PlS2j55XtntdiVfwkK+P6avLCnrJnv/gwTa79dOPw=="; + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.8.3.tgz"; + sha512 = "12YryWcA5Iw2WNoEVr/t2HDjYR1iEzbjEcxfh1vaVDdZ020PiGw67g5hyIE/tsnG7SRJ0xdRx1fQ2hDgED+0Ww=="; }; }; - "@parcel/optimizer-css-2.8.2" = { + "@parcel/optimizer-css-2.8.3" = { name = "_at_parcel_slash_optimizer-css"; packageName = "@parcel/optimizer-css"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.8.2.tgz"; - sha512 = "pQEuKhk0PJuYI3hrXlf4gpuuPy+MZUDzC44ulQM7kVcVJ0OofuJQQeHfTLE+v5wClFDd29ZQZ7RsLP5RyUQ+Lg=="; + url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.8.3.tgz"; + sha512 = "JotGAWo8JhuXsQDK0UkzeQB0UR5hDAKvAviXrjqB4KM9wZNLhLleeEAW4Hk8R9smCeQFP6Xg/N/NkLDpqMwT3g=="; }; }; - "@parcel/optimizer-htmlnano-2.8.2" = { + "@parcel/optimizer-htmlnano-2.8.3" = { name = "_at_parcel_slash_optimizer-htmlnano"; packageName = "@parcel/optimizer-htmlnano"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.8.2.tgz"; - sha512 = "4+3wi+Yi+hsf5/LolX59JXFe/7bLpI6NetUBgtoxOVm/EzFg1NGSNOcrthzEcgGj6+MMSdzBAxRTPObAfDxJCA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.8.3.tgz"; + sha512 = "L8/fHbEy8Id2a2E0fwR5eKGlv9VYDjrH9PwdJE9Za9v1O/vEsfl/0T/79/x129l5O0yB6EFQkFa20MiK3b+vOg=="; }; }; - "@parcel/optimizer-image-2.8.2" = { + "@parcel/optimizer-image-2.8.3" = { name = "_at_parcel_slash_optimizer-image"; packageName = "@parcel/optimizer-image"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.8.2.tgz"; - sha512 = "/ICYG0smbMkli+su4m/ENQPxQDCPYYTJTjseKwl+t1vyj6wqNF99mNI4c0RE2TIPuDneGwSz7PlHhC2JmdgxfQ=="; + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.8.3.tgz"; + sha512 = "SD71sSH27SkCDNUNx9A3jizqB/WIJr3dsfp+JZGZC42tpD/Siim6Rqy9M4To/BpMMQIIiEXa5ofwS+DgTEiEHQ=="; }; }; - "@parcel/optimizer-svgo-2.8.2" = { + "@parcel/optimizer-svgo-2.8.3" = { name = "_at_parcel_slash_optimizer-svgo"; packageName = "@parcel/optimizer-svgo"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.8.2.tgz"; - sha512 = "nFWyM+CBtgBixqknpbN4R92v8PK7Gjlrsb8vxN/IIr/3Pjk+DfoT51DnynhU7AixvDylYkgjjqrQ7uFYYl0OKA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.8.3.tgz"; + sha512 = "9KQed99NZnQw3/W4qBYVQ7212rzA9EqrQG019TIWJzkA9tjGBMIm2c/nXpK1tc3hQ3e7KkXkFCQ3C+ibVUnHNA=="; }; }; - "@parcel/optimizer-terser-2.8.2" = { + "@parcel/optimizer-terser-2.8.3" = { name = "_at_parcel_slash_optimizer-terser"; packageName = "@parcel/optimizer-terser"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.8.2.tgz"; - sha512 = "jFAOh9WaO6oNc8B9qDsCWzNkH7nYlpvaPn0w3ZzpMDi0HWD+w+xgO737rWLJWZapqUDSOs0Q/hDFEZ82/z0yxA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.8.3.tgz"; + sha512 = "9EeQlN6zIeUWwzrzu6Q2pQSaYsYGah8MtiQ/hog9KEPlYTP60hBv/+utDyYEHSQhL7y5ym08tPX5GzBvwAD/dA=="; }; }; - "@parcel/package-manager-2.8.2" = { + "@parcel/package-manager-2.8.3" = { name = "_at_parcel_slash_package-manager"; packageName = "@parcel/package-manager"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.8.2.tgz"; - sha512 = "hx4Imi0yhsSS0aNZkEANPYNNKqBuR63EUNWSxMyHh4ZOvbHoOXnMn1ySGdx6v0oi9HvKymNsLMQ1T5CuI4l4Bw=="; + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.8.3.tgz"; + sha512 = "tIpY5pD2lH53p9hpi++GsODy6V3khSTX4pLEGuMpeSYbHthnOViobqIlFLsjni+QA1pfc8NNNIQwSNdGjYflVA=="; }; }; - "@parcel/packager-css-2.8.2" = { + "@parcel/packager-css-2.8.3" = { name = "_at_parcel_slash_packager-css"; packageName = "@parcel/packager-css"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.8.2.tgz"; - sha512 = "l2fR5qr1moUWLOqQZPxtH6DBKbaKcxzEPAmQ+f15dHt8eQxU15MyQ4DHX41b5B7HwaumgCqe0NkuTF3DedpJKg=="; + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.8.3.tgz"; + sha512 = "WyvkMmsurlHG8d8oUVm7S+D+cC/T3qGeqogb7sTI52gB6uiywU7lRCizLNqGFyFGIxcVTVHWnSHqItBcLN76lA=="; }; }; - "@parcel/packager-html-2.8.2" = { + "@parcel/packager-html-2.8.3" = { name = "_at_parcel_slash_packager-html"; packageName = "@parcel/packager-html"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.8.2.tgz"; - sha512 = "/oiTsKZ5OyF9OwAVGHANNuW2TB3k3cVub1QfttSKJgG3sAhrOifb1dP8zBHMxvUrB0CJdYhGlgi1Jth9kjACCg=="; + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.8.3.tgz"; + sha512 = "OhPu1Hx1RRKJodpiu86ZqL8el2Aa4uhBHF6RAL1Pcrh2EhRRlPf70Sk0tC22zUpYL7es+iNKZ/n0Rl+OWSHWEw=="; }; }; - "@parcel/packager-js-2.8.2" = { + "@parcel/packager-js-2.8.3" = { name = "_at_parcel_slash_packager-js"; packageName = "@parcel/packager-js"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.8.2.tgz"; - sha512 = "48LtHP4lJn8J1aBeD4Ix/YjsRxrBUkzbx7czdUeRh2PlCqY4wwIhciVlEFipj/ANr3ieSX44lXyVPk/ttnSdrw=="; + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.8.3.tgz"; + sha512 = "0pGKC3Ax5vFuxuZCRB+nBucRfFRz4ioie19BbDxYnvBxrd4M3FIu45njf6zbBYsI9eXqaDnL1b3DcZJfYqtIzw=="; }; }; - "@parcel/packager-raw-2.8.2" = { + "@parcel/packager-raw-2.8.3" = { name = "_at_parcel_slash_packager-raw"; packageName = "@parcel/packager-raw"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.8.2.tgz"; - sha512 = "dGonfFptNV1lgqKaD17ecXBUyIfoG6cJI1cCE1sSoYCEt7r+Rq56X/Gq8oiA3+jjMC7QTls+SmFeMZh26fl77Q=="; + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.8.3.tgz"; + sha512 = "BA6enNQo1RCnco9MhkxGrjOk59O71IZ9DPKu3lCtqqYEVd823tXff2clDKHK25i6cChmeHu6oB1Rb73hlPqhUA=="; }; }; - "@parcel/packager-svg-2.8.2" = { + "@parcel/packager-svg-2.8.3" = { name = "_at_parcel_slash_packager-svg"; packageName = "@parcel/packager-svg"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.8.2.tgz"; - sha512 = "k7LymTJ4XQA+UcPwFYqJfWs5/Awa4GirNxRWfiFflLqH3F1XvMiKSCIQXmrDM6IaeIqqDDsu6+P5U6YDAzzM3A=="; + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.8.3.tgz"; + sha512 = "mvIoHpmv5yzl36OjrklTDFShLUfPFTwrmp1eIwiszGdEBuQaX7JVI3Oo2jbVQgcN4W7J6SENzGQ3Q5hPTW3pMw=="; }; }; - "@parcel/plugin-2.8.2" = { + "@parcel/plugin-2.8.3" = { name = "_at_parcel_slash_plugin"; packageName = "@parcel/plugin"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.8.2.tgz"; - sha512 = "YG7TWfKsoNm72jbz3b3TLec0qJHVkuAWSzGzowdIhX37cP1kRfp6BU2VcH+qYPP/KYJLzhcZa9n3by147mGcxw=="; + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.8.3.tgz"; + sha512 = "jZ6mnsS4D9X9GaNnvrixDQwlUQJCohDX2hGyM0U0bY2NWU8Km97SjtoCpWjq+XBCx/gpC4g58+fk9VQeZq2vlw=="; }; }; - "@parcel/reporter-cli-2.8.2" = { + "@parcel/reporter-cli-2.8.3" = { name = "_at_parcel_slash_reporter-cli"; packageName = "@parcel/reporter-cli"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.8.2.tgz"; - sha512 = "OIRlBqpKqPpMWRHATT8az8fUAqfceLWlWqgX/CW5cG1i6gefbBWFq2qYxDVBEk1bPDLIUCtqNLhfO8hLyweMjA=="; + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.8.3.tgz"; + sha512 = "3sJkS6tFFzgIOz3u3IpD/RsmRxvOKKiQHOTkiiqRt1l44mMDGKS7zANRnJYsQzdCsgwc9SOP30XFgJwtoVlMbw=="; }; }; - "@parcel/reporter-dev-server-2.8.2" = { + "@parcel/reporter-dev-server-2.8.3" = { name = "_at_parcel_slash_reporter-dev-server"; packageName = "@parcel/reporter-dev-server"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.8.2.tgz"; - sha512 = "A16pAQSAT8Yilo1yCPZcrtWbRhwyiMopEz0mOyGobA1ZDy6B3j4zjobIWzdPQCSIY7+v44vtWMDGbdGrxt6M1Q=="; + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.8.3.tgz"; + sha512 = "Y8C8hzgzTd13IoWTj+COYXEyCkXfmVJs3//GDBsH22pbtSFMuzAZd+8J9qsCo0EWpiDow7V9f1LischvEh3FbQ=="; }; }; - "@parcel/resolver-default-2.8.2" = { + "@parcel/resolver-default-2.8.3" = { name = "_at_parcel_slash_resolver-default"; packageName = "@parcel/resolver-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.8.2.tgz"; - sha512 = "mlowJMjFjyps9my8wd13kgeExJ5EgkPAuIxRSSWW+GPR7N3uA5DBJ+SB/CzdhCkPrXR6kwVWxNkkOch38pzOQQ=="; + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.8.3.tgz"; + sha512 = "k0B5M/PJ+3rFbNj4xZSBr6d6HVIe6DH/P3dClLcgBYSXAvElNDfXgtIimbjCyItFkW9/BfcgOVKEEIZOeySH/A=="; }; }; - "@parcel/runtime-browser-hmr-2.8.2" = { + "@parcel/runtime-browser-hmr-2.8.3" = { name = "_at_parcel_slash_runtime-browser-hmr"; packageName = "@parcel/runtime-browser-hmr"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.8.2.tgz"; - sha512 = "VRM8mxakMglqRB0f5eAuwCigjJ5vlaJMwHy+JuzOsn/yVSELOb+6psRKl2B9hhxp9sJPt4IU6KDdH2IOrgx87Q=="; + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.8.3.tgz"; + sha512 = "2O1PYi2j/Q0lTyGNV3JdBYwg4rKo6TEVFlYGdd5wCYU9ZIN9RRuoCnWWH2qCPj3pjIVtBeppYxzfVjPEHINWVg=="; }; }; - "@parcel/runtime-js-2.8.2" = { + "@parcel/runtime-js-2.8.3" = { name = "_at_parcel_slash_runtime-js"; packageName = "@parcel/runtime-js"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.8.2.tgz"; - sha512 = "Vk3Gywn2M9qP5X4lF6tu8QXP4xNI90UOSOhKHQ9W5pCu+zvD0Gdvu7qwQPFuFjIAq08xU7+PvZzGnlnM+8NyRw=="; + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.8.3.tgz"; + sha512 = "IRja0vNKwvMtPgIqkBQh0QtRn0XcxNC8HU1jrgWGRckzu10qJWO+5ULgtOeR4pv9krffmMPqywGXw6l/gvJKYQ=="; }; }; - "@parcel/runtime-react-refresh-2.8.2" = { + "@parcel/runtime-react-refresh-2.8.3" = { name = "_at_parcel_slash_runtime-react-refresh"; packageName = "@parcel/runtime-react-refresh"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.8.2.tgz"; - sha512 = "JjaMvBVx6v0zB1KHa7AopciIsl3FpjUMttr2tb6L7lzocti2muQGE6GBfinXOmD5oERwCf8HwGJ8SNFcIF0rKA=="; + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.8.3.tgz"; + sha512 = "2v/qFKp00MfG0234OdOgQNAo6TLENpFYZMbVbAsPMY9ITiqG73MrEsrGXVoGbYiGTMB/Toer/lSWlJxtacOCuA=="; }; }; - "@parcel/runtime-service-worker-2.8.2" = { + "@parcel/runtime-service-worker-2.8.3" = { name = "_at_parcel_slash_runtime-service-worker"; packageName = "@parcel/runtime-service-worker"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.8.2.tgz"; - sha512 = "KSxbOKV8nuH5JjFvcUlCtBYnVVlmxreXpMxRUPphPwJnyxRGA4E0jofbQxWY5KPgp7x/ZnZU/nyzCvqURH3kHA=="; + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.8.3.tgz"; + sha512 = "/Skkw+EeRiwzOJso5fQtK8c9b452uWLNhQH1ISTodbmlcyB4YalAiSsyHCtMYD0c3/t5Sx4ZS7vxBAtQd0RvOw=="; }; }; "@parcel/source-map-2.1.1" = { @@ -9463,112 +9967,112 @@ let sha512 = "Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew=="; }; }; - "@parcel/transformer-babel-2.8.2" = { + "@parcel/transformer-babel-2.8.3" = { name = "_at_parcel_slash_transformer-babel"; packageName = "@parcel/transformer-babel"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.8.2.tgz"; - sha512 = "oL2BpvrPMwFiU9jUZ9UYGD1gRgvq9jLsOq+/PJl4GvPbOBVedIBE2nbHP/mYuWRpRnTTTiJQ/ItyOS0R2VQl7A=="; + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.8.3.tgz"; + sha512 = "L6lExfpvvC7T/g3pxf3CIJRouQl+sgrSzuWQ0fD4PemUDHvHchSP4SNUVnd6gOytF3Y1KpnEZIunQGi5xVqQCQ=="; }; }; - "@parcel/transformer-css-2.8.2" = { + "@parcel/transformer-css-2.8.3" = { name = "_at_parcel_slash_transformer-css"; packageName = "@parcel/transformer-css"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.8.2.tgz"; - sha512 = "q8UDlX/TTCbuFBMU45q12/p92JNIz8MHkkH104dWDzXbRtvMKMg8jgNmr8S2bouZjtXMsSb2c54EO88DSM9G4A=="; + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.8.3.tgz"; + sha512 = "xTqFwlSXtnaYen9ivAgz+xPW7yRl/u4QxtnDyDpz5dr8gSeOpQYRcjkd4RsYzKsWzZcGtB5EofEk8ayUbWKEUg=="; }; }; - "@parcel/transformer-html-2.8.2" = { + "@parcel/transformer-html-2.8.3" = { name = "_at_parcel_slash_transformer-html"; packageName = "@parcel/transformer-html"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.8.2.tgz"; - sha512 = "QDgDw6+DAcllaRQiRteMX0VgPIsxRUTXFS8jcXhbGio41LbUkLcT09M04L/cfJAAzvIKhXqiOxfNnyajTvCPDQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.8.3.tgz"; + sha512 = "kIZO3qsMYTbSnSpl9cnZog+SwL517ffWH54JeB410OSAYF1ouf4n5v9qBnALZbuCCmPwJRGs4jUtE452hxwN4g=="; }; }; - "@parcel/transformer-image-2.8.2" = { + "@parcel/transformer-image-2.8.3" = { name = "_at_parcel_slash_transformer-image"; packageName = "@parcel/transformer-image"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.8.2.tgz"; - sha512 = "B/D9v/BVyN5jxoi+wHPbIRfMIylmC6adp8GP+BtChjbuRjukgGT8RlAVz4vDm1l0bboeyPL2IuoWRQgXKGuPVg=="; + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.8.3.tgz"; + sha512 = "cO4uptcCGTi5H6bvTrAWEFUsTNhA4kCo8BSvRSCHA2sf/4C5tGQPHt3JhdO0GQLPwZRCh/R41EkJs5HZ8A8DAg=="; }; }; - "@parcel/transformer-js-2.8.2" = { + "@parcel/transformer-js-2.8.3" = { name = "_at_parcel_slash_transformer-js"; packageName = "@parcel/transformer-js"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.8.2.tgz"; - sha512 = "mLksi6gu/20JdCFDNPl7Y0HTwJOAvf2ybC2HaJcy69PJCeUrrstgiFTjsCwv1eKcesgEHi9kKX+sMHVAH3B/dA=="; + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.8.3.tgz"; + sha512 = "9Qd6bib+sWRcpovvzvxwy/PdFrLUXGfmSW9XcVVG8pvgXsZPFaNjnNT8stzGQj1pQiougCoxMY4aTM5p1lGHEQ=="; }; }; - "@parcel/transformer-json-2.8.2" = { + "@parcel/transformer-json-2.8.3" = { name = "_at_parcel_slash_transformer-json"; packageName = "@parcel/transformer-json"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.8.2.tgz"; - sha512 = "eZuaY5tMxcMDJwpHJbPVTgSaBIO4mamwAa3VulN9kRRaf29nc+Q0iM7zMFVHWFQAi/mZZ194IIQXbDX3r6oSSQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.8.3.tgz"; + sha512 = "B7LmVq5Q7bZO4ERb6NHtRuUKWGysEeaj9H4zelnyBv+wLgpo4f5FCxSE1/rTNmP9u1qHvQ3scGdK6EdSSokGPg=="; }; }; - "@parcel/transformer-postcss-2.8.2" = { + "@parcel/transformer-postcss-2.8.3" = { name = "_at_parcel_slash_transformer-postcss"; packageName = "@parcel/transformer-postcss"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.8.2.tgz"; - sha512 = "0Vb4T2e0QinNDps1/PxYsZwEzWieVxoW++AAUD3gzg0MfSyRc72MPc27CLOnziiRDyOUl+62gqpnNzq9xaKExA=="; + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.8.3.tgz"; + sha512 = "e8luB/poIlz6jBsD1Izms+6ElbyzuoFVa4lFVLZnTAChI3UxPdt9p/uTsIO46HyBps/Bk8ocvt3J4YF84jzmvg=="; }; }; - "@parcel/transformer-posthtml-2.8.2" = { + "@parcel/transformer-posthtml-2.8.3" = { name = "_at_parcel_slash_transformer-posthtml"; packageName = "@parcel/transformer-posthtml"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.8.2.tgz"; - sha512 = "Ub7o6QlH7+xHHHdhvR7MxTqjyLVqeJopPSzy4yP+Bd72tWVjaVm7f76SUl+p7VjhLTMkmczr9OxG3k0SFHEbGw=="; + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.8.3.tgz"; + sha512 = "pkzf9Smyeaw4uaRLsT41RGrPLT5Aip8ZPcntawAfIo+KivBQUV0erY1IvHYjyfFzq1ld/Fo2Ith9He6mxpPifA=="; }; }; - "@parcel/transformer-raw-2.8.2" = { + "@parcel/transformer-raw-2.8.3" = { name = "_at_parcel_slash_transformer-raw"; packageName = "@parcel/transformer-raw"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.8.2.tgz"; - sha512 = "xSzyZtrfisbx0R7xkuFJ/FksKyWaUFN18F9/0bLF8wo5LrOTQoYQatjun7/Rbq5mELBK/0ZPp7uJ02OqLRd2mA=="; + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.8.3.tgz"; + sha512 = "G+5cXnd2/1O3nV/pgRxVKZY/HcGSseuhAe71gQdSQftb8uJEURyUHoQ9Eh0JUD3MgWh9V+nIKoyFEZdf9T0sUQ=="; }; }; - "@parcel/transformer-react-refresh-wrap-2.8.2" = { + "@parcel/transformer-react-refresh-wrap-2.8.3" = { name = "_at_parcel_slash_transformer-react-refresh-wrap"; packageName = "@parcel/transformer-react-refresh-wrap"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.8.2.tgz"; - sha512 = "UXBILYFXaj5zh1DzoYXoS3Wuq1+6WjoRQaFTUA5xrF3pjJb6LAXxWru3R20zR5INHIZXPxdQJB0b+epnmyjK4w=="; + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.8.3.tgz"; + sha512 = "q8AAoEvBnCf/nPvgOwFwKZfEl/thwq7c2duxXkhl+tTLDRN2vGmyz4355IxCkavSX+pLWSQ5MexklSEeMkgthg=="; }; }; - "@parcel/transformer-svg-2.8.2" = { + "@parcel/transformer-svg-2.8.3" = { name = "_at_parcel_slash_transformer-svg"; packageName = "@parcel/transformer-svg"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.8.2.tgz"; - sha512 = "FyliRrNHOF6tGzwHSzA2CTbkq3iMvS27eozf1kFj6gbO8gfJ5HXYoppQrTb237YZ/WXCHqe/3HVmGyJDZiLr+Q=="; + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.8.3.tgz"; + sha512 = "3Zr/gBzxi1ZH1fftH/+KsZU7w5GqkmxlB0ZM8ovS5E/Pl1lq1t0xvGJue9m2VuQqP8Mxfpl5qLFmsKlhaZdMIQ=="; }; }; - "@parcel/types-2.8.2" = { + "@parcel/types-2.8.3" = { name = "_at_parcel_slash_types"; packageName = "@parcel/types"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/types/-/types-2.8.2.tgz"; - sha512 = "HAYhokWxM10raIhqaYj9VR9eAvJ+xP2sNfQ1IcQybHpq3qblcBe/4jDeuUpwIyKeQ4gorp7xY+q8KDoR20j43w=="; + url = "https://registry.npmjs.org/@parcel/types/-/types-2.8.3.tgz"; + sha512 = "FECA1FB7+0UpITKU0D6TgGBpGxYpVSMNEENZbSJxFSajNy3wrko+zwBKQmFOLOiPcEtnGikxNs+jkFWbPlUAtw=="; }; }; "@parcel/utils-1.11.0" = { @@ -9580,13 +10084,13 @@ let sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ=="; }; }; - "@parcel/utils-2.8.2" = { + "@parcel/utils-2.8.3" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.8.2.tgz"; - sha512 = "Ufax7wZxC9FNsUpR0EU7Z22LEY/q9jjsDTwswctCdfpWb7TE/NudOfM9myycfRvwBVEYN50lPbkt1QltEVnXQQ=="; + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.8.3.tgz"; + sha512 = "IhVrmNiJ+LOKHcCivG5dnuLGjhPYxQ/IzbnF2DKNQXWBTsYlHkJZpmz7THoeLtLliGmSOZ3ZCsbR8/tJJKmxjA=="; }; }; "@parcel/watcher-1.12.1" = { @@ -9625,13 +10129,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@parcel/workers-2.8.2" = { + "@parcel/workers-2.8.3" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.8.2.tgz"; - sha512 = "Eg6CofIrJSNBa2fjXwvnzVLPKwR/6fkfQTFAm3Jl+4JYLVknBtTSFzQNp/Fa+HUEG889H9ucTk2CBi/fVPBAFw=="; + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.8.3.tgz"; + sha512 = "+AxBnKgjqVpUHBcHLWIHcjYgKIvHIpZjN33mG5LG9XXvrZiqdWvouEzqEXlVLq5VzzVbKIQQcmsvRy138YErkg=="; }; }; "@peculiar/asn1-schema-2.3.3" = { @@ -9715,6 +10219,15 @@ let sha512 = "SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA=="; }; }; + "@pnpm/crypto.base32-hash-1.0.1" = { + name = "_at_pnpm_slash_crypto.base32-hash"; + packageName = "@pnpm/crypto.base32-hash"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/crypto.base32-hash/-/crypto.base32-hash-1.0.1.tgz"; + sha512 = "pzAXNn6KxTA3kbcI3iEnYs4vtH51XEVqmK/1EiD18MaPKylhqy8UvMJK3zKG+jeP82cqQbozcTGm4yOQ8i3vNw=="; + }; + }; "@pnpm/error-1.4.0" = { name = "_at_pnpm_slash_error"; packageName = "@pnpm/error"; @@ -9796,6 +10309,15 @@ let sha512 = "nco4+4sZqNHn60Y4VE/fbtlShCBqipyUO+nKRPvDHqLrecMW9pzHWMVRxk4nrMRoeowj3q0rX3GYRBa8lsHTAg=="; }; }; + "@pnpm/types-8.9.0" = { + name = "_at_pnpm_slash_types"; + packageName = "@pnpm/types"; + version = "8.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/types/-/types-8.9.0.tgz"; + sha512 = "3MYHYm8epnciApn6w5Fzx6sepawmsNU7l6lvIq+ER22/DPSrr83YMhU/EQWnf4lORn2YyiXFj0FJSyJzEtIGmw=="; + }; + }; "@pnpm/write-project-manifest-1.1.7" = { name = "_at_pnpm_slash_write-project-manifest"; packageName = "@pnpm/write-project-manifest"; @@ -9823,13 +10345,13 @@ let sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="; }; }; - "@primer/octicons-17.8.0" = { + "@primer/octicons-17.10.2" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "17.8.0"; + version = "17.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-17.8.0.tgz"; - sha512 = "2OyvErMeqsJ/K1ZbQ902QowrwqXq+BMmGiL+PGqFzUQ85wmaWj+CobOwWPxBLs/xVGzacJJPt4fWcx4EMoRMkg=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-17.10.2.tgz"; + sha512 = "J/p2PcgT39Za4wpukbN6iUkEUvL5aE7Bs9kXBeEkrjEgc0Uu7J7B2ypwx9J0qM3m3lk2273RT5/4oGv8pfFLcg=="; }; }; "@prisma/engines-4.9.0" = { @@ -9940,13 +10462,13 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; - "@putdotio/api-client-8.33.0" = { + "@putdotio/api-client-8.33.1" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.33.0"; + version = "8.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.33.0.tgz"; - sha512 = "8GdqRQGfquU8WX1XNOuHnKqG4PJb2fgfS+7OH2g5wHRPKXdeStVbVYIVFxttwIeIcNPNtvjYHKyWhhWkFImEnQ=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.33.1.tgz"; + sha512 = "16mQ2diUm2/smxLG0PummI3G66GY3Fqtd1D6K64knPvaZUR1bRYhEJaXHdgiQLpl2PNYZl4MCyHXJ217t2RK2w=="; }; }; "@reach/router-1.3.4" = { @@ -9976,13 +10498,13 @@ let sha512 = "EBw7Ag1hPgFzdznK2PBblc1kdlj5B5Cw3XwI9/oG7tSn85/HKy3X9xHy/8tm/eNXJYHLXHJL/pkwBpFMVVefkw=="; }; }; - "@redis/bloom-1.1.0" = { + "@redis/bloom-1.2.0" = { name = "_at_redis_slash_bloom"; packageName = "@redis/bloom"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.1.0.tgz"; - sha512 = "9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ=="; + url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz"; + sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; }; }; "@redis/client-1.2.0" = { @@ -9994,13 +10516,13 @@ let sha512 = "a8Nlw5fv2EIAFJxTDSSDVUT7yfBGpZO96ybZXzQpgkyLg/dxtQ1uiwTc0EGfzg1mrPjZokeBSEGTbGXekqTNOg=="; }; }; - "@redis/client-1.4.2" = { + "@redis/client-1.5.3" = { name = "_at_redis_slash_client"; packageName = "@redis/client"; - version = "1.4.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.4.2.tgz"; - sha512 = "oUdEjE0I7JS5AyaAjkD3aOXn9NhO7XKyPyXEyrgFDu++VrVBHUPnV6dgEya9TcMuj5nIJRuCzCm8ZP+c9zCHPw=="; + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.3.tgz"; + sha512 = "kPad3QmWyRcmFj1gnb+SkzjXBV7oPpyTJmasVA+ocgNClxqZaTJjLFReqxm9cZQiCtqZK9vrcTISNrgzQXFpLg=="; }; }; "@redis/graph-1.0.1" = { @@ -10048,13 +10570,13 @@ let sha512 = "pP+ZQRis5P21SD6fjyCeLcQdps+LuTzp2wdUbzxEmNhleighDDTD5ck8+cYof+WLec4csZX7ks+BuoMw0RaZrA=="; }; }; - "@redis/search-1.1.0" = { + "@redis/search-1.1.1" = { name = "_at_redis_slash_search"; packageName = "@redis/search"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/search/-/search-1.1.0.tgz"; - sha512 = "NyFZEVnxIJEybpy+YskjgOJRNsfTYqaPbK/Buv6W2kmFNaRk85JiqjJZA5QkRmWvGbyQYwoO5QfDi2wHskKrQQ=="; + url = "https://registry.npmjs.org/@redis/search/-/search-1.1.1.tgz"; + sha512 = "pqCXTc5e7wJJgUuJiC3hBgfoFRoPxYzwn0BEfKgejTM7M/9zP3IpUcqcjgfp8hF+LoV8rHZzcNTz7V+pEIY7LQ=="; }; }; "@redis/time-series-1.0.3" = { @@ -10084,13 +10606,13 @@ let sha512 = "9GWx27t7xWhDIR02PA18nzBdLcKQRgc46xNQvjFkrYk4UOmvKhJ/dawwiX0cCOeetN5LcaaiqQbVOWYK62SGHw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.120" = { + "@redocly/openapi-core-1.0.0-beta.122" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.120"; + version = "1.0.0-beta.122"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.120.tgz"; - sha512 = "BvasunpVWm5O9F/mW6JmxUqat4XFU5zNnKJkMY6GJ9UYH2UxgKnGaMLWXKtbJEOBnMT12S/p9yeqrQHnk8rGhQ=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.122.tgz"; + sha512 = "oky8yeq0Bodw+lj+jxPP4PZPdsN+Fx71N0X5PPEGzMe8zBhFnOAXMR7auA02gHz7DhOnCZ7kTNV1KcftRtSRNg=="; }; }; "@repeaterjs/repeater-3.0.4" = { @@ -10102,6 +10624,123 @@ let sha512 = "AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA=="; }; }; + "@resvg/resvg-js-2.2.0" = { + name = "_at_resvg_slash_resvg-js"; + packageName = "@resvg/resvg-js"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.2.0.tgz"; + sha512 = "Btc6Bht2Y8jBlS1RqVYsPWQaL1WgeGZd/TasmQpCsh0s5Ax1Kw0zyr6DCpvlNYG6b3mNnmJ5ib44A5MIQZmrEQ=="; + }; + }; + "@resvg/resvg-js-android-arm-eabi-2.2.0" = { + name = "_at_resvg_slash_resvg-js-android-arm-eabi"; + packageName = "@resvg/resvg-js-android-arm-eabi"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.2.0.tgz"; + sha512 = "w3lAI6R5cfxGM5oxX6XhEFob4mJkkyfKm0veUQJOg65J4dznwcaJ54lGuQPfjAPhcHxSk/w+7BvFLjbbjV09qw=="; + }; + }; + "@resvg/resvg-js-android-arm64-2.2.0" = { + name = "_at_resvg_slash_resvg-js-android-arm64"; + packageName = "@resvg/resvg-js-android-arm64"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.2.0.tgz"; + sha512 = "rzo0IqUErz1GzPthmU3wB25Vvdyr6KGI+J2WqALgSqmFxJ/sDygT2/6tirb4Lp1IjbvLhzO3uA6SP/sMwcWNfw=="; + }; + }; + "@resvg/resvg-js-darwin-arm64-2.2.0" = { + name = "_at_resvg_slash_resvg-js-darwin-arm64"; + packageName = "@resvg/resvg-js-darwin-arm64"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.2.0.tgz"; + sha512 = "MHJBjUh+xlZeMXcHqGiBO5d5CcgNAd0pXXaOmQtcamfBN5oc9SCJP3z137BEN5RhE6bgz6Wl88Sv1Jh3Wn0nlA=="; + }; + }; + "@resvg/resvg-js-darwin-x64-2.2.0" = { + name = "_at_resvg_slash_resvg-js-darwin-x64"; + packageName = "@resvg/resvg-js-darwin-x64"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.2.0.tgz"; + sha512 = "y6uaW/lWgvqpoeTA2hrgPlvNS7kbduBpUfYCpmk7KzOEMBzUUssOHT+DgqlQ7SZOi01mL6DHeDpAjvzM7K4Ocw=="; + }; + }; + "@resvg/resvg-js-linux-arm-gnueabihf-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-arm-gnueabihf"; + packageName = "@resvg/resvg-js-linux-arm-gnueabihf"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.2.0.tgz"; + sha512 = "G32NqLnuYilT3z5oD5AKXZvpD/ZPRzP1t2T0dvqQC6kBE6c5ckhdCbyT0gnnarcvMoXP+J/xh7kadEp3V8wFDg=="; + }; + }; + "@resvg/resvg-js-linux-arm64-gnu-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-arm64-gnu"; + packageName = "@resvg/resvg-js-linux-arm64-gnu"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.2.0.tgz"; + sha512 = "R0KJCCyjFcTDFT+nAVlP/CYUMIEjxSkSJsEED9QesulCxMY/aoO52p91FgQrGjecORkASNXovlqS3HsNYbCTOg=="; + }; + }; + "@resvg/resvg-js-linux-arm64-musl-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-arm64-musl"; + packageName = "@resvg/resvg-js-linux-arm64-musl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.2.0.tgz"; + sha512 = "Ir83lcBsuB6YVkAVPW4AAOzYo/F9kjlx2HA/O3vCjy/Rn5u5Xf2fGANfJxfCHUCtDMcqmM4hjdF2fOzqS9fusw=="; + }; + }; + "@resvg/resvg-js-linux-x64-gnu-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-x64-gnu"; + packageName = "@resvg/resvg-js-linux-x64-gnu"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.2.0.tgz"; + sha512 = "pH1GdShtIDF3fmQZM9NTEEdZPkNKQ+XUJb7r1jaD8gusdXeD2ejWWi/uvlsugaoMoG0tUmMZi78eVm4IjlY+gw=="; + }; + }; + "@resvg/resvg-js-linux-x64-musl-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-x64-musl"; + packageName = "@resvg/resvg-js-linux-x64-musl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.2.0.tgz"; + sha512 = "7n2d4gfcyLb06RE/7aMGwiiMiqeCf/Ze/fBhKs9F2L60GX6rpgDC2PGJmWBiXIwz48PifvxmBiqD9XCUH5YGoA=="; + }; + }; + "@resvg/resvg-js-win32-arm64-msvc-2.2.0" = { + name = "_at_resvg_slash_resvg-js-win32-arm64-msvc"; + packageName = "@resvg/resvg-js-win32-arm64-msvc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.2.0.tgz"; + sha512 = "rJWhnui1+P9lakfx92zhm+HInZUU1NdvkL/G5KrFcRI8HH0rfdNHokfKknvuko4e7iUSia7kTsbuKDNe4fErtQ=="; + }; + }; + "@resvg/resvg-js-win32-ia32-msvc-2.2.0" = { + name = "_at_resvg_slash_resvg-js-win32-ia32-msvc"; + packageName = "@resvg/resvg-js-win32-ia32-msvc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.2.0.tgz"; + sha512 = "GlckTgsrlF9PQlWcXs1EySeGaT8TAkrSGhVZPRvSv46DUpZlhyVVvKMjsvpbDfqWltFkJTEgkTJ6uravnJrEMA=="; + }; + }; + "@resvg/resvg-js-win32-x64-msvc-2.2.0" = { + name = "_at_resvg_slash_resvg-js-win32-x64-msvc"; + packageName = "@resvg/resvg-js-win32-x64-msvc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.2.0.tgz"; + sha512 = "4coA6J+MfrpbMaPynSLmmiq3DutmvNmCcNFyjnhhnytQW7+8zbrkVZGra7fty3364LY3unZGxS878WRa/AU7tw=="; + }; + }; "@rollup/plugin-commonjs-22.0.2" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -10129,13 +10768,13 @@ let sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; }; }; - "@rushstack/heft-config-file-0.11.4" = { + "@rushstack/heft-config-file-0.11.5" = { name = "_at_rushstack_slash_heft-config-file"; packageName = "@rushstack/heft-config-file"; - version = "0.11.4"; + version = "0.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.11.4.tgz"; - sha512 = "EmXZbqc1akLjcVPagDKlX/rJFtNlkHwhIsd/GGpOPUgytuYNRmhvdXIy6aGLpGHvJpaDqvDmY6powbeOPrs52A=="; + url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.11.5.tgz"; + sha512 = "R6kZyvoZrNmhST3nyYd53N+N4RicQVOCciiglAj6/Y44bscAKIUijAMEHF17JD1+1xAYh/G3R+XIaWLbBpZDSw=="; }; }; "@rushstack/node-core-library-3.53.3" = { @@ -10147,13 +10786,13 @@ let sha512 = "H0+T5koi5MFhJUd5ND3dI3bwLhvlABetARl78L3lWftJVQEPyzcgTStvTTRiIM5mCltyTM8VYm6BuCtNUuxD0Q=="; }; }; - "@rushstack/package-deps-hash-3.2.66" = { + "@rushstack/package-deps-hash-4.0.3" = { name = "_at_rushstack_slash_package-deps-hash"; packageName = "@rushstack/package-deps-hash"; - version = "3.2.66"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-3.2.66.tgz"; - sha512 = "LpsJZ8H7bmEvPEluw9/6Ucf92xiqomZ0P4RSw1YGABYfwt/eOGBYQ2VhyBJsfkQFTRBlIOGCy3GvwvRMRUKz+A=="; + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.0.3.tgz"; + sha512 = "dx3P51viHUuBTw2KakZ4DU8paIOPi2zuvj94TBA9Gv3XQAX6xguD+ZIa2r2P3SNPrv/KPLMVxMpAS9QneJfLsA=="; }; }; "@rushstack/rig-package-0.3.17" = { @@ -10165,49 +10804,49 @@ let sha512 = "nxvAGeIMnHl1LlZSQmacgcRV4y1EYtgcDIrw6KkeVjudOMonlxO482PhDj3LVZEp6L7emSf6YSO2s5JkHlwfZA=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.88.0" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.89.1" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.88.0"; + version = "5.89.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.88.0.tgz"; - sha512 = "gHJZxMNOHnuCCr0MVnWumdHwn3/L9QJYwsw1gmPQ8bIH7sNoXDRNNLTH2PsrpsKdrfZIc1wJx9i//ZoBTUZy0g=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.89.1.tgz"; + sha512 = "TyvsweC16xNoZeFEbv4vCD4z2L6jO6GXmw+97y1ep+OVJXQzKJHPgV4Wct2i+jYjO1+cbUsqshUwyJif42UqvA=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.88.0" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.89.1" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.88.0"; + version = "5.89.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.88.0.tgz"; - sha512 = "zya+KZVm0Z0OWn+yK4PcBVvUGcygNCU3AqcEy9t/dZJ5iw9uWSvWig4dMgmuJPRtqTL2zDHzGGpxxRzVcl2JhQ=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.89.1.tgz"; + sha512 = "YpF+18c/Z5YYCH9WRQ/X6lxhpxcxO8727XNWrOMBbYCIjQgPY83Dh3xGtDk8sLr2WFxJVKIetyEtHDJNh5ghGg=="; }; }; - "@rushstack/rush-sdk-5.88.0" = { + "@rushstack/rush-sdk-5.89.1" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.88.0"; + version = "5.89.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.88.0.tgz"; - sha512 = "2oiD3/9XOdsq1uH5TkPIlp8Bur/60QbAEyAjSiHAlaHwFCXBfIpfRwEU5Yqso2QJz4Wk15yKJaOW8or8bF+m1A=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.89.1.tgz"; + sha512 = "KSrcfycU82dI3+XIVIwiESnIXsMyvzkDHgfDexl1K+094klzYlmQBvDc8ladaUmTWs/9eRadggN/Y2xhgE7wOg=="; }; }; - "@rushstack/stream-collator-4.0.219" = { + "@rushstack/stream-collator-4.0.222" = { name = "_at_rushstack_slash_stream-collator"; packageName = "@rushstack/stream-collator"; - version = "4.0.219"; + version = "4.0.222"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.0.219.tgz"; - sha512 = "dY3srmUXpPbrtFoqrXmRzkum6+TGl9XQkkQLM18ZvSQfihg1iNbkR4vxOUlw0YvkQq373TI5lHBoDbfUZB7Mmw=="; + url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.0.222.tgz"; + sha512 = "oE0DzdzqdaX3xRnbqIsNSRGTWSbSKPs3irDsHAE9Fj6diftfV++7EvDMpcEcD1owN0mJTyco6VeZdRjJf1Ytqw=="; }; }; - "@rushstack/terminal-0.3.88" = { + "@rushstack/terminal-0.3.91" = { name = "_at_rushstack_slash_terminal"; packageName = "@rushstack/terminal"; - version = "0.3.88"; + version = "0.3.91"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.3.88.tgz"; - sha512 = "ZY6VqeOG+2mdis+6aV0EMay/aBE5OpQo931b7+YZuP2CxknljUuW/H/WGnnaSvbb54mvX3lmzK088hPfH4XrRQ=="; + url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.3.91.tgz"; + sha512 = "m4XqR8HeffmsWR4qpYm4FpUU66vqYFJZJf8xuYO33zSkHDL5qdNjQ9yrtRJFs1mF38hMsXSHkvo2djRuf9MM5A=="; }; }; "@rushstack/ts-command-line-4.13.1" = { @@ -10255,13 +10894,13 @@ let sha512 = "DJKkAvJf8ZpkTIZlxi29d/jRvraweA2I2KIqa7eSNhXuDnau8bIQBkOhSpnhVUckR8i/W8SNYdqwiHlUm5t9Lw=="; }; }; - "@schematics/angular-15.1.1" = { + "@schematics/angular-15.1.3" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "15.1.1"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.1.tgz"; - sha512 = "Ujo4vt/r3WzIhGn2I2Lt3eOTWSsVxoXfcXxFRuxl3cil/9mH1X66hDTQ2DVYiXPFGcQMjcNaDwlQxyor4yGbqA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.3.tgz"; + sha512 = "jCJ0Nq/FpoMnA63rPAhRWQJFVbS+K8NpdTHZ/7l4wx9iFtIH7khCdbp3QYMJSwZh5pEiw/NO7ouxsWo5YgapYQ=="; }; }; "@segment/ajv-human-errors-2.2.0" = { @@ -10300,13 +10939,13 @@ let sha512 = "tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw=="; }; }; - "@sentry/core-7.31.1" = { + "@sentry/core-7.34.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.31.1"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.31.1.tgz"; - sha512 = "quaNU6z8jabmatBTDi28Wpff2yzfWIp/IU4bbi2QOtEiCNT+TQJXqlRTRMu9xLrX7YzyKCL5X2gbit/85lyWUg=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.34.0.tgz"; + sha512 = "J1oxsYZX1N0tkEcaHt/uuDqk6zOnaivyampp+EvBsUMCdemjg7rwKvawlRB0ZtBEQu3HAhi8zecm03mlpWfCDw=="; }; }; "@sentry/hub-6.19.7" = { @@ -10318,13 +10957,13 @@ let sha512 = "y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA=="; }; }; - "@sentry/integrations-7.31.1" = { + "@sentry/integrations-7.34.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.31.1"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.31.1.tgz"; - sha512 = "El+qzwbiXHPDWg8ZmX+W/kCheoaYoaAJuaG2+l3D5Y4ny8JNYfSMCum9qXVEb8oB98fFHfSEoFzB+z54pH+p3w=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.34.0.tgz"; + sha512 = "xbWnTvG4gkKeCVpmhhdPtMbQkPO0RAfEJ8VPO5TWmUMT23ZWy2kE0gTZHtnBopy7AXxg231XxTi4fxnwgQGxEQ=="; }; }; "@sentry/minimal-6.19.7" = { @@ -10345,13 +10984,13 @@ let sha512 = "gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg=="; }; }; - "@sentry/node-7.31.1" = { + "@sentry/node-7.34.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.31.1"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.31.1.tgz"; - sha512 = "4VzfOU1YHeoGkBQmkVXlXoXITf+1NkZEREKhdzgpVAkVjb2Tk3sMoFov4wOKWnNTTj4ka50xyaw/ZmqApgQ4Pw=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.34.0.tgz"; + sha512 = "VM4XeydRdgeaNTRe8kwqYg2oNPddVyY74PlCFEFnPEN1NccycNuwiFno68kNrApeqxxLlTTmzkJy0BWo16x2Yg=="; }; }; "@sentry/types-6.19.7" = { @@ -10363,13 +11002,13 @@ let sha512 = "jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="; }; }; - "@sentry/types-7.31.1" = { + "@sentry/types-7.34.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.31.1"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.31.1.tgz"; - sha512 = "1uzr2l0AxEnxUX/S0EdmXUQ15/kDsam8Nbdw4Gai8SU764XwQgA/TTjoewVP597CDI/AHKan67Y630/Ylmkx9w=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.34.0.tgz"; + sha512 = "K+OeHIrl35PSYn6Zwqe4b8WWyAJQoI5NeWxHVkM7oQTGJ1YLG4BvLsR+UiUXnKdR5krE4EDtEA5jLsDlBEyPvw=="; }; }; "@sentry/utils-6.19.7" = { @@ -10381,13 +11020,13 @@ let sha512 = "z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA=="; }; }; - "@sentry/utils-7.31.1" = { + "@sentry/utils-7.34.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.31.1"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.31.1.tgz"; - sha512 = "ZsIPq29aNdP9q3R7qIzJhZ9WW+4DzE9g5SfGwx3UjTIxoRRBfdUJUbf7S+LKEdvCkKbyoDt6FLt5MiSJV43xBA=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.34.0.tgz"; + sha512 = "VIHHXEBw0htzqxnU8A7WkXKvmsG2pZVqHlAn0H9W/yyFQtXMuP1j1i0NsjADB/3JXUKK83kTNWGzScXvp0o+Jg=="; }; }; "@serialport/binding-mock-10.2.2" = { @@ -10516,13 +11155,13 @@ let sha512 = "gbcUdvq9Kyv2HsnywS7QjnEB28g+6OGB5Z8TLP7X+UPpoMIWoUsoQIq5Kt0ZTgMoWn3JGM2lqwTsSHF+1qhniA=="; }; }; - "@serverless/dashboard-plugin-6.2.2" = { + "@serverless/dashboard-plugin-6.2.3" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.2.2.tgz"; - sha512 = "h3zOprpuWZCdAP7qoOKT2nboB+AaxMkGoSzOD0jIBpt9s0cXqLE2VFjR2vKn8Cvam47Qa3XYnT2/XN6tR6rZgQ=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.2.3.tgz"; + sha512 = "iTZhpZbiVl6G2AyfgoqxemqqpG4pUceWys3GsyZtjimnfnGd2UFBOMVUMTavLhYia7lQc4kQVuXQ+afLlkg+pQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -11029,6 +11668,15 @@ let sha512 = "sV+51I7WYnLJnKPn2EMWgS4EUfoP4iWEbrWwbXsj0MZCB/xOK8j6+C9fntIdOM50kpx45ZLC3s6kwKivWuqvyg=="; }; }; + "@streamparser/json-0.0.10" = { + name = "_at_streamparser_slash_json"; + packageName = "@streamparser/json"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@streamparser/json/-/json-0.0.10.tgz"; + sha512 = "juqNFdqqmY/nvsODq1Vba7PWIaqr01VcqICIrxbws97QKSQhQUMml8FqdHLmevwVpqH39H5mVXKFWiWCi1ke0w=="; + }; + }; "@stroncium/procfs-1.2.1" = { name = "_at_stroncium_slash_procfs"; packageName = "@stroncium/procfs"; @@ -11083,103 +11731,202 @@ let sha512 = "LOC/z9HDUmTqSAF08YIRLThGGNZLdRrjcEdoQu/EANxPSVRedYgh4AiZlOX8sY8Rp1p7S/StOmZogJLuvR4mcA=="; }; }; - "@swc/core-1.3.27" = { + "@swc/core-1.3.29" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.27.tgz"; - sha512 = "praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.29.tgz"; + sha512 = "BYDBEqQ77ASZNQYTP7PlKnMLwbHh3lhtlzD/gQP2zIK9XhqQlcy/zIcLljYDn0EOogLn3IyaUiXgAzDWoAmWMg=="; }; }; - "@swc/core-darwin-arm64-1.3.27" = { + "@swc/core-1.3.30" = { + name = "_at_swc_slash_core"; + packageName = "@swc/core"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.30.tgz"; + sha512 = "pg6GWw615EwCh4vJ5k7xll1E4WJSPeINrRvF/EPyBvNNhlXR3s6+KZevJTx3PpA5PXjprDR0aqwi0/aigSCAPA=="; + }; + }; + "@swc/core-darwin-arm64-1.3.29" = { name = "_at_swc_slash_core-darwin-arm64"; packageName = "@swc/core-darwin-arm64"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.27.tgz"; - sha512 = "IKlxkhEy99CnP9nduaf5IJWIFcr6D5cZCjYmCs7nWkjMV+aAieyDO9AX4LT8AcHy6CF7ByOX7SKoqk+gVMAaKw=="; + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.29.tgz"; + sha512 = "1RQ0MCmWOQmo3qG60vhbNaO/qMZ25lDfjhTayAzHjS1k7WyoUv3M8Em2Fip2VKJz5cN2M7MWiP5aHMotMovuaQ=="; }; }; - "@swc/core-darwin-x64-1.3.27" = { + "@swc/core-darwin-arm64-1.3.30" = { + name = "_at_swc_slash_core-darwin-arm64"; + packageName = "@swc/core-darwin-arm64"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.30.tgz"; + sha512 = "GZ4mZZbH77N8renK34A3Lkhl6x8z+c97SCbl43pn5E0Z0sifohA8WNhrtucKrUdid0svYibwotJzeFNpDtg7gQ=="; + }; + }; + "@swc/core-darwin-x64-1.3.29" = { name = "_at_swc_slash_core-darwin-x64"; packageName = "@swc/core-darwin-x64"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.27.tgz"; - sha512 = "MtabZIhFf/dL3vs6UMbd+vJsjIkm2NaFqulGV0Jofy2bfVZPTj/b5pXeOlUsTWy7JcH1uixjdx4RvJRyvqJxQA=="; + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.29.tgz"; + sha512 = "UXiVOkt9i/mwarhHiN6o5RAi3Q7riCQTiOO2e98c/qi3SiYqbgd6kil+2gBcpVB0CGEFyyGB9rECwNBkaYe7zw=="; }; }; - "@swc/core-linux-arm-gnueabihf-1.3.27" = { + "@swc/core-darwin-x64-1.3.30" = { + name = "_at_swc_slash_core-darwin-x64"; + packageName = "@swc/core-darwin-x64"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.30.tgz"; + sha512 = "ppGrAJmKpT3vFr2vGaxXFL8JqHsb6kSAj0dVYTNYicl3c6XOjnMiNSfu6HRbdmXt0VpFHhC5L/a7Ta89mQ1sJA=="; + }; + }; + "@swc/core-linux-arm-gnueabihf-1.3.29" = { name = "_at_swc_slash_core-linux-arm-gnueabihf"; packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.27.tgz"; - sha512 = "XELMoGcUTAkk+G4buwIIhu6AIr1U418Odt22HUW8+ZvV+Wty2ICgR/myOIhM3xMb6U2L8ay+evMqoVNMQ0RRTg=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.29.tgz"; + sha512 = "0B7+FoYgEE1Yg6j5EAtEpKVbHby3jnJo6Y4g0dGxecRtXUhu8TKVI4P93sj4PJ+l4XkAyzdhSsQ+ytFRsbOJ6w=="; }; }; - "@swc/core-linux-arm64-gnu-1.3.27" = { + "@swc/core-linux-arm-gnueabihf-1.3.30" = { + name = "_at_swc_slash_core-linux-arm-gnueabihf"; + packageName = "@swc/core-linux-arm-gnueabihf"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.30.tgz"; + sha512 = "XQYY/VNRnM0/779ehfMgh2poO3reOANvfzOprF8xmGK20+DxFqbMWjHhJutscQuEjLtdwk/LfgCkwmTaB1hhwg=="; + }; + }; + "@swc/core-linux-arm64-gnu-1.3.29" = { name = "_at_swc_slash_core-linux-arm64-gnu"; packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.27.tgz"; - sha512 = "O6vtT6bnrVR9PzEIuA5U7tIfYo7bv97H9K9Vqy2oyHNeGN0H36DKwS4UqPreHtziXNF5+7ubdUYUkrG/j8UnUQ=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.29.tgz"; + sha512 = "XN9axiTuiFOm+UBnDDOQV3b2OekziXHtVPBAPSEssRsNGS4uN7YvCyVAcS8GYdK7GoZ+cmoZBYwD4trir48WXw=="; }; }; - "@swc/core-linux-arm64-musl-1.3.27" = { + "@swc/core-linux-arm64-gnu-1.3.30" = { + name = "_at_swc_slash_core-linux-arm64-gnu"; + packageName = "@swc/core-linux-arm64-gnu"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.30.tgz"; + sha512 = "ME4BjMYSXana0Lfswa3aQW0rTdmR9wa1NGQ3t6MYLdBVm+76Xwe29JKlOfnI1iCCtcbRBoWy4dlhyuxW8DN7cw=="; + }; + }; + "@swc/core-linux-arm64-musl-1.3.29" = { name = "_at_swc_slash_core-linux-arm64-musl"; packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.27.tgz"; - sha512 = "Oa0E1i7dOTWpaEZumKoNbTE/Ap+da6nlhqKVUdYrFDrOBi25tz76SdxZIyvAszzmgY89b5yd1naourKmkPXpww=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.29.tgz"; + sha512 = "M6eE02Dzl1efRLozitGvgjiNEee0VQInqMX4tvfpzQwqZsKNAD8/NGPeTG4763BLDHc4hnMZbnt5wncDLjFq7A=="; }; }; - "@swc/core-linux-x64-gnu-1.3.27" = { + "@swc/core-linux-arm64-musl-1.3.30" = { + name = "_at_swc_slash_core-linux-arm64-musl"; + packageName = "@swc/core-linux-arm64-musl"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.30.tgz"; + sha512 = "h3X9Pn1m5kuFSW8lJyDiMB4ELNZFJ+QxLva5GCxZDArQttkNeY4tMNWFcaG44xUXeywffrgjpXO7Yj2JGzmG4g=="; + }; + }; + "@swc/core-linux-x64-gnu-1.3.29" = { name = "_at_swc_slash_core-linux-x64-gnu"; packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.27.tgz"; - sha512 = "S3v9H8oL2a8Ur6AjQyhkC6HfBVPOxKMdBhcZmdNuVgEUHbHdbf/Lka85F9IOYXEarMn0FtQw3ywowS22O9L5Uw=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.29.tgz"; + sha512 = "t2e9byHRpxKyUsLeODlb3yKJcm8wMirsLIxjr24q5YbnChD3QUMQwA8aA9w2PWc86ihukw7Ksx3RYT7uR706HA=="; }; }; - "@swc/core-linux-x64-musl-1.3.27" = { + "@swc/core-linux-x64-gnu-1.3.30" = { + name = "_at_swc_slash_core-linux-x64-gnu"; + packageName = "@swc/core-linux-x64-gnu"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.30.tgz"; + sha512 = "vfPR8cakx5IZQSpNuXPrpkRprBdVxXsvN5JWN3fpuNVIgFFo3q8njihaItujKvePIHQwov4achfBZlm4JRitWQ=="; + }; + }; + "@swc/core-linux-x64-musl-1.3.29" = { name = "_at_swc_slash_core-linux-x64-musl"; packageName = "@swc/core-linux-x64-musl"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.27.tgz"; - sha512 = "6DDkdXlOADpwICFZTRphCR+cIeS8aEYh4NlyzBito0mOWwIIdfCgALzhkTQOzTOkcD42bP97CIoZ97hqV/puOg=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.29.tgz"; + sha512 = "3jDzDYIyHXrXKOSnTtsN56eINbTPuVQj65D3K8+zo1o52GGwNGyCvQt2RpxNfM8+ptb4j6v7weSU8kVvbUzGTQ=="; }; }; - "@swc/core-win32-arm64-msvc-1.3.27" = { + "@swc/core-linux-x64-musl-1.3.30" = { + name = "_at_swc_slash_core-linux-x64-musl"; + packageName = "@swc/core-linux-x64-musl"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.30.tgz"; + sha512 = "jtfv8N+00E2RMTVjwfTfimeqzo0B9FmbbSkzlnLvkmV8xDAPyLmX7v/xL5YiVJRLeSrlJ7DmkCSxLzpJao73dw=="; + }; + }; + "@swc/core-win32-arm64-msvc-1.3.29" = { name = "_at_swc_slash_core-win32-arm64-msvc"; packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.27.tgz"; - sha512 = "baxfH4AbEcaTNo08wxV0W6hiMXwVCxPS4qc0amHpXPti92unvSqeDR1W3C9GjHqzXlWtmCRsq8Ww1pal6ZVLrw=="; + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.29.tgz"; + sha512 = "3PadPieyslG++7SQ42OApfiXtQdzFpnCv/i/UJ6gOL5d0MluNzZ2nIxD8LwXXizVdmcm8bmc0WRhK3JhvhzVJA=="; }; }; - "@swc/core-win32-ia32-msvc-1.3.27" = { + "@swc/core-win32-arm64-msvc-1.3.30" = { + name = "_at_swc_slash_core-win32-arm64-msvc"; + packageName = "@swc/core-win32-arm64-msvc"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.30.tgz"; + sha512 = "fX3T6JzS5F8JJ/UZQWrZfdml8nLuSzgA0EFKetTNa5AHh1x9ltShmlFOJ3OPpD9BKI/QcQSLxyoAjxt7NtAnaQ=="; + }; + }; + "@swc/core-win32-ia32-msvc-1.3.29" = { name = "_at_swc_slash_core-win32-ia32-msvc"; packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.27.tgz"; - sha512 = "7iLJnH71k5qCwxv9NcM/P7nIEzTsC7r1sIiQW6bu+CpC8qZvwl0PS+XvQRlLly2gCZM+Le98tksYG14MEh+Hrw=="; + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.29.tgz"; + sha512 = "tUFrHxxYz9Cfz07yGwDXdtRziC3q1ia2SHodzZ3obTpY+HQiBDHs0QO/HkbUBNF+du0vhnsgtWilnsMQDILFDQ=="; }; }; - "@swc/core-win32-x64-msvc-1.3.27" = { + "@swc/core-win32-ia32-msvc-1.3.30" = { + name = "_at_swc_slash_core-win32-ia32-msvc"; + packageName = "@swc/core-win32-ia32-msvc"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.30.tgz"; + sha512 = "m88NjTcVFHFAciWRWTW7NbeQPrzjKKBzSoSPukhjvKSWQNk5v6BBbTAKpymNGQssPn5WLarC2QlQzCwjyh1QLA=="; + }; + }; + "@swc/core-win32-x64-msvc-1.3.29" = { name = "_at_swc_slash_core-win32-x64-msvc"; packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.27.tgz"; - sha512 = "mFM907PDw/jrQ44+TRjIVGEOy2Mu06mMMz0HPMFuRsBzl5t0Kajp3vmn8FkkpS9wH5982VPi6hPYVTb7QJo5Qg=="; + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.29.tgz"; + sha512 = "/Z3kxMXGKlIhtkxBxsCSZl8j/qYfbA4dtW7RKv1RNxbPLbwk8k3Owhgk/Y3JeRavcUKwja1rUX5rhMjLYeN3tw=="; + }; + }; + "@swc/core-win32-x64-msvc-1.3.30" = { + name = "_at_swc_slash_core-win32-x64-msvc"; + packageName = "@swc/core-win32-x64-msvc"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.30.tgz"; + sha512 = "HsePRjbdD5XsnS8NkN+MmhtUyjF16cU3COd92DjRYKsB1rMDE51itfacBvOeZPHFV6VkrLsakubAZCMc+3d/Ag=="; }; }; "@swc/helpers-0.4.14" = { @@ -11191,13 +11938,22 @@ let sha512 = "4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw=="; }; }; - "@swc/wasm-1.3.27" = { + "@swc/wasm-1.3.29" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.27.tgz"; - sha512 = "bSFeKxGU2zY/xC3K7Y4sjdtHMgbv6gM2Z01PTMGoC8b2PVubPKeW+BYmprZFSf2eCOsNLZaVzVufdVTQB/ORfg=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.29.tgz"; + sha512 = "Tzpl541GRLyzQufasGScL9tMOzk0SsdcVX0jYpG74u6VZHqr0u62Cw6nYtRhTtkcsFsfNpg7RQM+CycyXY8Nmw=="; + }; + }; + "@swc/wasm-1.3.30" = { + name = "_at_swc_slash_wasm"; + packageName = "@swc/wasm"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.30.tgz"; + sha512 = "y5LnHLIaZ2mNmnY/b0jEJccV3eErxnIbF8K3RxqmnD4zWHsuvaOAVeQPKTK4vlM/V9ip+BUtCeFiUfnxCx8JwA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -11236,22 +11992,31 @@ let sha512 = "/FcGQVvXAslhiC9aMG5gxKXJctg8N7XLZrP+wYrFTFccWEPZd/Xon5y7jUXpKOVSOFEA1MOKZKbPuK4ET5/T8Q=="; }; }; - "@tediousjs/connection-string-0.4.1" = { + "@tediousjs/connection-string-0.4.2" = { name = "_at_tediousjs_slash_connection-string"; packageName = "@tediousjs/connection-string"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.4.1.tgz"; - sha512 = "gr1mFN7KMOn+VviQKcrt+z1/7ttn7s9NSMFFyg5GrJylNH6JGrDDNRm7C5vE4PNwhW6hYT67QRUO44Ns2LQijg=="; + url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.4.2.tgz"; + sha512 = "1R9UC7Qc5wief2oJL+c1+d7v1/oPBayL85u8L/jV2DzIKput1TZ8ZUjj2nxQaSfzu210zp0oFWUrYUiUs8NhBQ=="; }; }; - "@textlint/ast-node-types-12.3.0" = { + "@textlint/ast-node-types-12.6.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "12.3.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.3.0.tgz"; - sha512 = "ke5hlKy/xZ/vQt6j+h4k9GradJPDsV3FKsUqWpCpF/X8qWCU2zM4e1SMUAFjoUcLuF9in+eXIQ71Qm/AdjjkZQ=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz"; + sha512 = "uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA=="; + }; + }; + "@textlint/ast-node-types-13.0.4" = { + name = "_at_textlint_slash_ast-node-types"; + packageName = "@textlint/ast-node-types"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.0.4.tgz"; + sha512 = "6/8reOpc7csrwR8Hd+WqP75QS2akk8U7lzCAUv5cyoGga2KzWlauCC6gy4ZU/Qw8UfSU2ri7ZcX975i6KYLtwQ=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -11263,139 +12028,238 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.5.0" = { + "@textlint/ast-tester-12.6.1" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.5.0.tgz"; - sha512 = "osHf1OFLC3RnjGyoSBynn2u5pgj7qkik8TNaxgPekVwlLWtJTcyh22PHo+mXPF47XWM5gJQmy/72nUrqtbDMPg=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.6.1.tgz"; + sha512 = "Gxiq6xmDR3PnX0RqRGth/Lu5fyFWoXNPfGxXTLORPFpfs8JKPh/eXGhlwc1f0v4VQzPay2KwVl6SGXvJD5qLXw=="; }; }; - "@textlint/ast-traverse-12.5.0" = { + "@textlint/ast-tester-13.0.4" = { + name = "_at_textlint_slash_ast-tester"; + packageName = "@textlint/ast-tester"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.0.4.tgz"; + sha512 = "i/7bNipeeWsUqpYCxwxXXUmbiUBNJCZrVSVsZgFo1llJPa/uivyRy64Wgxy725GoWr3GdhAAGI3e7gtjGrZXjg=="; + }; + }; + "@textlint/ast-traverse-12.6.1" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.5.0.tgz"; - sha512 = "TAbfxz8x8Q/sn7D/h7OikzYp5NqPDrRExm3N+3v9yj+gq++fxHtskas48tm1TYcChTMq6BbPU+EGbdlMo3rWWA=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.6.1.tgz"; + sha512 = "Y/j7ip7yDuTjuIV4kTRPVnkJKfpI71U+eqXFnrM9sE2xBA9IsqzqiLQeDY+S5hhfQzmcEnZFtAP0hqrYaT6gNA=="; }; }; - "@textlint/config-loader-12.5.0" = { + "@textlint/ast-traverse-13.0.4" = { + name = "_at_textlint_slash_ast-traverse"; + packageName = "@textlint/ast-traverse"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.0.4.tgz"; + sha512 = "wK1HWrONMfJBhFby9Dpu2tEj0j1JRBlk1fVxLljBzmrV31v1nMI7Q9+ZMqGAZIZD7kDMUpHvGg7OsA6KjHiLcA=="; + }; + }; + "@textlint/config-loader-13.0.4" = { name = "_at_textlint_slash_config-loader"; packageName = "@textlint/config-loader"; - version = "12.5.0"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-12.5.0.tgz"; - sha512 = "g706+XwdsUGpVXzqW7OFcBO8XdxH1AqbD0D3UYEjlfUONXD0c4Bymctdjk49hzOwTVDGqj+CCyvL+cB/X2bG+Q=="; + url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.0.4.tgz"; + sha512 = "LGJeHEr3DosO1NlCOR3186Pqx2e2TcWAm3fydb3MD7kp5ko2mfMlGsJzo0wQOjuRGTtMV212b3OKsdKZBFo0TA=="; }; }; - "@textlint/feature-flag-12.5.0" = { + "@textlint/feature-flag-12.6.1" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.5.0.tgz"; - sha512 = "GdyRbbIsWRuZieWKvRxQA8j5wX5hzq+QqEmuputBrU/KKapNfkg6uNY2GOY6SWvC8QcwD0dYh3Dy1x2txT8p8Q=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.6.1.tgz"; + sha512 = "cY/AraTLdzbwDyAhdpaXB7n1Lw6zA+k+7UaT8mmxMmjs0uYGzdMQa499I0rQatctJ6izrdZXYW0NdUQfG2ugiA=="; }; }; - "@textlint/fixer-formatter-12.5.1" = { + "@textlint/feature-flag-13.0.4" = { + name = "_at_textlint_slash_feature-flag"; + packageName = "@textlint/feature-flag"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.0.4.tgz"; + sha512 = "mo4AaRrSbOgYhf6p+LSwo+UbMr62dsq12vMVqEkjHZ5tm5vrWbQkC2YrtMAM0ot9AY1x6RJFJ5ZO3Qn42N0JTQ=="; + }; + }; + "@textlint/fixer-formatter-13.0.4" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.5.1"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.5.1.tgz"; - sha512 = "dzOsgpkl5lIB25BHgW0saAohRW4ZF0s/SyK/FbweYtkDGd190USLGpCibx2M8/mAEFDs5YsnTqZlkbp1FLLuyQ=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.0.4.tgz"; + sha512 = "Sdx65V3e8Ggs2UBt/2VoN58w85YXOlaHnAoHV7aRoqMySHOf5You4y4Amby5AeHeXeltLXz1keLwloq5UiJdsQ=="; }; }; - "@textlint/kernel-12.5.0" = { + "@textlint/kernel-12.6.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.5.0.tgz"; - sha512 = "9UspUHtS2FShTO9pWnrZjadjIvJzFIdIZDKIYCdZuUdU8dEhJqwOdYosqM4N5Wy40aMKnv4Voxp80Ssaq7zZaA=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.6.1.tgz"; + sha512 = "GjNaI36pYx/boy1Xf7NPJFbS0uWHhY9y9DMMl/8ZJZoldN7XrCvJFivNdeYQxu+LTmfGGaUJoTjDpnllOs6XSQ=="; }; }; - "@textlint/linter-formatter-12.5.0" = { + "@textlint/kernel-13.0.4" = { + name = "_at_textlint_slash_kernel"; + packageName = "@textlint/kernel"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.0.4.tgz"; + sha512 = "lfZC2690xX7x5ZJn8kKfyx1/cD815+o5X80hbIjmhuY8pdoJgP4nqemaI/Y3Y+re/zg3YgT1PTayA6vcuxOw3g=="; + }; + }; + "@textlint/linter-formatter-13.0.4" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.5.0"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.5.0.tgz"; - sha512 = "cJ87VGmyqDyjxT2aL3492g/YyGh6AU7/3QqxKN9q8rxJtzaY2e1uJrUKdpj0oOj1xZzYYv8zPeIpFaiFtNW02Q=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.0.4.tgz"; + sha512 = "3hMOMlDIAgWPi1SXso35cqkwSzneH6qKdYGEpRejosSNTYePaY16ayRabQxPP07mx2m9X2Sa3ozrebq98Y9PXA=="; }; }; - "@textlint/markdown-to-ast-12.5.0" = { + "@textlint/markdown-to-ast-12.6.1" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.5.0.tgz"; - sha512 = "+fUslPm0+ukMnRVMPUQwKv1DEwmDP/rXFuzc5+k5tCMhighZ/Fv/e3Y9MUe7SgNDte7ilajTa3/uP0Iurr60WA=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz"; + sha512 = "T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ=="; }; }; - "@textlint/module-interop-12.5.0" = { + "@textlint/markdown-to-ast-13.0.4" = { + name = "_at_textlint_slash_markdown-to-ast"; + packageName = "@textlint/markdown-to-ast"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.0.4.tgz"; + sha512 = "4Vs79pcBsFb7vzTp92K1ojhXQrNisK69e6QNVLc7sy8CdDhB4wWmP9tR783oBgvNgYrOfF5qwv8Z7ARCv+oFeg=="; + }; + }; + "@textlint/module-interop-13.0.4" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.5.0"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.5.0.tgz"; - sha512 = "NmkHL5tt+HEqLm00JSW1f03KTbEqOzupliboSZ2HeNhOqZxSX4wR3lBlGqVeVi5dImMWrt40oa+AbkqkD78b9Q=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.0.4.tgz"; + sha512 = "w63oM5dL1kbAdmg0JAcL6NU9r7x0xnsjGoimiUNx0nPZusBDjmFo18u//UwScDa3YmMYd10hQp+teAAsnsVuAg=="; }; }; - "@textlint/source-code-fixer-12.5.0" = { + "@textlint/source-code-fixer-12.6.1" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.5.0.tgz"; - sha512 = "7LebJ6Y64Rb4fVYyokpU8FnjNLdx+TehcHQJ9L/fi8PYVjpS/08klYtYfRtKWmi/vrWED7U0aGhb8Xr26NuWFw=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.6.1.tgz"; + sha512 = "J9UZ3uitT+T50ug5X6AoIOwn6kTl54ZmPYBPB9bmH4lwBamN7e4gT65lSweHY1D21elOkq+3bO/OAJMfQfAVHg=="; }; }; - "@textlint/text-to-ast-12.5.0" = { + "@textlint/source-code-fixer-13.0.4" = { + name = "_at_textlint_slash_source-code-fixer"; + packageName = "@textlint/source-code-fixer"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.0.4.tgz"; + sha512 = "C9SYHCQbgB6iJbRNtw+CUMRC7ACIqpLLMRDBw3VXyJfS4Ki9V3YZAlFvhe8kYTjeUe50skOQtDUMgvoIS5nNRA=="; + }; + }; + "@textlint/text-to-ast-12.6.1" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.5.0.tgz"; - sha512 = "wOWYX+d821ThwNYNk5hfxOBxvkqKUpNOBKkDaic4V+dkuBoAS0D9lE9fA9Ps62kL/I1uQwhU5d4qsAHWnFmQkw=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.6.1.tgz"; + sha512 = "22tgSBaNerpwb66eCivjXmdZ3CDX2Il38vpuAGchiI+cl+sENU9dpuntxwEJdZQePX5qrkmw8XGj5kgyMF015A=="; }; }; - "@textlint/textlint-plugin-markdown-12.5.0" = { + "@textlint/text-to-ast-13.0.4" = { + name = "_at_textlint_slash_text-to-ast"; + packageName = "@textlint/text-to-ast"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.0.4.tgz"; + sha512 = "KfR+4uuNOYQAwayzYNQUiv7GACvcjb+8ZOpJnpmu5FymI+c3g6EayYwt4cx01fmSLeZEL8njiyP1hQi3rzaR1g=="; + }; + }; + "@textlint/textlint-plugin-markdown-12.6.1" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.5.0.tgz"; - sha512 = "1B4mTmA1NOvK2kAk4Rl/TW3QFB80iwhsOKSJ16nCH/yvF82xgH+Gu4gQB/prNpACb4TivmzwvBRYp7rzhOTTyA=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.6.1.tgz"; + sha512 = "fRKsFCL2fGeu0Bt+08FuEc2WHiI8IMDRvy6KT1pmNWO5irS4yL2/OXNknLH3erXvwcJw/hQnd5WEl4hQzS0Erw=="; }; }; - "@textlint/textlint-plugin-text-12.5.0" = { + "@textlint/textlint-plugin-markdown-13.0.4" = { + name = "_at_textlint_slash_textlint-plugin-markdown"; + packageName = "@textlint/textlint-plugin-markdown"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.0.4.tgz"; + sha512 = "2w0kIO3xgCMNeCxl0TuMCkOqHprpa+gKyI5EPXSy0sj6ksSHlW3hntiPI7MsMzTA90qMXhKSJQAVwYYQ6ntpTA=="; + }; + }; + "@textlint/textlint-plugin-text-12.6.1" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.5.0.tgz"; - sha512 = "ec3rZaJYytoscwpAtuxD4UM3bUPqNAeWKia+LMaVMWREULwKfntlSAqSNmudujEkxdsKr028CkzYuP78q8Xmuw=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.6.1.tgz"; + sha512 = "ZUfG0Xb8qGymIPNp2eFTq9bHvkJo3N3Ia1Aff5W9fsgZib1/Eb55U16Sp60TjhBFns0/p7L7usBC3nd3+tB5mQ=="; }; }; - "@textlint/types-12.5.0" = { + "@textlint/textlint-plugin-text-13.0.4" = { + name = "_at_textlint_slash_textlint-plugin-text"; + packageName = "@textlint/textlint-plugin-text"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.0.4.tgz"; + sha512 = "wnAxJ4qQQrjur3zTiVhI6rxoO2vDV7ZCvR8i62LKzK8YyVN4tQM9P6NjiCwnZD0RaIyXTcYX6huiUBQZffmHHg=="; + }; + }; + "@textlint/types-12.6.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.5.0.tgz"; - sha512 = "Po5qOubilL/g3dx+ZUgaQzNXbROADBF4Z5xy7qqgV6pBQIEE/06INZDmmLE1Eesm2zoDpygoG/1f/0/Cy5Yupw=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-12.6.1.tgz"; + sha512 = "t1SZYahu2olnF8MUhlP6qDIEDyl7WmyIaBYxQdE2qU6xUkZWXS2zIxoAT/pVgvFCzDw3KO5HhIYGVeWRp90dTg=="; }; }; - "@textlint/utils-12.5.0" = { + "@textlint/types-13.0.4" = { + name = "_at_textlint_slash_types"; + packageName = "@textlint/types"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/types/-/types-13.0.4.tgz"; + sha512 = "ZYnrp+s/MUl1IMvEu92zafLwA8x1vMFaHEZV6BGP3ELf2GZVLZYns2hGYtJse1vb/+/PYH6OCSOTZqfsGwKARg=="; + }; + }; + "@textlint/utils-12.6.1" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.5.0.tgz"; - sha512 = "bQWrQ7Xaru1DRLQhAQQJgNnfGQIwgTgWUigdS5wSwpbmfLDnaMzHu3AG0lk5hEnELMKTCIej5uCR0+YscyUckg=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.6.1.tgz"; + sha512 = "HJkqYXT2FAAHDM5XLFpQLF/CEdm8c2ltMeKmPBSSty1VfPXQMi8tGPT1b58b8KWh6dVmi7w0YYB7NrquuzXOKA=="; + }; + }; + "@textlint/utils-13.0.4" = { + name = "_at_textlint_slash_utils"; + packageName = "@textlint/utils"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.0.4.tgz"; + sha512 = "BrSShnYFzCeIYWCTsIIe7GQcFhapQhXq6b3FdZ3CMaAz1apzTKTpukyjfL4Wdiai99XfAWFLko4sld/uWF3/KA=="; }; }; "@tokenizer/token-0.1.1" = { @@ -11893,6 +12757,15 @@ let sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; }; }; + "@types/express-4.17.16" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz"; + sha512 = "LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA=="; + }; + }; "@types/express-serve-static-core-4.17.31" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -11902,13 +12775,13 @@ let sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; }; - "@types/express-serve-static-core-4.17.32" = { + "@types/express-serve-static-core-4.17.33" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.32"; + version = "4.17.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz"; - sha512 = "aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz"; + sha512 = "TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA=="; }; }; "@types/file-type-10.9.1" = { @@ -11965,15 +12838,6 @@ let sha512 = "Po8ZPCsAcPPuf5OODPEkb6cdWJ/w4BdX1veP7IIOc2WG0x1SW4GEQ1+FHKN1AMG2AePJfNUceJbh5PKtP92yRQ=="; }; }; - "@types/html-minifier-terser-5.1.2" = { - name = "_at_types_slash_html-minifier-terser"; - packageName = "@types/html-minifier-terser"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz"; - sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; - }; - }; "@types/html-minifier-terser-6.1.0" = { name = "_at_types_slash_html-minifier-terser"; packageName = "@types/html-minifier-terser"; @@ -12406,13 +13270,13 @@ let sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; }; }; - "@types/node-18.11.16" = { + "@types/node-16.9.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.16"; + version = "16.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.16.tgz"; - sha512 = "6T7P5bDkRhqRxrQtwj7vru+bWTpelgtcETAZEUSdq0YISKz8WKdoBukQLYQQ6DFHvU9JRsbFq0JH5C51X2ZdnA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz"; + sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; "@types/node-18.11.18" = { @@ -12532,15 +13396,6 @@ let sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; }; }; - "@types/raf-3.4.0" = { - name = "_at_types_slash_raf"; - packageName = "@types/raf"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/raf/-/raf-3.4.0.tgz"; - sha512 = "taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw=="; - }; - }; "@types/range-parser-1.2.4" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; @@ -12550,22 +13405,22 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/react-17.0.52" = { + "@types/react-17.0.53" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "17.0.52"; + version = "17.0.53"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-17.0.52.tgz"; - sha512 = "vwk8QqVODi0VaZZpDXQCmEmiOuyjEFPY7Ttaw5vjM112LOq37yz1CDJGrRJwA1fYEq4Iitd5rnjd1yWAc/bT+A=="; + url = "https://registry.npmjs.org/@types/react/-/react-17.0.53.tgz"; + sha512 = "1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw=="; }; }; - "@types/react-18.0.26" = { + "@types/react-18.0.27" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.0.26"; + version = "18.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz"; - sha512 = "hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.0.27.tgz"; + sha512 = "3vtRKHgVxu3Jp9t718R9BuzoD4NcQ8YJ5XRzsSKxNDiDonD2MXIT1TmSkenxuCycZJoQT5d2vE8LwWJxBC1gmA=="; }; }; "@types/react-dom-18.0.10" = { @@ -12982,15 +13837,6 @@ let sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; }; }; - "@types/ws-8.5.3" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "8.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz"; - sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; - }; - }; "@types/ws-8.5.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -13054,13 +13900,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.48.2" = { + "@typescript-eslint/eslint-plugin-5.49.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.48.2.tgz"; - sha512 = "sR0Gja9Ky1teIq4qJOl0nC+Tk64/uYdX+mi+5iB//MH8gwyx8e3SOyhEzeLZEFEEfCaLf8KJq+Bd/6je1t+CAg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.49.0.tgz"; + sha512 = "IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -13081,13 +13927,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.48.2" = { + "@typescript-eslint/parser-5.49.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.48.2.tgz"; - sha512 = "38zMsKsG2sIuM5Oi/olurGwYJXzmtdsHhn5mI/pQogP+BjYVkK5iRazCQ8RGS0V+YLk282uWElN70zAAUmaYHw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz"; + sha512 = "veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -13099,22 +13945,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.48.2" = { + "@typescript-eslint/scope-manager-5.49.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz"; - sha512 = "zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz"; + sha512 = "clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ=="; }; }; - "@typescript-eslint/type-utils-5.48.2" = { + "@typescript-eslint/type-utils-5.49.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.2.tgz"; - sha512 = "QVWx7J5sPMRiOMJp5dYshPxABRoZV1xbRirqSk8yuIIsu0nvMTZesKErEA3Oix1k+uvsk8Cs8TGJ6kQ0ndAcew=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.49.0.tgz"; + sha512 = "eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -13126,13 +13972,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.48.2" = { + "@typescript-eslint/types-5.49.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz"; - sha512 = "hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.49.0.tgz"; + sha512 = "7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -13144,22 +13990,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.48.2" = { + "@typescript-eslint/typescript-estree-5.49.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz"; - sha512 = "bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz"; + sha512 = "PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA=="; }; }; - "@typescript-eslint/utils-5.48.2" = { + "@typescript-eslint/utils-5.49.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz"; - sha512 = "2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.49.0.tgz"; + sha512 = "cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -13171,13 +14017,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.48.2" = { + "@typescript-eslint/visitor-keys-5.49.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz"; - sha512 = "z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz"; + sha512 = "v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -13225,40 +14071,58 @@ let sha512 = "UGyyGAMXzop9C/fIoe7Ij63DkPSy1uMw2jipB5dnB8R3kl80za7LYzVnA1HvBEt2ZPWfMuwez/VGLOQ7XX4bTA=="; }; }; - "@vercel/build-utils-5.9.0" = { + "@vercel/build-utils-6.0.0" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "5.9.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-5.9.0.tgz"; - sha512 = "LJRhd/ritLGHH+YvZ+DC7AW3Jr87UZHFHz2h2ENULDZ8qAo5LJH+y+Cg11uxfXkhQKK2f/AZQJXyKVyu1BBwdQ=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-6.0.0.tgz"; + sha512 = "2AoVcDUyQCj516KrRNH92NeKI+KZGnVGjHkcb+VcXxGspYpKL/gC+AdFtC05qbgxX1e8U95Yd8ROucTftHErWw=="; }; }; - "@vercel/go-2.2.30" = { + "@vercel/gatsby-plugin-vercel-analytics-1.0.7" = { + name = "_at_vercel_slash_gatsby-plugin-vercel-analytics"; + packageName = "@vercel/gatsby-plugin-vercel-analytics"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-analytics/-/gatsby-plugin-vercel-analytics-1.0.7.tgz"; + sha512 = "j4DsneQ+oOF0Zurvisj+H2ds8s8ZEqfI4iD6xgFY9mB2UdGixhzFRjvDBH6g4pfUQXfO76K5GiA1afumGlJbwA=="; + }; + }; + "@vercel/gatsby-plugin-vercel-builder-1.0.2" = { + name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; + packageName = "@vercel/gatsby-plugin-vercel-builder"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-1.0.2.tgz"; + sha512 = "zhbLVDM8wdWK1Se0aYK5kB3w/LvR8ayzYSpeWZK2rzpTPmjWNbRBjJkWtoZvL5LlE4rEcSELaci7uxXIrflEag=="; + }; + }; + "@vercel/go-2.2.31" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "2.2.30"; + version = "2.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-2.2.30.tgz"; - sha512 = "ODz5UrlBzYIpPVjfMZVofQGfsqHSn2WjLdHGw58UAgQH+rUYSWBwqsXvIcYT3QXy2hKCZGguahqeT0qXSqBpTw=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-2.2.31.tgz"; + sha512 = "zDBxGi+M9AU18fNKSfZeD+hEALlIO/vQRD2kCh2f5k/Agjera6ughW0B3he+1s/M23vCDdx6N54E2j9GeTBZlQ=="; }; }; - "@vercel/hydrogen-0.0.44" = { + "@vercel/hydrogen-0.0.45" = { name = "_at_vercel_slash_hydrogen"; packageName = "@vercel/hydrogen"; - version = "0.0.44"; + version = "0.0.45"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.44.tgz"; - sha512 = "7RnSk10nE0tNLHcTCUTWCpO5rfcMQ7N6ECTaeozWcYWs2/Fol7tLjc9Uowo1ZqnV7wTm5mE/ooCD2FNlaKmiaA=="; + url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.45.tgz"; + sha512 = "ZE/1scAUiuYZTEmO3CN08mGPo6dbORR8/tGDzsF//KYjTNcsKQJ+szVRqxUH5ZbazS4F2h1+wNDM0XHwKuLbLA=="; }; }; - "@vercel/next-3.3.15" = { + "@vercel/next-3.3.19" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "3.3.15"; + version = "3.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-3.3.15.tgz"; - sha512 = "zfJ54JkalkMvxE4e0/OAL0sPEm9AplUCBR2Bq6JhGrOEaxBGdCyv2RPBAyZOV1JL+m9y06hJpWyFQGsOtI5RgA=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-3.3.19.tgz"; + sha512 = "Adu3i4eHcQqLmRLCpJteilCTxfMLdr9grwk4Yq4g66xwRgkYTHiupkDN7hXThsxEBQgtotfcTUlygYYJjXvBkA=="; }; }; "@vercel/nft-0.22.5" = { @@ -13270,49 +14134,49 @@ let sha512 = "mug57Wd1BL7GMj9gXMgMeKUjdqO0e4u+0QLPYMFE1rwdJ+55oPy6lp3nIBCS8gOvigT62UI4QKUL2sGqcoW4Hw=="; }; }; - "@vercel/node-2.8.13" = { + "@vercel/node-2.8.16" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "2.8.13"; + version = "2.8.16"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-2.8.13.tgz"; - sha512 = "RI0Ig2v7MK4N3EVPHKNEj3IK+D0/GtIbMFZB0WcUgE77UvdD++tf5JWTlqrwxPOYOxO/J0/0L8WZXTAzpPgdGA=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-2.8.16.tgz"; + sha512 = "aLuPHOm29cYjCK649/5j/zbYFXxRtNYcnNFdBd2gVg2II54SfByYIx/Tw3A6PeQmR23piBwPZMI5uEuYC0TGmA=="; }; }; - "@vercel/node-bridge-3.1.9" = { + "@vercel/node-bridge-3.1.10" = { name = "_at_vercel_slash_node-bridge"; packageName = "@vercel/node-bridge"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-3.1.9.tgz"; - sha512 = "07Bgb6jm8OMTlxGRC4kOY0ewi4xLtMcK3z45T+GKRO7oKeA4vhRGFbT5BsJKF3V5/nj6TYAsWsErBf4RGVSBcw=="; + url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-3.1.10.tgz"; + sha512 = "0DQzF5pdyP+xd5f1Ss2fAO+9xIvzUhngRAPazwg4XHZE9iLkv2L+A1u3L8NYi4hoUlAAZQ5GF3txlm/oBn4tNw=="; }; }; - "@vercel/python-3.1.40" = { + "@vercel/python-3.1.41" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "3.1.40"; + version = "3.1.41"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.40.tgz"; - sha512 = "Cns+KTVBloQXtls72KaaXQ2gHgsH5/Mm7lwv80ysTZvp5x6loh+Faf6QJq93LxYh9lz2wqWjO+nq3XJ77N5twg=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.41.tgz"; + sha512 = "xS3LY1zzuKM2wTeW9tTQqQ3gNgsstSWMO8dnxcuFnYMP8JwN4ffLSreXeJm4S5pFsn5dNyH1EckgoXWgB9TgBQ=="; }; }; - "@vercel/redwood-1.0.51" = { + "@vercel/redwood-1.0.52" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "1.0.51"; + version = "1.0.52"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.51.tgz"; - sha512 = "0i9+qe4branWzMfeLbIazvomxCX7scASJ9bqm2oMCdMxZrXeB3/hwRCUUdGJGXmRsrGp7ATsXjxynd+D1wZymw=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.52.tgz"; + sha512 = "ZZ+qWdYRYfL5wKYao4/oXHxbGpoN6MJEN+YtiOSCauDfolN/7c+qFbZu4P6MdEddY4/3Kq1CRMy9z89UfPPzew=="; }; }; - "@vercel/remix-1.2.5" = { + "@vercel/remix-1.2.8" = { name = "_at_vercel_slash_remix"; packageName = "@vercel/remix"; - version = "1.2.5"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.2.5.tgz"; - sha512 = "jbTDy+Ar+DRbk2UJqazOcGs1lgWhTSf5yvO27ZyN+mM4diTKg834McjJ9IUhpEyBGejS3+dPaz7U9dn+Bfbztw=="; + url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.2.8.tgz"; + sha512 = "30Cfc+tl6L+L4+c9fGTBfS8YbCSfP/plqf+bTSHHU9wIGWmq/oKpIxInRbcT2+7oAb+EdehMDoZ1r/L7me7Dew=="; }; }; "@vercel/routing-utils-2.1.8" = { @@ -13324,22 +14188,22 @@ let sha512 = "rng+qyQ0VpnBjO2R7GQlpAdEx+yyvrcEp6XNe+4q6e+oW0n2H6dm6SLFEBA6B1QmHX4OTTCkq1GIiKsK6ENw4Q=="; }; }; - "@vercel/ruby-1.3.56" = { + "@vercel/ruby-1.3.57" = { name = "_at_vercel_slash_ruby"; packageName = "@vercel/ruby"; - version = "1.3.56"; + version = "1.3.57"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.56.tgz"; - sha512 = "fYjyU8ZhsouRC5WWZBuN8FQG+eHGTFzl8sCwCGdeaykJOpVa0FW9Xl/fDjBpAQoicbrdZhDH2HaEfnjBkLVIeA=="; + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.57.tgz"; + sha512 = "AY9bhSwDPcWt20KNskpn/zGF8nP7JBkfWbddXwF0uP2Ui55b+hnBr2VjRf2qys2npOZu2O2jd70/KCOUGnkdIw=="; }; }; - "@vercel/static-build-1.1.7" = { + "@vercel/static-build-1.3.0" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "1.1.7"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.1.7.tgz"; - sha512 = "l0QBOuRD6NjewHyPTSMxk96MVJbeem46cjqKb9AB9Ochf2nb20JGZaON0VSqeJRtrQR19gWiqgTT+glz1G098A=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.3.0.tgz"; + sha512 = "Ai9xpqkMCxXT8lHtyn+qE9N+fQSdlBv9ph0ldeKdc+BhDx8T91LzAoCxqT2XnNii0TIakD2k/ZI/qusqTTMe6Q=="; }; }; "@vercel/static-config-2.0.11" = { @@ -13360,13 +14224,13 @@ let sha512 = "IIB8jbiKy37zN8bAIHx59YmnIelY78CGHtThnibD/d3tQOKRY83bYVi9blwmZVUZh6l9nfkYH3tvReaiNxY9EQ=="; }; }; - "@vscode/l10n-0.0.10" = { + "@vscode/l10n-0.0.11" = { name = "_at_vscode_slash_l10n"; packageName = "@vscode/l10n"; - version = "0.0.10"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.10.tgz"; - sha512 = "E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ=="; + url = "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.11.tgz"; + sha512 = "ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA=="; }; }; "@vscode/test-electron-2.2.2" = { @@ -14656,22 +15520,22 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-3.0.0-rc.35" = { + "@yarnpkg/parsers-3.0.0-rc.36" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "3.0.0-rc.35"; + version = "3.0.0-rc.36"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.35.tgz"; - sha512 = "J6ySgEdQUqAmlttvZOoXOEsrDTAnHyR/MtEvuAG5a+gwKY/2Cc7xn4CWcpgfuwkp+0a4vXmt2BDwzacDoGDN1g=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.36.tgz"; + sha512 = "PvTlgUr7WO2qDnph8tVdItbJlo9hEcGSVd8+ppn/tvcn8XZUaD1z4EgvMEZcJYZi3LmHJGzSgVZzcFE+zQiz8A=="; }; }; - "@zeit/schemas-2.21.0" = { + "@zeit/schemas-2.29.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; - version = "2.21.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.21.0.tgz"; - sha512 = "/J4WBTpWtQ4itN1rb3ao8LfClmVcmz2pO6oYb7Qd4h7VSqUhIbJIvrykz9Ew1WMg6eFWsKdsMHc5uPbFxqlCpg=="; + url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.29.0.tgz"; + sha512 = "g5QiLIfbg3pLuYUJPlisNKY+epQJTcMDsOnVNkscrDP1oi7vmJnzOANYJI/1pZcVJ6umUkBv3aFtlg1UvUHGzA=="; }; }; "@zeit/schemas-2.6.0" = { @@ -14683,13 +15547,13 @@ let sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg=="; }; }; - "@zkochan/cmd-shim-5.4.0" = { + "@zkochan/cmd-shim-5.4.1" = { name = "_at_zkochan_slash_cmd-shim"; packageName = "@zkochan/cmd-shim"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-5.4.0.tgz"; - sha512 = "Ldv5OxVJNNoHgwDPkJVdTT4l31hA4YLhJxpNNx3I5C9E3xXej66w6sQTL9Q/ZNVVTLplqDxTy+UjcnPx6cxwuA=="; + url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-5.4.1.tgz"; + sha512 = "odWb1qUzt0dIOEUPyWBEpFDYQPRjEMr/dbHHAfgBkVkYR9aO7Zo+I7oYWrXIxl+cKlC7+49ftPm8uJxL1MA9kw=="; }; }; "@zkochan/js-yaml-0.0.6" = { @@ -14701,58 +15565,58 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-10.4.0" = { + "@zwave-js/cc-10.5.2" = { name = "_at_zwave-js_slash_cc"; packageName = "@zwave-js/cc"; - version = "10.4.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.4.0.tgz"; - sha512 = "qKisjEz2fOCCNp8LREYyRZu0pib38lqO+pnJwZs5Gjni0EnEC3A1FW470AXPUVJw2cbGtFDaYnGfTW72xeJSpg=="; + url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.5.2.tgz"; + sha512 = "RBuAJ6cWlhZTLDDppWx6ILmqXATN9L8lyIfjSbNIzdlJ6jzJK1sW7r+rvXlcubAOPdDBEQa2UYbCJ/PEdFdoBg=="; }; }; - "@zwave-js/config-10.4.0" = { + "@zwave-js/config-10.5.2" = { name = "_at_zwave-js_slash_config"; packageName = "@zwave-js/config"; - version = "10.4.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.4.0.tgz"; - sha512 = "Z3Gc8gmgUJUwP/on/EDgobksfazOxOxfxUGHDH/jfqxsF0adFSdhSeatF9cCfh5YM+UWFYEZLgVykbKtIW9XoA=="; + url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.5.2.tgz"; + sha512 = "nnXehRQZlOSwvKOhDuLkjwkyR2dZVaNOqwxz9UKcovclIZyXV+1V2VhAxa0BeIyidDZYV/Ma2SzT4lGckW/3WQ=="; }; }; - "@zwave-js/core-10.4.0" = { + "@zwave-js/core-10.5.0" = { name = "_at_zwave-js_slash_core"; packageName = "@zwave-js/core"; - version = "10.4.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.4.0.tgz"; - sha512 = "/3gKj8dzxn1T3ymiMjNPN/ficAEti9cnCVxQvjjRyqNsBe6onsN+n4Te+Ed7LuSybGH+v9G8iH29YkjjgzU66g=="; + url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.5.0.tgz"; + sha512 = "l5/YwSZMMg8MeUhi8bCnS2xu1EYFO9ocY9Zl2LWXF/8xMYKqZohgxjkUg4YzbIoTyE5vGuaxVoBHqQ4iQ7xj3g=="; }; }; - "@zwave-js/host-10.4.0" = { + "@zwave-js/host-10.5.2" = { name = "_at_zwave-js_slash_host"; packageName = "@zwave-js/host"; - version = "10.4.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.4.0.tgz"; - sha512 = "NLL18cmaXZcbT/rQ/vdVCvRo9GQF5xYWGDxgja6zjuAR5xrsYyfyvI1lJuiOD9i9iPmTiu1XFv1PfJl54Ird3A=="; + url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.5.2.tgz"; + sha512 = "BTbIWobUI/YYlSe35U/hDkA/zyMFtktEyLis17r/FTYZR35zcmKO/jHpwwKii/EELsxTrCJnXMh017NrhJlpKA=="; }; }; - "@zwave-js/nvmedit-10.4.0" = { + "@zwave-js/nvmedit-10.5.0" = { name = "_at_zwave-js_slash_nvmedit"; packageName = "@zwave-js/nvmedit"; - version = "10.4.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.4.0.tgz"; - sha512 = "fxhIxRHBcDESafhdE6Qnil+IbQig+XncUMcVXm1m77/fT8Ee3QXLPbqte0O1+10KcnHdult3t9cB0hlBIk2OhA=="; + url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.5.0.tgz"; + sha512 = "kXTToCLTytqdLBCfVZN1HaB7F4SrW8TVO/xMmG9D3n3yMEMaSDHRXobym9kOOb5aVwVCplASQiHwY+pL4t5R9A=="; }; }; - "@zwave-js/serial-10.4.0" = { + "@zwave-js/serial-10.5.2" = { name = "_at_zwave-js_slash_serial"; packageName = "@zwave-js/serial"; - version = "10.4.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.4.0.tgz"; - sha512 = "8NPH7MqjSpd8HeGTJYfw+bmCPpadMebpSlJsf2n/vAbMU6E8Sp1Gi3X347MzdMxDAQOzF3YaV9UBmGcRcxvfBQ=="; + url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.5.2.tgz"; + sha512 = "IqAYBhNE+LsEVSRu2UDzoM3inV2dp3JMfIJXBN8iVa/revCXTjGWOPJkqhulj74cQX9brCuA919YQ33N9hlJwA=="; }; }; "@zwave-js/shared-10.4.0" = { @@ -14764,13 +15628,13 @@ let sha512 = "uuLYDDNqIkagJ40piNMhljVG9OepI31/labLnivJByxGdELJnIXGRKLQ8ZKvm/5Ba8qXpEw/t7UrV2plfP/QCg=="; }; }; - "@zwave-js/testing-10.4.0" = { + "@zwave-js/testing-10.5.2" = { name = "_at_zwave-js_slash_testing"; packageName = "@zwave-js/testing"; - version = "10.4.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.4.0.tgz"; - sha512 = "5rCxp7EJXK6B8td4SdVyqmZL+4WL3p7blVLKjT3LpZXcMolOTeEEptggJ9yhmFm2pUhkOHSoE12FwroJbRObXw=="; + url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.5.2.tgz"; + sha512 = "3Si/nerD7I9pPpgiipUZqrEJUTNeFAPnbgXG9P5mZb+uhHzbrwVVDASK9wPgjGqWx2AJffAMl2MPEknqcMEaRA=="; }; }; "CSSselect-0.4.1" = { @@ -15034,13 +15898,13 @@ let sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; }; }; - "acorn-8.8.1" = { + "acorn-8.8.2" = { name = "acorn"; packageName = "acorn"; - version = "8.8.1"; + version = "8.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"; - sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"; + sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; }; }; "acorn-dynamic-import-3.0.0" = { @@ -15205,13 +16069,13 @@ let sha512 = "qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ=="; }; }; - "addons-linter-5.23.0" = { + "addons-linter-5.27.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "5.23.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.23.0.tgz"; - sha512 = "Vo6+5YlM2Ge3yYMY+gNg9Smcfcl1J0ZMfGVXnGJjUwDVHuszHVIvurunQuJURnO4FR1gi4Vy1sWye8ArRL5LOw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.27.0.tgz"; + sha512 = "gDgl0FcmhZ5cs3St0qAaO9J1BoektwnY+p4dVgcvPu8WaBqH9MG2fk0gL/evCpoHSXeSw15GA87n8Y7zy7raVQ=="; }; }; "addons-moz-compare-1.3.0" = { @@ -15223,13 +16087,13 @@ let sha512 = "/rXpQeaY0nOKhNx00pmZXdk5Mu+KhVlL3/pSBuAYwrxRrNiTvI/9xfQI8Lmm7DMMl+PDhtfAHY/0ibTpdeoQQQ=="; }; }; - "addons-scanner-utils-8.1.0" = { + "addons-scanner-utils-8.3.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "8.1.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-8.1.0.tgz"; - sha512 = "wxqnmmrzZXjz4B4GZbFcR4HJxTP+pGu+C6iOjMJdmL6mgZZey/UEVJlU6XTxu8GdGv0bUoJxyIioH8XEDxy91Q=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-8.3.0.tgz"; + sha512 = "XP+2kxhZxlxiVFXVJ7lyJEuxpUS8ryrolUDqnUEnvOZ/3p8qt9hWCYSliXhI2W+Swf/hZ3F4CLAG6tBnqdxDYA=="; }; }; "addr-to-ip-port-1.5.4" = { @@ -15241,15 +16105,6 @@ let sha512 = "ByxmJgv8vjmDcl3IDToxL2yrWFrRtFpZAToY0f46XFXl8zS081t7El5MXIodwm7RC6DhHBRoOSMLFSPKCtHukg=="; }; }; - "address-1.1.2" = { - name = "address"; - packageName = "address"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.1.2.tgz"; - sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; - }; - }; "address-1.2.2" = { name = "address"; packageName = "address"; @@ -15439,15 +16294,6 @@ let sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; - "ajv-8.11.2" = { - name = "ajv"; - packageName = "ajv"; - version = "8.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz"; - sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="; - }; - }; "ajv-8.12.0" = { name = "ajv"; packageName = "ajv"; @@ -15538,15 +16384,6 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; - "ajv-merge-patch-5.0.1" = { - name = "ajv-merge-patch"; - packageName = "ajv-merge-patch"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-merge-patch/-/ajv-merge-patch-5.0.1.tgz"; - sha512 = "0UP3aJCzfzBOkmLR+EinJDCfg6DNtprj3bVPo7JJNgUpZMKt097t9xxQOWFGRoB4JvKKIHE2qe0HkVaS/HyrjQ=="; - }; - }; "alcalzone-shared-4.0.8" = { name = "alcalzone-shared"; packageName = "alcalzone-shared"; @@ -15997,6 +16834,15 @@ let sha512 = "Ydgbey4zqUmmNN2i2OVeVHXig3PxHRbok2X6B2Sogmb92JzZUFfTL806dT7os6tBL1peXItfeFt76CP3zsoXUg=="; }; }; + "any-base-1.1.0" = { + name = "any-base"; + packageName = "any-base"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz"; + sha512 = "uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="; + }; + }; "any-observable-0.3.0" = { name = "any-observable"; packageName = "any-observable"; @@ -17365,13 +18211,13 @@ let sha512 = "uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw=="; }; }; - "async-each-1.0.3" = { + "async-each-1.0.4" = { name = "async-each"; packageName = "async-each"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; - sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.4.tgz"; + sha512 = "qL5v0vnRtD4rxlrzLz3WMnMfTvTrMf3IK1xFCF0Q5vqXJkULhM13gO2ynE8RZMjE+bPcH0AUHgcd5BU1FtO1tA=="; }; }; "async-each-series-0.1.1" = { @@ -17527,15 +18373,6 @@ let sha512 = "eKEYj1+jDgQ15jazjmelcPGXO77pa5epzlyXyEQcwwLtnACtBTCrxaW+96uXF2j4rzIikmUtVlzXwejx6iIhWw=="; }; }; - "asyncjs-util-1.2.10" = { - name = "asyncjs-util"; - packageName = "asyncjs-util"; - version = "1.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.10.tgz"; - sha512 = "p4U6HQUw4k/xZKrwEQO7ZuF+8/OkzAQS4iAMhFUBGtSD8p3KkKBaTBuUTEH8TWKB3ArNbrP0401TGE2vIiU7uQ=="; - }; - }; "asyncjs-util-1.2.11" = { name = "asyncjs-util"; packageName = "asyncjs-util"; @@ -17716,13 +18553,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.15.7" = { + "aws-crt-1.15.8" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.15.7"; + version = "1.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.7.tgz"; - sha512 = "wq26kPlK6PYfJ1A4ckW5HDaf+mgkKqjDf3GoYdvQhGR97riO7mLltRRtbe1sPJ0CRUolA1ypt49HRvf1N/yp2g=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.8.tgz"; + sha512 = "2TLgxvcHwYaCpaZWwMTn7628Xa7mcpedE+pdGf+Vg2l6MiTrRKZ5X5YyXMqX4GvfvDB1I3EfIAi5iFxlHZ1J4w=="; }; }; "aws-sdk-1.18.0" = { @@ -17743,13 +18580,13 @@ let sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw=="; }; }; - "aws-sdk-2.1296.0" = { + "aws-sdk-2.1304.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1296.0"; + version = "2.1304.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1296.0.tgz"; - sha512 = "6Nm6zQexyne8lVy+BW8jklGpS36mXJjq67zlsn5XuyB3+qAMlolzar9nxgtuabvb/tSQTP4RSwlhkVzOct+MvA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1304.0.tgz"; + sha512 = "9mf2uafa2M9yFC5IlMe85TIc7OUo1HSProCQWzpRmAAYhcSwmfbRyt02Wtr5YSVvJJPmcSgcyI92snsQR1c3nw=="; }; }; "aws-sign2-0.6.0" = { @@ -17779,13 +18616,13 @@ let sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; }; }; - "axe-core-4.6.2" = { + "axe-core-4.6.3" = { name = "axe-core"; packageName = "axe-core"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.2.tgz"; - sha512 = "b1WlTV8+XKLj9gZy2DZXgQiyDp9xkkoe2a6U6UbYccScq2wgH/YwCeI2/Jq2mgo0HzQxqJOjWZBLeA/mqsk5Mg=="; + url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz"; + sha512 = "/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg=="; }; }; "axios-0.19.2" = { @@ -17851,13 +18688,13 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-1.2.3" = { + "axios-1.2.6" = { name = "axios"; packageName = "axios"; - version = "1.2.3"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz"; - sha512 = "pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw=="; + url = "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz"; + sha512 = "rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ=="; }; }; "axios-cookiejar-support-0.5.1" = { @@ -17941,15 +18778,6 @@ let sha512 = "Law0PGtRV1JL8Y9Wpzc0d6EE0GD7LzXWCfaeWwboUMcBWNG6gvaWTK1/+BK7a4X5EmeJiGEuDDFxUsOa8RSWCw=="; }; }; - "babel-loader-8.1.0" = { - name = "babel-loader"; - packageName = "babel-loader"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"; - sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; - }; - }; "babel-loader-8.3.0" = { name = "babel-loader"; packageName = "babel-loader"; @@ -18013,13 +18841,13 @@ let sha512 = "NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw=="; }; }; - "babel-plugin-react-native-web-0.18.10" = { + "babel-plugin-react-native-web-0.18.12" = { name = "babel-plugin-react-native-web"; packageName = "babel-plugin-react-native-web"; - version = "0.18.10"; + version = "0.18.12"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.18.10.tgz"; - sha512 = "2UiwS6G7XKJvpo0X5OFkzGjHGFuNx9J+DgEG8TEmm+X5S0z6EB59W11RDEZghdKzsQzVbs1jB+2VHBuVgjMTiw=="; + url = "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.18.12.tgz"; + sha512 = "4djr9G6fMdwQoD6LQ7hOKAm39+y12flWgovAqS1k5O8f42YQ3A1FFMyV5kKfetZuGhZO5BmNmOdRRZQ1TixtDw=="; }; }; "babel-plugin-react-require-3.0.0" = { @@ -18985,15 +19813,6 @@ let sha512 = "5DcLxGUDejgNBYcieMIUfjORtUeNWl828VWLHJGVKZCb4zIS1oOySTUr0LGmcqJBQgTBz3bGbRQla4FgrdQEIQ=="; }; }; - "bitcoinjs-lib-6.0.2" = { - name = "bitcoinjs-lib"; - packageName = "bitcoinjs-lib"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.0.2.tgz"; - sha512 = "I994pGt9cL5s5OA6mkv1e8IuYcsKN2ORXnWbkqAXLNGvEnOHBhKBSvCjFl7YC2uVoJnfr/iwq7JMrq575SYO5w=="; - }; - }; "bitcoinjs-lib-6.1.0" = { name = "bitcoinjs-lib"; packageName = "bitcoinjs-lib"; @@ -19354,6 +20173,15 @@ let sha512 = "epsm3Z92j5xwek9p97pVw3KbsNc0F4QnbYh+N93SpbJYuHFQQ/UAh6K+bKFGyLePH3Hudtl/Sa95Quqp0gX8IQ=="; }; }; + "bmp-js-0.1.0" = { + name = "bmp-js"; + packageName = "bmp-js"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz"; + sha512 = "vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw=="; + }; + }; "bmutex-0.1.6" = { name = "bmutex"; packageName = "bmutex"; @@ -19525,15 +20353,6 @@ let sha512 = "7KQAp+lrtogthZ5UCkqhT3SBfVanGKmBnI4hYdQfcvNcGor4zZdyegUcovf7NmAXhx0c7pc0QiTjkPHFMvQ3mw=="; }; }; - "bolt07-1.8.2" = { - name = "bolt07"; - packageName = "bolt07"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bolt07/-/bolt07-1.8.2.tgz"; - sha512 = "jq1b/ZdMambhh+yi+pm+1PJBAnlYvQYljaBgSajvVAINHrHg32ovCBra8d0ADE3BAoj6G/tK7OSV4t/yT9A+/g=="; - }; - }; "bolt07-1.8.3" = { name = "bolt07"; packageName = "bolt07"; @@ -19543,15 +20362,6 @@ let sha512 = "NXML2vzFmxRrdWt+wNqphU6f8FmS7tkebqDLIhfc8xKoOcGFv4Kf7WuJbKBqcfFDQVXpCpKAF7FQAgTIN2/30A=="; }; }; - "bolt09-0.2.4" = { - name = "bolt09"; - packageName = "bolt09"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bolt09/-/bolt09-0.2.4.tgz"; - sha512 = "ulNUekEfVhJredkXxP970MrVcrbPbDYyybfagqKFa8J3/4MtkhrX1pR5DjHWeyIujEkFNLbZpo6QF/Og2gXxug=="; - }; - }; "bolt09-0.2.5" = { name = "bolt09"; packageName = "bolt09"; @@ -20110,15 +20920,6 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.14.2" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz"; - sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; - }; - }; "browserslist-4.21.4" = { name = "browserslist"; packageName = "browserslist"; @@ -20588,6 +21389,15 @@ let sha512 = "bd1dDQhiC+bEbEfg56IdBv7faWa6OipMs/AFFFvtFnB3wAYjlwQpQRZ0pm6ZkgtfL0pILRXhKxOiQj6UzoMR7A=="; }; }; + "bufio-1.2.0" = { + name = "bufio"; + packageName = "bufio"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bufio/-/bufio-1.2.0.tgz"; + sha512 = "UlFk8z/PwdhYQTXSQQagwGAdtRI83gib2n4uy4rQnenxUM2yQi8lBDzF230BNk+3wAoZDxYRoBwVVUPgHa9MCA=="; + }; + }; "bufrw-1.3.0" = { name = "bufrw"; packageName = "bufrw"; @@ -20732,13 +21542,13 @@ let sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="; }; }; - "bval-0.1.6" = { + "bval-0.1.7" = { name = "bval"; packageName = "bval"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/bval/-/bval-0.1.6.tgz"; - sha512 = "jxNH9gSx7g749hQtS+nTxXYz/bLxwr4We1RHFkCYalNYcj12RfbW6qYWsKu0RYiKAdFcbNoZRHmWrIuXIyhiQQ=="; + url = "https://registry.npmjs.org/bval/-/bval-0.1.7.tgz"; + sha512 = "Ohv+MV7C0xAt5DJ4u681EVCArZ+ybEpz8yPjAozBEZYmR/rp9AX9QJB9PJ0aVlzEodjr3PIKTQrZfaONP8XR9w=="; }; }; "bweb-0.1.12" = { @@ -21236,15 +22046,6 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "camelcase-7.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-7.0.0.tgz"; - sha512 = "JToIvOmz6nhGsUhAYScbo2d6Py5wojjNfoxoc2mEVLUdJ70gJK2gnd+ABY1Tc3sVMyK7QDPtN0T/XdlCQWITyQ=="; - }; - }; "camelcase-7.0.1" = { name = "camelcase"; packageName = "camelcase"; @@ -21326,13 +22127,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001445" = { + "caniuse-lite-1.0.30001449" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001445"; + version = "1.0.30001449"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001445.tgz"; - sha512 = "8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz"; + sha512 = "CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw=="; }; }; "canvas-2.11.0" = { @@ -21344,15 +22145,6 @@ let sha512 = "bdTjFexjKJEwtIo0oRx8eD4G2yWoUOXP9lj279jmQ2zMnTQhT8C3512OKz3s+ZOaQlLbE7TuVvRDYDB3Llyy5g=="; }; }; - "canvg-3.0.7" = { - name = "canvg"; - packageName = "canvg"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/canvg/-/canvg-3.0.7.tgz"; - sha512 = "4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA=="; - }; - }; "capability-0.2.5" = { name = "capability"; packageName = "capability"; @@ -21497,31 +22289,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.6.22" = { + "cdk8s-2.6.32" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.6.22"; + version = "2.6.32"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.6.22.tgz"; - sha512 = "mVeo+zJMJIwbQP/5p8grhxcIpl6Ff59IkOkUyF9JV89zTXD3D5HwoG4VYfhZxjDhgCzftXi31cqmQ8u+8XhgHQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.6.32.tgz"; + sha512 = "JofFfr6+qpFeUiZcVK8NwWdjgz5z4b7ZZrKSwOrbvE2g441X+EEu4F3HfWEt4q68RvdaLkvIAFZki/4k4XEp3A=="; }; }; - "cdk8s-plus-25-2.3.27" = { + "cdk8s-plus-25-2.4.3" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.3.27"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.3.27.tgz"; - sha512 = "GKBcvio3iYVYXHTZkH0IaR08omt2M2IdnUpcGnkTrlnxdbkZICRDLVqr1hTw+uq+DgyUSi+ThPy5FgokU00MHQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.4.3.tgz"; + sha512 = "oD1yQFUpazobHUOOuWOIjng0iKYkB8IGx7w4XIA7Un3jqU2jGqiRT+nEy94KidAMOBjUcJp6GPBDqrTB6K8YoQ=="; }; }; - "cdktf-0.15.0" = { + "cdktf-0.15.2" = { name = "cdktf"; packageName = "cdktf"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.15.0.tgz"; - sha512 = "Dzv/pfJWTFzxMxjcgI3cttK7hPLy69bUPzcZgUK0sI+k3kY4I67pmxKuXDh1XVK9AX+pCaiZT7wzQbCznTrQkQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.15.2.tgz"; + sha512 = "1V8u4nMtcgwfHq7V7+a+VkotMDDZUk6JJQ7BKPZyraN7MfiBjkUQUQo9PYJQdRONABFugwyggjy1Aqw8dto7Vw=="; }; }; "center-align-0.1.3" = { @@ -22316,13 +23108,13 @@ let sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="; }; }; - "clean-css-5.3.1" = { + "clean-css-5.3.2" = { name = "clean-css"; packageName = "clean-css"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz"; - sha512 = "lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz"; + sha512 = "JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww=="; }; }; "clean-git-ref-2.0.1" = { @@ -22361,13 +23153,13 @@ let sha512 = "LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg=="; }; }; - "clean-webpack-plugin-3.0.0" = { + "clean-webpack-plugin-4.0.0" = { name = "clean-webpack-plugin"; packageName = "clean-webpack-plugin"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz"; - sha512 = "MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A=="; + url = "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz"; + sha512 = "WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w=="; }; }; "clear-module-4.1.2" = { @@ -22982,15 +23774,6 @@ let sha512 = "2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="; }; }; - "cluster-key-slot-1.1.1" = { - name = "cluster-key-slot"; - packageName = "cluster-key-slot"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz"; - sha512 = "rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw=="; - }; - }; "cluster-key-slot-1.1.2" = { name = "cluster-key-slot"; packageName = "cluster-key-slot"; @@ -24269,13 +25052,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.223" = { + "constructs-10.1.233" = { name = "constructs"; packageName = "constructs"; - version = "10.1.223"; + version = "10.1.233"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.223.tgz"; - sha512 = "m/+jkHuVZiHmGpEaNwoB3toYdKu/EOd9xVlZ0uYivnWm7uertOPSTXl/Z1f35DXY518ir8X0VBOREAjtIT4F/g=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.233.tgz"; + sha512 = "Km1hjAx2e303J5YH64PwTxESrJZG067p3egdneoC4kgr158V9ES+i3roeBTc9hjR0zyM2GEfS6jaVUibEi9VjQ=="; }; }; "consume-http-header-1.0.0" = { @@ -24810,6 +25593,15 @@ let sha512 = "3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="; }; }; + "copy-webpack-plugin-10.2.4" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "10.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz"; + sha512 = "xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg=="; + }; + }; "copy-webpack-plugin-5.1.2" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; @@ -24819,15 +25611,6 @@ let sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; }; }; - "copy-webpack-plugin-6.0.4" = { - name = "copy-webpack-plugin"; - packageName = "copy-webpack-plugin"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.4.tgz"; - sha512 = "zCazfdYAh3q/O4VzZFiadWGpDA2zTs6FC6D7YTHD6H1J40pzo0H4z22h1NYMCl4ArQP4CK8y/KWqPrJ4rVkZ5A=="; - }; - }; "cordova-app-hello-world-6.0.0" = { name = "cordova-app-hello-world"; packageName = "cordova-app-hello-world"; @@ -24891,15 +25674,6 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.25.3" = { - name = "core-js"; - packageName = "core-js"; - version = "3.25.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.25.3.tgz"; - sha512 = "y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ=="; - }; - }; "core-js-3.27.1" = { name = "core-js"; packageName = "core-js"; @@ -24909,22 +25683,22 @@ let sha512 = "GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww=="; }; }; - "core-js-compat-3.27.1" = { - name = "core-js-compat"; - packageName = "core-js-compat"; - version = "3.27.1"; + "core-js-3.27.2" = { + name = "core-js"; + packageName = "core-js"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.1.tgz"; - sha512 = "Dg91JFeCDA17FKnneN7oCMz4BkQ4TcffkgHP4OWwp9yx3pi7ubqMDXXSacfNak1PQqjc95skyt+YBLHQJnkJwA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz"; + sha512 = "9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w=="; }; }; - "core-js-pure-3.27.1" = { - name = "core-js-pure"; - packageName = "core-js-pure"; - version = "3.27.1"; + "core-js-compat-3.27.2" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.27.1.tgz"; - sha512 = "BS2NHgwwUppfeoqOXqi08mUqS5FiZpuRuJJpKsaME7kJz0xxuk0xkhDdfMIlP/zLa80krBqss1LtD7f889heAw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz"; + sha512 = "welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg=="; }; }; "core-util-is-1.0.2" = { @@ -25179,13 +25953,13 @@ let sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; }; }; - "create-gatsby-3.4.0" = { + "create-gatsby-3.5.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.4.0.tgz"; - sha512 = "WD9WtsXzqa+5vMBF56iiq8IGdJQT7TlWGYLv1qeM5jgK7tCCFxHnzHZ/MnvTnwspeKGRQuFgWpbrnSgD4YyQdA=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.5.0.tgz"; + sha512 = "wRLAkmKlJZNwNqVxXCgayAdvAtUjRKP8vr9ZRt2FYXyqZQmQtzXVDn8aekDlPs720z33HBajAYa+xCvl8pZhDA=="; }; }; "create-graphback-1.0.1" = { @@ -25674,6 +26448,24 @@ let sha512 = "M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ=="; }; }; + "css-loader-6.7.3" = { + name = "css-loader"; + packageName = "css-loader"; + version = "6.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz"; + sha512 = "qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ=="; + }; + }; + "css-minimizer-webpack-plugin-3.4.1" = { + name = "css-minimizer-webpack-plugin"; + packageName = "css-minimizer-webpack-plugin"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz"; + sha512 = "1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q=="; + }; + }; "css-modules-loader-core-1.1.0" = { name = "css-modules-loader-core"; packageName = "css-modules-loader-core"; @@ -26223,13 +27015,13 @@ let sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; }; - "d3-7.8.1" = { + "d3-7.8.2" = { name = "d3"; packageName = "d3"; - version = "7.8.1"; + version = "7.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3/-/d3-7.8.1.tgz"; - sha512 = "fdipulGWUYTZTxxU9gDJ2P4mpZL2u7Oqe6n2FI95Q8UY0AjbKNYjPHvhLOsvR+HcSao4vo3YYy4Bk9CWOrt1Vw=="; + url = "https://registry.npmjs.org/d3/-/d3-7.8.2.tgz"; + sha512 = "WXty7qOGSHb7HR7CfOzwN1Gw04MUOzN8qh9ZUsvwycIMb4DYMpY9xczZ6jUorGtO6bR9BPMPaueIKwiDxu9uiQ=="; }; }; "d3-array-3.1.1" = { @@ -26241,13 +27033,13 @@ let sha512 = "33qQ+ZoZlli19IFiQx4QEpf2CBEayMRzhlisJHSCsSUbDXv6ZishqS1x7uFVClKG4Wr7rZVHvaAttoLow6GqdQ=="; }; }; - "d3-array-3.2.1" = { + "d3-array-3.2.2" = { name = "d3-array"; packageName = "d3-array"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.1.tgz"; - sha512 = "gUY/qeHq/yNqqoCKNq4vtpFLdoCdvyNpWoC/KNjhGbhDuQpAM9sIQQKkXSNpXa9h5KySs/gzm7R88WkUutgwWQ=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz"; + sha512 = "yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ=="; }; }; "d3-axis-3.0.0" = { @@ -27888,6 +28680,15 @@ let sha512 = "JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg=="; }; }; + "dependency-path-9.2.8" = { + name = "dependency-path"; + packageName = "dependency-path"; + version = "9.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-path/-/dependency-path-9.2.8.tgz"; + sha512 = "S0OhIK7sIyAsph8hVH/LMCTDL3jozKtlrPx3dMQrlE2nAlXTquTT+AcOufphDMTQqLkfn4acvfiem9I1IWZ4jQ=="; + }; + }; "deprecation-2.3.1" = { name = "deprecation"; packageName = "deprecation"; @@ -28041,15 +28842,6 @@ let sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; }; - "detect-port-alt-1.1.6" = { - name = "detect-port-alt"; - packageName = "detect-port-alt"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz"; - sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; - }; - }; "detective-4.7.1" = { name = "detective"; packageName = "detective"; @@ -28077,13 +28869,13 @@ let sha512 = "LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A=="; }; }; - "devtools-protocol-0.0.1068969" = { + "devtools-protocol-0.0.1082910" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.1068969"; + version = "0.0.1082910"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz"; - sha512 = "ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1082910.tgz"; + sha512 = "RqoZ2GmqaNxyx+99L/RemY5CkwG9D0WEfOKxekwCRXOGrDCep62ngezEJUVMq6rISYQ+085fJnWDQqGHlxVNww=="; }; }; "devtools-protocol-0.0.981744" = { @@ -28230,13 +29022,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.4.29" = { + "diff2html-3.4.31" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.29"; + version = "3.4.31"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.29.tgz"; - sha512 = "xS7LQgUEd5ALH9X5TTPP8nnSmaa7mm+cAt5pZE5hSnEEvXSdoYBTStTkLBHOHJu9rZmGXs4jdFRsU8q90VfWkg=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.31.tgz"; + sha512 = "bgL4kUUChpBqyFykgalwXRXbeW+zCkGmoH4Ftw6+WFP5JccBUJPNMapfX2WDEb+KOLflrE7eJwvb5r8+zutetw=="; }; }; "diff3-0.0.3" = { @@ -28734,15 +29526,6 @@ let sha512 = "eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw=="; }; }; - "domhandler-3.3.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"; - sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; - }; - }; "domhandler-4.3.1" = { name = "domhandler"; packageName = "domhandler"; @@ -29564,6 +30347,15 @@ let sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; }; }; + "encode-registry-3.0.0" = { + name = "encode-registry"; + packageName = "encode-registry"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/encode-registry/-/encode-registry-3.0.0.tgz"; + sha512 = "2fRYji8K6FwYuQ6EPBKR/J9mcqb7kIoNqt1vGvJr3NrvKfncRiNm00Oxo6gi/YJF8R5Sp2bNFSFdGKTG0rje1Q=="; + }; + }; "encode-utf8-1.0.3" = { name = "encode-utf8"; packageName = "encode-utf8"; @@ -30267,6 +31059,15 @@ let sha512 = "x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q=="; }; }; + "esbuild-0.16.17" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz"; + sha512 = "G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg=="; + }; + }; "esbuild-android-64-0.14.47" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; @@ -30996,15 +31797,6 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-8.28.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz"; - sha512 = "S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ=="; - }; - }; "eslint-8.32.0" = { name = "eslint"; packageName = "eslint"; @@ -31086,13 +31878,13 @@ let sha512 = "63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA=="; }; }; - "eslint-plugin-no-unsanitized-4.0.1" = { + "eslint-plugin-no-unsanitized-4.0.2" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.1.tgz"; - sha512 = "y/lAMWnPPC7RYuUdxlEL/XiCL8FehN9h9s3Kjqbp/Kv0i9NZs+IXSC2kS546Fa4Bumwy31HlVS/OdWX0Kxb5Xg=="; + url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.2.tgz"; + sha512 = "Pry0S9YmHoz8NCEMRQh7N0Yexh2MYCNPIlrV52hTmS7qXnTghWsjXouF08bgsrrZqaW9tt1ZiK3j5NEmPE+EjQ=="; }; }; "eslint-plugin-prettier-3.4.1" = { @@ -31419,22 +32211,22 @@ let sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; - "estree-util-is-identifier-name-2.0.1" = { + "estree-util-is-identifier-name-2.1.0" = { name = "estree-util-is-identifier-name"; packageName = "estree-util-is-identifier-name"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.0.1.tgz"; - sha512 = "rxZj1GkQhY4x1j/CSnybK9cGuMFQYFPLq0iNyopqf14aOVLFtMv7Esika+ObJWPWiOHuMOAHz3YkWoLYYRnzWQ=="; + url = "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz"; + sha512 = "bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ=="; }; }; - "estree-util-visit-1.2.0" = { + "estree-util-visit-1.2.1" = { name = "estree-util-visit"; packageName = "estree-util-visit"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-1.2.0.tgz"; - sha512 = "wdsoqhWueuJKsh5hqLw3j8lwFqNStm92VcwtAOAny8g/KS/l5Y8RISjR4k5W6skCj3Nirag/WUCMS0Nfy3sgsg=="; + url = "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-1.2.1.tgz"; + sha512 = "xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw=="; }; }; "estree-walker-0.6.1" = { @@ -31743,15 +32535,6 @@ let sha512 = "6hULIO5fmncZ3CVTInnySP/ZC+Sqfdbkrhg79VCp5PMFjZdaGW6vA57qyK6/NRMZOVAbXxfopuGgps+cxHy1Ow=="; }; }; - "eventsource-1.1.2" = { - name = "eventsource"; - packageName = "eventsource"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz"; - sha512 = "xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA=="; - }; - }; "eventsource-2.0.2" = { name = "eventsource"; packageName = "eventsource"; @@ -32319,13 +33102,13 @@ let sha512 = "ytpHAAOQ/G5Nm7jyyEKzaoGiDhrUGPHeeJfyI2q7jii5dcPCLogf8EyWzSNcxAX8FZy1U6gfGY46SMmEhP3lMw=="; }; }; - "express-validator-6.14.2" = { + "express-validator-6.14.3" = { name = "express-validator"; packageName = "express-validator"; - version = "6.14.2"; + version = "6.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/express-validator/-/express-validator-6.14.2.tgz"; - sha512 = "8XfAUrQ6Y7dIIuy9KcUPCfG/uCbvREctrxf5EeeME+ulanJ4iiW71lWmm9r4YcKKYOCBMan0WpVg7FtHu4Z4Wg=="; + url = "https://registry.npmjs.org/express-validator/-/express-validator-6.14.3.tgz"; + sha512 = "c4b9NMdhskfcLbH/FchsSfCt4Vb14gKzcotG9zLS+VoOJDox57aGhCL+kmAu7cl+ytaSed+HD5jdJhel8DQsdg=="; }; }; "express-ws-2.0.0" = { @@ -32976,15 +33759,6 @@ let sha512 = "36frUeNww/TF3mMCSyLMjSy0BLD+ZURrmev6M/Tf1Q+Bu8K1Bk1tHJI9Uf2+di8oxe/38Xzo37Mi4EGaekbrAg=="; }; }; - "faye-websocket-0.10.0" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha512 = "Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ=="; - }; - }; "faye-websocket-0.11.4" = { name = "faye-websocket"; packageName = "faye-websocket"; @@ -33282,15 +34056,6 @@ let sha512 = "aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA=="; }; }; - "file-loader-6.0.0" = { - name = "file-loader"; - packageName = "file-loader"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz"; - sha512 = "/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ=="; - }; - }; "file-loader-6.2.0" = { name = "file-loader"; packageName = "file-loader"; @@ -33408,6 +34173,15 @@ let sha512 = "qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="; }; }; + "file-type-9.0.0" = { + name = "file-type"; + packageName = "file-type"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz"; + sha512 = "Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="; + }; + }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -33498,15 +34272,6 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; - "filesize-6.1.0" = { - name = "filesize"; - packageName = "filesize"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz"; - sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; - }; - }; "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; @@ -33957,13 +34722,13 @@ let sha512 = "d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA=="; }; }; - "flow-parser-0.197.0" = { + "flow-parser-0.198.2" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.197.0"; + version = "0.198.2"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.197.0.tgz"; - sha512 = "yhwkJPxH1JBg0aJunk/jVRy5p3UhVZBGkzL1hq/GK+GaBh6bKr2YKkv6gDuiufaw+i3pKWQgOLtD++1cvrgXLA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.198.2.tgz"; + sha512 = "tCQzqXbRAz0ZadIhAXGwdp/xsusADo8IK9idgc/2qCK5RmazbKDGedyykfRtzWgy7Klt4f4NZxq0o/wFUg6plQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -33975,13 +34740,13 @@ let sha512 = "IZTB4kq5GK0DPp7sGQ0q/BWurGHffRtQQwVkiqDgeO6wYJLLV5ZhgNOQ65loZxxuPMKZKZcICCUnaGtlxBiR0Q=="; }; }; - "fluent-syntax-0.13.0" = { + "fluent-syntax-0.14.0" = { name = "fluent-syntax"; packageName = "fluent-syntax"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.13.0.tgz"; - sha512 = "0Bk1AsliuYB550zr4JV9AYhsETsD3ELXUQzdXGJfIc1Ni/ukAfBdQInDhVMYJUaT2QxoamNslwkYF7MlOrPUwg=="; + url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.14.0.tgz"; + sha512 = "+k8uXWfRpSrE33764RbpjIKMzIX6R9EnSjFBgaA1s0Mboc3KnW9sYe0c6vjIoZQY1C4Gst1VFvAOP6YGJjTJuA=="; }; }; "flumecodec-0.0.0" = { @@ -34254,15 +35019,6 @@ let sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; }; }; - "fork-ts-checker-webpack-plugin-4.1.6" = { - name = "fork-ts-checker-webpack-plugin"; - packageName = "fork-ts-checker-webpack-plugin"; - version = "4.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz"; - sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; - }; - }; "fork-ts-checker-webpack-plugin-7.2.14" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; @@ -35010,22 +35766,22 @@ let sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; }; }; - "gatsby-core-utils-4.4.0" = { + "gatsby-core-utils-4.5.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.4.0.tgz"; - sha512 = "/ibilcGENKH6qqkcT17SIZgc2kjZn3HiGpD+ixbXYkMGqHiM5pj9XIHjy3DfvZvDt2ujkYV5EinmUdqx7CI81w=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.5.0.tgz"; + sha512 = "8ckCNXB7iasqLLoBTJLDzXwUcJ/cNUZVHo3+3cyMA9CLc8pfZiXtlp5qaOl0J+Q1qdorfENAnTvNEddXABfIZw=="; }; }; - "gatsby-telemetry-4.4.0" = { + "gatsby-telemetry-4.5.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.4.0.tgz"; - sha512 = "rcGMNa4fWIQSDqaUYjMXccrtVr71YQNzw01BfDZ6jxnSc7j29tZ8YXZZh+caS9Fc9cdLpQ2UabFcIp5vAtKQqA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.5.0.tgz"; + sha512 = "0lus63TNQXjlr4IwCyxtW+m7eP6RkOpzLB+KJ1eohuCTVPFsmxhtr4N1Kjub/Ip0IG1RtzNA0LW0xPg7ykJa7g=="; }; }; "gauge-1.2.7" = { @@ -35280,13 +36036,13 @@ let sha512 = "Qkn9eq6tW5/q9BDVdMpB8tOHljX9OSP0jRC5TRNVA4qRc839t4g8KQaR8t0Uv0EFVL0MlyG7m/ofjEgAROtYsA=="; }; }; - "get-intrinsic-1.1.3" = { + "get-intrinsic-1.2.0" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; + sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; }; }; "get-package-info-1.0.0" = { @@ -35532,6 +36288,15 @@ let sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; }; }; + "gifwrap-0.9.4" = { + name = "gifwrap"; + packageName = "gifwrap"; + version = "0.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gifwrap/-/gifwrap-0.9.4.tgz"; + sha512 = "MDMwbhASQuVeD4JKd1fKgNgCRL3fGqMM4WaqpNhWO0JiMOAjbQdumbs4BbBZEy9/M00EHEjKN3HieVhCUlwjeQ=="; + }; + }; "git-clone-0.1.0" = { name = "git-clone"; packageName = "git-clone"; @@ -36154,13 +36919,13 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globals-13.19.0" = { + "globals-13.20.0" = { name = "globals"; packageName = "globals"; - version = "13.19.0"; + version = "13.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz"; - sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; + url = "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"; + sha512 = "Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ=="; }; }; "globals-9.18.0" = { @@ -36217,6 +36982,15 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; + "globby-12.2.0" = { + name = "globby"; + packageName = "globby"; + version = "12.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz"; + sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA=="; + }; + }; "globby-13.1.3" = { name = "globby"; packageName = "globby"; @@ -36334,15 +37108,6 @@ let sha512 = "YSwLaGMOgSBx9roJlNLL12c+FRiw7VECphinc6mGucphc/ZxTHgdEz6gmJqH6NOzYEd/yr64hwjom5pZ+tJVpg=="; }; }; - "goldengate-12.0.1" = { - name = "goldengate"; - packageName = "goldengate"; - version = "12.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-12.0.1.tgz"; - sha512 = "Ku6nujmXs0JWj1/Z6ZLN7Mtq3S4inAW8JSv6EtsNRORCofJ8r8BlwxDDV3EDYfZvOmttc2JbnfGFtcKoXKz/BA=="; - }; - }; "goldengate-12.0.2" = { name = "goldengate"; packageName = "goldengate"; @@ -36613,15 +37378,6 @@ let sha512 = "vH2bsdjoJLQ33sZCquG1GyiFyK+Qk8n04NzqHLWTnY9l8lg08AGUyA8ZgeZHdi3I81nrdcGO13V9qYyP6sdshw=="; }; }; - "grammy-1.13.0" = { - name = "grammy"; - packageName = "grammy"; - version = "1.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.13.0.tgz"; - sha512 = "3C9ClsH05NogyZ68MXGDjS3rsieIWsEfx904CR48cfwG1m8fAgSLRi2HLuZOF6HPMEHsyYFwjtvOU312QcADdw=="; - }; - }; "grammy-1.13.1" = { name = "grammy"; packageName = "grammy"; @@ -36775,13 +37531,13 @@ let sha512 = "QUrX7R4htnTBTi83a0IlIilWVfiLEG8ANFlHRcxoZiTvOXTbgan67SUdGe1OlopbDuyNgtcy4ladl3Gvk4C36A=="; }; }; - "graphql-language-service-5.1.0" = { + "graphql-language-service-5.1.1" = { name = "graphql-language-service"; packageName = "graphql-language-service"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.1.0.tgz"; - sha512 = "APffigZ/l2me6soek+Yq5Us3HBwmfw4vns4QoqsTePXkK3knVO8rn0uAC6PmTyglb1pmFFPbYaRIzW4wmcnnGQ=="; + url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.1.1.tgz"; + sha512 = "gpaDT9E3+3eWhoqO4C81CGhkzr7Vp2jH/eq+ykoUbgfvMEpqhGTfCeNmrf+S4K/+4WTkAAJBsYT0/ZPZkqe/Hg=="; }; }; "graphql-language-service-interface-2.10.2" = { @@ -36802,13 +37558,13 @@ let sha512 = "duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA=="; }; }; - "graphql-language-service-server-2.9.4" = { + "graphql-language-service-server-2.9.5" = { name = "graphql-language-service-server"; packageName = "graphql-language-service-server"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.9.4.tgz"; - sha512 = "26PediCh1HWP6vIwiqCCUkh1QzKoLVFeEX79SerI3ETsfCS4RYyFAX4SiiFPLj0JKKM8Xmg7OBjRgiwwa1AdYw=="; + url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.9.5.tgz"; + sha512 = "u4X6mgoB5ufp64h9vT5UsFgQZ8GsbIIGLHfr/vndujlVpY+iHml9ea1o8on2c9i1LpB/ILa2zF90pJkBQgASfg=="; }; }; "graphql-language-service-types-1.8.7" = { @@ -37477,6 +38233,15 @@ let sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; }; }; + "hash-wasm-4.9.0" = { + name = "hash-wasm"; + packageName = "hash-wasm"; + version = "4.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-wasm/-/hash-wasm-4.9.0.tgz"; + sha512 = "7SW7ejyfnRxuOc7ptQHSf4LDoZaWOivfzqw+5rpcQku0nHfmicPKE51ra9BiRLAmT8+gGLestr1XroUkqdjL6w=="; + }; + }; "hash.js-1.1.7" = { name = "hash.js"; packageName = "hash.js"; @@ -38278,15 +39043,6 @@ let sha512 = "ADd49pudM157uWHwHQPUSX4ssMsvR/yHIswOR5CUfBdK9g9ZYGMhVSE6KZVHJ6kCkR0gH4htsfzU6zECDNVwyw=="; }; }; - "html-loader-1.1.0" = { - name = "html-loader"; - packageName = "html-loader"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-loader/-/html-loader-1.1.0.tgz"; - sha512 = "zwLbEgy+i7sgIYTlxI9M7jwkn29IvdsV6f1y7a2aLv/w8l1RigVk0PFijBZLLFsdi2gvL8sf2VJhTjLlfnK8sA=="; - }; - }; "html-minifier-3.5.21" = { name = "html-minifier"; packageName = "html-minifier"; @@ -38296,15 +39052,6 @@ let sha512 = "LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="; }; }; - "html-minifier-terser-5.1.1" = { - name = "html-minifier-terser"; - packageName = "html-minifier-terser"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; - sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg=="; - }; - }; "html-minifier-terser-6.1.0" = { name = "html-minifier-terser"; packageName = "html-minifier-terser"; @@ -38368,15 +39115,6 @@ let sha512 = "Br4ifmjQojUP4EmHnRBoUIYcZ9J7M4bTMcm7u6xoIAIuq2Nte4TzXX0533owvkQKQD1WeMTTTyD4Ni4QKxS0Bg=="; }; }; - "html-webpack-plugin-4.3.0" = { - name = "html-webpack-plugin"; - packageName = "html-webpack-plugin"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz"; - sha512 = "C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w=="; - }; - }; "html-webpack-plugin-5.5.0" = { name = "html-webpack-plugin"; packageName = "html-webpack-plugin"; @@ -38449,15 +39187,6 @@ let sha512 = "hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q=="; }; }; - "htmlparser2-4.1.0" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz"; - sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; - }; - }; "htmlparser2-6.1.0" = { name = "htmlparser2"; packageName = "htmlparser2"; @@ -38521,13 +39250,13 @@ let sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; }; }; - "http-cache-semantics-4.1.0" = { + "http-cache-semantics-4.1.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; }; "http-call-5.3.0" = { @@ -39106,6 +39835,15 @@ let sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; }; }; + "icss-utils-5.1.0" = { + name = "icss-utils"; + packageName = "icss-utils"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"; + sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; + }; + }; "idb-keyval-6.2.0" = { name = "idb-keyval"; packageName = "idb-keyval"; @@ -39241,6 +39979,15 @@ let sha512 = "BZh721F2Q5TwBdwpiqrBrHEdj8daj8KuMZK/DOCyqQlz1CqFhhuZWbK5ZCUnAvFJr8LaKHTaWl9ja3/a3DC2Ew=="; }; }; + "image-q-4.0.0" = { + name = "image-q"; + packageName = "image-q"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/image-q/-/image-q-4.0.0.tgz"; + sha512 = "PfJGVgIfKQJuq3s0tTDOKtztksibuUEbJQIYT3by6wctQo+Rdlh7ef4evJ5NCdxY4CfMbvFkocEwbl4BF8RlJw=="; + }; + }; "image-size-0.5.5" = { name = "image-size"; packageName = "image-size"; @@ -39340,22 +40087,13 @@ let sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA=="; }; }; - "immer-8.0.1" = { + "immer-9.0.19" = { name = "immer"; packageName = "immer"; - version = "8.0.1"; + version = "9.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz"; - sha512 = "aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA=="; - }; - }; - "immer-9.0.18" = { - name = "immer"; - packageName = "immer"; - version = "9.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-9.0.18.tgz"; - sha512 = "eAPNpsj7Ax1q6Y/3lm2PmlwRcFzpON7HSNQ3ru5WQH1/PSpnyed/HpNOELl2CxLKoj4r+bAHgdyKqW5gc2Se1A=="; + url = "https://registry.npmjs.org/immer/-/immer-9.0.19.tgz"; + sha512 = "eY+Y0qcsB4TZKwgQzLaE/lqYMlKhv5J9dyd2RhhtGhNo2njPXDqU9XPfcNfa3MIDsdtZt5KlkIsirlo4dHsWdQ=="; }; }; "immutable-3.8.2" = { @@ -40231,15 +40969,6 @@ let sha512 = "CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw=="; }; }; - "invoices-2.2.2" = { - name = "invoices"; - packageName = "invoices"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/invoices/-/invoices-2.2.2.tgz"; - sha512 = "flSBneW7IYRS2K7eVoL6Uemo5LkXkv++6wul8ZBbDz48j3GSGb1pVLdHUo1nvU9+WGNU3/Pqq27r99okyCnHdQ=="; - }; - }; "invoices-2.2.3" = { name = "invoices"; packageName = "invoices"; @@ -40267,13 +40996,13 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; - "ioredis-5.2.5" = { + "ioredis-5.3.0" = { name = "ioredis"; packageName = "ioredis"; - version = "5.2.5"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-5.2.5.tgz"; - sha512 = "7HKo/ClM2DGLRXdFq8ruS3Uuadensz4A76wPOU0adqlOqd1qkhoLPDaBhmVhUhNGpB+J65/bhLmNB8DDY99HJQ=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.0.tgz"; + sha512 = "Id9jKHhsILuIZpHc61QkagfVdUj2Rag5GzG1TGEvRNeM7dtTOjICgjC+tvqYxi//PuX2wjQ+Xjva2ONBuf92Pw=="; }; }; "iota-array-1.0.0" = { @@ -40465,13 +41194,13 @@ let sha512 = "kniTIJmaZYiwa17eTtWIfm0K342seyugl6vuC8DiiyiRAJWAVlLkqGCI0Im0neo0TkXw+pRcKaBPRdcKHnQJ6Q=="; }; }; - "irregular-plurals-3.3.0" = { + "irregular-plurals-3.4.0" = { name = "irregular-plurals"; packageName = "irregular-plurals"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz"; - sha512 = "MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g=="; + url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.4.0.tgz"; + sha512 = "YXxECO/W6N9aMBVKMKKZ8TXESgq7EFrp3emCGGUcrYY1cgJIeZjoB75MTu8qi+NAKntS9NwPU8VdcQ3r6E6aWQ=="; }; }; "is-3.3.0" = { @@ -42544,15 +43273,6 @@ let sha512 = "Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw=="; }; }; - "jest-worker-26.6.2" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "26.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; - sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; - }; - }; "jest-worker-27.5.1" = { name = "jest-worker"; packageName = "jest-worker"; @@ -42562,6 +43282,15 @@ let sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; }; }; + "jimp-0.16.2" = { + name = "jimp"; + packageName = "jimp"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jimp/-/jimp-0.16.2.tgz"; + sha512 = "UpItBk81a92f8oEyoGYbO3YK4QcM0hoIyuGHmShoF9Ov63P5Qo7Q/X2xsAgnODmSuDJFOtrPtJd5GSWW4LKdOQ=="; + }; + }; "jimp-compact-0.16.1" = { name = "jimp-compact"; packageName = "jimp-compact"; @@ -42661,13 +43390,13 @@ let sha512 = "jnt9OC34sLXMLJ6YfPQ2ZEKrR9mB5ZbSnQb4LPaOx1c5rTzxpR33L18jjp0r75mGGTJmsil3qwN1B5IBeTnSSA=="; }; }; - "jose-4.11.1" = { + "jose-4.11.2" = { name = "jose"; packageName = "jose"; - version = "4.11.1"; + version = "4.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.11.1.tgz"; - sha512 = "YRv4Tk/Wlug8qicwqFNFVEZSdbROCHRAC6qu/i0dyNKr5JQdoa2pIGoS04lLO/jXQX7Z9omoNewYIVIxqZBd9Q=="; + url = "https://registry.npmjs.org/jose/-/jose-4.11.2.tgz"; + sha512 = "njj0VL2TsIxCtgzhO+9RRobBvws4oYyCM8TpvoUQwl/MbIM3NFJRR9+e6x0sS5xXaP1t6OCBkaBME98OV9zU5A=="; }; }; "joycon-3.1.1" = { @@ -42833,22 +43562,13 @@ let sha512 = "efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="; }; }; - "js-sdsl-4.1.4" = { + "js-sdsl-4.3.0" = { name = "js-sdsl"; packageName = "js-sdsl"; - version = "4.1.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz"; - sha512 = "Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw=="; - }; - }; - "js-sdsl-4.2.0" = { - name = "js-sdsl"; - packageName = "js-sdsl"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz"; - sha512 = "dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ=="; + url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz"; + sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; }; }; "js-sha256-0.9.0" = { @@ -43157,13 +43877,13 @@ let sha512 = "UrXBaM/7jJldrlDN2aV/vaIurIZJM4ikJtcE/ugSoAuJUW42Hpi0Qd5k9MiSaE/k+KNxRpihS+skRa2TETT3Cg=="; }; }; - "jsii-srcmak-0.1.797" = { + "jsii-srcmak-0.1.807" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.797"; + version = "0.1.807"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.797.tgz"; - sha512 = "SF41dMMOlMYWHDrvJ0PgTPzHR+RGxoyUBk+kUaAazE2WaWINLqwFxeT5rbrrXqcYNQ/JiprlrES69TllyWVAVA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.807.tgz"; + sha512 = "K4Sri59N7ckh1jSxjdEG386xmJERx4uJgN2CszTA/w8EFMe9cg1xcTgOKyue2Q674xlhNhQleC1ON0wUv/bu7A=="; }; }; "json-bigint-1.0.0" = { @@ -43526,22 +44246,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "json2csv-5.0.7" = { - name = "json2csv"; - packageName = "json2csv"; - version = "5.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/json2csv/-/json2csv-5.0.7.tgz"; - sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA=="; - }; - }; - "json2jsii-0.3.247" = { + "json2jsii-0.3.257" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.247"; + version = "0.3.257"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.247.tgz"; - sha512 = "0TJVNcWTd3dRYT1Zz9thhceNAEYnK/k7TIhwfmyWP1KaqdZq1tvxLOWkBrzQX6rIEXFU7l8EX6u+Y7bWXP/oFA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.257.tgz"; + sha512 = "viB1ukEAISc2TQS2uSmyrwLm8TS/zyAhsXwSj2nNC4UU43F+j7MK0SqloosTPiJVGBgB+3iSUDaMy5Rb5BV34g=="; }; }; "json3-3.2.6" = { @@ -43553,15 +44264,6 @@ let sha512 = "KA+GHhYTLTo7Ri4DyjwUgW8kn98AYtVZtBC94qL5yD0ZSYct8/eF8qBmTNyk+gPE578bKeIL4WBq+MUyd1I26g=="; }; }; - "json3-3.3.3" = { - name = "json3"; - packageName = "json3"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; - sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; - }; - }; "json5-0.5.1" = { name = "json5"; packageName = "json5"; @@ -43931,13 +44633,13 @@ let sha512 = "xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="; }; }; - "jszip-3.7.1" = { + "jszip-3.8.0" = { name = "jszip"; packageName = "jszip"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz"; - sha512 = "ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.8.0.tgz"; + sha512 = "cnpQrXvFSLdsR9KR5/x7zdf6c3m8IhZfZzSblFEHSqBaVwD2nvJ4CuCKLyvKvwBgZm08CgfSoiTBQLm5WW9hGw=="; }; }; "junk-1.0.3" = { @@ -45200,15 +45902,6 @@ let sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA=="; }; }; - "lightning-6.8.0" = { - name = "lightning"; - packageName = "lightning"; - version = "6.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-6.8.0.tgz"; - sha512 = "HzcRq5n4zkGIXuGefFCoCjKIG/4IbpGESUyKA/+3UvfiGhtrKymRM8zoSFjWRFoaLaosR2P2SuKlrTyMfDmPHg=="; - }; - }; "lightning-7.0.3" = { name = "lightning"; packageName = "lightning"; @@ -45470,13 +46163,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "listr2-5.0.6" = { + "listr2-5.0.7" = { name = "listr2"; packageName = "listr2"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/listr2/-/listr2-5.0.6.tgz"; - sha512 = "u60KxKBy1BR2uLJNTWNptzWQ1ob/gjMzIJPZffAENzpZqbMZ/5PrXXOomDcevIS/+IB7s1mmCEtSlT2qHWMqag=="; + url = "https://registry.npmjs.org/listr2/-/listr2-5.0.7.tgz"; + sha512 = "MD+qXHPmtivrHIDRwPYdfNkrzqDiuaKU/rfBcec3WMyMF3xylQj3jMq344OtvQxz7zaCFViRAeqlr2AFhPvXHw=="; }; }; "livereload-0.9.3" = { @@ -45515,22 +46208,13 @@ let sha512 = "iBA0cb13CobBSoGJLfZgnrykLlfJipDAnvtf+YwIqqzBEsTeQYsXrHaSBkaHd5wCWeabwrNvhjZoFMUrlo+eLw=="; }; }; - "ln-accounting-6.1.2" = { + "ln-accounting-6.1.3" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-6.1.2.tgz"; - sha512 = "fVYvNmwyOzqpxKRhcBV4itOYbGRKtjnml5sbmS6lGsS2ZNDZgmopx4/cxl+ZQG5dO8W7/MlSJD7I5MVmFXOrOw=="; - }; - }; - "ln-service-54.8.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "54.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-54.8.0.tgz"; - sha512 = "QNOek7A5BFKGiHlCYHQfIwhehtRyO/oFndeaSn/11x2cvo461pgJXyu/zQETCb4yhGZUa1v3LU1Lmk4bPqsvyw=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-6.1.3.tgz"; + sha512 = "8eQvvZb/MiYcRUlg/iIaamWSSTLBpLidLiviqmZ3enpnliW1JIA6pgXsbfyKSWPK3bdzqPuRGnQKQevXsTAybQ=="; }; }; "ln-service-54.9.0" = { @@ -45542,24 +46226,6 @@ let sha512 = "aeuRa5B3EhCJf6RL2m2oTK7luClU90Evhqp9RRWcfxngQZc2BSbw47fav63WaoXwA/o7/3tgy6y/1bCZ5UfzgA=="; }; }; - "ln-sync-4.1.0" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.1.0.tgz"; - sha512 = "N02s3tCvlyiTSmhJYoawDLqVmZ63Yk/7k27F+244J8kOorwLNrtAjcy8WHn+YnR44yreAph9xHwacU4Nr+VQuQ=="; - }; - }; - "ln-sync-4.1.1" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.1.1.tgz"; - sha512 = "Y0XIPFizypuIUNzjwEJMz2eBkgH+7UepCUjwWiVurp61QpLqDNW73dq8/ittFO+mf9bIFqebmTeIiORh0DETFQ=="; - }; - }; "ln-sync-4.2.0" = { name = "ln-sync"; packageName = "ln-sync"; @@ -45569,13 +46235,22 @@ let sha512 = "yRQZ7nQOIa97p4vWeUo8iqGXX0nVMoROqA3PVm29RnW+AgKPk3sXtJ+LUDu+vMNkOauocrGz1vXS61Q+WNLutg=="; }; }; - "ln-telegram-4.6.0" = { + "ln-sync-4.3.0" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.3.0.tgz"; + sha512 = "DQr68yZBk9QmcSKRJ9Nto6WxB2xjRS2XcUFSQXNDWkM+r9vMFCsqNUFU5IMVt/aLiKnf4PdKQ3mhfrvbH+TMuQ=="; + }; + }; + "ln-telegram-4.6.1" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-4.6.0.tgz"; - sha512 = "rNnNgYUsXEbkLjX20AwgsAa8JBi5U938/NadOLW4ro+gMdb36TprMe/qDX8jOyoiXRVJs+0re9vdQPbHmXBxVw=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-4.6.1.tgz"; + sha512 = "0zoS1dDGXKwT2ixtSxfWRJsHdcz7ap+PNoNB5KEB3vKeAR1fuGZAz1kr5lbKXGLK8Y8RaR/S/qK3hV8e5khfkg=="; }; }; "load-bmfont-1.4.1" = { @@ -45722,15 +46397,6 @@ let sha512 = "I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg=="; }; }; - "loader-utils-2.0.0" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"; - sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; - }; - }; "loader-utils-2.0.4" = { name = "loader-utils"; packageName = "loader-utils"; @@ -48549,13 +49215,13 @@ let sha512 = "vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ=="; }; }; - "mdast-comment-marker-2.1.0" = { + "mdast-comment-marker-2.1.1" = { name = "mdast-comment-marker"; packageName = "mdast-comment-marker"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-2.1.0.tgz"; - sha512 = "/+Cfm8A83PjkqjQDB9iYqHESGuXlriCWAwRGPJjkYmxXrF4r6saxeUlOKNrf+SogTwg9E8uyHRCFHLG6/BAAdA=="; + url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-2.1.1.tgz"; + sha512 = "ktFfySmbRfOPiWoLkRKqkkyYkDnBVX5b5FqXwnvV1TmgVOl49ETsYK4hPKqrlM15y7AtxNDKIKwJRkZa3TWkng=="; }; }; "mdast-util-compact-2.0.1" = { @@ -48576,13 +49242,13 @@ let sha512 = "9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA=="; }; }; - "mdast-util-find-and-replace-2.2.1" = { + "mdast-util-find-and-replace-2.2.2" = { name = "mdast-util-find-and-replace"; packageName = "mdast-util-find-and-replace"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz"; - sha512 = "SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw=="; + url = "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.2.tgz"; + sha512 = "MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw=="; }; }; "mdast-util-footnote-0.1.7" = { @@ -48603,13 +49269,13 @@ let sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; }; }; - "mdast-util-from-markdown-1.2.0" = { + "mdast-util-from-markdown-1.3.0" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz"; - sha512 = "iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q=="; + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.0.tgz"; + sha512 = "HN3W1gRIuN/ZW295c7zi7g9lVBllMgZE40RxCX37wrTPWXCWtpvOZdfnuK+1WNpvZje6XuJeI3Wnb4TJEUem+g=="; }; }; "mdast-util-frontmatter-0.2.0" = { @@ -48621,13 +49287,13 @@ let sha512 = "FHKL4w4S5fdt1KjJCwB0178WJ0evnyyQr5kXTM3wrOVpytD0hrkvd+AOOjU9Td8onOejCkmZ+HQRT3CZ3coHHQ=="; }; }; - "mdast-util-frontmatter-1.0.0" = { + "mdast-util-frontmatter-1.0.1" = { name = "mdast-util-frontmatter"; packageName = "mdast-util-frontmatter"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-1.0.0.tgz"; - sha512 = "7itKvp0arEVNpCktOET/eLFAYaZ+0cNjVtFtIPxgQ5tV+3i+D4SDDTjTzPWl44LT59PC+xdx+glNTawBdF98Mw=="; + url = "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-1.0.1.tgz"; + sha512 = "JjA2OjxRqAa8wEG8hloD0uTU0kdn8kbtOWpPP94NBkfAlbxn4S8gCGf/9DwFtEeGPXrDcNXdiDjVaRdUFqYokw=="; }; }; "mdast-util-gfm-0.1.2" = { @@ -48666,13 +49332,13 @@ let sha512 = "FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg=="; }; }; - "mdast-util-gfm-footnote-1.0.1" = { + "mdast-util-gfm-footnote-1.0.2" = { name = "mdast-util-gfm-footnote"; packageName = "mdast-util-gfm-footnote"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz"; - sha512 = "p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw=="; + url = "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.2.tgz"; + sha512 = "56D19KOGbE00uKVj3sgIykpwKL179QsVFwx/DCW0u/0+URsryacI4MAdNJl0dh+u2PSsD9FtxPFbHCzJ78qJFQ=="; }; }; "mdast-util-gfm-strikethrough-0.2.3" = { @@ -48720,13 +49386,13 @@ let sha512 = "/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A=="; }; }; - "mdast-util-gfm-task-list-item-1.0.1" = { + "mdast-util-gfm-task-list-item-1.0.2" = { name = "mdast-util-gfm-task-list-item"; packageName = "mdast-util-gfm-task-list-item"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz"; - sha512 = "KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA=="; + url = "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.2.tgz"; + sha512 = "PFTA1gzfp1B1UaiJVyhJZA1rm0+Tzn690frc/L8vNX1Jop4STZgOE6bxUhnzdVSB+vm2GU1tIsuQcA9bxTQpMQ=="; }; }; "mdast-util-heading-style-1.0.6" = { @@ -48774,13 +49440,13 @@ let sha512 = "7N5ihsOkAEGjFotIX9p/YPdl4TqUoMxL4ajNz7PbT89BqsdWJuBC9rvgt6wpbwTZqWWR0jKWqQbwsOWDBUZv4g=="; }; }; - "mdast-util-phrasing-3.0.0" = { + "mdast-util-phrasing-3.0.1" = { name = "mdast-util-phrasing"; packageName = "mdast-util-phrasing"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-3.0.0.tgz"; - sha512 = "S+QYsDRLkGi8U7o5JF1agKa/sdP+CNGXXLqC17pdTVL8FHHgQEiwFGa9yE5aYtUxNiFGYoaDy9V1kC85Sz86Gg=="; + url = "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-3.0.1.tgz"; + sha512 = "WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg=="; }; }; "mdast-util-to-markdown-0.6.5" = { @@ -48837,13 +49503,13 @@ let sha512 = "AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w=="; }; }; - "mdast-util-to-string-3.1.0" = { + "mdast-util-to-string-3.1.1" = { name = "mdast-util-to-string"; packageName = "mdast-util-to-string"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz"; - sha512 = "n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA=="; + url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.1.tgz"; + sha512 = "tGvhT94e+cVnQt8JWE9/b3cUQZWS732TJxXHktvP+BYo62PpYD53Ls/6cC60rW21dW+txxiM4zMdc6abASvZKA=="; }; }; "mdmanifest-1.0.8" = { @@ -48990,6 +49656,15 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; + "mem-8.1.1" = { + name = "mem"; + packageName = "mem"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz"; + sha512 = "qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="; + }; + }; "mem-fs-2.2.1" = { name = "mem-fs"; packageName = "mem-fs"; @@ -48999,13 +49674,13 @@ let sha512 = "yiAivd4xFOH/WXlUi6v/nKopBh1QLzwjFi36NK88cGt/PRXI8WeBASqY+YSjIVWvQTx3hR8zHKDBMV6hWmglNA=="; }; }; - "mem-fs-editor-9.5.0" = { + "mem-fs-editor-9.6.0" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "9.5.0"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.5.0.tgz"; - sha512 = "7p+bBDqsSisO20YIZf2ntYvST27fFJINn7CKE21XdPUQDcLV62b/yB5sTOooQeEoiZ3rldZQ+4RfONgL/gbRoA=="; + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.6.0.tgz"; + sha512 = "CsuAd+s0UPZnGzm3kQ5X7gGmVmwiX9XXRAmXj9Mbq0CJa8YWUkPqneelp0aG2g+7uiwCBHlJbl30FYtToLT3VQ=="; }; }; "memfs-3.4.13" = { @@ -49548,13 +50223,13 @@ let sha512 = "PpysK2S1Q/5VXi72IIapbi/jliaiOFzv7THH4amwXeYXLq3l1uo8/2Be0Ac1rEwK20MQEsGH2ltAZLNY2KI/0Q=="; }; }; - "micromark-extension-mdx-expression-1.0.3" = { + "micromark-extension-mdx-expression-1.0.4" = { name = "micromark-extension-mdx-expression"; packageName = "micromark-extension-mdx-expression"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.3.tgz"; - sha512 = "TjYtjEMszWze51NJCZmhv7MEBcgYRgb3tJeMAJ+HQCAaZHHRBaDCccqQzGizR/H4ODefP44wRTgOn2vE5I6nZA=="; + url = "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.4.tgz"; + sha512 = "TCgLxqW6ReQ3AJgtj1P0P+8ZThBTloLbeb7jNaqr6mCOLDpxUiBFE/9STgooMZttEwOQu5iEcCCa3ZSDhY9FGw=="; }; }; "micromark-extension-mdx-jsx-1.0.3" = { @@ -49611,13 +50286,13 @@ let sha512 = "CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg=="; }; }; - "micromark-factory-mdx-expression-1.0.6" = { + "micromark-factory-mdx-expression-1.0.7" = { name = "micromark-factory-mdx-expression"; packageName = "micromark-factory-mdx-expression"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.6.tgz"; - sha512 = "WRQIc78FV7KrCfjsEf/sETopbYjElh3xAmNpLkd1ODPqxEngP42eVRGbiPEQWpRV27LzqW+XVTvQAMIIRLPnNA=="; + url = "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.7.tgz"; + sha512 = "QAdFbkQagTZ/eKb8zDGqmjvgevgJH3+aQpvvKrXWxNJp3o8/l2cAbbrBd0E04r0Gx6nssPpqWIjnbHFvZu5qsQ=="; }; }; "micromark-factory-space-1.0.0" = { @@ -49710,13 +50385,13 @@ let sha512 = "U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA=="; }; }; - "micromark-util-events-to-acorn-1.2.0" = { + "micromark-util-events-to-acorn-1.2.1" = { name = "micromark-util-events-to-acorn"; packageName = "micromark-util-events-to-acorn"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.0.tgz"; - sha512 = "WWp3bf7xT9MppNuw3yPjpnOxa8cj5ACivEzXJKu0WwnjBYfzaBvIAT9KfeyI0Qkll+bfQtfftSwdgTH6QhTOKw=="; + url = "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.1.tgz"; + sha512 = "mkg3BaWlw6ZTkQORrKVBW4o9ICXPxLtGz51vml5mQpKFdo9vqIX68CAx5JhTOdjQyAHH7JFmm4rh8toSPQZUmg=="; }; }; "micromark-util-html-tag-name-1.1.0" = { @@ -50106,15 +50781,6 @@ let sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; }; }; - "mini-css-extract-plugin-0.5.0" = { - name = "mini-css-extract-plugin"; - packageName = "mini-css-extract-plugin"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz"; - sha512 = "IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw=="; - }; - }; "mini-css-extract-plugin-0.9.0" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; @@ -50124,6 +50790,15 @@ let sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; }; }; + "mini-css-extract-plugin-2.7.2" = { + name = "mini-css-extract-plugin"; + packageName = "mini-css-extract-plugin"; + version = "2.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz"; + sha512 = "EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw=="; + }; + }; "mini-svg-data-uri-1.4.4" = { name = "mini-svg-data-uri"; packageName = "mini-svg-data-uri"; @@ -50601,6 +51276,15 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; + "mkdirp-2.1.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.3.tgz"; + sha512 = "sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw=="; + }; + }; "mkdirp-classic-0.5.3" = { name = "mkdirp-classic"; packageName = "mkdirp-classic"; @@ -51033,13 +51717,13 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "msgpackr-1.8.1" = { + "msgpackr-1.8.2" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.1.tgz"; - sha512 = "05fT4J8ZqjYlR4QcRDIhLCYKUOHXk7C/xa62GzMKj74l3up9k2QZ3LgFc6qWdsPHl91QA2WLWqWc8b8t7GLNNw=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz"; + sha512 = "eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ=="; }; }; "msgpackr-extract-2.2.0" = { @@ -51051,13 +51735,13 @@ let sha512 = "0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog=="; }; }; - "mssql-9.1.0" = { + "mssql-9.1.1" = { name = "mssql"; packageName = "mssql"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-9.1.0.tgz"; - sha512 = "rAsD7xfOkzSUqmNMoWX9YT43QfxbabIbrhEuf/PGRCzhWCzwHf25jxNgaoAwqT7vcb5/1irDCi6l6DG05ZGEEQ=="; + url = "https://registry.npmjs.org/mssql/-/mssql-9.1.1.tgz"; + sha512 = "m0yTx9xzUtTvJpWJHqknUXUDPRnJXZYOOFNygnNIXn1PBkLsC/rkXQdquObd+M0ZPlBhGC00Jg28zG0wCl7VWg=="; }; }; "multer-1.4.3" = { @@ -52159,13 +52843,13 @@ let sha512 = "R+1OJEmRl3ZOp9d8PbiRxGpnvmpi3jU+lzSqCJoLeogdEh0FYDRH1aC223qUbaKffxNTJkEfeDOeQfziw749yA=="; }; }; - "nlcst-is-literal-2.1.0" = { + "nlcst-is-literal-2.1.1" = { name = "nlcst-is-literal"; packageName = "nlcst-is-literal"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-2.1.0.tgz"; - sha512 = "jaEIXvIreWx4lfkRa+B3toTTxQgDxnECncbEQVSUVfRWxamQFbRHgxyfrt0aMnuoq5AMd3CQHl5SHGGruOUOdQ=="; + url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-2.1.1.tgz"; + sha512 = "/PyEKNHN+SrcrmnZRwszzZYbvZSN2AVD506+rfMUzyFHB0PtUmqZOdUuXmQxQeZXv6o29pT5chLjQJdC9weOCQ=="; }; }; "nlcst-normalize-2.1.5" = { @@ -52177,13 +52861,13 @@ let sha512 = "xSqTKv8IHIy3n/orD7wj81BZljLfbrTot0Pv64MYUnQUXfDbi1xDSpJR4qEmbFWyFoHsmivcOdgrK+o7ky3mcw=="; }; }; - "nlcst-normalize-3.1.0" = { + "nlcst-normalize-3.1.1" = { name = "nlcst-normalize"; packageName = "nlcst-normalize"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-3.1.0.tgz"; - sha512 = "kRWfUwtffmU26wPAJ25St5rec29PhV8F6dKaa7PxGhH3uytsGakfLyOEEm1mULzWOdfyDb03aE+OKp7h0OJuhA=="; + url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-3.1.1.tgz"; + sha512 = "Fz6DhC0dmsuqilkz0viOScT+u9UGjgUpSrzo6yOZlcQ24F/m2BuoVF72KUOKZ06dRUeWyPpCSMxI5ONop9Qptw=="; }; }; "nlcst-search-2.0.0" = { @@ -52195,13 +52879,13 @@ let sha512 = "+3xdctMFTcG+76vKAa0wObNg1EYq7IIQlZcL+HxSFXkHO1DgSPRjsPJrmelVIvMg7rk+wmBcdPEoScv/CTT1Zw=="; }; }; - "nlcst-search-3.1.0" = { + "nlcst-search-3.1.1" = { name = "nlcst-search"; packageName = "nlcst-search"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-3.1.0.tgz"; - sha512 = "d+0fXxF0d5oFAeeyuoGbIYcbiixE9Xt/lsmt491jjPyabXRoIRBE0++U+G8kbDyJFRk1bMQnGFpMCzeoMlDYfQ=="; + url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-3.1.1.tgz"; + sha512 = "0KsxSqFzSYWVDTo/SPde0RYf5LVmW1eAje8rbRJm+Lev1NzrWj2bIwtXfwGvfPbCi2ABsTV8bqmGAiF/EVqVWA=="; }; }; "nlcst-to-string-2.0.4" = { @@ -52213,13 +52897,13 @@ let sha512 = "3x3jwTd6UPG7vi5k4GEzvxJ5rDA7hVUIRNHPblKuMVP9Z3xmlsd9cgLcpAMkc5uPOBna82EeshROFhsPkbnTZg=="; }; }; - "nlcst-to-string-3.1.0" = { + "nlcst-to-string-3.1.1" = { name = "nlcst-to-string"; packageName = "nlcst-to-string"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-3.1.0.tgz"; - sha512 = "Y8HQWKw/zrHTCnu2zcFBN1dV6vN0NUG7s5fkEj380G8tF3R+vA2KG+tDl2QoHVQCTHGHVXwoni2RQkDSFQb1PA=="; + url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-3.1.1.tgz"; + sha512 = "63mVyqaqt0cmn2VcI2aH6kxe1rLAmSROqHMA0i4qqg1tidkfExgpb0FGMikMCn86mw5dFtBtEANfmSSK7TjNHw=="; }; }; "no-case-2.3.2" = { @@ -52267,13 +52951,13 @@ let sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; }; }; - "node-abort-controller-3.0.1" = { + "node-abort-controller-3.1.1" = { name = "node-abort-controller"; packageName = "node-abort-controller"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz"; - sha512 = "/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="; + url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz"; + sha512 = "AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="; }; }; "node-addon-api-1.7.2" = { @@ -52627,13 +53311,13 @@ let sha512 = "qhCyQqrPpP93F/6Wc/xUR7L8mAJW0Z6R7HMQV8jCHHksAxNDe/4z4Un/H9CpLOT+5K39OPyt9tIQlavxWES3lg=="; }; }; - "node-html-parser-1.4.9" = { + "node-html-parser-5.4.2" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "1.4.9"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.9.tgz"; - sha512 = "UVcirFD1Bn0O+TSmloHeHqZZCxHjvtIeGdVdGMhyZ8/PWlEiZaZ5iJzR189yKZr8p0FXN58BUeC7RHRkf/KYGw=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz"; + sha512 = "RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw=="; }; }; "node-int64-0.4.0" = { @@ -52780,15 +53464,6 @@ let sha512 = "1J1tcV+zkCIy24n0rcJ/DSPSCziEgLGld+QBYk1rNESIo+gFyL5RMkCOcII2IrBTZF/kcDTElepMTCILXbMDfQ=="; }; }; - "node-releases-1.1.77" = { - name = "node-releases"; - packageName = "node-releases"; - version = "1.1.77"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz"; - sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; - }; - }; "node-releases-2.0.8" = { name = "node-releases"; packageName = "node-releases"; @@ -53797,13 +54472,13 @@ let sha512 = "Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg=="; }; }; - "number-allocator-1.0.12" = { + "number-allocator-1.0.14" = { name = "number-allocator"; packageName = "number-allocator"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.12.tgz"; - sha512 = "sGB0qoQGmKimery9JubBQ9pQUr1V/LixJAk3Ygp7obZf6mpSXime8d7XHEobbIimkdZpgjkNlLt6G7LPEWFYWg=="; + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.14.tgz"; + sha512 = "OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA=="; }; }; "number-is-nan-1.0.1" = { @@ -53869,13 +54544,13 @@ let sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; }; }; - "nx-15.5.2" = { + "nx-15.6.3" = { name = "nx"; packageName = "nx"; - version = "15.5.2"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-15.5.2.tgz"; - sha512 = "jo8DG7zt0EorKL6AihkoshaeiFkK25NOeGUEnF05BFCaqsIoS9s3uctrOumh2G9DhaGMEWzakc3kF4/LeLB9pg=="; + url = "https://registry.npmjs.org/nx/-/nx-15.6.3.tgz"; + sha512 = "3t0A0GPLNen1yPAyE+VGZ3nkAzZYb5nfXtAcx8SHBlKq4u42yBY3khBmP1y4Og3jhIwFIj7J7Npeh8ZKrthmYQ=="; }; }; "nyc-15.1.0" = { @@ -55247,22 +55922,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.5.5" = { + "ot-builder-1.6.1" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.5.tgz"; - sha512 = "LRzFRcx8+33inNTAcyxHY9vS1mp17VMIU0DUW2aPZmIEYLvOGYrL2oQl0ePESg+QB0/D40GbQB7oO9Hi8fjJpA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.6.1.tgz"; + sha512 = "08u12lm5A2S9c16/QTHs/ZvsZhQQe8BQEkSdU1D/u9gpKccBV1jadJNJHXfkZA7N/Y1Yn0dlh274J35YHX1RNQ=="; }; }; - "otb-ttc-bundle-1.5.5" = { + "otb-ttc-bundle-1.6.1" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.5.tgz"; - sha512 = "BG36gFUPVBYhM4cgsHrTBQYU+7wuV98rwjNHLBTCXaXK3lU9P1lM2mE7l1o/sG2tx9OxWwNUupE8/N+usyTnpw=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.6.1.tgz"; + sha512 = "UN/85A4UWU6w1fkzpLwN60nh6bxCcg8E8gtz+yhOmjOQEhZ8g40rQG2mqqoy7Dubkc1kzsehtzCjKrhzp+YWLA=="; }; }; "ow-0.21.0" = { @@ -55949,15 +56624,6 @@ let sha512 = "8EKVBxCRSvLnsX1p2LlSFSH3c2/wuhY9/BXXWu8boL78FbVKqn2L5SpURt1x5iw6Gq8PTqJ7MdPoe5nCtX3I+g=="; }; }; - "paid-services-4.2.1" = { - name = "paid-services"; - packageName = "paid-services"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-4.2.1.tgz"; - sha512 = "XguuYsT5jQ9QZPLeS/OrUnodpawCFf79oRB033synxe2RvZYIs8QH52PuPPqwT+dyHR8KvuI9QcdZayLVYOE+A=="; - }; - }; "paid-services-4.3.0" = { name = "paid-services"; packageName = "paid-services"; @@ -56336,15 +57002,6 @@ let sha512 = "Eg1OuNntBMH0ojvEKSrvDSnwLmvVuUOSdylH/pSCPNMIspLlweJyIWXCE+k/5hm3cj/EBUYwmWkjhBALNP4LXQ=="; }; }; - "parse-srcset-1.0.2" = { - name = "parse-srcset"; - packageName = "parse-srcset"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; - sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="; - }; - }; "parse-torrent-4.1.0" = { name = "parse-torrent"; packageName = "parse-torrent"; @@ -57110,13 +57767,13 @@ let sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; - "pg-8.8.0" = { + "pg-8.9.0" = { name = "pg"; packageName = "pg"; - version = "8.8.0"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz"; - sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; + url = "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz"; + sha512 = "ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg=="; }; }; "pg-connection-string-2.5.0" = { @@ -57128,13 +57785,13 @@ let sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; - "pg-cursor-2.7.4" = { + "pg-cursor-2.8.0" = { name = "pg-cursor"; packageName = "pg-cursor"; - version = "2.7.4"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.7.4.tgz"; - sha512 = "CNWwOzTTZ9QvphoOL+Wg/7pmVr9GnAWBjPbuK2FRclrB4A/WRO/ssCJ9BlkzIGmmofK2M/LyokNHgsLSn+fMHA=="; + url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.8.0.tgz"; + sha512 = "LrOaEHK+R1C40e+xeri3FTRY/VKp9uTOCVsKtGB7LJ57qbeaphYvWjbVly8AesdT1GfHXYcAnVdExKhW7DKOvA=="; }; }; "pg-int8-1.0.1" = { @@ -57164,22 +57821,22 @@ let sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; }; }; - "pg-protocol-1.5.0" = { + "pg-protocol-1.6.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz"; + sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; }; - "pg-query-stream-4.2.4" = { + "pg-query-stream-4.3.0" = { name = "pg-query-stream"; packageName = "pg-query-stream"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.2.4.tgz"; - sha512 = "Et3gTrWn4C2rj4LVioNq1QDd7aH/3mSJcBm79jZALv3wopvx9bWENtbOYZbHQ6KM+IkfFxs0JF1ZLjMDJ9/N6Q=="; + url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.3.0.tgz"; + sha512 = "+Eer4Y1e43rAaphFNu9/VJKn9nKTApFKCSwVtDjXYnuO4QYqWHOEkApmGJv8gvaU5T6fcuEtjsN24gk+Rx7X9A=="; }; }; "pg-types-1.13.0" = { @@ -57371,6 +58028,15 @@ let sha512 = "l9sA5uPxmZzwydhMWUcm1gI0YxNnYl8MfSr2h8cwLvOAzQLBLewzF247h/vqHe3/tt6fgtXeG9wdjjoetdI/vA=="; }; }; + "pino-8.8.0" = { + name = "pino"; + packageName = "pino"; + version = "8.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-8.8.0.tgz"; + sha512 = "cF8iGYeu2ODg2gIwgAHcPrtR63ILJz3f7gkogaHC/TXVVXxZgInmNYiIpDYEwgEkxZti2Se6P2W2DxlBIZe6eQ=="; + }; + }; "pino-abstract-transport-1.0.0" = { name = "pino-abstract-transport"; packageName = "pino-abstract-transport"; @@ -57911,15 +58577,6 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.19" = { - name = "postcss"; - packageName = "postcss"; - version = "8.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz"; - sha512 = "h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA=="; - }; - }; "postcss-8.4.21" = { name = "postcss"; packageName = "postcss"; @@ -58271,6 +58928,15 @@ let sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; }; }; + "postcss-modules-extract-imports-3.0.0" = { + name = "postcss-modules-extract-imports"; + packageName = "postcss-modules-extract-imports"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; + }; + }; "postcss-modules-local-by-default-1.2.0" = { name = "postcss-modules-local-by-default"; packageName = "postcss-modules-local-by-default"; @@ -58298,6 +58964,15 @@ let sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw=="; }; }; + "postcss-modules-local-by-default-4.0.0" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; + }; + }; "postcss-modules-scope-1.1.0" = { name = "postcss-modules-scope"; packageName = "postcss-modules-scope"; @@ -58316,6 +58991,15 @@ let sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; }; }; + "postcss-modules-scope-3.0.0" = { + name = "postcss-modules-scope"; + packageName = "postcss-modules-scope"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; + }; + }; "postcss-modules-values-1.3.0" = { name = "postcss-modules-values"; packageName = "postcss-modules-values"; @@ -58343,6 +59027,15 @@ let sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; }; }; + "postcss-modules-values-4.0.0" = { + name = "postcss-modules-values"; + packageName = "postcss-modules-values"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; + }; + }; "postcss-nested-6.0.0" = { name = "postcss-nested"; packageName = "postcss-nested"; @@ -59855,15 +60548,6 @@ let sha512 = "aC9j+BZsRSSzEsXBNBwDnAxujdx19HycZoKgRgzWnS8eOHg1asuf9heuLprfbe739zY3IdUQx+Egv6Jn135WHA=="; }; }; - "prompts-2.4.0" = { - name = "prompts"; - packageName = "prompts"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz"; - sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ=="; - }; - }; "prompts-2.4.2" = { name = "prompts"; packageName = "prompts"; @@ -59999,6 +60683,15 @@ let sha512 = "4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ=="; }; }; + "protobufjs-7.2.0" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.0.tgz"; + sha512 = "hYCqTDuII4iJ4stZqiuGCSU8xxWl5JeXYpwARGtn/tWcKCAro6h3WQz+xpsNbXW0UYqpmTQFEyFWO0G0Kjt64g=="; + }; + }; "protobufjs-cli-1.0.2" = { name = "protobufjs-cli"; packageName = "protobufjs-cli"; @@ -60116,15 +60809,6 @@ let sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; }; - "psbt-2.7.1" = { - name = "psbt"; - packageName = "psbt"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/psbt/-/psbt-2.7.1.tgz"; - sha512 = "qFnvwdQcDoQBHHi3jYVVX+W98CRTbyeQs3RlUdAIzdEVbwBHEcv1+xhVaEJHrYiF75n7L+i6roDmZHIXT6tDSQ=="; - }; - }; "psbt-2.7.2" = { name = "psbt"; packageName = "psbt"; @@ -60998,13 +61682,13 @@ let sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; - "punycode-2.2.0" = { + "punycode-2.3.0" = { name = "punycode"; packageName = "punycode"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz"; - sha512 = "LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; }; "pupa-2.1.1" = { @@ -61043,22 +61727,22 @@ let sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; }; }; - "puppeteer-19.5.2" = { + "puppeteer-19.6.2" = { name = "puppeteer"; packageName = "puppeteer"; - version = "19.5.2"; + version = "19.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.5.2.tgz"; - sha512 = "xlqRyrhXhVH114l79Y0XqYXUVG+Yfw4sKlvN55t8Y9DxtA5fzI1uqF8SVXbWK5DUMbD6Jo4lpixTZCTTZGD05g=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.6.2.tgz"; + sha512 = "Y5OAXXwXLfJYbl0dEFg8JKIhvCGxn+UYaBW9yra9ErmIhkVroDnYusM6oYxJCt/YIfC2pQWhvhxoZyf/E5fV6w=="; }; }; - "puppeteer-core-19.5.2" = { + "puppeteer-core-19.6.2" = { name = "puppeteer-core"; packageName = "puppeteer-core"; - version = "19.5.2"; + version = "19.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.5.2.tgz"; - sha512 = "Rqk+3kqM+Z2deooTYqcYt8lRtGffJdifWa9td9nbJSjhANWsFouk8kLBNUKycewCCFHM8TZUKS0x28OllavW2A=="; + url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.6.2.tgz"; + sha512 = "il7uK658MNC1FlxPABvcnv1RdpDa9CaBFHzvtEsl+9Y4tbAJKZurkegpcvWeIWcRYGiuBIVo+t+ZSh3G82CCjw=="; }; }; "purgecss-2.3.0" = { @@ -61133,13 +61817,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.290" = { + "pyright-1.1.291" = { name = "pyright"; packageName = "pyright"; - version = "1.1.290"; + version = "1.1.291"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.290.tgz"; - sha512 = "iHT8G2+R/GUfYWxxd4ud5Lj/0H0bE1eWVR0avKKgPtkBeLkUz3sorjKpfuaJdsuJNrunzMtZsmYPD366t39klg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.291.tgz"; + sha512 = "wkSlCEhF1OwtJqHuifwxk76UMr1NPqsAbPIlCh7tiZx8VUdZs17NCGNorhyb2M+GFEvp8pod9Xyu1LXN1JL2kQ=="; }; }; "q-0.9.7" = { @@ -61547,31 +62231,31 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quicktype-core-20.0.26" = { + "quicktype-core-21.0.4" = { name = "quicktype-core"; packageName = "quicktype-core"; - version = "20.0.26"; + version = "21.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-20.0.26.tgz"; - sha512 = "B+VGYa6adM0kZq6yhnwmAMeGMnHEFMjJbHRZQidPmTCbnzeY2cNuxDIhNV6JbPzyt+o8c+fZ/DkYMefWJynIHQ=="; + url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-21.0.4.tgz"; + sha512 = "JJiJ8dzBTh/l/gTNnVwKFx0g2A0CfLNzXlUxTHjdvyldXi/Jjckr+Z04calGXxlG8KunpE4G5vV+EtuFjoTIPQ=="; }; }; - "quicktype-graphql-input-20.0.26" = { + "quicktype-graphql-input-21.0.4" = { name = "quicktype-graphql-input"; packageName = "quicktype-graphql-input"; - version = "20.0.26"; + version = "21.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-20.0.26.tgz"; - sha512 = "AbvJp7g0Xbjb5jl3nP/go4GZ93vogky0HcEjDhzted/LCCSQK4tHYMPFECKcqtW7nxk0OB7/f9BEj5aZNHLvPg=="; + url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-21.0.4.tgz"; + sha512 = "WXHcXL2d2HLfihbJBsJvBhzDc8sAkR5cNF6Y36R9p1eY3b0PKKmdbdHSFif/SkW9HAVP0DyP8/6rskFLU5Z9KA=="; }; }; - "quicktype-typescript-input-20.0.26" = { + "quicktype-typescript-input-21.0.4" = { name = "quicktype-typescript-input"; packageName = "quicktype-typescript-input"; - version = "20.0.26"; + version = "21.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-20.0.26.tgz"; - sha512 = "OieJhc77M8mb3yEqZHQMF9LmzD3/6j8P1Khs4A1dTJT44lQAs6R3tK6EAIIF/5cfyXyOMGD3d3N7Ou6NoT0OfQ=="; + url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-21.0.4.tgz"; + sha512 = "Lc0dwFZUk+dRL95sjb2iNS92GsvuwVaXQQyPJ5y4RPXm15ASTdSE3U8U94ySy2QwhNOnsv23WkkCyrxDdvk0sg=="; }; }; "quotation-1.1.3" = { @@ -61925,15 +62609,6 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "rc-config-loader-3.0.0" = { - name = "rc-config-loader"; - packageName = "rc-config-loader"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-3.0.0.tgz"; - sha512 = "bwfUSB37TWkHfP+PPjb/x8BUjChFmmBK44JMfVnU7paisWqZl/o5k7ttCH+EQLnrbn2Aq8Fo1LAsyUiz+WF4CQ=="; - }; - }; "rc-config-loader-4.1.2" = { name = "rc-config-loader"; packageName = "rc-config-loader"; @@ -62006,15 +62681,6 @@ let sha512 = "gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="; }; }; - "react-dev-utils-11.0.4" = { - name = "react-dev-utils"; - packageName = "react-dev-utils"; - version = "11.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz"; - sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; - }; - }; "react-devtools-core-4.27.1" = { name = "react-devtools-core"; packageName = "react-devtools-core"; @@ -62051,15 +62717,6 @@ let sha512 = "FlsPxavEyMuR6TjVbSSywovXSEyOg6ZDj5+Z8nbsRl9EkOzAhEIcS+GLoQDC5fz/t9suhUXWmUrOBrgeUvrMxw=="; }; }; - "react-error-overlay-6.0.11" = { - name = "react-error-overlay"; - packageName = "react-error-overlay"; - version = "6.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz"; - sha512 = "/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="; - }; - }; "react-error-overlay-6.0.9" = { name = "react-error-overlay"; packageName = "react-error-overlay"; @@ -62744,15 +63401,6 @@ let sha512 = "4xod0yBv9Cvm9MXNjrSC/mi8RjrIMMMMRUVMs3I3uOGH5nEHf4gqN1+8ziIPL50qtPSybhcLSwXu6St1TBaqTA=="; }; }; - "recursive-readdir-2.2.2" = { - name = "recursive-readdir"; - packageName = "recursive-readdir"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; - }; - }; "recursive-readdir-2.2.3" = { name = "recursive-readdir"; packageName = "recursive-readdir"; @@ -62843,13 +63491,13 @@ let sha512 = "bCR0gKVhIXFg8zCQjXEANzgI01DDixtPZgIUZHBCmwqixnu+MK3Tb2yqGjh+HCLASQVVgApiwhNkv+FoedZOGQ=="; }; }; - "redis-4.5.1" = { + "redis-4.6.2" = { name = "redis"; packageName = "redis"; - version = "4.5.1"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.5.1.tgz"; - sha512 = "oxXSoIqMJCQVBTfxP6BNTCtDMyh9G6Vi5wjdPdV/sRKkufyZslDqCScSGcOr6XGR/reAWZefz7E4leM31RgdBA=="; + url = "https://registry.npmjs.org/redis/-/redis-4.6.2.tgz"; + sha512 = "Xoh7UyU6YnT458xA8svaZAJu6ZunKeW7Z/7GXrLWGGwhVLTsDX6pr3u7ENAoV+DHBPO+9LwIu45ClwUwpIjAxw=="; }; }; "redis-commands-1.7.0" = { @@ -64868,6 +65516,15 @@ let sha512 = "4LMcbvBonVhsufIwa7Po+HhK0rznNyvQxIG/14/wTm7W88eFQy1jU+T7i5afaWOQ53czEJlaI3ua9pzZtqXE0w=="; }; }; + "rfc4648-1.5.2" = { + name = "rfc4648"; + packageName = "rfc4648"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rfc4648/-/rfc4648-1.5.2.tgz"; + sha512 = "tLOizhR6YGovrEBLatX1sdcuhoSCXddw3mqNVAcKxGJ+J0hFeJ+SjeWCv5UPA/WU3YzWPPuCVYgXBKZUPGpKtg=="; + }; + }; "rfdc-1.3.0" = { name = "rfdc"; packageName = "rfdc"; @@ -64895,15 +65552,6 @@ let sha512 = "zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg=="; }; }; - "rgbcolor-1.0.1" = { - name = "rgbcolor"; - packageName = "rgbcolor"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz"; - sha512 = "9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw=="; - }; - }; "right-align-0.1.3" = { name = "right-align"; packageName = "right-align"; @@ -64976,6 +65624,15 @@ let sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; + "rimraf-4.1.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz"; + sha512 = "BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ=="; + }; + }; "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; @@ -66623,15 +67280,6 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "shell-quote-1.7.2" = { - name = "shell-quote"; - packageName = "shell-quote"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"; - sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="; - }; - }; "shell-quote-1.7.3" = { name = "shell-quote"; packageName = "shell-quote"; @@ -66830,13 +67478,13 @@ let sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; }; }; - "sign-addon-5.1.0" = { + "sign-addon-5.2.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-5.1.0.tgz"; - sha512 = "fag/csbsw25WpW+G+uWE6rRImSjlfwQNjuP28fFhvXpfW+kXccxl/o1QEW+hXtTidwpysksb7Y0B8UCeMkYkSA=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-5.2.0.tgz"; + sha512 = "t5CZ4MSKAd3uJBUfjgWfSyKYC1pQS6BMUbgI5OytzMkTOQ9NkdkFE8bB0AJLQIGqDrNS2b1+/ghAP56iuCUE+g=="; }; }; "signal-exit-3.0.7" = { @@ -67595,22 +68243,13 @@ let sha512 = "j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog=="; }; }; - "socket.io-parser-4.2.1" = { + "socket.io-parser-4.2.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz"; - sha512 = "V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g=="; - }; - }; - "sockjs-0.3.20" = { - name = "sockjs"; - packageName = "sockjs"; - version = "0.3.20"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz"; - sha512 = "SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz"; + sha512 = "DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw=="; }; }; "sockjs-0.3.24" = { @@ -67622,15 +68261,6 @@ let sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; }; }; - "sockjs-client-1.4.0" = { - name = "sockjs-client"; - packageName = "sockjs-client"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; - sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; - }; - }; "sockjs-client-1.6.1" = { name = "sockjs-client"; packageName = "sockjs-client"; @@ -67802,6 +68432,15 @@ let sha512 = "R5ocFmKZQFfSTstfOtHjJuAwbpGyf9qjQa1egyhvXSbM7emjrtLXtGdZsDJDABC85YBfVvrOiGWKSYXPKdvP1g=="; }; }; + "sorcery-0.11.0" = { + name = "sorcery"; + packageName = "sorcery"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorcery/-/sorcery-0.11.0.tgz"; + sha512 = "J69LQ22xrQB1cIFJhPfgtLuI6BpWRiWu1Y3vSsIwK/eAScqJxd/+CJlUuHQRdX2C9NGFamq+KqNywGgaThwfHw=="; + }; + }; "sort-json-2.0.1" = { name = "sort-json"; packageName = "sort-json"; @@ -67955,6 +68594,15 @@ let sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; }; }; + "source-map-loader-3.0.2" = { + name = "source-map-loader"; + packageName = "source-map-loader"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz"; + sha512 = "BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg=="; + }; + }; "source-map-resolve-0.5.3" = { name = "source-map-resolve"; packageName = "source-map-resolve"; @@ -69135,15 +69783,6 @@ let sha512 = "XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ=="; }; }; - "stackblur-canvas-2.5.0" = { - name = "stackblur-canvas"; - packageName = "stackblur-canvas"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz"; - sha512 = "EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ=="; - }; - }; "stackframe-1.3.4" = { name = "stackframe"; packageName = "stackframe"; @@ -70116,15 +70755,6 @@ let sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; - "strip-ansi-6.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; - }; - }; "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -70449,15 +71079,6 @@ let sha512 = "XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg=="; }; }; - "style-loader-1.2.1" = { - name = "style-loader"; - packageName = "style-loader"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz"; - sha512 = "ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg=="; - }; - }; "style-loader-3.3.1" = { name = "style-loader"; packageName = "style-loader"; @@ -70917,13 +71538,13 @@ let sha512 = "S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ=="; }; }; - "svelte-preprocess-5.0.0" = { + "svelte-preprocess-5.0.1" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.0.0.tgz"; - sha512 = "q7lpa7i2FBu8Pa+G0MmuQQWETBwCKgsGmuq1Sf6n8q4uaG9ZLcLP0Y+etC6bF4sE6EbLxfiI38zV6RfPe3RSfg=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.0.1.tgz"; + sha512 = "0HXyhCoc9rsW4zGOgtInylC6qj259E1hpFnJMJWTf+aIfeqh4O/QHT31KT2hvPEqQfdjmqBR/kO2JDkkciBLrQ=="; }; }; "svelte2tsx-0.6.0" = { @@ -70944,15 +71565,6 @@ let sha512 = "aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg=="; }; }; - "svg-pathdata-5.0.5" = { - name = "svg-pathdata"; - packageName = "svg-pathdata"; - version = "5.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-5.0.5.tgz"; - sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow=="; - }; - }; "svg-tags-1.0.0" = { name = "svg-tags"; packageName = "svg-tags"; @@ -70962,13 +71574,13 @@ let sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="; }; }; - "svg2img-0.9.4" = { + "svg2img-1.0.0-beta.2" = { name = "svg2img"; packageName = "svg2img"; - version = "0.9.4"; + version = "1.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.4.tgz"; - sha512 = "1XquM9CorP9Em58gS9NjTaKpoRrIBM4gSSGSOHnoU70Y4AB3D+vILbdcHfvyGcLJ80IdYTbcpznp8NVNKkCedQ=="; + url = "https://registry.npmjs.org/svg2img/-/svg2img-1.0.0-beta.2.tgz"; + sha512 = "Tq05Q0HTXDJZM+9ub9HCPPDbui2VavugF+/H9b1Ur9ykXbPsSUPFeXFZdDlutvDsVWZO8JjHKRdT3grpNSwwSg=="; }; }; "svgo-0.6.6" = { @@ -71214,13 +71826,13 @@ let sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g=="; }; }; - "synckit-0.8.4" = { + "synckit-0.8.5" = { name = "synckit"; packageName = "synckit"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/synckit/-/synckit-0.8.4.tgz"; - sha512 = "Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw=="; + url = "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz"; + sha512 = "L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q=="; }; }; "syntax-error-1.4.0" = { @@ -71232,13 +71844,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.17.3" = { + "systeminformation-5.17.4" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.17.3"; + version = "5.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.3.tgz"; - sha512 = "IAmnUJdeFUWqY+YneAWJ9rceTdRRIaTiwspvd1B6SG7yhqpxLrSosHgGZKiE8lcaBlBYpLQpY3BRLtus4n8PNQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.4.tgz"; + sha512 = "mEiIYrw7X5ABX8tJUgzbumQAuFQxNyHdZDz6+UtwNKUbKgIoZqLtug2z1spFB/LiXZne5tdPBJOlvVckbvfhiQ=="; }; }; "sywac-1.3.0" = { @@ -71791,15 +72403,6 @@ let sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; }; }; - "terser-webpack-plugin-3.1.0" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz"; - sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA=="; - }; - }; "terser-webpack-plugin-5.3.6" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; @@ -71881,13 +72484,13 @@ let sha512 = "MeqZRHLuaGamUXGuVn2ivtU3LA3mLCCIO5kUGoohTCoGmCBg/+8yPhWVX9WSl9telvVd8erftjFk9Fwb2dD6rw=="; }; }; - "textlint-12.5.1" = { + "textlint-13.0.4" = { name = "textlint"; packageName = "textlint"; - version = "12.5.1"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.5.1.tgz"; - sha512 = "LoFU1yBIm/gxM++jDdvdfS2diW14NBHsimRyChi8Kb5h5pUHcG0rGfW2PflUzfYcHF0XykgW9WBdPd1WWnyS7Q=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.0.4.tgz"; + sha512 = "XBPK+cRMYLY3NodKoCFMncmVJRk59S+aSgkwpdNnV8VXFo1hF0EEysbwEp9s8ov0LhVO8flfd51/L+VlUFeTlg=="; }; }; "textlint-rule-helper-1.2.0" = { @@ -71899,22 +72502,22 @@ let sha512 = "yJmVbmyuUPOndKsxOijpx/G7mwybXXf4M10U2up0BeIZSN+6drUl+aSKAoC+RUHY7bG4ogLwRcmWoNG1lSrRIQ=="; }; }; - "textlint-rule-helper-2.2.4" = { + "textlint-rule-helper-2.3.0" = { name = "textlint-rule-helper"; packageName = "textlint-rule-helper"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.2.4.tgz"; - sha512 = "aQDn83+L6uG8tA6IjAsfFLWxR0/OJg51/C0k6OxNuGJnn/rgQnX+6Lh/bWh9dJ0RmOIQk7VkZ1uHUny5PXkjwQ=="; + url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.3.0.tgz"; + sha512 = "Ug78Saahb/qVImttL0NSFyT5/JJ5wXvOPepR2pYAjNi54BsQAAz/hAyyEgKuYeR0+yjFb0KPhby4f880X5vqHA=="; }; }; - "textlint-tester-12.5.0" = { + "textlint-tester-12.6.1" = { name = "textlint-tester"; packageName = "textlint-tester"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-tester/-/textlint-tester-12.5.0.tgz"; - sha512 = "4BKh/eWCc73T6mvBwXz1q53gbzCm+S0iHet2nmOQWF9aEbGkVnLbFbEKNdPiayAJ5tugIdvpfT/5iUb1RXDjeg=="; + url = "https://registry.npmjs.org/textlint-tester/-/textlint-tester-12.6.1.tgz"; + sha512 = "4O8hrXNb0BUePg+yvueWdR+ViXC8R7RgUcmo+56iU28pgqcrAjSEpz2YGpbsSF54wlyxJuP4v98whgjlEJtCmw=="; }; }; "textlint-util-to-string-3.1.1" = { @@ -72295,6 +72898,15 @@ let sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; }; }; + "timm-1.7.1" = { + name = "timm"; + packageName = "timm"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/timm/-/timm-1.7.1.tgz"; + sha512 = "IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw=="; + }; + }; "timsort-0.3.0" = { name = "timsort"; packageName = "timsort"; @@ -73456,6 +74068,15 @@ let sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; }; }; + "tslib-2.5.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"; + sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="; + }; + }; "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; @@ -73861,15 +74482,6 @@ let sha512 = "RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="; }; }; - "type-fest-3.4.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.4.0.tgz"; - sha512 = "PEPg6RHlB9cFwoTMNENNrQFL0cXX04voWr2UPwQBJ3pVs7Mt8Y1oLWdUeMdGEwZE8HFFlujq8gS9enmyiQ8pLg=="; - }; - }; "type-fest-3.5.1" = { name = "type-fest"; packageName = "type-fest"; @@ -73879,13 +74491,13 @@ let sha512 = "70T99cpILFk2fzwuljwWxmazSphFrdOe3gRHbp6bqs71pxFBbJwFqnmkLO2lQL6aLHxHmYAnP/sL+AJWpT70jA=="; }; }; - "type-fest-3.5.2" = { + "type-fest-3.5.3" = { name = "type-fest"; packageName = "type-fest"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.2.tgz"; - sha512 = "Ph7S4EhXzWy0sbljEuZo0tTNoLl+K2tPauGrQpcwUWrOVneLePTuhVzcuzVJJ6RU5DsNwQZka+8YtkXXU4z9cA=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.3.tgz"; + sha512 = "V2+og4j/rWReWvaFrse3s9g2xvUv/K9Azm/xo6CjIuq7oeGqsoimC7+9/A3tfvNcbQf8RPSVj/HV81fB4DJrjA=="; }; }; "type-is-1.6.18" = { @@ -74050,15 +74662,6 @@ let sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; - "typescript-4.8.4" = { - name = "typescript"; - packageName = "typescript"; - version = "4.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz"; - sha512 = "QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="; - }; - }; "typescript-4.9.4" = { name = "typescript"; packageName = "typescript"; @@ -74140,13 +74743,13 @@ let sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; }; }; - "typo-geom-0.12.1" = { + "typo-geom-0.13.0" = { name = "typo-geom"; packageName = "typo-geom"; - version = "0.12.1"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.12.1.tgz"; - sha512 = "W20RYp2OCEGMhEYayR0cAP67AUWiGRUufMs6Clul7MAmu5SpLuOG/RWk7+LkL65wsugcfhPQlFEJ231C2xHNQg=="; + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.13.0.tgz"; + sha512 = "s7BV1wSA+kcv2kNjJXrXgl9By8BGqwRu1llbxfkv45McR/ZyxWOFXUgTMUZdUFn79UQuVc0yzKisrj8XzkR27A=="; }; }; "u2f-api-0.2.7" = { @@ -74185,13 +74788,13 @@ let sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="; }; }; - "ua-parser-js-0.7.32" = { + "ua-parser-js-0.7.33" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.32"; + version = "0.7.33"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz"; - sha512 = "f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz"; + sha512 = "s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw=="; }; }; "ua-parser-js-1.0.2" = { @@ -74545,13 +75148,13 @@ let sha512 = "UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw=="; }; }; - "undici-5.15.0" = { + "undici-5.16.0" = { name = "undici"; packageName = "undici"; - version = "5.15.0"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.15.0.tgz"; - sha512 = "wCAZJDyjw9Myv+Ay62LAoB+hZLPW9SmKbQkbHIhMw/acKSlpn7WohdMUc/Vd4j1iSMBO0hWwU8mjB7a5p5bl8g=="; + url = "https://registry.npmjs.org/undici/-/undici-5.16.0.tgz"; + sha512 = "KWBOXNv6VX+oJQhchXieUznEmnJMqgXMbs0xxH2t8q/FUAWSJvOSr/rMaZKnX5RIVq7JDn0JbP4BOnKG2SGXLQ=="; }; }; "undici-5.9.1" = { @@ -74995,13 +75598,13 @@ let sha512 = "fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw=="; }; }; - "unist-util-inspect-7.0.1" = { + "unist-util-inspect-7.0.2" = { name = "unist-util-inspect"; packageName = "unist-util-inspect"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-7.0.1.tgz"; - sha512 = "gEPeSrsYXus8012VJ00p9uZC8D0iogtLLiHlBgvS61hU22KNKduQhMKezJm83viHlLf3TYS2y9SDEFglWPDMKw=="; + url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-7.0.2.tgz"; + sha512 = "Op0XnmHUl6C2zo/yJCwhXQSm/SmW22eDZdWP2qdf4WpGrgO1ZxFodq+5zFyeRGasFjJotAnLgfuD1jkcKqiH1Q=="; }; }; "unist-util-is-2.1.3" = { @@ -75031,13 +75634,13 @@ let sha512 = "ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg=="; }; }; - "unist-util-is-5.1.1" = { + "unist-util-is-5.2.0" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.1.1.tgz"; - sha512 = "F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ=="; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz"; + sha512 = "Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ=="; }; }; "unist-util-map-1.0.5" = { @@ -75067,13 +75670,13 @@ let sha512 = "HGrj7JQo9DwZt8XFsX8UD4gGqOsIlCih9opG6Y+N11XqkBGKzHo8cvDi+MfQQgiZ7zXRUiQREYHhjOBHERTMdg=="; }; }; - "unist-util-modify-children-3.1.0" = { + "unist-util-modify-children-3.1.1" = { name = "unist-util-modify-children"; packageName = "unist-util-modify-children"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-3.1.0.tgz"; - sha512 = "L0UizdncPZ1NIwpmkwFdLo2NaK2Eb5LU/vaQ7lZGkAaOBZfsHp+8T/gVWPVmmMO1hj6gc+XeMoytut8jr7fdyA=="; + url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-3.1.1.tgz"; + sha512 = "yXi4Lm+TG5VG+qvokP6tpnk+r1EPwyYL04JWDxLvgvPV40jANh7nm3udk65OOWquvbMDe+PL9+LmkxDpTv/7BA=="; }; }; "unist-util-position-3.1.0" = { @@ -75085,22 +75688,22 @@ let sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="; }; }; - "unist-util-position-4.0.3" = { + "unist-util-position-4.0.4" = { name = "unist-util-position"; packageName = "unist-util-position"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.3.tgz"; - sha512 = "p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ=="; + url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.4.tgz"; + sha512 = "kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg=="; }; }; - "unist-util-position-from-estree-1.1.1" = { + "unist-util-position-from-estree-1.1.2" = { name = "unist-util-position-from-estree"; packageName = "unist-util-position-from-estree"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.1.tgz"; - sha512 = "xtoY50b5+7IH8tFbkw64gisG9tMSpxDjhX9TmaJJae/XuxQ9R/Kc8Nv1eOsf43Gt4KV/LkriMy9mptDr7XLcaw=="; + url = "https://registry.npmjs.org/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.2.tgz"; + sha512 = "poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww=="; }; }; "unist-util-remove-position-2.0.1" = { @@ -75112,13 +75715,13 @@ let sha512 = "fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA=="; }; }; - "unist-util-remove-position-4.0.1" = { + "unist-util-remove-position-4.0.2" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-4.0.1.tgz"; - sha512 = "0yDkppiIhDlPrfHELgB+NLQD5mfjup3a8UYclHruTJWmY74je8g+CIFr79x5f6AkmzSwlvKLbs63hC0meOMowQ=="; + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-4.0.2.tgz"; + sha512 = "TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ=="; }; }; "unist-util-stringify-position-1.1.2" = { @@ -75139,13 +75742,13 @@ let sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g=="; }; }; - "unist-util-stringify-position-3.0.2" = { + "unist-util-stringify-position-3.0.3" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz"; - sha512 = "7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg=="; + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz"; + sha512 = "k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg=="; }; }; "unist-util-to-list-of-char-0.1.3" = { @@ -75184,13 +75787,13 @@ let sha512 = "Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA=="; }; }; - "unist-util-visit-4.1.1" = { + "unist-util-visit-4.1.2" = { name = "unist-util-visit"; packageName = "unist-util-visit"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.1.tgz"; - sha512 = "n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg=="; + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz"; + sha512 = "MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg=="; }; }; "unist-util-visit-children-1.1.4" = { @@ -75202,13 +75805,13 @@ let sha512 = "sA/nXwYRCQVRwZU2/tQWUqJ9JSFM1X3x7JIOsIgSzrFHcfVt6NkzDtKzyxg2cZWkCwGF9CO8x4QNZRJRMK8FeQ=="; }; }; - "unist-util-visit-children-2.0.1" = { + "unist-util-visit-children-2.0.2" = { name = "unist-util-visit-children"; packageName = "unist-util-visit-children"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-2.0.1.tgz"; - sha512 = "2cEU3dhV1hMfO9ajwb8rJsDedMfsahsm6fCfR8LxDR/w7KcB5lzHQ9dBTQIXsWGNWBFH5MPmaFP3Xh0dWLqClQ=="; + url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-2.0.2.tgz"; + sha512 = "+LWpMFqyUwLGpsQxpumsQ9o9DG2VGLFrpz+rpVXYIEdPy57GSy5HioC0g3bg/8WP9oCLlapQtklOzQ8uLS496Q=="; }; }; "unist-util-visit-parents-2.1.2" = { @@ -75238,13 +75841,13 @@ let sha512 = "1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw=="; }; }; - "unist-util-visit-parents-5.1.1" = { + "unist-util-visit-parents-5.1.3" = { name = "unist-util-visit-parents"; packageName = "unist-util-visit-parents"; - version = "5.1.1"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz"; - sha512 = "gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw=="; + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz"; + sha512 = "x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg=="; }; }; "universal-analytics-0.5.3" = { @@ -75670,13 +76273,13 @@ let sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; }; }; - "urkel-1.0.2" = { + "urkel-1.0.3" = { name = "urkel"; packageName = "urkel"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/urkel/-/urkel-1.0.2.tgz"; - sha512 = "Y5UXbgBr6pczrD08N0SYJkWjtdtTTpmZsOvuftdrEHLnTjuxwSNjKsXYLQkICTptvnHAJ2OjI6XdAxtYTyOHew=="; + url = "https://registry.npmjs.org/urkel/-/urkel-1.0.3.tgz"; + sha512 = "L2M46WWSaz1LpyUYFgnQg7WSOWtNcRx3uH+4GwHK1jbmYj6phLuIwirTVMlhfcZ0o/CWn5Y04UWLhmlvijZiDg=="; }; }; "url-0.10.3" = { @@ -75742,15 +76345,6 @@ let sha512 = "goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog=="; }; }; - "url-loader-4.1.1" = { - name = "url-loader"; - packageName = "url-loader"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz"; - sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; - }; - }; "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; @@ -75922,13 +76516,13 @@ let sha512 = "vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q=="; }; }; - "utf-8-validate-6.0.0" = { + "utf-8-validate-6.0.2" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "6.0.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.0.tgz"; - sha512 = "OCJuwxQsnG51swYmNloViggxNOFO/leOZpnb/vVeoastJbrzrZZU7lGsYlUcdkCl9nsBu2nkKLjpljb3Ckvb/Q=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.2.tgz"; + sha512 = "yd7PQEOW+EgecUzSD7XUXTyq/vREGXk7t7fzGfOvwOAr0Z64h5rfGrmkNk8+ddVmf/FrkjPPhVyYBa7fuSPVTg=="; }; }; "utf7-1.0.2" = { @@ -75985,6 +76579,15 @@ let sha512 = "Rv9/OsKlBgMlLGai2EAoVheIbdBlndMunkXH4BuU81R2+Nky24I670OdGIb+NMpCbuHGyKjk9OQ7hdyOxuNXgw=="; }; }; + "utif-2.0.1" = { + name = "utif"; + packageName = "utif"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utif/-/utif-2.0.1.tgz"; + sha512 = "Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg=="; + }; + }; "util-0.10.3" = { name = "util"; packageName = "util"; @@ -77227,13 +77830,13 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; - "vscode-css-languageservice-6.2.1" = { + "vscode-css-languageservice-6.2.3" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "6.2.1"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.1.tgz"; - sha512 = "FMaMjB2LQdkHjTCP2CWh2S94xuGsxSc8xr0H9nAACVd/iUDyZLoKFjwoB+mA3v0rpCH2U5vVCVwxyULy61CgqA=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.3.tgz"; + sha512 = "EAyhyIVHpEaf+GjtI+tVe7SekdoANfG0aubnspsQwak3Qkimn/97FpAufNyXk636ngW05pjNKAR9zyTCzo6avQ=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -77254,13 +77857,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-html-languageservice-5.0.3" = { + "vscode-html-languageservice-5.0.4" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.3.tgz"; - sha512 = "6rfrtcHhXDMXmC5pR2WXrx02HiNCzQDynOBMn+53zLxr2hvZrDzoc0QgC0FaFGfcglf7GeOsfhkWvJBFC/a70g=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.4.tgz"; + sha512 = "tvrySfpglu4B2rQgWGVO/IL+skvU7kBkQotRlxA7ocSyRXOZUd6GA13XHkxo8LPe07KWjeoBlN1aVGqdfTK4xA=="; }; }; "vscode-json-languageservice-3.11.0" = { @@ -77290,13 +77893,13 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; - "vscode-json-languageservice-5.1.3" = { + "vscode-json-languageservice-5.1.4" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "5.1.3"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.1.3.tgz"; - sha512 = "p0O1Ql5+zyWFIBU4cSxnDcuq9OnbE0MmvNKDYYvz4EPsZ9EHBT3I6KJb5Gk3snkj+jQTFILEZ06cfY7WZxxqPw=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.1.4.tgz"; + sha512 = "ROZ1ezYQUbq9b/07xYpHtZSyyhoUk3oTTGVAEr6bU1DKr8ELaz9fsDoHno34tKtHj/Tf3deQqfjQNGKdbRuvTw=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -78109,13 +78712,13 @@ let sha512 = "/lRBpLn2TvEwrIW5i35ZCpb+SIq4VWq4c1yxN311we+E4eXRW7EB5nybrv4fJEuBmgqyqVkT2gtQ6Zqu+u66mA=="; }; }; - "wavedrom-2.9.1" = { + "wavedrom-3.1.1" = { name = "wavedrom"; packageName = "wavedrom"; - version = "2.9.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.9.1.tgz"; - sha512 = "IPv1bKVwh4Zo8dMMQfnNy4KFqU/v0buoPDwLkTrtHE2nr0dV4pHqryhWpqNCSUm7xTWroER+nE5xRkng96xLUA=="; + url = "https://registry.npmjs.org/wavedrom/-/wavedrom-3.1.1.tgz"; + sha512 = "+6w4AvzsD+yHVP/mEYzn2sQ1VKn0UZNEt4QeO4X74cxEt8NhZOB+fxfHrUkbArfyC32AhhbTd5ZtD8RtBChA0Q=="; }; }; "wawoff2-2.0.1" = { @@ -78244,6 +78847,15 @@ let sha512 = "flC9JJmTII9uAeeYpWF8hxDJ7bfY+leldQryetll8Nv4WgI+MXc6h7TiyAZASWl9uC9TvmfdgOjZn1DAQecb3A=="; }; }; + "web-vitals-0.2.4" = { + name = "web-vitals"; + packageName = "web-vitals"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/web-vitals/-/web-vitals-0.2.4.tgz"; + sha512 = "6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg=="; + }; + }; "web3-utils-1.8.1" = { name = "web3-utils"; packageName = "web3-utils"; @@ -78343,15 +78955,6 @@ let sha512 = "75WFUMblcWYcocjSLlXCb71QuGyH7egdBZu50FtBGl2Nso8CK3Ej+J7bTZz2FPFq5l6fzCisD9modB7t30ikuA=="; }; }; - "webpack-4.43.0" = { - name = "webpack"; - packageName = "webpack"; - version = "4.43.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; - sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; - }; - }; "webpack-4.46.0" = { name = "webpack"; packageName = "webpack"; @@ -78442,15 +79045,6 @@ let sha512 = "hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="; }; }; - "webpack-dev-server-3.11.0" = { - name = "webpack-dev-server"; - packageName = "webpack-dev-server"; - version = "3.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; - sha512 = "PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg=="; - }; - }; "webpack-dev-server-3.11.3" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; @@ -78460,6 +79054,15 @@ let sha512 = "3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA=="; }; }; + "webpack-dev-server-4.11.1" = { + name = "webpack-dev-server"; + packageName = "webpack-dev-server"; + version = "4.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz"; + sha512 = "lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw=="; + }; + }; "webpack-flush-chunks-2.0.3" = { name = "webpack-flush-chunks"; packageName = "webpack-flush-chunks"; @@ -78487,13 +79090,13 @@ let sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; }; }; - "webpack-manifest-plugin-2.2.0" = { + "webpack-manifest-plugin-4.1.1" = { name = "webpack-manifest-plugin"; packageName = "webpack-manifest-plugin"; - version = "2.2.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"; - sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; + url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz"; + sha512 = "YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow=="; }; }; "webpack-merge-4.2.2" = { @@ -78550,6 +79153,15 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; + "webpack-sources-2.3.1" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz"; + sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; + }; + }; "webpack-sources-3.2.3" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -78568,15 +79180,6 @@ let sha512 = "UlTm7Yz4meJV0THhZMrgRTE9v/vZ0xfUoJ/eOig98TvzsqNiW+FLSv5WaZeML3uJUPrMQ6K5jo1FJJFXNCc8+g=="; }; }; - "websocket-driver-0.6.5" = { - name = "websocket-driver"; - packageName = "websocket-driver"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; - sha512 = "oBx6ZM1Gs5q2jwZuSN/Qxyy/fbgomV8+vqsmipaPKB/74hjHlKuM07jNmRhn4qa2AdUwsgxrltq+gaPsHgcl0Q=="; - }; - }; "websocket-driver-0.7.4" = { name = "websocket-driver"; packageName = "websocket-driver"; @@ -79333,13 +79936,13 @@ let sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; }; - "wrap-ansi-8.0.1" = { + "wrap-ansi-8.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz"; - sha512 = "QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g=="; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"; + sha512 = "si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="; }; }; "wrap-fn-0.1.5" = { @@ -79729,13 +80332,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.3.0" = { + "xdl-60.0.1" = { name = "xdl"; packageName = "xdl"; - version = "59.3.0"; + version = "60.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.3.0.tgz"; - sha512 = "+7HeQDo13SWNCktnmggutegmWBIgF5TzKLPpaZe3qhlTXRETdNvQUbuYfaETLlcwk372jzvO7navUgxUvFrpNA=="; + url = "https://registry.npmjs.org/xdl/-/xdl-60.0.1.tgz"; + sha512 = "L9T0faRdF8hH3LUOkYV4dJc43peV3WSYV3l+edonWbNGPdbhhVvbFgriEL9yWJrxlHmTLC/vRJ4unUXGkUTk4A=="; }; }; "xenvar-0.5.1" = { @@ -80126,13 +80729,13 @@ let sha512 = "F6WF5s6xG/bm8Oxi2ETuzwGQW8yleL5I4JPxZl49m7Uw7D4LAXu+4dvUK78Uo4D863sM8auqw6+1Xmj9mFlmDQ=="; }; }; - "xstate-4.35.2" = { + "xstate-4.35.3" = { name = "xstate"; packageName = "xstate"; - version = "4.35.2"; + version = "4.35.3"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.35.2.tgz"; - sha512 = "5X7EyJv5OHHtGQwN7DsmCAbSnDs3Mxl1cXQ4PVaLwi+7p/RRapERnd1dFyHjYin+KQoLLfuXpl1dPBThgyIGNg=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.35.3.tgz"; + sha512 = "/vM8la6OPcmT2P4R8p37P/Pzo8fTeEjvg+lxCfQ7vTeJg6NmzPHDJ5RdlrGfojEIabMxKW22Tm2kz8oV390Awg=="; }; }; "xstream-11.14.0" = { @@ -80909,13 +81512,13 @@ let sha512 = "1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ=="; }; }; - "zwave-js-10.4.0" = { + "zwave-js-10.5.4" = { name = "zwave-js"; packageName = "zwave-js"; - version = "10.4.0"; + version = "10.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.4.0.tgz"; - sha512 = "9eVe+7xli+KOvoyakXPMI1a5Mhkjlwi2t6Gniuyu+s6U8rOCd8NmhHvvzB2p+2KLRjuYjBRqPNA5c8qAsvC+ug=="; + url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.5.4.tgz"; + sha512 = "Zo2aSYLYKLUca0Wxp7m1Ju83CZeAvJorKjww9MkIvR85hqi/I5QZCC0nXQ2sQb3q0171tGndtICdfsuAE7dfRg=="; }; }; "zwitch-1.0.5" = { @@ -80951,15 +81554,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "15.1.1"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-15.1.1.tgz"; - sha512 = "539I3B5yTasaX/EQrXZyXOc9eZUyVBxMWiGj3/bmlCsft7/Y8J+A92uftjxIO4P8lYWzSdSxFT3Bu1zI1b6yzw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-15.1.3.tgz"; + sha512 = "gNVvyvkGZ1zKiDdWjPqCLst8iHcB1C4B2nXrr3B+/YAd1G/y87VI1aBKFlK9ulG4tkwktog5uQaut7xs48IsEQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1501.1" - sources."@angular-devkit/core-15.1.1" - sources."@angular-devkit/schematics-15.1.1" + sources."@angular-devkit/architect-0.1501.3" + sources."@angular-devkit/core-15.1.3" + sources."@angular-devkit/schematics-15.1.3" sources."@gar/promisify-1.1.3" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@npmcli/fs-2.1.2" @@ -80969,7 +81572,7 @@ in sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.0" - sources."@schematics/angular-15.1.1" + sources."@schematics/angular-15.1.3" sources."@tootallnate/once-2.0.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -81050,7 +81653,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-6.1.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" @@ -81071,7 +81674,7 @@ in (sources."inquirer-8.2.4" // { dependencies = [ sources."rxjs-7.8.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."ip-2.0.0" @@ -81182,7 +81785,7 @@ in sources."proc-log-3.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" (sources."read-package-json-6.0.0" // { dependencies = [ sources."brace-expansion-2.0.1" @@ -81268,10 +81871,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.18.8"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.18.8.tgz"; - sha512 = "0m++AudwQq+wWAz/Ax7g+sh/wFW51HHQ6BtPLsuTAsFIzWB/bv/0COwZE7BRS+u0nqMb6Ks6nlk6cY1TpPDwHg=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.19.0.tgz"; + sha512 = "33VKTuBjoW2canoVMGa4g5oGCg7KK8UVmBBmUKzvQ+Fa69kk2YI8sqt94WCpvSWmW/yD5ZXsD9G9s689b9KwwQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -81443,7 +82046,7 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.1.3" sources."glob-parent-6.0.2" (sources."glob-stream-7.0.0" // { @@ -81610,10 +82213,10 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.29.4"; + version = "0.29.5"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.29.4.tgz"; - sha512 = "ZcvMVz4ItsLe+Ey6Ucrp+HYYT5Bc9BeNlQ7QYWVyHYqoke/HvlHXHPScj04LxVJ2Iq9FXjj4yRNFxBWj8P5J2g=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.29.5.tgz"; + sha512 = "HRPpAicAE+nyuC7wX3f8W2HOcXgWOU+++hZk1290wQUp1SUHAziZ4VWtnqMAm9n8h4VfS09yM/cvXOtHzGd/BQ=="; }; dependencies = [ sources."@astrojs/compiler-0.31.4" @@ -81629,7 +82232,7 @@ in sources."vscode-uri-2.1.2" ]; }) - sources."@vscode/l10n-0.0.10" + sources."@vscode/l10n-0.0.11" sources."cross-spawn-7.0.3" sources."define-lazy-prop-2.0.0" sources."emmet-2.3.6" @@ -81652,11 +82255,11 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."suf-log-2.5.3" - sources."synckit-0.8.4" + sources."synckit-0.8.5" sources."tiny-glob-0.2.9" - sources."tslib-2.4.1" - sources."vscode-css-languageservice-6.2.1" - sources."vscode-html-languageservice-5.0.3" + sources."tslib-2.5.0" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" @@ -81685,9 +82288,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -81704,18 +82307,18 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-transform-modules-commonjs-7.20.11" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -81739,7 +82342,7 @@ in sources."abab-2.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -81772,7 +82375,7 @@ in sources."bytes-3.1.2" sources."cache-content-type-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."canvas-2.11.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -81873,7 +82476,7 @@ in sources."function-bind-1.1.1" sources."gauge-3.0.2" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."globals-11.12.0" sources."graceful-fs-4.2.10" @@ -82002,7 +82605,7 @@ in sources."process-nextick-args-2.0.1" sources."proper-lockfile-4.1.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."querystringify-2.2.0" (sources."raw-body-2.5.1" // { @@ -82020,7 +82623,7 @@ in sources."run-async-2.4.1" (sources."rxjs-7.8.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."safe-buffer-5.1.2" @@ -82151,18 +82754,18 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -82171,7 +82774,7 @@ in sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" sources."JSONStream-1.3.5" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" @@ -82279,7 +82882,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -82384,10 +82987,10 @@ in "@emacs-eask/cli" = nodeEnv.buildNodePackage { name = "_at_emacs-eask_slash_cli"; packageName = "@emacs-eask/cli"; - version = "0.7.8"; + version = "0.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.7.8.tgz"; - sha512 = "Vr7nZf9H/T6wQyrC+vj3x2ysGbRlyRsayp6TrWu5jBWUi2ocYCq2/0O48HUKj9lkyEPWKjwr+ANehC95S727Sg=="; + url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.7.10.tgz"; + sha512 = "Gwr5PsyH+JSsM3jaJLW00EqwMD151wu0v3lBa58mnbBVVXOEG6Fnynv9jE9vLzOkhAVcDH9dtCtYlurDH7/YZg=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -82420,10 +83023,10 @@ in "@forge/cli" = nodeEnv.buildNodePackage { name = "_at_forge_slash_cli"; packageName = "@forge/cli"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli/-/cli-6.4.0.tgz"; - sha512 = "inTrWbkBbgnFX+L+RJ4XRxo6GgXGGiECZLnE1WrCpgoNI8j+SSvk11UPz5YA3krebKeiSJseMQ/VyswePvzsMg=="; + url = "https://registry.npmjs.org/@forge/cli/-/cli-6.4.1.tgz"; + sha512 = "tG2Zoq63T256wmA9BteJwFqef2qFxySHurs1WOZ4j1Dnz23w2tQLa86X0Sz3P6/43td+j74TMklPqRdu1jJIEg=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -82434,9 +83037,9 @@ in ]; }) sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -82459,9 +83062,9 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.20.7" @@ -82469,23 +83072,23 @@ in sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-typescript-7.20.0" - sources."@babel/plugin-transform-react-jsx-7.20.7" - sources."@babel/plugin-transform-typescript-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/preset-typescript-7.18.6" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@colors/colors-1.5.0" sources."@discoveryjs/json-ext-0.5.7" - sources."@forge/api-2.9.1" + sources."@forge/api-2.10.0" (sources."@forge/auth-0.0.1" // { dependencies = [ sources."tslib-1.14.1" ]; }) sources."@forge/babel-plugin-transform-ui-1.1.0" - sources."@forge/bundler-4.2.0" - (sources."@forge/cli-shared-3.5.0" // { + sources."@forge/bundler-4.3.0" + (sources."@forge/cli-shared-3.5.1" // { dependencies = [ sources."glob-7.2.3" ]; @@ -82496,8 +83099,8 @@ in sources."minimatch-5.1.6" ]; }) - sources."@forge/lint-3.2.12" - sources."@forge/manifest-4.5.3" + sources."@forge/lint-3.2.13" + sources."@forge/manifest-4.6.0" sources."@forge/storage-1.3.1" sources."@forge/util-1.2.0" sources."@jridgewell/gen-mapping-0.1.1" @@ -82515,6 +83118,22 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@polka/url-1.0.0-next.21" + (sources."@sentry/core-7.34.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@sentry/node-7.34.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."@sentry/types-7.34.0" + (sources."@sentry/utils-7.34.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-8.4.10" @@ -82524,15 +83143,15 @@ in sources."@types/json-schema-7.0.11" sources."@types/node-18.11.18" sources."@types/node-fetch-2.6.2" - sources."@typescript-eslint/types-5.48.2" - (sources."@typescript-eslint/typescript-estree-5.48.2" // { + sources."@typescript-eslint/types-5.49.0" + (sources."@typescript-eslint/typescript-estree-5.49.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.8" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.48.2" + sources."@typescript-eslint/visitor-keys-5.49.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -82553,9 +83172,10 @@ in sources."@webpack-cli/serve-1.7.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."acorn-walk-8.2.0" + sources."agent-base-6.0.2" (sources."ajv-6.12.6" // { dependencies = [ sources."fast-deep-equal-3.1.3" @@ -82639,7 +83259,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."case-1.6.3" sources."chainsaw-0.1.0" sources."chalk-2.4.2" @@ -82660,7 +83280,7 @@ in sources."chownr-1.1.4" sources."chrome-trace-event-1.0.3" sources."cipher-base-1.0.4" - sources."clean-css-5.3.1" + sources."clean-css-5.3.2" sources."cli-color-2.0.3" sources."cli-cursor-3.1.0" sources."cli-spinners-2.7.0" @@ -82686,6 +83306,7 @@ in sources."conf-6.2.4" sources."console-browserify-1.2.0" sources."convert-source-map-1.9.0" + sources."cookie-0.4.2" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."crc32-stream-4.0.2" @@ -82821,7 +83442,7 @@ in sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-folder-size-2.0.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."github-from-package-0.0.0" @@ -82869,7 +83490,8 @@ in }) sources."html-webpack-plugin-5.5.0" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.2.4" @@ -82999,6 +83621,7 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" sources."lru-queue-0.1.0" + sources."lru_map-0.3.3" sources."make-dir-3.1.0" sources."md5.js-1.3.5" sources."memfs-3.4.13" @@ -83254,7 +83877,7 @@ in sources."totalist-1.1.0" (sources."tr46-1.0.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."traverse-0.3.9" @@ -83272,7 +83895,7 @@ in sources."yallist-4.0.0" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -83302,7 +83925,7 @@ in sources."update-browserslist-db-1.0.10" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."urijs-1.19.11" @@ -83480,7 +84103,7 @@ in sources."fuzzy-0.1.3" sources."gaxios-4.3.3" sources."gcp-metadata-4.3.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."glob-parent-5.1.2" sources."google-auth-library-7.14.1" @@ -83494,7 +84117,7 @@ in sources."has-flag-4.0.0" sources."has-symbols-1.0.3" sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" @@ -83671,7 +84294,7 @@ in sources."type-fest-2.19.0" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.21.3" sources."typescript-4.9.4" sources."universalify-2.0.0" @@ -83715,7 +84338,7 @@ in sha512 = "zCtMCbQxJc5k2iaB/nV+1FrGQBEfbnFh427BD7O3jR6wJjVGBIamXtVKnqYqC5Kjtam7Eb9jvusZNpRcnVcAFQ=="; }; dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@medable/mdctl-api-1.0.68" sources."@medable/mdctl-api-driver-1.0.68" sources."@medable/mdctl-axon-tools-1.0.68" @@ -84383,7 +85006,7 @@ in sources."promise-nodify-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."queue-microtask-1.2.3" @@ -84640,25 +85263,25 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.88.0"; + version = "5.89.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.88.0.tgz"; - sha512 = "SEgQvrlCmBrjWogSXtk0cA9QAV7XqdeTurWYjjXLSNP56MMpqmF3e8b7FqnZcdT1r9i+rkWrBuQF/K3q+5bT7A=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.89.1.tgz"; + sha512 = "i21mAr6U+fo7+td9zlJ9R0MA9sqbpcq8dkod0keiFJkzOJnzIb0y8yJAvr7rEzxKKZqXdfktI/8gBi+GTvdMig=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-auth-1.4.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-client-1.7.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-http-2.3.1" // { @@ -84669,63 +85292,63 @@ in sources."form-data-3.0.1" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-lro-2.5.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-paging-1.4.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-rest-pipeline-1.10.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-tracing-1.0.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-util-1.1.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/identity-2.1.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/logger-1.0.3" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/msal-browser-2.32.2" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-9.1.1" ]; }) sources."@azure/msal-common-7.6.0" (sources."@azure/msal-node-1.14.6" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-9.1.1" ]; }) (sources."@azure/storage-blob-12.11.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.20.14" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" @@ -84736,12 +85359,12 @@ in sources."@babel/parser-7.16.4" (sources."@babel/template-7.20.7" // { dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" ]; }) - (sources."@babel/traverse-7.20.12" // { + (sources."@babel/traverse-7.20.13" // { dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" ]; }) sources."@babel/types-7.20.7" @@ -84751,11 +85374,12 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@microsoft/rush-lib-5.88.0" + sources."@microsoft/rush-lib-5.89.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@opentelemetry/api-1.4.0" + sources."@pnpm/crypto.base32-hash-1.0.1" sources."@pnpm/error-1.4.0" sources."@pnpm/link-bins-5.3.25" sources."@pnpm/package-bins-4.1.0" @@ -84768,24 +85392,24 @@ in }) sources."@pnpm/types-6.4.0" sources."@pnpm/write-project-manifest-1.1.7" - sources."@rushstack/heft-config-file-0.11.4" + sources."@rushstack/heft-config-file-0.11.5" (sources."@rushstack/node-core-library-3.53.3" // { dependencies = [ sources."import-lazy-4.0.0" sources."resolve-1.17.0" ]; }) - sources."@rushstack/package-deps-hash-3.2.66" + sources."@rushstack/package-deps-hash-4.0.3" (sources."@rushstack/rig-package-0.3.17" // { dependencies = [ sources."resolve-1.17.0" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.88.0" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.88.0" - sources."@rushstack/rush-sdk-5.88.0" - sources."@rushstack/stream-collator-4.0.219" - sources."@rushstack/terminal-0.3.88" + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.89.1" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.89.1" + sources."@rushstack/rush-sdk-5.89.1" + sources."@rushstack/stream-collator-4.0.222" + sources."@rushstack/terminal-0.3.91" (sources."@rushstack/ts-command-line-4.13.1" // { dependencies = [ sources."argparse-1.0.10" @@ -84810,7 +85434,7 @@ in sources."@vue/reactivity-transform-3.2.45" sources."@vue/shared-3.2.45" sources."@yarnpkg/lockfile-1.0.2" - sources."@zkochan/cmd-shim-5.4.0" + sources."@zkochan/cmd-shim-5.4.1" sources."agent-base-6.0.2" sources."ansi-align-3.0.1" (sources."ansi-escapes-4.3.2" // { @@ -84919,6 +85543,11 @@ in sources."js-yaml-3.14.1" ]; }) + (sources."dependency-path-9.2.8" // { + dependencies = [ + sources."@pnpm/types-8.9.0" + ]; + }) sources."deps-regex-0.1.4" sources."detect-indent-6.1.0" sources."dezalgo-1.0.4" @@ -84927,6 +85556,7 @@ in sources."duplexer3-0.1.5" sources."ecdsa-sig-formatter-1.0.11" sources."emoji-regex-8.0.0" + sources."encode-registry-3.0.0" (sources."encoding-0.1.13" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -85003,7 +85633,7 @@ in ]; }) sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" @@ -85074,7 +85704,7 @@ in sources."jws-3.2.2" ]; }) - sources."jszip-3.7.1" + sources."jszip-3.8.0" sources."jwa-1.4.1" (sources."jws-4.0.0" // { dependencies = [ @@ -85115,7 +85745,9 @@ in sources."semver-6.3.0" ]; }) + sources."map-age-cleaner-0.1.3" sources."map-obj-4.3.0" + sources."mem-8.1.1" (sources."meow-9.0.0" // { dependencies = [ sources."type-fest-0.18.1" @@ -85126,7 +85758,7 @@ in sources."micromatch-4.0.5" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" + sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimatch-3.1.2" @@ -85176,7 +85808,11 @@ in sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.2" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) sources."open-8.4.0" (sources."ora-5.4.1" // { dependencies = [ @@ -85192,6 +85828,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" + sources."p-defer-1.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-reflect-2.1.0" @@ -85238,7 +85875,7 @@ in sources."process-nextick-args-2.0.1" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-2.1.1" sources."query-ast-1.0.5" sources."querystringify-2.2.0" @@ -85296,6 +85933,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" + sources."rfc4648-1.5.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-6.6.7" @@ -85540,10 +86178,10 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "9.1.8"; + version = "9.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.8.tgz"; - sha512 = "53laCMoPLAkjyz3405FlMSrHnbr3DGeoaQjY963bEroezLlm/qfQhwj6oGJwtgA28eNFgx68mvQV2f1VZNUJtw=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.9.tgz"; + sha512 = "oRiJArvQcYUJRO0jRWG99KkXuw+HafSnlfWcO4028gTDb4IanRwbl6fw4mELTEAaXAwDGOcuk8R0QY8H3muyiQ=="; }; dependencies = [ sources."@angular-devkit/core-15.0.4" @@ -85553,7 +86191,7 @@ in sources."chalk-4.1.2" sources."inquirer-8.2.4" sources."rxjs-7.8.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."@babel/code-frame-7.18.6" @@ -85599,7 +86237,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-8.11.0" sources."ajv-formats-2.1.1" @@ -85624,7 +86262,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -85738,7 +86376,7 @@ in sources."minimist-1.2.7" sources."mute-stream-0.0.8" sources."neo-async-2.6.2" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-emoji-1.11.0" sources."node-releases-2.0.8" sources."normalize-path-3.0.0" @@ -85762,7 +86400,7 @@ in sources."picomatch-2.3.1" sources."pluralize-8.0.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."readable-stream-3.6.0" sources."readdirp-3.6.0" @@ -85923,18 +86561,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -86009,7 +86647,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; @@ -86047,18 +86685,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -86134,7 +86772,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; @@ -86190,18 +86828,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -86276,7 +86914,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; @@ -86314,18 +86952,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -86403,7 +87041,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; @@ -86428,10 +87066,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.1.1.tgz"; - sha512 = "uNKVXXJ/LTeUgdaoLg0bQr27ccVRZx6weD9H2UR0/pHkwb+vXptJB81LwPmvRldlaK7G35N2i/w2Mjqbz/Lakg=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.2.0.tgz"; + sha512 = "ybgxZqfGlqGQu65rClEEBllT8rrnTcEPkz3Q+asjOwIzbmLZhRniKWXCNIW/Z5VPzSzg32zQsEPjFaSE1+iJxg=="; }; dependencies = [ sources."@redis/bloom-1.0.2" @@ -86453,7 +87091,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1296.0" + sources."aws-sdk-2.1304.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { dependencies = [ @@ -86535,7 +87173,7 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."generic-pool-3.8.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."gopd-1.0.1" sources."got-11.8.6" @@ -86547,7 +87185,7 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."helmet-4.6.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http2-wrapper-1.0.3" sources."iconv-lite-0.4.24" @@ -86724,13 +87362,13 @@ in sources."@apollographql/apollo-tools-0.5.4" sources."@apollographql/graphql-playground-html-1.6.29" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -86769,7 +87407,7 @@ in sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86780,7 +87418,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -86818,7 +87456,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.11" + sources."@babel/plugin-transform-block-scoping-7.20.14" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -86846,7 +87484,7 @@ in sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-typescript-7.20.7" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" (sources."@babel/preset-env-7.20.2" // { @@ -86864,15 +87502,15 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@graphql-tools/merge-8.3.1" - (sources."@graphql-tools/mock-8.7.15" // { + (sources."@graphql-tools/mock-8.7.16" // { dependencies = [ - sources."@graphql-tools/merge-8.3.15" - sources."@graphql-tools/schema-9.0.13" + sources."@graphql-tools/merge-8.3.16" + sources."@graphql-tools/schema-9.0.14" sources."@graphql-tools/utils-9.1.4" sources."value-or-promise-1.0.12" ]; @@ -87030,7 +87668,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -87079,7 +87717,7 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.27.1" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -87248,7 +87886,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.197.0" + sources."flow-parser-0.198.2" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -87267,7 +87905,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -87433,7 +88071,7 @@ in sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-dir-0.1.17" sources."node-fetch-2.6.8" sources."node-gyp-build-4.6.0" @@ -87740,7 +88378,7 @@ in sources."toidentifier-1.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.6.0" sources."type-is-1.6.18" @@ -87951,11 +88589,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.20.14" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.3.2" @@ -88062,7 +88700,7 @@ in sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."abbrev-2.0.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -88148,8 +88786,8 @@ in sources."error-ex-1.3.2" sources."escape-goat-4.0.0" sources."escape-string-regexp-1.0.5" - sources."estree-util-is-identifier-name-2.0.1" - sources."estree-util-visit-1.2.0" + sources."estree-util-is-identifier-name-2.1.0" + sources."estree-util-visit-1.2.1" sources."event-stream-3.1.7" sources."extend-3.0.2" sources."fault-2.0.1" @@ -88186,7 +88824,7 @@ in sources."hast-util-whitespace-2.0.1" sources."hastscript-7.2.0" sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http2-wrapper-2.2.0" // { dependencies = [ sources."quick-lru-5.1.1" @@ -88235,28 +88873,28 @@ in sources."map-obj-4.3.0" sources."map-stream-0.1.0" sources."markdown-table-3.0.3" - sources."mdast-comment-marker-2.1.0" - (sources."mdast-util-find-and-replace-2.2.1" // { + sources."mdast-comment-marker-2.1.1" + (sources."mdast-util-find-and-replace-2.2.2" // { dependencies = [ sources."escape-string-regexp-5.0.0" ]; }) - sources."mdast-util-from-markdown-1.2.0" - sources."mdast-util-frontmatter-1.0.0" + sources."mdast-util-from-markdown-1.3.0" + sources."mdast-util-frontmatter-1.0.1" sources."mdast-util-gfm-2.0.1" sources."mdast-util-gfm-autolink-literal-1.0.2" - sources."mdast-util-gfm-footnote-1.0.1" + sources."mdast-util-gfm-footnote-1.0.2" sources."mdast-util-gfm-strikethrough-1.0.2" sources."mdast-util-gfm-table-1.0.6" - sources."mdast-util-gfm-task-list-item-1.0.1" + sources."mdast-util-gfm-task-list-item-1.0.2" sources."mdast-util-mdx-2.0.0" sources."mdast-util-mdx-expression-1.3.1" sources."mdast-util-mdx-jsx-2.1.0" sources."mdast-util-mdxjs-esm-1.3.0" - sources."mdast-util-phrasing-3.0.0" + sources."mdast-util-phrasing-3.0.1" sources."mdast-util-to-markdown-1.5.0" sources."mdast-util-to-nlcst-5.2.1" - sources."mdast-util-to-string-3.1.0" + sources."mdast-util-to-string-3.1.1" sources."meow-11.0.0" sources."micromark-3.1.0" sources."micromark-core-commonmark-1.0.6" @@ -88268,14 +88906,14 @@ in sources."micromark-extension-gfm-table-1.0.5" sources."micromark-extension-gfm-tagfilter-1.0.1" sources."micromark-extension-gfm-task-list-item-1.0.3" - sources."micromark-extension-mdx-expression-1.0.3" + sources."micromark-extension-mdx-expression-1.0.4" sources."micromark-extension-mdx-jsx-1.0.3" sources."micromark-extension-mdx-md-1.0.0" sources."micromark-extension-mdxjs-1.0.0" sources."micromark-extension-mdxjs-esm-1.0.3" sources."micromark-factory-destination-1.0.0" sources."micromark-factory-label-1.0.2" - sources."micromark-factory-mdx-expression-1.0.6" + sources."micromark-factory-mdx-expression-1.0.7" sources."micromark-factory-space-1.0.0" sources."micromark-factory-title-1.0.2" sources."micromark-factory-whitespace-1.0.0" @@ -88286,7 +88924,7 @@ in sources."micromark-util-decode-numeric-character-reference-1.0.0" sources."micromark-util-decode-string-1.0.2" sources."micromark-util-encode-1.0.1" - sources."micromark-util-events-to-acorn-1.2.0" + sources."micromark-util-events-to-acorn-1.2.1" sources."micromark-util-html-tag-name-1.1.0" sources."micromark-util-normalize-identifier-1.0.0" sources."micromark-util-resolve-all-1.0.0" @@ -88301,10 +88939,10 @@ in sources."minimist-options-4.1.0" sources."mri-1.2.0" sources."ms-2.1.2" - sources."nlcst-is-literal-2.1.0" - sources."nlcst-normalize-3.1.0" - sources."nlcst-search-3.1.0" - sources."nlcst-to-string-3.1.0" + sources."nlcst-is-literal-2.1.1" + sources."nlcst-normalize-3.1.1" + sources."nlcst-search-3.1.1" + sources."nlcst-to-string-3.1.1" sources."nopt-7.0.0" sources."normalize-package-data-4.0.1" sources."normalize-url-8.0.0" @@ -88324,8 +88962,8 @@ in sources."parse-json-5.2.0" (sources."parse-latin-5.0.1" // { dependencies = [ - sources."unist-util-modify-children-3.1.0" - sources."unist-util-visit-children-2.0.1" + sources."unist-util-modify-children-3.1.1" + sources."unist-util-visit-children-2.0.2" ]; }) sources."parse5-6.0.1" @@ -88433,7 +89071,7 @@ in sources."to-vfile-7.2.3" sources."trim-newlines-4.0.2" sources."trough-2.1.0" - sources."type-fest-3.5.2" + sources."type-fest-3.5.3" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-3.0.1" @@ -88457,20 +89095,20 @@ in ]; }) sources."unique-string-3.0.0" - sources."unist-util-inspect-7.0.1" - sources."unist-util-is-5.1.1" + sources."unist-util-inspect-7.0.2" + sources."unist-util-is-5.2.0" (sources."unist-util-modify-children-2.0.0" // { dependencies = [ sources."array-iterate-1.1.4" ]; }) - sources."unist-util-position-4.0.3" - sources."unist-util-position-from-estree-1.1.1" - sources."unist-util-remove-position-4.0.1" - sources."unist-util-stringify-position-3.0.2" - sources."unist-util-visit-4.1.1" + sources."unist-util-position-4.0.4" + sources."unist-util-position-from-estree-1.1.2" + sources."unist-util-remove-position-4.0.2" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" sources."unist-util-visit-children-1.1.4" - sources."unist-util-visit-parents-5.1.1" + sources."unist-util-visit-parents-5.1.3" (sources."update-notifier-6.0.2" // { dependencies = [ sources."chalk-5.2.0" @@ -88493,7 +89131,7 @@ in sources."walk-up-path-1.0.0" sources."web-namespaces-2.0.1" sources."widest-line-4.0.1" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" @@ -88531,9 +89169,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -88549,11 +89187,11 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -88568,7 +89206,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" sources."browserslist-4.21.4" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -88814,7 +89452,7 @@ in sources."path-to-regexp-1.8.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."require-directory-2.1.1" @@ -88966,7 +89604,7 @@ in }; dependencies = [ sources."browserslist-4.21.4" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."electron-to-chromium-1.4.284" sources."escalade-3.1.1" sources."fraction.js-4.2.0" @@ -89039,7 +89677,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/node-18.11.18" sources."@types/yauzl-2.10.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" @@ -89047,7 +89685,7 @@ in sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1296.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -89128,7 +89766,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."get-uri-3.0.2" sources."glob-7.2.3" @@ -89228,7 +89866,7 @@ in sources."tmp-0.0.33" sources."toidentifier-1.0.1" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" (sources."unbzip2-stream-1.4.3" // { @@ -89271,10 +89909,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.60.0"; + version = "2.62.2"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.60.0.tgz"; - sha512 = "/kO8KGuJVCnkhnR+SmDHsAaaqmaTR6Vp/kpryohsBfKh/ZdOH1oKpviMiz167K6tUdin7x95Wjz/GZAfeiKPKg=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.62.2.tgz"; + sha512 = "fACUQEdc43AfiqKKXUZLuHB2VADLU965hl50Fn6BhMemFmUsc+iS/GFfOwvfCUO3/iaRtsn/gk+dQ3zZ+snKRw=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -89412,7 +90050,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."ieee754-1.2.1" sources."ignore-5.2.4" sources."indent-string-4.0.0" @@ -89420,7 +90058,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inspect-with-kind-1.0.5" - sources."irregular-plurals-3.3.0" + sources."irregular-plurals-3.4.0" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" @@ -89710,10 +90348,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "13.21.0"; + version = "13.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.21.0.tgz"; - sha512 = "4y0t3tAZiAMqRpyw0Yc8EbbRlikIpJRSKkcbi/0i3QcNg85FYaMeL7f2+BxfkMWzTjmN6XA4WWaPgqTV7W69eg=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.24.0.tgz"; + sha512 = "QP3hY4Ehgjnl5mXmHuXzgU/rnRpMTlpMxr3+JytC2NTNTUTjD5NSm+jJ+fUTHfcfGa8Plos2RTTmiqamHEE7uw=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -89743,6 +90381,8 @@ in sources."@grpc/grpc-js-1.8.4" sources."@grpc/proto-loader-0.7.4" sources."@handsontable/formulajs-2.0.2" + sources."@json2csv/formatters-6.1.2" + sources."@json2csv/plainjs-6.1.2" sources."@mitmaro/errors-1.0.0" sources."@mitmaro/http-authorization-header-1.0.0" sources."@protobufjs/aspromise-1.1.2" @@ -89755,11 +90395,12 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" + sources."@streamparser/json-0.0.10" sources."@types/body-parser-1.19.2" sources."@types/caseless-0.12.2" sources."@types/connect-3.4.35" sources."@types/express-4.17.15" - sources."@types/express-serve-static-core-4.17.32" + sources."@types/express-serve-static-core-4.17.33" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" sources."@types/node-18.11.18" @@ -89768,7 +90409,7 @@ in sources."@types/request-2.48.8" sources."@types/serve-static-1.15.0" sources."@types/tough-cookie-4.0.2" - sources."@types/ws-8.5.3" + sources."@types/ws-8.5.4" sources."abort-controller-3.0.0" sources."accepts-1.3.8" (sources."agent-base-6.0.2" // { @@ -89811,7 +90452,7 @@ in sources."bolt01-1.2.6" sources."bolt03-1.2.15" sources."bolt07-1.8.3" - sources."bolt09-0.2.4" + sources."bolt09-0.2.5" sources."bs58-4.0.1" sources."bs58check-2.1.2" sources."buffer-6.0.3" @@ -89842,7 +90483,6 @@ in sources."colors-1.4.0" sources."colorspace-1.1.4" sources."combined-stream-1.0.8" - sources."commander-6.2.1" sources."concat-stream-1.6.2" (sources."content-disposition-0.5.4" // { dependencies = [ @@ -89900,8 +90540,12 @@ in sources."function-bind-1.1.1" sources."gauge-1.2.7" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" - sources."goldengate-12.0.2" + sources."get-intrinsic-1.2.0" + (sources."goldengate-12.0.2" // { + dependencies = [ + sources."ln-sync-4.2.0" + ]; + }) (sources."grammy-1.13.1" // { dependencies = [ sources."debug-4.3.4" @@ -89947,15 +90591,10 @@ in sources."string-width-5.1.2" sources."strip-ansi-7.0.1" sources."tmp-0.0.33" - sources."wrap-ansi-8.0.1" - ]; - }) - (sources."invoices-2.2.2" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - sources."bolt07-1.8.2" + sources."wrap-ansi-8.1.0" ]; }) + sources."invoices-2.2.3" sources."ip-2.0.0" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" @@ -89974,82 +90613,19 @@ in sources."is-unicode-supported-1.3.0" sources."isarray-1.0.0" sources."json-schema-traverse-1.0.0" - sources."json2csv-5.0.7" - sources."jsonparse-1.3.1" sources."jstat-1.9.6" sources."kind-of-6.0.3" sources."kuler-2.0.0" - (sources."lightning-6.8.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.8.0" - sources."@types/node-18.11.16" - sources."asyncjs-util-1.2.10" - sources."bolt07-1.8.2" - (sources."psbt-2.7.1" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - ]; - }) - sources."type-fest-3.4.0" - ]; - }) - (sources."ln-accounting-6.1.2" // { + (sources."lightning-7.0.3" // { dependencies = [ sources."@grpc/grpc-js-1.8.1" - sources."bolt07-1.8.2" - sources."goldengate-12.0.1" - (sources."ln-sync-4.1.0" // { - dependencies = [ - sources."asyncjs-util-1.2.10" - sources."ln-service-54.8.0" - ]; - }) - (sources."psbt-2.7.1" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - ]; - }) - ]; - }) - (sources."ln-service-54.9.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.8.1" - sources."@types/ws-8.5.4" - sources."bolt09-0.2.5" - sources."invoices-2.2.3" - sources."lightning-7.0.3" sources."type-fest-3.5.1" ]; }) - sources."ln-sync-4.2.0" - (sources."ln-telegram-4.6.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.8.1" - sources."bolt09-0.2.5" - sources."debug-4.3.4" - (sources."goldengate-12.0.1" // { - dependencies = [ - sources."bolt07-1.8.2" - (sources."ln-sync-4.1.0" // { - dependencies = [ - sources."asyncjs-util-1.2.10" - sources."ln-service-54.8.0" - (sources."psbt-2.7.1" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - ]; - }) - ]; - }) - ]; - }) - sources."grammy-1.13.0" - sources."invoices-2.2.3" - sources."ln-sync-4.1.1" - sources."ms-2.1.2" - sources."paid-services-4.2.1" - ]; - }) + sources."ln-accounting-6.1.3" + sources."ln-service-54.9.0" + sources."ln-sync-4.3.0" + sources."ln-telegram-4.6.1" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.difference-4.5.0" @@ -90118,8 +90694,7 @@ in sources."p2tr-1.3.3" (sources."paid-services-4.3.0" // { dependencies = [ - sources."bolt09-0.2.5" - sources."invoices-2.2.3" + sources."ln-sync-4.2.0" ]; }) sources."parseurl-1.3.3" @@ -90128,14 +90703,14 @@ in sources."pinkie-promise-2.0.1" sources."probing-3.0.1" sources."process-nextick-args-2.0.1" - (sources."protobufjs-7.1.2" // { + (sources."protobufjs-7.2.0" // { dependencies = [ sources."long-5.2.1" ]; }) sources."proxy-addr-2.0.7" sources."psbt-2.7.2" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pushdata-bitcoin-1.0.1" sources."qrcode-terminal-0.12.0" sources."qs-6.11.0" @@ -90207,10 +90782,10 @@ in sources."tr46-0.0.3" sources."triple-beam-1.3.0" sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-fest-3.5.2" + sources."type-fest-3.5.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typeforce-1.18.0" @@ -90263,10 +90838,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.5.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.5.0.tgz"; - sha512 = "Vnq+3KScmrj6MYujzUhiZ4DJDMI/Pyc5EC2gxi1bIW8Qg+ASlOeUnm485/3Q6Ro3jNf+T6E9opQFbh6O606xfg=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.6.1.tgz"; + sha512 = "3pzB92+0/+rrR4TdONFhOtczPLQBgobu+27/X2icnS32YzgdMJd7GMzM4V6nBZsrl5jMUY4W/0ExSVGIV3o4aw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -90295,7 +90870,6 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."turndown-7.1.1" - sources."urijs-1.19.11" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" @@ -90556,7 +91130,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."gopd-1.0.1" sources."has-1.0.3" @@ -90767,7 +91341,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.10" sources."has-1.0.3" @@ -90861,7 +91435,7 @@ in sources."socket.io-4.5.4" sources."socket.io-adapter-2.4.0" sources."socket.io-client-4.5.4" - sources."socket.io-parser-4.2.1" + sources."socket.io-parser-4.2.2" sources."statuses-1.3.1" sources."stream-throttle-0.1.3" (sources."string-width-4.2.3" // { @@ -90926,7 +91500,7 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/types-7.20.7" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -91103,7 +91677,7 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."glob-6.0.4" sources."har-schema-2.0.0" @@ -91236,7 +91810,7 @@ in sources."pug-runtime-3.0.1" sources."pug-strip-comments-2.0.0" sources."pug-walk-2.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pushdata-bitcoin-1.0.1" sources."qrcode-1.5.1" sources."qs-6.11.0" @@ -91646,7 +92220,7 @@ in sources."once-1.2.0" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qap-3.3.1" sources."qs-6.5.3" sources."query-string-1.0.1" @@ -92489,10 +93063,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.1.109"; + version = "2.1.119"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.109.tgz"; - sha512 = "ebHJcPSosOi62963Roe3HB05ibu4bj2HXdFnWBbbiQB9JQtmJCfE8Ml2wmi9U1e5LMvw7xwh6NiRM/2U0I8gkg=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.119.tgz"; + sha512 = "zz7Y0MQgJQxOXOOh/ctmjlGBGrAN1D/V8d+zvrombUIADuX0jE6CYk1zhQVQra82egzpLcxJVtH49FOKjrlXmQ=="; }; dependencies = [ sources."@jsii/check-node-1.73.0" @@ -92510,8 +93084,8 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.6.22" - sources."cdk8s-plus-25-2.3.27" + sources."cdk8s-2.6.32" + sources."cdk8s-plus-25-2.4.3" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -92524,7 +93098,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.223" + sources."constructs-10.1.233" sources."date-format-4.0.14" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -92578,14 +93152,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.797" // { + (sources."jsii-srcmak-0.1.807" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.247" + sources."json2jsii-0.3.257" sources."jsonfile-6.1.0" sources."locate-path-5.0.0" sources."lodash.truncate-4.4.2" @@ -92605,7 +93179,7 @@ in sources."p-try-2.2.0" sources."path-exists-4.0.0" sources."picomatch-2.3.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" @@ -92632,7 +93206,7 @@ in sources."supports-color-7.2.0" sources."table-6.8.1" sources."to-regex-range-5.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typescript-3.9.10" sources."universalify-2.0.0" sources."uri-js-4.4.1" @@ -92667,26 +93241,26 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.15.0.tgz"; - sha512 = "wPVkiuoId7u1Jy1C1d+D4ktfQde5GfHkZBMppmkO/daZXsI2kH7yIFZpJ81/0k9hNRHvoK1d0/gDMMywqwWcmg=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.15.2.tgz"; + sha512 = "RAwXojqBZT8evWDwYCPzXiI/usUrciBhu9sopgm9MpcX55OLZMr2/R8/ZmX/oCxrvZxwboDD18dNJpi2hyXJ7w=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.20.14" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" sources."@babel/types-7.20.7" - sources."@cdktf/cli-core-0.15.0" - sources."@cdktf/commons-0.15.0" - sources."@cdktf/hcl2cdk-0.15.0" - sources."@cdktf/hcl2json-0.15.0" + sources."@cdktf/cli-core-0.15.2" + sources."@cdktf/commons-0.15.2" + sources."@cdktf/hcl2cdk-0.15.2" + sources."@cdktf/hcl2json-0.15.2" sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" - sources."@cdktf/provider-generator-0.15.0" + sources."@cdktf/provider-generator-0.15.2" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -92716,7 +93290,7 @@ in sources."@types/node-18.11.18" sources."@types/node-fetch-2.6.2" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."@xmldom/xmldom-0.8.6" @@ -92743,7 +93317,7 @@ in sources."bufferutil-4.0.7" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.15.0" + sources."cdktf-0.15.2" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -92766,7 +93340,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.223" + sources."constructs-10.1.233" sources."convert-to-spaces-1.0.2" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" @@ -92909,7 +93483,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.797" // { + (sources."jsii-srcmak-0.1.807" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -92945,7 +93519,7 @@ in sources."napi-build-utils-1.0.2" sources."ncp-2.0.0" sources."node-abi-3.31.0" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-fetch-2.6.8" sources."node-gyp-build-4.6.0" sources."object-assign-4.1.1" @@ -92965,7 +93539,7 @@ in sources."prebuild-install-7.1.1" sources."prettier-2.8.3" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."react-17.0.2" @@ -93049,7 +93623,7 @@ in sources."ws-7.5.9" sources."xml-js-1.6.11" sources."xmlbuilder-15.1.1" - sources."xstate-4.35.2" + sources."xstate-4.35.3" sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-17.6.2" // { @@ -93084,10 +93658,10 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.1.tgz"; - sha512 = "/StJu1YODZY6cOwkBx5FMhSoc9YmvEJXtwNN+udGg1GIKrr4PkdsCdUqC26GfdPdt5IuZnu+5y9/3mrdIJa40Q=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.2.tgz"; + sha512 = "GDQkr6zVqHJhO3yWTy3sA22sMCT6iUqaJuBdqZMW6oI25MtiJ2iZXDmWzErpjoRotsB+TYPTpuZSNSgaC1n4lA=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -93096,7 +93670,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."chokidar-3.5.3" - sources."clean-css-5.3.1" + sources."clean-css-5.3.2" sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fill-range-7.0.1" @@ -93272,7 +93846,7 @@ in sources."mute-stream-0.0.8" sources."node-fetch-1.7.3" sources."prompt-1.3.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."query-string-6.14.1" sources."read-1.0.7" sources."revalidator-0.1.8" @@ -93358,10 +93932,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.23.7"; + version = "0.23.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.7.tgz"; - sha512 = "CRFEcusfy8ATbYswZV2205Et/qjfe82KvJunQnLL8VlhKkymwgrfbgMZCTr35WPX0Dv3PItUSZZYq91LcYIm6w=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.8.tgz"; + sha512 = "knOr++uIcb+RppNXja+JrU1heoRDiW4v3GEzApJPsEgyjAaH6sZMh/XU5upFp7OSmeX++ZLndPUeumjzQuAbOg=="; }; buildInputs = globalBuildInputs; meta = { @@ -93386,7 +93960,7 @@ in sources."dockerfile-language-server-nodejs-0.2.2" sources."dockerfile-language-service-0.1.1" sources."dockerfile-utils-0.1.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."vscode-jsonrpc-8.0.2" (sources."vscode-languageserver-7.0.0" // { dependencies = [ @@ -93550,10 +94124,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.6.0.tgz"; - sha512 = "1Xo6++/ml/ozfBi2ubDXPVz49I1ewI5v8tZysn/Rz3/PojQuOcroXs48aqYx8rPADt7zSXAVGs+uN9lAkLgrLA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.6.1.tgz"; + sha512 = "GUkltYI/RTAx3vUIb+lQuEoF96ByfliYokoqM/Gn4hMRtl0IE/XaxqRj71byaj9eO1boSGzqMQtpx8ju1xhWuQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -93575,7 +94149,7 @@ in }; dependencies = [ sources."isexe-2.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-uri-3.0.7" sources."which-2.0.2" @@ -93665,10 +94239,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.5.6"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.6.tgz"; - sha512 = "AwIVgKdfmeVnf56cI3bOGSGM+SHZ5cIXtWI0xU5ToFGAFk/wJ3YJlpUsHensuBrBrMTIAYHk+O3Mu+FuG9jKZg=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.6.0.tgz"; + sha512 = "fMEM9CUlsUODmXtmFQG+ppOqnem65X9qR+SqWndhw9LiE4NdsLsRm7pJmTT5Dz/R0AT7JaOfJeWi0gyUSSL25A=="; }; buildInputs = globalBuildInputs; meta = { @@ -93718,10 +94292,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.5.0.tgz"; - sha512 = "X3xt19f5CtRZ9/zMzNjjxuBaZLmyJt1KUnbvt1njFrBa80SK5pCkuTcJC+/CnkFhHwFeJbMyKNfw1AG68h4d6Q=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.5.1.tgz"; + sha512 = "tJYhsDHadL6YYEsHAUc+tFi8MYklHmPx3AcjiUHTYRAtkAyKoZb+BPpAwG8gvfSqdkCxu55eHLeJ9lGhXNztZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -93843,7 +94417,7 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" @@ -93962,7 +94536,7 @@ in sources."tar-6.1.13" sources."tr46-0.0.3" sources."traverse-0.3.9" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" @@ -93998,10 +94572,10 @@ in coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.4.1.tgz"; - sha512 = "iWLgnUnd8MXi5k1RQQ5GiCboRg+lpOkcziPCpn8eWpFmXc947XZuZF3CB6zFdNZD8ifNbs9mZtcf31DnLPQuew=="; + url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.4.2.tgz"; + sha512 = "4qcKB1i4SdQUKv8HT+/owk+fZn4zssX4NUOEZ5IFt+hP5pb6hdWMyuJvqnH5A0+5SYQuwg5zdtQeZnneUIApfg=="; }; buildInputs = globalBuildInputs; meta = { @@ -94037,13 +94611,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.284"; + version = "1.1.291"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.284.tgz"; - sha512 = "MP4yyTx1C7WCp6/l1JIBlSIZLmnoNLSjHPyt2rCKQyglt8T+4zt6pHDRgoG+nGs9SjxMASQJLU7y4tURHTV+4g=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.291.tgz"; + sha512 = "Ffl7Gynb4zqsmUelEFuB1gqV5tFGGR/+Btd8l7/YVZVZ3M2/Ur9nBa6K8+inWPMQUkZ00nQEbXGDKeOzDLDcJQ=="; }; dependencies = [ - sources."pyright-1.1.290" + sources."pyright-1.1.291" ]; buildInputs = globalBuildInputs; meta = { @@ -94117,10 +94691,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.71.1"; + version = "0.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.71.1.tgz"; - sha512 = "O8gH7wk6AMoRKBvfwvI9rF9MeZapS5fmN+U8/xlgB12IqcqkQliOWMbQYoH+jmb1/CWEnCg3hY6MjwWIwe9HBA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.72.0.tgz"; + sha512 = "kKbvsKyEDa+SND3mgOjdo3mGUUJwcHCt92fwZ9D7qLaE4y4SCxaHxrp3uAncaiMQUMicMT3a+5KEu0iaIXVnnQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -94188,7 +94762,7 @@ in sources."once-1.4.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."request-promise-core-1.1.4" @@ -94198,7 +94772,7 @@ in sources."sshpk-1.17.0" sources."stealthy-require-1.1.1" sources."tough-cookie-2.5.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."turndown-7.1.1" sources."tweetnacl-0.14.5" @@ -94421,9 +94995,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -94439,15 +95013,15 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -94487,7 +95061,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -94665,7 +95239,7 @@ in sources."postcss-selector-parser-6.0.11" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -94961,10 +95535,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "2.1.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-2.1.0.tgz"; - sha512 = "gjc0WOlYu42m46+0kN+uBjSUPKq8kf+1aLuhnCTA6bp6cNRoen4Oe2QtTDGE71CHWSVbNYmAw1TYfRZBmHV8sQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-2.1.3.tgz"; + sha512 = "rzom53icaFoCF7p6Ps0dHqflS8yv+hOtQw43qOS4NL3b+rnulkfNracHFzuH1n1tyQWCzLgs73cAL1pBGrkUHQ=="; }; dependencies = [ sources."typescript-4.9.4" @@ -95092,10 +95666,10 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.3" @@ -95138,7 +95712,7 @@ in sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" sources."resolve-1.22.1" @@ -95564,7 +96138,7 @@ in sources."strip-ansi-6.0.1" sources."supports-color-8.1.1" sources."tree-kill-1.2.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yargs-17.6.2" @@ -96097,7 +96671,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-2.7.4" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-6.0.1" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -96118,7 +96692,7 @@ in sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-2.0.0" // { dependencies = [ sources."depd-2.0.0" @@ -96308,7 +96882,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-2.1.1" sources."q-1.5.1" sources."qs-6.5.3" @@ -96398,7 +96972,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.17.3" + sources."systeminformation-5.17.4" (sources."tar-6.1.13" // { dependencies = [ sources."minipass-4.0.0" @@ -96687,7 +97261,7 @@ in sources."form-data-2.5.1" sources."formidable-1.2.6" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."globalthis-1.0.3" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -96960,7 +97534,7 @@ in sources."@cspell/dict-ruby-4.0.1" sources."@cspell/dict-rust-4.0.0" sources."@cspell/dict-scala-4.0.0" - sources."@cspell/dict-software-terms-3.1.0" + sources."@cspell/dict-software-terms-3.1.1" sources."@cspell/dict-sql-2.0.1" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" @@ -97526,7 +98100,7 @@ in sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."queue-tick-1.0.1" sources."random-access-file-2.2.1" @@ -97907,10 +98481,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.96.0"; + version = "6.96.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.96.0.tgz"; - sha512 = "GJsJF+yxOBv5s/KS1h4nCnkhXbJtHm0nEq7xUTDxpI6aqHj9wWaWCURNjdGziN4lv3hNPtnHXt7TsM57nzAXbQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.96.1.tgz"; + sha512 = "YXsVhkOvhfSRj1oQsb+30nAX7VNEwAM8hoNV+DSz9uj+HrW4t5DWm2g7Cbc/LzpxPqFnLzp0nQCAvn84oudxMQ=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -98022,14 +98596,14 @@ in sources."through-2.3.8" (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."url-0.10.3" @@ -98250,7 +98824,7 @@ in sources."gauge-4.0.4" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" (sources."get-package-info-1.0.0" // { dependencies = [ sources."debug-2.6.9" @@ -98277,7 +98851,7 @@ in sources."has-unicode-2.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" @@ -98312,7 +98886,7 @@ in sources."jsonfile-6.1.0" sources."junk-3.1.0" sources."keyv-4.5.2" - sources."listr2-5.0.6" + sources."listr2-5.0.7" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.21" @@ -98478,7 +99052,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.13.1" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" @@ -98524,10 +99098,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.3.2.tgz"; - sha512 = "YHlGUS+qkSXOnwin67gC+6IfV87fkCUNUS/t8Lm9aXVTClLPNVOI3LPPJqnabPn6TzhYU3zSIP+S7IzOL8zqzA=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.4.1.tgz"; + sha512 = "YLeowqdlv7xHh7JBo3uYOjh5g2nZJFH5l6xIY/MO/f3vEEgHDltE8oXwgZ8JHzQ8n/PntyRZwffxVDsxMMS7vw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -98909,7 +99483,7 @@ in sources."promise-limit-2.7.0" sources."promise-retry-2.0.1" sources."prompts-2.4.2" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qrcode-terminal-0.12.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -99103,13 +99677,13 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -99133,17 +99707,17 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.20.7" sources."@babel/plugin-transform-parameters-7.20.7" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -99153,7 +99727,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."ajv-6.12.6" @@ -99178,7 +99752,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -99331,7 +99905,7 @@ in sources."pkg-up-3.1.0" sources."prop-types-15.8.1" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."quick-lru-4.0.1" sources."react-16.14.0" sources."react-devtools-core-4.27.1" @@ -99471,13 +100045,13 @@ in sources."@azure/logger-1.0.3" (sources."@azure/msal-browser-2.32.2" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-9.1.1" ]; }) sources."@azure/msal-common-7.6.0" (sources."@azure/msal-node-1.14.6" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-9.1.1" sources."uuid-8.3.2" ]; }) @@ -99515,17 +100089,17 @@ in }) sources."@fluentui/date-time-utilities-8.5.4" sources."@fluentui/dom-utilities-2.2.4" - sources."@fluentui/font-icons-mdl2-8.5.6" - sources."@fluentui/foundation-legacy-8.2.26" + sources."@fluentui/font-icons-mdl2-8.5.7" + sources."@fluentui/foundation-legacy-8.2.27" sources."@fluentui/keyboard-key-0.4.4" sources."@fluentui/merge-styles-8.5.5" - sources."@fluentui/react-8.104.5" - sources."@fluentui/react-focus-8.8.12" + sources."@fluentui/react-8.104.8" + sources."@fluentui/react-focus-8.8.13" sources."@fluentui/react-hooks-8.6.15" sources."@fluentui/react-portal-compat-context-9.0.4" sources."@fluentui/react-window-provider-2.2.5" sources."@fluentui/set-version-8.2.4" - sources."@fluentui/style-utilities-8.8.5" + sources."@fluentui/style-utilities-8.9.0" sources."@fluentui/theme-2.6.21" sources."@fluentui/utilities-8.13.5" sources."@gar/promisify-1.1.3" @@ -99579,15 +100153,11 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@redis/bloom-1.1.0" - (sources."@redis/client-1.4.2" // { - dependencies = [ - sources."cluster-key-slot-1.1.1" - ]; - }) + sources."@redis/bloom-1.2.0" + sources."@redis/client-1.5.3" sources."@redis/graph-1.1.0" sources."@redis/json-1.0.4" - sources."@redis/search-1.1.0" + sources."@redis/search-1.1.1" sources."@redis/time-series-1.0.4" (sources."@sap/hana-client-2.15.19" // { dependencies = [ @@ -99596,20 +100166,20 @@ in }) sources."@sindresorhus/is-0.14.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@szmarczak/http-timer-1.1.2" - sources."@tediousjs/connection-string-0.4.1" + sources."@tediousjs/connection-string-0.4.2" sources."@tokenizer/token-0.3.0" sources."@tootallnate/once-1.1.2" sources."@tsconfig/node10-1.0.9" @@ -99625,7 +100195,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.32" + sources."@types/express-serve-static-core-4.17.33" sources."@types/file-type-10.9.1" sources."@types/js-yaml-4.0.4" sources."@types/json-schema-7.0.11" @@ -99639,7 +100209,7 @@ in sources."@types/prop-types-15.7.5" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/react-18.0.26" + sources."@types/react-18.0.27" sources."@types/react-dom-18.0.10" sources."@types/scheduler-0.16.2" sources."@types/serve-static-1.15.0" @@ -99693,7 +100263,7 @@ in sources."acorn-7.4.1" (sources."acorn-import-assertions-1.8.0" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" ]; }) sources."acorn-jsx-5.3.2" @@ -99793,7 +100363,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-2.0.0" sources."async-done-1.3.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-limiter-1.0.1" sources."async-settle-1.0.0" sources."asynckit-0.4.0" @@ -99856,7 +100426,7 @@ in sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-4.1.2" sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { @@ -100206,7 +100776,7 @@ in sources."generate-function-2.3.1" sources."generic-pool-3.9.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" @@ -100233,7 +100803,7 @@ in sources."which-1.3.1" ]; }) - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globalthis-1.0.3" sources."globby-11.1.0" sources."glogg-1.0.2" @@ -100367,7 +100937,7 @@ in sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.7.2" (sources."http-proxy-agent-4.0.1" // { dependencies = [ @@ -100397,7 +100967,7 @@ in sources."interpret-1.4.0" sources."inversify-5.1.1" sources."invert-kv-1.0.0" - (sources."ioredis-5.2.5" // { + (sources."ioredis-5.3.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -100675,7 +101245,7 @@ in ]; }) sources."ms-2.0.0" - (sources."mssql-9.1.0" // { + (sources."mssql-9.1.1" // { dependencies = [ sources."commander-9.5.0" sources."debug-4.3.4" @@ -100720,7 +101290,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-abi-3.31.0" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" sources."node-fetch-2.6.8" (sources."node-gyp-8.4.1" // { @@ -100859,9 +101429,9 @@ in sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."peek-readable-4.1.0" - sources."pg-8.8.0" + sources."pg-8.9.0" sources."pg-connection-string-2.5.0" - sources."pg-cursor-2.7.4" + sources."pg-cursor-2.8.0" sources."pg-int8-1.0.1" (sources."pg-native-3.0.1" // { dependencies = [ @@ -100872,8 +101442,8 @@ in ]; }) sources."pg-pool-3.5.2" - sources."pg-protocol-1.5.0" - sources."pg-query-stream-4.2.4" + sources."pg-protocol-1.6.0" + sources."pg-query-stream-4.3.0" sources."pg-types-2.2.0" sources."pgpass-1.0.5" sources."picocolors-0.2.1" @@ -100910,7 +101480,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" @@ -100942,7 +101512,7 @@ in ]; }) sources."rechoir-0.6.2" - sources."redis-4.5.1" + sources."redis-4.6.2" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" @@ -101174,7 +101744,7 @@ in }) (sources."terser-5.16.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."commander-2.20.3" ]; }) @@ -101211,10 +101781,10 @@ in sources."ts-log-2.2.5" (sources."ts-node-10.4.0" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -101302,7 +101872,7 @@ in sources."webidl-conversions-3.0.1" (sources."webpack-5.75.0" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" ]; }) sources."webpack-sources-3.2.3" @@ -101367,12 +101937,12 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-7.3.1" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."ignore-4.0.6" sources."type-fest-0.20.2" ]; @@ -101415,8 +101985,8 @@ in sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/express-4.17.15" - sources."@types/express-serve-static-core-4.17.32" + sources."@types/express-4.17.16" + sources."@types/express-serve-static-core-4.17.33" sources."@types/glob-7.2.0" sources."@types/hls.js-0.13.3" sources."@types/http-proxy-1.17.9" @@ -101665,7 +102235,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."async-2.6.4" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-foreach-0.1.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" @@ -101778,7 +102348,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -102114,7 +102684,7 @@ in sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" sources."flatted-3.2.7" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."is-fullwidth-code-point-3.0.0" @@ -102316,7 +102886,7 @@ in }) sources."gaze-1.1.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-6.0.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" @@ -103060,7 +103630,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."query-string-4.3.4" @@ -103719,7 +104289,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -103761,7 +104331,7 @@ in sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" sources."ignore-5.2.4" @@ -103773,7 +104343,7 @@ in sources."is-glob-4.0.3" sources."is-path-inside-3.0.3" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -103792,7 +104362,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.2.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" sources."resolve-from-4.0.0" @@ -103839,7 +104409,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -103886,7 +104456,7 @@ in sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" sources."ignore-5.2.4" @@ -103898,7 +104468,7 @@ in sources."is-glob-4.0.3" sources."is-path-inside-3.0.3" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -103918,7 +104488,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.2.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" sources."resolve-from-4.0.0" @@ -103969,26 +104539,27 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "6.1.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-6.1.0.tgz"; - sha512 = "yhbevPdwof7oyjQup/dEYbxYZCiK/vYYQVnZA3CbYxtz0TG6LcEumz1Pn5WhAwU6vGCSmKpsJ02r4O0/bwIB/Q=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-6.2.1.tgz"; + sha512 = "trFLjh02d+KqN+7ENaaMEYr2ankQLZZO93uQAzSP7eJd5VxnUBNQj96Qr0XXIy5cSffViftBsDOkmTbQA++oMw=="; }; dependencies = [ - (sources."@ampproject/remapping-2.2.0" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.1.1" - ]; - }) + sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.20.10" - (sources."@babel/core-7.9.0" // { + sources."@babel/compat-data-7.20.14" + (sources."@babel/core-7.20.12" // { dependencies = [ + sources."@babel/code-frame-7.18.6" sources."json5-2.2.3" - sources."semver-5.7.1" + sources."semver-6.3.0" + ]; + }) + (sources."@babel/generator-7.20.14" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/generator-7.20.7" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" (sources."@babel/helper-compilation-targets-7.20.7" // { @@ -104023,33 +104594,19 @@ in sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - (sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.12" - sources."json5-2.2.3" - sources."semver-6.3.0" - ]; - }) + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - (sources."@babel/plugin-proposal-class-static-block-7.20.7" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.12" - sources."json5-2.2.3" - sources."semver-6.3.0" - ]; - }) - sources."@babel/plugin-proposal-decorators-7.20.7" + sources."@babel/plugin-proposal-class-static-block-7.20.7" + sources."@babel/plugin-proposal-decorators-7.20.13" sources."@babel/plugin-proposal-dynamic-import-7.18.6" sources."@babel/plugin-proposal-export-default-from-7.18.10" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" @@ -104086,7 +104643,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.11" + sources."@babel/plugin-transform-block-scoping-7.20.14" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -104108,7 +104665,7 @@ in sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-react-jsx-self-7.18.6" sources."@babel/plugin-transform-react-jsx-source-7.19.6" sources."@babel/plugin-transform-regenerator-7.20.5" @@ -104123,7 +104680,7 @@ in sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-typescript-7.20.7" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" (sources."@babel/preset-env-7.20.2" // { @@ -104138,7 +104695,7 @@ in sources."@babel/code-frame-7.18.6" ]; }) - (sources."@babel/traverse-7.20.12" // { + (sources."@babel/traverse-7.20.13" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; @@ -104149,7 +104706,7 @@ in sources."@expo/bunyan-4.0.0" (sources."@expo/cli-0.4.11" // { dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" (sources."@expo/config-7.0.3" // { dependencies = [ sources."@expo/json-file-8.2.36" @@ -104293,7 +104850,19 @@ in sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" sources."@expo/vector-icons-13.0.0" - sources."@expo/webpack-config-0.17.4" + (sources."@expo/webpack-config-18.0.1" // { + dependencies = [ + sources."@expo/config-6.0.20" + (sources."@expo/config-plugins-4.1.1" // { + dependencies = [ + sources."semver-7.3.8" + ]; + }) + sources."@expo/config-types-44.0.0" + sources."@expo/json-file-8.2.35" + sources."@expo/plist-0.0.18" + ]; + }) (sources."@expo/xcpretty-4.2.2" // { dependencies = [ sources."js-yaml-4.1.0" @@ -104304,11 +104873,17 @@ in sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jest/types-26.6.2" - sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" + (sources."@jridgewell/source-map-0.3.2" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" + ]; + }) sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" + sources."@leichtgewicht/ip-codec-2.0.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -104330,69 +104905,66 @@ in sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" + sources."@trysound/sax-0.2.0" + sources."@types/body-parser-1.19.2" + sources."@types/bonjour-3.5.10" sources."@types/cacheable-request-6.0.3" + sources."@types/connect-3.4.35" + sources."@types/connect-history-api-fallback-1.3.5" + sources."@types/eslint-8.4.10" + sources."@types/eslint-scope-3.7.4" + sources."@types/estree-0.0.51" + sources."@types/express-4.17.16" + sources."@types/express-serve-static-core-4.17.33" sources."@types/glob-7.2.0" - sources."@types/html-minifier-terser-5.1.2" + sources."@types/html-minifier-terser-6.1.0" sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-proxy-1.17.9" sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" sources."@types/json-schema-7.0.11" sources."@types/keyv-3.1.4" + sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" sources."@types/node-18.11.18" - sources."@types/q-1.5.5" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.2" - sources."@types/source-list-map-0.1.2" - sources."@types/tapable-1.0.8" - (sources."@types/uglify-js-3.17.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."@types/webpack-4.41.33" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."@types/webpack-sources-3.2.0" // { - dependencies = [ - sources."source-map-0.7.4" - ]; - }) + sources."@types/serve-index-1.9.1" + sources."@types/serve-static-1.15.0" + sources."@types/sockjs-0.3.33" + sources."@types/ws-8.5.4" sources."@types/yargs-15.0.15" sources."@types/yargs-parser-21.0.0" sources."@urql/core-2.3.6" sources."@urql/exchange-retry-0.3.0" - sources."@webassemblyjs/ast-1.9.0" - sources."@webassemblyjs/floating-point-hex-parser-1.9.0" - sources."@webassemblyjs/helper-api-error-1.9.0" - sources."@webassemblyjs/helper-buffer-1.9.0" - sources."@webassemblyjs/helper-code-frame-1.9.0" - sources."@webassemblyjs/helper-fsm-1.9.0" - sources."@webassemblyjs/helper-module-context-1.9.0" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" - sources."@webassemblyjs/helper-wasm-section-1.9.0" - sources."@webassemblyjs/ieee754-1.9.0" - sources."@webassemblyjs/leb128-1.9.0" - sources."@webassemblyjs/utf8-1.9.0" - sources."@webassemblyjs/wasm-edit-1.9.0" - sources."@webassemblyjs/wasm-gen-1.9.0" - sources."@webassemblyjs/wasm-opt-1.9.0" - sources."@webassemblyjs/wasm-parser-1.9.0" - sources."@webassemblyjs/wast-parser-1.9.0" - sources."@webassemblyjs/wast-printer-1.9.0" + sources."@webassemblyjs/ast-1.11.1" + sources."@webassemblyjs/floating-point-hex-parser-1.11.1" + sources."@webassemblyjs/helper-api-error-1.11.1" + sources."@webassemblyjs/helper-buffer-1.11.1" + sources."@webassemblyjs/helper-numbers-1.11.1" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" + sources."@webassemblyjs/helper-wasm-section-1.11.1" + sources."@webassemblyjs/ieee754-1.11.1" + sources."@webassemblyjs/leb128-1.11.1" + sources."@webassemblyjs/utf8-1.11.1" + sources."@webassemblyjs/wasm-edit-1.11.1" + sources."@webassemblyjs/wasm-gen-1.11.1" + sources."@webassemblyjs/wasm-opt-1.11.1" + sources."@webassemblyjs/wasm-parser-1.11.1" + sources."@webassemblyjs/wast-printer-1.11.1" sources."@xmldom/xmldom-0.7.9" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" + sources."abab-2.0.6" sources."accepts-1.3.8" - sources."acorn-6.4.2" - sources."address-1.1.2" + sources."acorn-8.8.2" + sources."acorn-import-assertions-1.8.0" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" sources."ajv-8.12.0" - sources."ajv-errors-1.0.1" sources."ajv-formats-2.1.1" (sources."ajv-keywords-3.5.2" // { dependencies = [ @@ -104400,61 +104972,30 @@ in sources."json-schema-traverse-0.4.1" ]; }) - sources."alphanum-sort-1.0.2" sources."ansi-align-3.0.1" - sources."ansi-colors-3.2.4" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" ]; }) - sources."ansi-html-0.0.7" + sources."ansi-html-community-0.0.8" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."application-config-path-0.1.1" - sources."aproba-1.2.0" sources."arg-4.1.0" sources."argparse-2.0.1" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.5" sources."arrify-2.0.1" sources."asap-2.0.6" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.3" - sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."atob-2.1.2" - sources."available-typed-arrays-1.0.5" sources."axios-0.21.1" - (sources."babel-loader-8.1.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-1.4.2" - sources."schema-utils-2.7.1" - ]; - }) + sources."babel-loader-8.3.0" sources."babel-plugin-module-resolver-4.1.0" (sources."babel-plugin-polyfill-corejs2-0.3.3" // { dependencies = [ @@ -104463,31 +105004,23 @@ in }) sources."babel-plugin-polyfill-corejs3-0.6.0" sources."babel-plugin-polyfill-regenerator-0.4.1" - sources."babel-plugin-react-native-web-0.18.10" + sources."babel-plugin-react-native-web-0.18.12" sources."babel-preset-expo-9.2.2" sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."base64-js-1.5.1" sources."batch-0.6.1" sources."better-opn-3.0.2" sources."big-integer-1.6.51" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - sources."bluebird-3.7.2" sources."blueimp-md5-2.19.0" - sources."bn.js-5.2.1" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) - (sources."bonjour-3.5.0" // { + (sources."bonjour-service-1.1.0" // { dependencies = [ sources."array-flatten-2.1.2" ]; @@ -104502,26 +105035,12 @@ in sources."bplist-parser-0.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."browserify-zlib-0.2.0" sources."browserslist-4.21.4" - sources."buffer-4.9.2" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" - sources."buffer-indexof-1.1.1" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" + sources."bufferutil-4.0.7" sources."builtins-1.0.3" sources."bytes-3.1.0" (sources."cacache-15.3.0" // { @@ -104530,18 +105049,14 @@ in sources."rimraf-3.0.2" ]; }) - sources."cache-base-1.0.1" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" sources."call-bind-1.0.2" - sources."caller-callsite-2.0.0" - sources."caller-path-2.0.0" sources."callsite-1.0.0" - sources."callsites-2.0.0" sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -104556,31 +105071,9 @@ in sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" sources."ci-info-3.7.1" - sources."cipher-base-1.0.4" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."clean-css-4.2.4" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."clean-css-5.3.2" sources."clean-stack-2.2.0" - (sources."clean-webpack-plugin-3.0.0" // { + (sources."clean-webpack-plugin-4.0.0" // { dependencies = [ sources."array-union-1.0.2" sources."del-4.1.1" @@ -104594,34 +105087,17 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-2.7.0" sources."cli-table3-0.6.3" - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.1" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."wrap-ansi-5.1.0" - ]; - }) sources."clone-1.0.4" sources."clone-response-1.0.3" - (sources."coa-2.0.2" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) - sources."collection-visit-1.0.0" - sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.9.1" + sources."colord-2.9.3" + sources."colorette-2.0.19" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.17.1" sources."commondir-1.0.1" sources."compare-versions-3.6.0" - sources."component-emitter-1.3.0" sources."component-type-1.2.1" sources."compressible-2.0.18" (sources."compression-1.7.4" // { @@ -104640,48 +105116,24 @@ in sources."ms-2.0.0" ]; }) - sources."connect-history-api-fallback-1.6.0" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" + sources."connect-history-api-fallback-2.0.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."convert-source-map-1.9.0" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - (sources."copy-concurrently-1.0.5" // { + (sources."copy-webpack-plugin-10.2.4" // { dependencies = [ - sources."rimraf-2.7.1" + sources."ajv-keywords-5.1.0" + sources."array-union-3.0.1" + sources."glob-parent-6.0.2" + sources."globby-12.2.0" + sources."schema-utils-4.0.0" + sources."slash-4.0.0" ]; }) - sources."copy-descriptor-0.1.1" - (sources."copy-webpack-plugin-6.0.4" // { - dependencies = [ - sources."ajv-6.12.6" - sources."find-cache-dir-3.3.2" - sources."find-up-4.1.0" - sources."json-schema-traverse-0.4.1" - sources."locate-path-5.0.0" - sources."make-dir-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."pkg-dir-4.2.0" - sources."schema-utils-2.7.1" - sources."semver-6.3.0" - ]; - }) - sources."core-js-compat-3.27.1" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" - sources."cosmiconfig-5.2.1" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" (sources."cross-fetch-3.1.5" // { dependencies = [ sources."node-fetch-2.6.7" @@ -104693,67 +105145,42 @@ in ]; }) sources."crypt-0.0.2" - sources."crypto-browserify-3.12.0" sources."crypto-random-string-1.0.0" - sources."css-color-names-0.0.4" - sources."css-declaration-sorter-4.0.1" - (sources."css-loader-3.6.0" // { + sources."css-declaration-sorter-6.3.1" + (sources."css-loader-6.7.3" // { dependencies = [ - sources."ajv-6.12.6" - sources."camelcase-5.3.1" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-1.4.2" - sources."schema-utils-2.7.1" - sources."semver-6.3.0" + sources."semver-7.3.8" ]; }) - (sources."css-select-4.3.0" // { + (sources."css-minimizer-webpack-plugin-3.4.1" // { dependencies = [ - sources."domhandler-4.3.1" - ]; - }) - sources."css-select-base-adapter-0.1.1" - (sources."css-tree-1.0.0-alpha.37" // { - dependencies = [ - sources."source-map-0.6.1" + sources."ajv-keywords-5.1.0" + sources."schema-utils-4.0.0" ]; }) + sources."css-select-4.3.0" + sources."css-tree-1.1.3" sources."css-what-6.1.0" sources."cssesc-3.0.0" - sources."cssnano-4.1.11" - sources."cssnano-preset-default-4.0.8" - sources."cssnano-util-get-arguments-4.0.0" - sources."cssnano-util-get-match-4.0.0" - sources."cssnano-util-raw-cache-4.0.1" - sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.2.0" // { - dependencies = [ - sources."css-tree-1.1.3" - sources."mdn-data-2.0.14" - sources."source-map-0.6.1" - ]; - }) - sources."cyclist-1.0.1" + sources."cssnano-5.1.14" + sources."cssnano-preset-default-5.2.13" + sources."cssnano-utils-3.1.0" + sources."csso-4.2.0" sources."dag-map-1.0.2" sources."dateformat-3.0.3" sources."debug-4.3.4" sources."decache-4.4.0" - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.2" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" ]; }) - sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."deepmerge-4.2.2" sources."default-gateway-4.2.0" sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.4" - sources."define-property-2.0.2" (sources."del-6.1.1" // { dependencies = [ sources."rimraf-3.0.2" @@ -104761,51 +105188,21 @@ in }) sources."delayed-stream-1.0.0" sources."depd-1.1.2" - sources."des.js-1.0.1" sources."destroy-1.2.0" sources."detect-node-2.1.0" - (sources."detect-port-alt-1.1.6" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."dir-glob-3.0.1" sources."dns-equal-1.0.0" - sources."dns-packet-1.3.4" - sources."dns-txt-2.0.2" + sources."dns-packet-5.4.0" sources."dom-converter-0.2.0" - (sources."dom-serializer-1.4.1" // { - dependencies = [ - sources."domhandler-4.3.1" - ]; - }) - sources."domain-browser-1.2.0" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" - sources."domhandler-3.3.0" + sources."domhandler-4.3.1" sources."domino-2.1.6" - (sources."domutils-2.8.0" // { - dependencies = [ - sources."domhandler-4.3.1" - ]; - }) + sources."domutils-2.8.0" sources."dot-case-3.0.4" - sources."dot-prop-5.3.0" - sources."duplexer-0.1.2" sources."duplexer3-0.1.5" - sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."electron-to-chromium-1.4.284" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -104815,24 +105212,15 @@ in ]; }) sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.5.0" // { - dependencies = [ - sources."memory-fs-0.5.0" - ]; - }) + sources."enhanced-resolve-5.12.0" sources."entities-2.2.0" sources."env-editor-0.4.2" sources."eol-0.9.1" - sources."errno-0.1.8" - sources."error-ex-1.3.2" - sources."es-abstract-1.21.1" - sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.1" - sources."es-to-primitive-1.2.1" + sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" + sources."eslint-scope-5.1.1" sources."esprima-4.0.1" (sources."esrecurse-4.3.0" // { dependencies = [ @@ -104844,8 +105232,6 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."events-3.3.0" - sources."eventsource-1.1.2" - sources."evp_bytestokey-1.0.3" sources."exec-async-2.2.0" (sources."execa-1.0.0" // { dependencies = [ @@ -104853,29 +105239,9 @@ in sources."is-stream-1.1.0" ]; }) - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) (sources."expo-47.0.13" // { dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" (sources."@expo/config-7.0.3" // { dependencies = [ sources."semver-7.3.2" @@ -104949,36 +105315,15 @@ in sources."statuses-1.4.0" ]; }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" - sources."faye-websocket-0.10.0" + sources."faye-websocket-0.11.4" sources."fbemitter-3.0.0" sources."fbjs-3.0.4" sources."fbjs-css-vars-1.0.2" sources."fetch-retry-4.1.1" - sources."figgy-pudding-3.5.2" - (sources."file-loader-6.0.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-2.7.1" - ]; - }) - sources."file-uri-to-path-1.0.0" - sources."filesize-6.1.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -104992,195 +105337,86 @@ in sources."path-exists-3.0.0" ]; }) - sources."find-cache-dir-2.1.0" + sources."find-cache-dir-3.3.2" sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" - sources."flush-write-stream-1.1.1" sources."follow-redirects-1.15.2" sources."fontfaceobserver-2.3.0" - sources."for-each-0.3.3" - sources."for-in-1.0.2" - (sources."fork-ts-checker-webpack-plugin-4.1.6" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."chalk-2.4.2" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."micromatch-3.1.10" - sources."semver-5.7.1" - sources."to-regex-range-2.1.1" - ]; - }) sources."form-data-2.5.1" sources."forwarded-0.2.0" - sources."fragment-cache-0.2.1" sources."freeport-async-2.0.0" sources."fresh-0.5.2" - sources."from2-2.3.0" (sources."fs-extra-9.0.0" // { dependencies = [ sources."universalify-1.0.0" ]; }) sources."fs-minipass-2.1.0" - sources."fs-write-stream-atomic-1.0.10" + sources."fs-monkey-1.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-port-3.2.0" sources."get-stream-5.2.0" - sources."get-symbol-description-1.0.0" - sources."get-value-2.0.6" sources."getenv-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.2" - sources."global-modules-2.0.0" - sources."global-prefix-3.0.0" + sources."glob-to-regexp-0.4.1" sources."globals-11.12.0" - sources."globalthis-1.0.3" sources."globby-11.1.0" - sources."gopd-1.0.1" sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."graphql-15.8.0" sources."graphql-tag-2.12.6" - sources."gzip-size-5.1.1" sources."handle-thing-2.0.1" sources."has-1.0.3" - sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) sources."hasbin-1.2.3" - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."hash.js-1.1.7" sources."hashids-1.1.4" sources."he-1.2.0" - sources."hex-color-regex-1.1.0" - sources."hmac-drbg-1.0.1" sources."hosted-git-info-3.0.8" sources."hpack.js-2.1.6" - sources."hsl-regex-1.0.0" - sources."hsla-regex-1.0.0" - sources."html-entities-1.4.0" - (sources."html-loader-1.1.0" // { + sources."html-entities-2.3.3" + (sources."html-minifier-terser-6.1.0" // { dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-2.7.1" + sources."commander-8.3.0" ]; }) - (sources."html-minifier-terser-5.1.1" // { - dependencies = [ - sources."commander-4.1.1" - ]; - }) - (sources."html-webpack-plugin-4.3.0" // { - dependencies = [ - sources."loader-utils-1.4.2" - ]; - }) - sources."htmlparser2-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."html-webpack-plugin-5.5.0" + sources."htmlparser2-6.1.0" + sources."http-cache-semantics-4.1.1" sources."http-deceiver-1.2.7" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" ]; }) + sources."http-parser-js-0.5.8" sources."http-proxy-1.18.1" - (sources."http-proxy-middleware-0.19.1" // { - dependencies = [ - sources."braces-2.3.2" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" - ]; - }) + sources."http-proxy-middleware-2.0.6" sources."http2-wrapper-1.0.3" - sources."https-browserify-1.0.0" sources."https-proxy-agent-5.0.1" + sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" - sources."icss-utils-4.1.1" - sources."ieee754-1.2.1" - sources."iferr-0.1.5" + sources."icss-utils-5.1.0" sources."ignore-5.2.4" - sources."image-size-1.0.2" - sources."immer-8.0.1" - (sources."import-fresh-2.0.0" // { - dependencies = [ - sources."resolve-from-3.0.0" - ]; - }) - sources."import-local-2.0.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."indexes-of-1.0.1" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-ip-4.3.0" - sources."internal-slot-1.0.4" sources."invariant-2.2.4" - sources."ip-1.1.8" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" - sources."is-absolute-url-2.1.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.1" - sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.7" - sources."is-color-stop-1.1.0" sources."is-core-module-2.11.0" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.5" - sources."is-descriptor-1.0.2" - sources."is-directory-0.3.1" sources."is-docker-2.2.1" - sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -105190,10 +105426,7 @@ in sources."is-glob-2.0.1" ]; }) - sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" - sources."is-number-object-1.0.7" - sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" (sources."is-path-in-cwd-2.1.0" // { dependencies = [ @@ -105201,7 +105434,7 @@ in ]; }) sources."is-path-inside-3.0.3" - sources."is-plain-object-2.0.4" + sources."is-plain-obj-3.0.0" sources."is-port-reachable-2.0.1" (sources."is-reachable-4.0.0" // { dependencies = [ @@ -105226,25 +105459,16 @@ in sources."responselike-1.0.2" ]; }) - sources."is-regex-1.1.4" - sources."is-resolvable-1.1.0" sources."is-root-2.1.0" - sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" sources."is-valid-path-0.1.1" - sources."is-weakref-1.0.2" - sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" - (sources."jest-worker-26.6.2" // { + (sources."jest-worker-27.5.1" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."supports-color-8.1.1" ]; }) sources."jimp-compact-0.16.1" @@ -105258,7 +105482,7 @@ in }) sources."jsesc-2.5.2" sources."json-buffer-3.0.1" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" (sources."json-schema-deref-sync-0.13.0" // { dependencies = [ sources."clone-2.1.2" @@ -105266,19 +105490,16 @@ in ]; }) sources."json-schema-traverse-1.0.0" - sources."json3-3.3.3" sources."json5-1.0.2" sources."jsonfile-6.1.0" sources."keychain-1.3.0" sources."keyv-4.5.2" - sources."killable-1.0.1" - sources."kind-of-6.0.3" sources."kleur-3.0.3" - sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" sources."leven-3.1.0" + sources."lilconfig-2.0.6" sources."lines-and-columns-1.2.4" - sources."loader-runner-2.4.0" + sources."loader-runner-4.3.0" (sources."loader-utils-2.0.4" // { dependencies = [ sources."json5-2.2.3" @@ -105295,60 +105516,40 @@ in sources."chalk-2.4.2" ]; }) - sources."loglevel-1.8.1" sources."loose-envify-1.4.0" sources."lower-case-2.0.2" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" - (sources."make-dir-2.1.0" // { + (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" sources."md5-2.3.0" sources."md5-file-3.2.3" - sources."md5.js-1.3.5" sources."md5hex-1.0.0" - sources."mdn-data-2.0.4" + sources."mdn-data-2.0.14" sources."media-typer-0.3.0" + sources."memfs-3.4.13" sources."memory-cache-0.2.0" - sources."memory-fs-0.4.1" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - (sources."metro-react-native-babel-preset-0.72.3" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.12" - sources."json5-2.2.3" - sources."semver-6.3.0" - ]; - }) - sources."microevent.ts-0.1.1" + sources."metro-react-native-babel-preset-0.72.3" sources."micromatch-4.0.5" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."mime-2.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - (sources."mini-css-extract-plugin-0.5.0" // { + (sources."mini-css-extract-plugin-2.7.2" // { dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-1.4.2" - sources."schema-utils-1.0.0" + sources."ajv-keywords-5.1.0" + sources."schema-utils-4.0.0" ]; }) sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" sources."minipass-3.1.6" @@ -105356,25 +105557,12 @@ in sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minizlib-2.1.2" - sources."mississippi-3.0.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."mkdirp-0.5.6" - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) sources."ms-2.1.2" - sources."multicast-dns-6.2.3" - sources."multicast-dns-service-types-1.1.0" + sources."multicast-dns-7.2.5" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nan-2.17.0" - sources."nanomatch-1.2.13" + sources."nanoid-3.3.4" sources."ncp-2.0.0" (sources."needle-2.9.1" // { dependencies = [ @@ -105388,13 +105576,8 @@ in sources."no-case-3.0.4" sources."node-fetch-2.6.8" sources."node-forge-0.10.0" - sources."node-html-parser-1.4.9" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."path-browserify-0.0.1" - sources."punycode-1.4.1" - ]; - }) + sources."node-gyp-build-4.6.0" + sources."node-html-parser-5.4.2" sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" @@ -105408,40 +105591,13 @@ in sources."nth-check-2.1.1" sources."nullthrows-1.1.1" sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) sources."object-inspect-1.12.3" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.4" - sources."object.entries-1.1.6" - sources."object.getownpropertydescriptors-2.1.5" - sources."object.pick-1.3.0" - sources."object.values-1.1.6" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-8.4.0" - (sources."opn-5.5.0" // { - dependencies = [ - sources."is-wsl-1.1.0" - ]; - }) - sources."optimize-css-assets-webpack-plugin-5.0.8" (sources."ora-3.4.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -105449,7 +105605,6 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -105492,23 +105647,16 @@ in sources."semver-6.3.0" ]; }) - sources."pako-1.0.11" - sources."parallel-transform-1.2.0" sources."param-case-3.0.4" - sources."parse-asn1-5.1.6" - sources."parse-json-4.0.0" sources."parse-png-2.1.0" - sources."parse-srcset-1.0.2" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" - sources."pascalcase-0.1.1" (sources."password-prompt-1.1.2" // { dependencies = [ sources."ansi-escapes-3.2.0" ]; }) sources."path-browserify-1.0.1" - sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -105516,20 +105664,18 @@ in sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."pbkdf2-3.1.2" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pirates-4.0.5" - (sources."pkg-dir-3.0.0" // { + (sources."pkg-dir-4.2.0" // { dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" + sources."p-locate-4.1.0" ]; }) (sources."pkg-up-3.1.0" // { @@ -105547,133 +105693,43 @@ in ]; }) sources."pngjs-3.4.0" - sources."pnp-webpack-plugin-1.7.0" - (sources."portfinder-1.0.32" // { - dependencies = [ - sources."async-2.6.4" - sources."debug-3.2.7" - ]; - }) - sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.39" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."postcss-calc-7.0.5" - (sources."postcss-colormin-4.0.3" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-convert-values-4.0.1" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-discard-comments-4.0.2" - sources."postcss-discard-duplicates-4.0.2" - sources."postcss-discard-empty-4.0.1" - sources."postcss-discard-overridden-4.0.1" - (sources."postcss-merge-longhand-4.0.11" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-merge-rules-4.0.3" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - (sources."postcss-minify-font-values-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-minify-gradients-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-minify-params-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-minify-selectors-4.0.2" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - sources."postcss-modules-extract-imports-2.0.0" - sources."postcss-modules-local-by-default-3.0.3" - sources."postcss-modules-scope-2.2.0" - sources."postcss-modules-values-3.0.0" - sources."postcss-normalize-charset-4.0.1" - (sources."postcss-normalize-display-values-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-positions-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-repeat-style-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-string-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-timing-functions-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-unicode-4.0.1" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-url-4.0.1" // { - dependencies = [ - sources."normalize-url-3.3.0" - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-whitespace-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-ordered-values-4.1.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-reduce-initial-4.0.3" - (sources."postcss-reduce-transforms-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-safe-parser-4.0.2" + sources."postcss-8.4.21" + sources."postcss-calc-8.2.4" + sources."postcss-colormin-5.3.0" + sources."postcss-convert-values-5.1.3" + sources."postcss-discard-comments-5.1.2" + sources."postcss-discard-duplicates-5.1.0" + sources."postcss-discard-empty-5.1.1" + sources."postcss-discard-overridden-5.1.0" + sources."postcss-merge-longhand-5.1.7" + sources."postcss-merge-rules-5.1.3" + sources."postcss-minify-font-values-5.1.0" + sources."postcss-minify-gradients-5.1.1" + sources."postcss-minify-params-5.1.4" + sources."postcss-minify-selectors-5.2.1" + sources."postcss-modules-extract-imports-3.0.0" + sources."postcss-modules-local-by-default-4.0.0" + sources."postcss-modules-scope-3.0.0" + sources."postcss-modules-values-4.0.0" + sources."postcss-normalize-charset-5.1.0" + sources."postcss-normalize-display-values-5.1.0" + sources."postcss-normalize-positions-5.1.1" + sources."postcss-normalize-repeat-style-5.1.1" + sources."postcss-normalize-string-5.1.0" + sources."postcss-normalize-timing-functions-5.1.0" + sources."postcss-normalize-unicode-5.1.1" + sources."postcss-normalize-url-5.1.0" + sources."postcss-normalize-whitespace-5.1.1" + sources."postcss-ordered-values-5.1.3" + sources."postcss-reduce-initial-5.1.1" + sources."postcss-reduce-transforms-5.1.0" sources."postcss-selector-parser-6.0.11" - (sources."postcss-svgo-4.0.3" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-unique-selectors-4.0.1" + sources."postcss-svgo-5.1.0" + sources."postcss-unique-selectors-5.1.1" sources."postcss-value-parser-4.2.0" sources."prepend-http-3.0.1" sources."pretty-bytes-5.6.0" - sources."pretty-error-2.1.2" + sources."pretty-error-4.0.0" (sources."pretty-format-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -105682,68 +105738,23 @@ in ]; }) sources."probe-image-size-6.0.0" - sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" sources."promise-inflight-1.0.1" sources."prompts-2.4.2" sources."proxy-addr-2.0.7" - sources."prr-1.0.1" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) - sources."punycode-2.2.0" - sources."q-1.5.1" + sources."punycode-2.3.0" sources."qrcode-terminal-0.11.0" sources."qs-6.7.0" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" - sources."queue-6.0.2" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - (sources."react-dev-utils-11.0.4" // { - dependencies = [ - sources."browserslist-4.14.2" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."cross-spawn-7.0.3" - sources."escape-string-regexp-2.0.0" - sources."find-up-4.1.0" - sources."globby-11.0.1" - sources."json5-2.2.3" - sources."loader-utils-2.0.0" - sources."locate-path-5.0.0" - sources."node-releases-1.1.77" - sources."open-7.4.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."path-key-3.1.1" - sources."prompts-2.4.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."strip-ansi-6.0.0" - sources."which-2.0.2" - ]; - }) - sources."react-error-overlay-6.0.11" sources."react-is-17.0.2" sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" @@ -105754,17 +105765,10 @@ in ]; }) sources."readdirp-3.6.0" - (sources."recursive-readdir-2.2.2" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.1.0" sources."regenerator-runtime-0.13.11" sources."regenerator-transform-0.15.1" - sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.3" sources."regexpu-core-5.2.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -105775,21 +105779,9 @@ in ]; }) sources."relateurl-0.2.7" - sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" - (sources."renderkid-2.0.7" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."domhandler-4.3.1" - sources."htmlparser2-6.1.0" - sources."strip-ansi-3.0.1" - ]; - }) - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."require-directory-2.1.1" + sources."renderkid-3.0.0" sources."require-from-string-2.0.2" - sources."require-main-filename-2.0.0" (sources."requireg-0.2.2" // { dependencies = [ sources."resolve-1.7.1" @@ -105799,43 +105791,34 @@ in sources."reselect-4.1.7" sources."resolve-1.22.1" sources."resolve-alpn-1.2.1" - (sources."resolve-cwd-2.0.0" // { - dependencies = [ - sources."resolve-from-3.0.0" - ]; - }) sources."resolve-from-5.0.0" - sources."resolve-url-0.2.1" sources."responselike-2.0.1" sources."restore-cursor-2.0.0" - sources."ret-0.1.15" sources."retry-0.12.0" sources."reusify-1.0.4" - sources."rgb-regex-1.0.1" - sources."rgba-regex-1.0.0" (sources."rimraf-2.4.5" // { dependencies = [ sources."glob-6.0.4" ]; }) - sources."ripemd160-2.0.2" sources."router-ips-1.0.0" sources."run-parallel-1.2.0" - sources."run-queue-1.0.3" sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" - sources."safe-regex-1.1.0" - sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - (sources."schema-utils-3.1.1" // { + (sources."schema-utils-2.7.1" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" ]; }) sources."select-hose-2.0.0" - sources."selfsigned-1.10.14" + (sources."selfsigned-2.1.1" // { + dependencies = [ + sources."node-forge-1.3.1" + ]; + }) sources."semver-7.3.2" (sources."send-0.18.0" // { dependencies = [ @@ -105855,7 +105838,7 @@ in ]; }) sources."serialize-error-6.0.0" - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-6.0.1" (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" @@ -105878,18 +105861,10 @@ in sources."statuses-1.4.0" ]; }) - sources."set-blocking-2.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" - sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.2" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" (sources."simple-plist-1.4.0" // { @@ -105897,60 +105872,23 @@ in sources."bplist-parser-0.3.2" ]; }) - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."slugify-1.6.5" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."sockjs-0.3.20" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - (sources."sockjs-client-1.4.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."faye-websocket-0.11.4" - ]; - }) + sources."sockjs-0.3.24" sources."source-list-map-2.0.1" - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-support-0.4.18" - sources."source-map-url-0.4.1" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + (sources."source-map-loader-3.0.2" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) + (sources."source-map-support-0.4.18" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -105958,42 +105896,18 @@ in ]; }) sources."split-1.0.1" - sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."stable-0.1.8" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."statuses-1.5.0" - sources."stream-browserify-2.0.2" sources."stream-buffers-2.2.0" - sources."stream-each-1.2.3" - sources."stream-http-2.8.3" (sources."stream-parser-0.3.1" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) - sources."stream-shift-1.0.1" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.6" - sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -106001,20 +105915,11 @@ in }) sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."structured-headers-0.4.1" - (sources."style-loader-1.2.1" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-2.7.1" - ]; - }) - (sources."stylehacks-4.0.3" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) + sources."style-loader-3.3.1" + sources."stylehacks-5.1.1" (sources."sucrase-3.29.0" // { dependencies = [ sources."commander-4.1.1" @@ -106029,22 +105934,12 @@ in ]; }) sources."supports-preserve-symlinks-flag-1.0.0" - (sources."svgo-1.3.2" // { + (sources."svgo-2.8.0" // { dependencies = [ - sources."chalk-2.4.2" - sources."css-select-2.1.0" - sources."css-what-3.4.2" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.3.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domutils-1.7.0" - sources."nth-check-1.0.2" + sources."commander-7.2.0" ]; }) - sources."tapable-1.1.3" + sources."tapable-2.2.1" (sources."tar-6.1.13" // { dependencies = [ sources."minipass-4.0.0" @@ -106060,269 +105955,133 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-4.8.1" // { + (sources."terser-5.16.1" // { dependencies = [ sources."commander-2.20.3" - sources."source-map-0.6.1" sources."source-map-support-0.5.21" ]; }) - (sources."terser-webpack-plugin-3.1.0" // { + (sources."terser-webpack-plugin-5.3.6" // { dependencies = [ sources."ajv-6.12.6" - sources."find-cache-dir-3.3.2" - sources."find-up-4.1.0" sources."json-schema-traverse-0.4.1" - sources."locate-path-5.0.0" - sources."make-dir-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."pkg-dir-4.2.0" - sources."schema-utils-2.7.1" - sources."semver-6.3.0" - sources."source-map-0.6.1" + sources."schema-utils-3.1.1" ]; }) sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."through-2.3.8" - sources."through2-2.0.5" sources."thunky-1.1.0" - sources."timers-browserify-2.0.12" - sources."timsort-0.3.0" sources."tmp-0.0.33" - sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."to-readable-stream-1.0.0" - sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tr46-0.0.3" sources."traverse-0.6.7" sources."tree-kill-1.2.2" sources."ts-interface-checker-0.1.13" - sources."ts-pnp-1.2.0" - sources."tslib-2.4.1" - sources."tty-browserify-0.0.0" + sources."tslib-2.5.0" sources."turndown-7.0.0" sources."type-fest-0.12.0" sources."type-is-1.6.18" - sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" - sources."ua-parser-js-0.7.32" - sources."unbox-primitive-1.0.2" + sources."ua-parser-js-0.7.33" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.1.0" sources."unicode-property-aliases-ecmascript-2.1.0" - sources."union-value-1.0.1" - sources."uniq-1.0.1" - sources."uniqs-2.0.0" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-1.0.0" sources."universalify-2.0.0" sources."unpipe-1.0.0" - sources."unquote-1.1.1" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) sources."untildify-3.0.3" - sources."upath-1.2.0" - (sources."update-browserslist-db-1.0.10" // { - dependencies = [ - sources."picocolors-1.0.0" - ]; - }) + sources."update-browserslist-db-1.0.10" sources."update-check-1.5.3" sources."uri-js-4.4.1" - sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-join-4.0.0" - sources."url-loader-4.1.1" sources."url-parse-1.5.10" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" ]; }) - sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."utila-0.4.0" sources."utils-merge-1.0.1" sources."uuid-8.3.2" sources."valid-url-1.0.9" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" - sources."vendors-1.0.4" - sources."vm-browserify-1.1.2" - sources."watchpack-1.7.5" - (sources."watchpack-chokidar2-2.0.1" // { - dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."normalize-path-2.1.1" - sources."readdirp-2.2.1" - sources."to-regex-range-2.1.1" - ]; - }) + sources."watchpack-2.4.0" sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - (sources."webpack-4.43.0" // { + (sources."webpack-5.75.0" // { dependencies = [ sources."ajv-6.12.6" - sources."braces-2.3.2" - sources."cacache-12.0.4" - sources."chownr-1.1.4" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."is-number-3.0.0" - sources."is-wsl-1.1.0" sources."json-schema-traverse-0.4.1" - sources."kind-of-3.2.2" - sources."loader-utils-1.4.2" - sources."lru-cache-5.1.1" - sources."micromatch-3.1.10" - sources."rimraf-2.7.1" - sources."schema-utils-1.0.0" - sources."source-map-0.6.1" - sources."ssri-6.0.2" - sources."terser-webpack-plugin-1.4.5" - sources."to-regex-range-2.1.1" - sources."yallist-3.1.1" + sources."schema-utils-3.1.1" + sources."webpack-sources-3.2.3" ]; }) - sources."webpack-dev-middleware-3.7.3" - (sources."webpack-dev-server-3.11.0" // { + (sources."webpack-dev-middleware-5.3.3" // { dependencies = [ - sources."ajv-6.12.6" - sources."ansi-regex-2.1.1" - sources."anymatch-2.0.0" - sources."array-union-1.0.2" - sources."binary-extensions-1.13.1" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."braces-2.3.2" + sources."ajv-keywords-5.1.0" + sources."schema-utils-4.0.0" + ]; + }) + (sources."webpack-dev-server-4.11.1" // { + dependencies = [ + sources."@types/retry-0.12.0" + sources."ajv-keywords-5.1.0" + sources."body-parser-1.20.1" sources."bytes-3.1.2" - sources."chokidar-2.1.8" sources."content-disposition-0.5.4" sources."cookie-0.5.0" - sources."del-4.1.1" + sources."cross-spawn-7.0.3" + sources."debug-2.6.9" + sources."default-gateway-6.0.3" sources."depd-2.0.0" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."globby-6.1.0" + sources."execa-5.1.1" + sources."express-4.18.2" + sources."finalhandler-1.2.0" + sources."get-stream-6.0.1" sources."http-errors-2.0.0" - sources."is-absolute-url-3.0.3" - sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."json-schema-traverse-0.4.1" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" + sources."ipaddr.js-2.0.1" + sources."mimic-fn-2.1.0" sources."ms-2.0.0" - sources."normalize-path-2.1.1" + sources."npm-run-path-4.0.1" sources."on-finished-2.4.1" - sources."p-map-2.1.0" - sources."p-retry-3.0.1" - sources."pify-2.3.0" + sources."onetime-5.1.2" + sources."p-retry-4.6.2" + sources."path-key-3.1.1" sources."qs-6.11.0" sources."raw-body-2.5.1" - sources."readdirp-2.2.1" - sources."rimraf-2.7.1" - sources."schema-utils-1.0.0" - sources."semver-6.3.0" + sources."retry-0.13.1" + sources."rimraf-3.0.2" + sources."schema-utils-4.0.0" sources."serve-static-1.15.0" sources."setprototypeof-1.2.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."statuses-2.0.1" - sources."strip-ansi-3.0.1" - sources."supports-color-6.1.0" - sources."to-regex-range-2.1.1" sources."toidentifier-1.0.1" + sources."which-2.0.2" ]; }) - (sources."webpack-log-2.0.0" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - (sources."webpack-manifest-plugin-2.2.0" // { - dependencies = [ - sources."fs-extra-7.0.1" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) - (sources."webpack-sources-1.4.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."websocket-driver-0.6.5" + sources."webpack-manifest-plugin-4.1.1" + sources."webpack-sources-2.3.1" + sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."whatwg-url-5.0.0" sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."which-module-2.0.0" - sources."which-typed-array-1.1.9" sources."widest-line-3.1.0" sources."with-open-file-0.1.7" sources."wonka-4.0.15" - sources."worker-farm-1.7.0" - sources."worker-rpc-0.1.1" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -106332,13 +106091,13 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-6.2.2" + sources."ws-8.12.0" (sources."xcode-3.0.1" // { dependencies = [ sources."uuid-7.0.3" ]; }) - (sources."xdl-59.3.0" // { + (sources."xdl-60.0.1" // { dependencies = [ sources."bplist-parser-0.3.2" sources."minimatch-3.0.4" @@ -106351,28 +106110,8 @@ in ]; }) sources."xmlbuilder-14.0.0" - sources."xtend-4.0.2" - sources."y18n-4.0.3" sources."yallist-4.0.0" - (sources."yargs-13.3.2" // { - dependencies = [ - sources."ansi-regex-4.1.1" - sources."emoji-regex-7.0.3" - sources."find-up-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - (sources."yargs-parser-13.1.2" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."yaml-1.10.2" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -106396,9 +106135,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -106416,17 +106155,17 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.20.7" sources."@babel/plugin-transform-parameters-7.20.7" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -106437,7 +106176,7 @@ in sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yauzl-2.10.0" sources."@types/yoga-layout-1.9.2" @@ -106465,7 +106204,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -106711,7 +106450,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.21" + sources."@oclif/command-1.8.22" sources."@oclif/config-1.18.6" sources."@oclif/errors-1.3.6" (sources."@oclif/help-1.0.5" // { @@ -106720,7 +106459,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.9" + sources."@oclif/parser-3.8.10" (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -106965,7 +106704,7 @@ in ]; }) sources."nice-try-1.0.5" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-fetch-2.6.8" sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" @@ -106992,7 +106731,7 @@ in sources."prettier-2.8.3" sources."process-nextick-args-2.0.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."query-string-5.1.1" sources."queue-microtask-1.2.3" @@ -107047,7 +106786,7 @@ in sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."treeify-1.1.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -107085,18 +106824,18 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "11.20.0"; + version = "11.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.20.0.tgz"; - sha512 = "jFDqWcYuydvHbx1uE1iDSx2pmqyIe2YuF7Jrf28HxU4VZyRPXII010v9OfT8cn5EJlA47WTDWuO2Fbx8EYPL7g=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.21.0.tgz"; + sha512 = "9J70y9E4t80rAGs9fvtTt2jhqMUNwOch0F7uqG/OQn6rRSkKGqpnaozUkCjRCmWaQi0bM8vYxruGyD0E+sqZlw=="; }; dependencies = [ - (sources."@apidevtools/json-schema-ref-parser-9.1.0" // { + (sources."@apidevtools/json-schema-ref-parser-9.1.2" // { dependencies = [ sources."js-yaml-4.1.0" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@gar/promisify-1.1.3" @@ -107104,7 +106843,7 @@ in sources."@google-cloud/precise-date-3.0.1" sources."@google-cloud/projectify-3.0.0" sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/pubsub-3.2.1" // { + (sources."@google-cloud/pubsub-3.3.0" // { dependencies = [ sources."google-auth-library-8.7.0" ]; @@ -107132,8 +106871,6 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."@types/duplexify-3.6.1" sources."@types/json-schema-7.0.11" @@ -107145,7 +106882,7 @@ in sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" @@ -107232,12 +106969,6 @@ in sources."minimatch-5.1.6" ]; }) - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" @@ -107260,7 +106991,6 @@ in sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" - sources."clone-response-1.0.3" (sources."color-3.2.1" // { dependencies = [ sources."color-convert-1.9.3" @@ -107329,12 +107059,10 @@ in sources."dashdash-1.14.1" sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.4" - sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.4" sources."defaults-1.0.4" - sources."defer-to-connect-1.1.3" sources."degenerator-3.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -107348,7 +107076,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."duplexer3-0.1.5" sources."duplexify-4.1.2" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" @@ -107455,8 +107182,7 @@ in sources."gaxios-5.0.2" sources."gcp-metadata-5.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" - sources."get-stream-4.1.0" + sources."get-intrinsic-1.2.0" (sources."get-uri-3.0.2" // { dependencies = [ sources."fs-extra-8.1.0" @@ -107484,7 +107210,6 @@ in ]; }) sources."google-p12-pem-4.0.1" - sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."gtoken-6.1.2" sources."har-schema-2.0.0" @@ -107495,7 +107220,7 @@ in sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."heap-js-2.2.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -107551,26 +107276,24 @@ in sources."jsbn-0.1.1" sources."jsdoc-3.6.11" sources."json-bigint-1.0.0" - sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" sources."json-ptr-3.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" - (sources."jsonwebtoken-8.5.1" // { + (sources."jsonwebtoken-9.0.0" // { dependencies = [ sources."jwa-1.4.1" sources."jws-3.2.2" + sources."semver-7.3.8" ]; }) sources."jsprim-1.4.2" sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-3.1.0" sources."klaw-3.0.0" sources."kuler-2.0.0" - sources."latest-version-5.1.0" (sources."lazystream-1.0.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -107590,20 +107313,13 @@ in sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" - sources."lodash.includes-4.3.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isinteger-4.0.4" - sources."lodash.isnumber-3.0.3" sources."lodash.isobject-2.4.1" sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.once-4.1.1" sources."lodash.snakecase-4.1.1" sources."lodash.union-4.6.0" sources."log-symbols-4.1.0" sources."logform-2.4.2" sources."long-4.0.0" - sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -107636,7 +107352,6 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" - sources."mimic-response-1.0.1" (sources."minimatch-3.1.2" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -107676,7 +107391,6 @@ in sources."node-gyp-build-4.6.0" sources."nopt-6.0.0" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" sources."npmlog-6.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -107692,17 +107406,10 @@ in sources."optionator-0.8.3" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" sources."p-defer-3.0.0" sources."p-map-4.0.0" sources."pac-proxy-agent-5.0.0" sources."pac-resolver-5.0.1" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."registry-auth-token-4.2.2" - sources."semver-6.3.0" - ]; - }) sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -107717,7 +107424,6 @@ in ]; }) sources."prelude-ls-1.1.2" - sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-breaker-6.0.0" @@ -107751,7 +107457,7 @@ in sources."proxy-from-env-1.1.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-2.1.1" sources."qs-6.11.0" sources."range-parser-1.2.1" @@ -107783,7 +107489,6 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."requizzle-0.2.4" - sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."retry-0.13.1" sources."retry-request-5.0.2" @@ -107871,7 +107576,6 @@ in sources."text-hex-1.0.0" sources."through-2.3.8" sources."tmp-0.2.1" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" @@ -107879,7 +107583,7 @@ in sources."tr46-0.0.3" sources."traverse-0.3.9" sources."triple-beam-1.3.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -107903,11 +107607,6 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) (sources."update-notifier-cjs-5.1.6" // { dependencies = [ sources."semver-7.3.8" @@ -107915,7 +107614,6 @@ in }) sources."uri-js-4.4.1" sources."url-join-0.0.1" - sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -108204,7 +107902,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."trim-newlines-4.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.21.3" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -108390,7 +108088,7 @@ in sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."querystring-0.2.1" sources."randombytes-2.1.0" @@ -108497,7 +108195,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" sources."balanced-match-1.0.2" @@ -108629,7 +108327,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."glob-7.2.3" (sources."glob-parent-3.1.0" // { @@ -109008,21 +108706,21 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.4.0.tgz"; - sha512 = "3b6PGhv89mtIabur6Al7O/0cDoazgQfNjQzeKqsboRyaZCanJZsZnk6mDaHBYBSUfq6M+8TQWZvNlvxnF2kwig=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.5.0.tgz"; + sha512 = "BLWk1iw7f4XCAWiRXfrINPgqBHLbCrNff7tkvAMnyJt6l2IwbwxQVA0zcZ6TRGC3mJQH+tU6JDH9OPlnW2yDsw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -109049,19 +108747,19 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-syntax-typescript-7.20.0" - sources."@babel/plugin-transform-typescript-7.20.7" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/preset-typescript-7.18.6" - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" @@ -109121,7 +108819,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109158,7 +108856,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.9.0" - sources."create-gatsby-3.4.0" + sources."create-gatsby-3.5.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -109214,22 +108912,10 @@ in sources."find-up-4.1.0" sources."form-data-3.0.1" sources."fs-exists-cached-1.0.0" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" sources."fs.realpath-1.0.0" - sources."gatsby-core-utils-4.4.0" - (sources."gatsby-telemetry-4.4.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."boxen-4.2.0" - sources."camelcase-5.3.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - sources."type-fest-0.8.1" - ]; - }) + sources."gatsby-core-utils-4.5.0" + sources."gatsby-telemetry-4.5.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" @@ -109239,6 +108925,7 @@ in sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."has-flag-3.0.0" + sources."hash-wasm-4.9.0" (sources."hosted-git-info-3.0.8" // { dependencies = [ sources."lru-cache-6.0.0" @@ -109246,7 +108933,7 @@ in ]; }) sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."human-signals-2.1.0" sources."iconv-lite-0.6.3" @@ -109295,7 +108982,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."ms-2.1.2" - sources."msgpackr-1.8.1" + sources."msgpackr-1.8.2" sources."msgpackr-extract-2.2.0" sources."mute-stream-0.0.8" sources."nice-try-1.0.5" @@ -109379,7 +109066,6 @@ in sources."strip-final-newline-2.0.0" sources."strtok3-6.3.0" sources."supports-color-5.5.0" - sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-fast-properties-2.0.0" @@ -109641,7 +109327,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" @@ -109696,7 +109382,7 @@ in sources."lru-cache-6.0.0" sources."make-fetch-happen-9.1.0" sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.5.0" + sources."mem-fs-editor-9.6.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -109878,7 +109564,7 @@ in sources."tr46-0.0.3" sources."treeverse-1.0.4" sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.8.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -110286,13 +109972,13 @@ in sources."filter-obj-1.1.0" sources."form-data-4.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."got-11.8.6" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."ieee754-1.2.1" sources."inherits-2.0.4" @@ -110380,7 +110066,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ajv-8.12.0" @@ -110514,7 +110200,7 @@ in sources."lru-cache-7.14.1" ]; }) - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" (sources."http2-wrapper-2.2.0" // { @@ -110619,7 +110305,7 @@ in ]; }) sources."proxy-from-env-1.1.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-3.1.0" sources."quick-lru-6.1.1" sources."raw-body-2.5.1" @@ -110686,9 +110372,9 @@ in sources."tmp-0.0.33" sources."toidentifier-1.0.1" sources."trim-newlines-4.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-check-0.3.2" - sources."type-fest-3.5.2" + sources."type-fest-3.5.3" sources."typedarray-to-buffer-3.1.5" sources."unique-string-3.0.0" sources."universalify-0.1.2" @@ -110704,7 +110390,7 @@ in sources."which-2.0.2" sources."widest-line-4.0.1" sources."word-wrap-1.2.3" - sources."wrap-ansi-8.0.1" + sources."wrap-ansi-8.1.0" sources."write-file-atomic-3.0.3" sources."xdg-basedir-5.1.0" sources."xregexp-2.0.0" @@ -111035,7 +110721,7 @@ in (sources."@graphql-tools/import-6.7.15" // { dependencies = [ sources."@graphql-tools/utils-9.1.4" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@graphql-tools/json-file-loader-6.2.6" // { @@ -111047,7 +110733,7 @@ in }) (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) ]; @@ -111063,7 +110749,7 @@ in dependencies = [ sources."@graphql-tools/merge-8.3.1" sources."@graphql-tools/utils-8.9.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@graphql-tools/url-loader-6.10.1" // { @@ -111224,7 +110910,7 @@ in sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -111255,7 +110941,7 @@ in sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-signature-1.2.0" sources."http2-client-1.3.5" sources."iconv-lite-0.4.24" @@ -111348,7 +111034,7 @@ in }) (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."lowercase-keys-1.0.1" @@ -111375,7 +111061,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."node-emoji-1.10.0" @@ -111434,7 +111120,7 @@ in sources."parse-json-5.2.0" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."passwd-user-3.0.0" @@ -111447,7 +111133,7 @@ in sources."prepend-http-2.0.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."queue-microtask-1.2.3" sources."rc-1.2.8" @@ -111565,10 +111251,10 @@ in graphql-language-service-cli = nodeEnv.buildNodePackage { name = "graphql-language-service-cli"; packageName = "graphql-language-service-cli"; - version = "3.3.14"; + version = "3.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.14.tgz"; - sha512 = "1jPvSEWMTNiro1Ao0wJV9ApMP4R0axnXKS0jTJqh+IsySgHBmO2suflPxewYdWMMv6StMqF9ITX5IXrW9E7bbw=="; + url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.15.tgz"; + sha512 = "YIWyxOxvrvcXb+IzkmMEtH22Uor4SKGl6E27xaMS2IkVpZtaEgwXeN7kEPFVeSn6I3fCahdMVtfz70IL4tWGxw=="; }; dependencies = [ sources."@ardatan/sync-fetch-0.0.1" @@ -111576,25 +111262,29 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/polyfill-7.12.1" sources."@babel/types-7.20.7" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" sources."@graphql-tools/batch-execute-8.5.15" - sources."@graphql-tools/delegate-9.0.22" + (sources."@graphql-tools/delegate-9.0.23" // { + dependencies = [ + sources."tslib-2.4.1" + ]; + }) sources."@graphql-tools/executor-0.0.12" - sources."@graphql-tools/executor-graphql-ws-0.0.6" + sources."@graphql-tools/executor-graphql-ws-0.0.7" sources."@graphql-tools/executor-http-0.1.1" sources."@graphql-tools/executor-legacy-ws-0.0.6" sources."@graphql-tools/graphql-file-loader-7.5.14" sources."@graphql-tools/import-6.7.15" sources."@graphql-tools/json-file-loader-7.4.15" - sources."@graphql-tools/load-7.8.9" - sources."@graphql-tools/merge-8.3.15" - sources."@graphql-tools/schema-9.0.13" - sources."@graphql-tools/url-loader-7.17.2" + sources."@graphql-tools/load-7.8.10" + sources."@graphql-tools/merge-8.3.16" + sources."@graphql-tools/schema-9.0.14" + sources."@graphql-tools/url-loader-7.17.4" sources."@graphql-tools/utils-9.1.4" - sources."@graphql-tools/wrap-9.3.1" + sources."@graphql-tools/wrap-9.3.2" sources."@graphql-typed-document-node/core-3.1.1" sources."@iarna/toml-2.2.5" sources."@nodelib/fs.scandir-2.1.5" @@ -111670,8 +111360,8 @@ in sources."minimatch-4.2.1" ]; }) - sources."graphql-language-service-5.1.0" - sources."graphql-language-service-server-2.9.4" + sources."graphql-language-service-5.1.1" + sources."graphql-language-service-server-2.9.5" sources."graphql-ws-5.11.2" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" @@ -111701,7 +111391,7 @@ in sources."minimatch-3.1.2" sources."mkdirp-1.0.4" sources."nanoid-3.3.4" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-domexception-1.0.0" sources."node-fetch-2.6.8" sources."node-gyp-build-4.6.0" @@ -111740,12 +111430,12 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."ts-node-9.1.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typescript-4.9.4" - sources."undici-5.15.0" + sources."undici-5.16.0" sources."unixify-1.0.0" sources."urlpattern-polyfill-6.0.2" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."value-or-promise-1.0.12" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" @@ -111808,9 +111498,13 @@ in sources."@cronvel/get-pixels-3.4.1" sources."@cspotcode/source-map-support-0.8.1" sources."@graphql-tools/batch-execute-8.5.15" - sources."@graphql-tools/delegate-9.0.22" + (sources."@graphql-tools/delegate-9.0.23" // { + dependencies = [ + sources."tslib-2.4.1" + ]; + }) sources."@graphql-tools/executor-0.0.12" - (sources."@graphql-tools/executor-graphql-ws-0.0.6" // { + (sources."@graphql-tools/executor-graphql-ws-0.0.7" // { dependencies = [ sources."isomorphic-ws-5.0.0" sources."ws-8.12.0" @@ -111826,17 +111520,17 @@ in sources."@graphql-tools/graphql-file-loader-7.5.14" sources."@graphql-tools/import-6.7.15" sources."@graphql-tools/json-file-loader-7.4.15" - sources."@graphql-tools/load-7.8.9" - sources."@graphql-tools/merge-8.3.15" - sources."@graphql-tools/schema-9.0.13" - (sources."@graphql-tools/url-loader-7.17.2" // { + sources."@graphql-tools/load-7.8.10" + sources."@graphql-tools/merge-8.3.16" + sources."@graphql-tools/schema-9.0.14" + (sources."@graphql-tools/url-loader-7.17.4" // { dependencies = [ sources."isomorphic-ws-5.0.0" sources."ws-8.12.0" ]; }) sources."@graphql-tools/utils-9.1.4" - sources."@graphql-tools/wrap-9.3.1" + sources."@graphql-tools/wrap-9.3.2" sources."@graphql-typed-document-node/core-3.1.1" sources."@iarna/toml-2.2.5" sources."@jridgewell/resolve-uri-3.1.0" @@ -111849,7 +111543,7 @@ in sources."@oclif/config-1.17.0" sources."@oclif/errors-1.3.4" sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.9" // { + (sources."@oclif/parser-3.8.10" // { dependencies = [ sources."@oclif/errors-1.3.6" ]; @@ -111878,18 +111572,18 @@ in sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -111900,7 +111594,7 @@ in sources."@whatwg-node/fetch-0.6.2" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.1" @@ -112174,16 +111868,16 @@ in sources."tree-kit-0.7.4" sources."treeify-1.1.0" sources."ts-node-10.9.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-is-1.6.18" sources."typescript-4.9.4" - sources."undici-5.15.0" + sources."undici-5.16.0" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" sources."unpipe-1.0.0" sources."urlpattern-polyfill-6.0.2" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."utils-merge-1.0.1" sources."v8-compile-cache-lib-3.0.1" sources."value-or-promise-1.0.12" @@ -112343,7 +112037,7 @@ in sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-symbols-1.0.3" sources."http-errors-2.0.0" @@ -112516,7 +112210,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.17.3" + sources."systeminformation-5.17.4" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -112579,7 +112273,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-done-1.3.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-settle-1.0.0" sources."atob-2.1.2" sources."bach-1.2.0" @@ -112718,7 +112412,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."glob-7.2.3" (sources."glob-parent-3.1.0" // { @@ -113129,7 +112823,7 @@ in sources."fragment-cache-0.2.1" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -113500,7 +113194,7 @@ in sources."eventemitter3-4.0.7" sources."follow-redirects-1.15.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.3" @@ -113540,27 +113234,39 @@ in hsd = nodeEnv.buildNodePackage { name = "hsd"; packageName = "hsd"; - version = "4.0.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hsd/-/hsd-4.0.1.tgz"; - sha512 = "5kb4Cp3/XjrFLmUZxl0tQxqVfmFxfrfys1sT9jmUK/Aq/tw+6/GkRGJjgrdTuzRL48zLrczOwL7/Q2e3Ufg2vA=="; + url = "https://registry.npmjs.org/hsd/-/hsd-5.0.1.tgz"; + sha512 = "G+4iLhKHEEOHYbk/VEvkVO4oNn1rVlH8N3LdsbH+sYZQo8qJTVP5Zwtz1pMa4vWLzA3mjrFSGG3nBFYoIJHpMQ=="; }; dependencies = [ sources."bcfg-0.1.7" - sources."bcrypto-5.4.0" + (sources."bcrypto-5.4.0" // { + dependencies = [ + sources."bufio-1.0.7" + ]; + }) sources."bcurl-0.2.0" sources."bdb-1.4.0" sources."bdns-0.1.5" sources."bevent-0.1.5" sources."bfile-0.2.2" - sources."bfilter-1.0.5" + (sources."bfilter-1.0.5" // { + dependencies = [ + sources."bufio-1.0.7" + ]; + }) sources."bheep-0.1.5" sources."binet-0.3.7" sources."blgr-0.2.0" sources."blru-0.1.6" sources."blst-0.1.5" sources."bmutex-0.1.6" - sources."bns-0.15.0" + (sources."bns-0.15.0" // { + dependencies = [ + sources."bufio-1.0.7" + ]; + }) sources."brq-0.1.8" sources."bs32-0.1.6" sources."bsert-0.0.10" @@ -113569,9 +113275,9 @@ in sources."btcp-0.1.5" sources."budp-0.1.6" sources."buffer-map-0.0.7" - sources."bufio-1.0.7" + sources."bufio-1.2.0" sources."bupnp-0.2.6" - sources."bval-0.1.6" + sources."bval-0.1.7" sources."bweb-0.1.12" sources."goosig-0.10.0" sources."hs-client-0.0.13" @@ -113579,7 +113285,7 @@ in sources."mrmr-0.1.10" sources."n64-0.2.10" sources."unbound-0.4.3" - sources."urkel-1.0.2" + sources."urkel-1.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -113725,7 +113431,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1296.0" + sources."aws-sdk-2.1304.0" sources."aws-sign2-0.7.0" sources."aws4-1.12.0" sources."base64-js-1.5.1" @@ -113775,7 +113481,7 @@ in sources."form-data-2.3.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."gopd-1.0.1" sources."har-schema-2.0.0" @@ -113890,7 +113596,7 @@ in sources."strip-ansi-6.0.1" (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."tunnel-agent-0.6.0" @@ -113899,7 +113605,7 @@ in sources."underscore-1.12.1" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."url-0.10.3" @@ -114113,7 +113819,7 @@ in sources."process-nextick-args-2.0.1" sources."promise-7.3.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."rc-1.2.8" @@ -114174,7 +113880,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites"; - homepage = "https://github.com/remy/inliner"; + homepage = "http://github.com/remy/inliner"; license = "MIT"; }; production = true; @@ -114247,10 +113953,10 @@ in immich = nodeEnv.buildNodePackage { name = "immich"; packageName = "immich"; - version = "0.28.0"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/immich/-/immich-0.28.0.tgz"; - sha512 = "Dz/z1OBeB4r9PJY1Owzk6JQZVHjPja8rx7icUuPIGXaAajohO5mjgE0/j+/846Of5X1P5wQW6aIS3Y3QCA1v8A=="; + url = "https://registry.npmjs.org/immich/-/immich-0.30.0.tgz"; + sha512 = "G+Kv+tYTruxAkUL4sZet51Bee4foJS7zl2igAn80S4nZEb0ATiiQhnzaMDO6zBOfxxtsaU/CD7tlrsRI8nvHIw=="; }; dependencies = [ sources."@ffprobe-installer/darwin-arm64-5.0.1" @@ -114314,7 +114020,7 @@ in sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-5.5.0" - sources."systeminformation-5.17.3" + sources."systeminformation-5.17.4" sources."util-deprecate-1.0.2" sources."which-2.0.2" sources."wrappy-1.0.2" @@ -114472,7 +114178,7 @@ in ]; }) sources."@types/tunnel-0.0.3" - sources."@vscode/l10n-0.0.10" + sources."@vscode/l10n-0.0.11" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -114635,7 +114341,7 @@ in sources."protobufjs-7.1.2" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -114684,7 +114390,7 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-4.1.2" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."turndown-7.1.1" @@ -114697,8 +114403,8 @@ in sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."verror-1.10.0" - sources."vscode-css-languageservice-6.2.1" - sources."vscode-html-languageservice-5.0.3" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" @@ -114751,7 +114457,7 @@ in sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."astral-regex-2.0.0" @@ -114829,7 +114535,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-uri-3.0.2" sources."glob-7.2.3" @@ -115040,75 +114746,118 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v15.6.3.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v17.1.0.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "15.6.3"; + version = "17.1.0"; src = fetchurl { - name = "iosevka-15.6.3.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v15.6.3"; - sha256 = "38902065a20081dd240d06a47f238d4a9e04063eb1094337538c1d37d64581c7"; + name = "iosevka-17.1.0.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v17.1.0"; + sha256 = "99900713a323b5464c232118237f2ff303dc20d5c2b1b14e4dc93fd5b7df083b"; }; dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.8.0" - sources."@ot-builder/bin-composite-types-1.5.5" - sources."@ot-builder/bin-util-1.5.5" - sources."@ot-builder/cli-help-shower-1.5.5" - sources."@ot-builder/cli-proc-1.5.5" - sources."@ot-builder/cli-shared-1.5.5" - sources."@ot-builder/common-impl-1.5.5" - sources."@ot-builder/errors-1.5.5" - sources."@ot-builder/io-bin-cff-1.5.5" - sources."@ot-builder/io-bin-encoding-1.5.5" - sources."@ot-builder/io-bin-ext-private-1.5.5" - sources."@ot-builder/io-bin-font-1.5.5" - sources."@ot-builder/io-bin-glyph-store-1.5.5" - sources."@ot-builder/io-bin-layout-1.5.5" - sources."@ot-builder/io-bin-metadata-1.5.5" - sources."@ot-builder/io-bin-metric-1.5.5" - sources."@ot-builder/io-bin-name-1.5.5" - sources."@ot-builder/io-bin-sfnt-1.5.5" - sources."@ot-builder/io-bin-ttf-1.5.5" - sources."@ot-builder/io-bin-vtt-private-1.5.5" - sources."@ot-builder/ot-1.5.5" - sources."@ot-builder/ot-encoding-1.5.5" - sources."@ot-builder/ot-ext-private-1.5.5" - sources."@ot-builder/ot-glyphs-1.5.5" - sources."@ot-builder/ot-layout-1.5.5" - sources."@ot-builder/ot-metadata-1.5.5" - sources."@ot-builder/ot-name-1.5.5" - sources."@ot-builder/ot-sfnt-1.5.5" - sources."@ot-builder/ot-standard-glyph-namer-1.5.5" - sources."@ot-builder/ot-vtt-private-1.5.5" - sources."@ot-builder/prelude-1.5.5" - sources."@ot-builder/primitive-1.5.5" - sources."@ot-builder/rectify-1.5.5" - sources."@ot-builder/stat-glyphs-1.5.5" - sources."@ot-builder/trace-1.5.5" - sources."@ot-builder/var-store-1.5.5" - sources."@ot-builder/variance-1.5.5" + sources."@ot-builder/bin-composite-types-1.6.1" + sources."@ot-builder/bin-util-1.6.1" + sources."@ot-builder/cli-help-shower-1.6.1" + sources."@ot-builder/cli-proc-1.6.1" + sources."@ot-builder/cli-shared-1.6.1" + sources."@ot-builder/common-impl-1.6.1" + sources."@ot-builder/errors-1.6.1" + sources."@ot-builder/io-bin-cff-1.6.1" + sources."@ot-builder/io-bin-encoding-1.6.1" + sources."@ot-builder/io-bin-ext-private-1.6.1" + sources."@ot-builder/io-bin-font-1.6.1" + sources."@ot-builder/io-bin-glyph-store-1.6.1" + sources."@ot-builder/io-bin-layout-1.6.1" + sources."@ot-builder/io-bin-metadata-1.6.1" + sources."@ot-builder/io-bin-metric-1.6.1" + sources."@ot-builder/io-bin-name-1.6.1" + sources."@ot-builder/io-bin-sfnt-1.6.1" + sources."@ot-builder/io-bin-ttf-1.6.1" + sources."@ot-builder/io-bin-vtt-private-1.6.1" + sources."@ot-builder/ot-1.6.1" + sources."@ot-builder/ot-encoding-1.6.1" + sources."@ot-builder/ot-ext-private-1.6.1" + sources."@ot-builder/ot-glyphs-1.6.1" + sources."@ot-builder/ot-layout-1.6.1" + sources."@ot-builder/ot-metadata-1.6.1" + sources."@ot-builder/ot-name-1.6.1" + sources."@ot-builder/ot-sfnt-1.6.1" + sources."@ot-builder/ot-standard-glyph-namer-1.6.1" + sources."@ot-builder/ot-vtt-private-1.6.1" + sources."@ot-builder/prelude-1.6.1" + sources."@ot-builder/primitive-1.6.1" + sources."@ot-builder/rectify-1.6.1" + sources."@ot-builder/stat-glyphs-1.6.1" + sources."@ot-builder/trace-1.6.1" + sources."@ot-builder/var-store-1.6.1" + sources."@ot-builder/variance-1.6.1" sources."aglfn-1.0.2" sources."ansi-styles-4.3.0" sources."argparse-2.0.1" + sources."available-typed-arrays-1.0.5" + sources."call-bind-1.0.2" sources."chalk-4.1.2" sources."clipper-lib-6.4.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."deep-equal-2.2.0" + sources."define-properties-1.1.4" + sources."es-get-iterator-1.1.3" + sources."for-each-0.3.3" + sources."function-bind-1.1.1" + sources."functions-have-names-1.2.3" + sources."get-intrinsic-1.2.0" + sources."gopd-1.0.1" + sources."has-1.0.3" + sources."has-bigints-1.0.2" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" + sources."internal-slot-1.0.4" + sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" + sources."is-bigint-1.0.4" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.7" + sources."is-date-object-1.0.5" + sources."is-map-2.0.2" + sources."is-number-object-1.0.7" + sources."is-regex-1.1.4" + sources."is-set-2.0.2" + sources."is-shared-array-buffer-1.0.2" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" + sources."is-weakmap-2.0.1" + sources."is-weakset-2.0.2" + sources."isarray-2.0.5" sources."lru-cache-6.0.0" - sources."ot-builder-1.5.5" - sources."otb-ttc-bundle-1.5.5" + sources."object-inspect-1.12.3" + sources."object-is-1.1.5" + sources."object-keys-1.1.1" + sources."object.assign-4.1.4" + sources."ot-builder-1.6.1" + sources."otb-ttc-bundle-1.6.1" + sources."regexp.prototype.flags-1.4.3" sources."safer-buffer-2.1.2" sources."semver-7.3.8" + sources."side-channel-1.0.4" sources."spiro-3.0.0" + sources."stop-iteration-iterator-1.0.0" sources."supports-color-7.2.0" sources."toposort-2.0.2" - sources."tslib-2.4.1" - sources."typo-geom-0.12.1" - sources."uuid-8.3.2" + sources."tslib-2.5.0" + sources."typo-geom-0.13.0" + sources."uuid-9.0.0" sources."wawoff2-2.0.1" + sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" + sources."which-typed-array-1.1.9" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -115254,141 +115003,141 @@ in sha512 = "5kjhOG5a2BA4KOkWsfGG0qDbVXkOoYEC9h6tb6KY1zFQTJ7bdLCeR35eyPy5ANfKmHh4tzc1A5SWcnHM8j3hNw=="; }; dependencies = [ - (sources."@aws-crypto/crc32-2.0.0" // { + (sources."@aws-crypto/crc32-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/crc32c-2.0.0" // { + (sources."@aws-crypto/crc32c-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/ie11-detection-2.0.2" // { + (sources."@aws-crypto/ie11-detection-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/sha1-browser-2.0.0" // { + (sources."@aws-crypto/sha1-browser-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/sha256-browser-2.0.0" // { + (sources."@aws-crypto/sha256-browser-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/sha256-js-2.0.0" // { + (sources."@aws-crypto/sha256-js-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/supports-web-crypto-2.0.2" // { + (sources."@aws-crypto/supports-web-crypto-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/util-2.0.2" // { + (sources."@aws-crypto/util-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/abort-controller-3.226.0" + sources."@aws-sdk/abort-controller-3.257.0" sources."@aws-sdk/chunked-blob-reader-3.188.0" sources."@aws-sdk/chunked-blob-reader-native-3.208.0" - (sources."@aws-sdk/client-s3-3.252.0" // { + (sources."@aws-sdk/client-s3-3.259.0" // { dependencies = [ sources."fast-xml-parser-4.0.11" ]; }) - sources."@aws-sdk/client-sso-3.252.0" - sources."@aws-sdk/client-sso-oidc-3.252.0" - (sources."@aws-sdk/client-sts-3.252.0" // { + sources."@aws-sdk/client-sso-3.259.0" + sources."@aws-sdk/client-sso-oidc-3.259.0" + (sources."@aws-sdk/client-sts-3.259.0" // { dependencies = [ sources."fast-xml-parser-4.0.11" ]; }) - sources."@aws-sdk/config-resolver-3.234.0" - sources."@aws-sdk/credential-provider-env-3.226.0" - sources."@aws-sdk/credential-provider-imds-3.226.0" - sources."@aws-sdk/credential-provider-ini-3.252.0" - sources."@aws-sdk/credential-provider-node-3.252.0" - sources."@aws-sdk/credential-provider-process-3.226.0" - sources."@aws-sdk/credential-provider-sso-3.252.0" - sources."@aws-sdk/credential-provider-web-identity-3.226.0" - sources."@aws-sdk/eventstream-codec-3.226.0" - sources."@aws-sdk/eventstream-serde-browser-3.226.0" - sources."@aws-sdk/eventstream-serde-config-resolver-3.226.0" - sources."@aws-sdk/eventstream-serde-node-3.226.0" - sources."@aws-sdk/eventstream-serde-universal-3.226.0" - sources."@aws-sdk/fetch-http-handler-3.226.0" - sources."@aws-sdk/hash-blob-browser-3.226.0" - sources."@aws-sdk/hash-node-3.226.0" - sources."@aws-sdk/hash-stream-node-3.226.0" - sources."@aws-sdk/invalid-dependency-3.226.0" + sources."@aws-sdk/config-resolver-3.259.0" + sources."@aws-sdk/credential-provider-env-3.257.0" + sources."@aws-sdk/credential-provider-imds-3.259.0" + sources."@aws-sdk/credential-provider-ini-3.259.0" + sources."@aws-sdk/credential-provider-node-3.259.0" + sources."@aws-sdk/credential-provider-process-3.257.0" + sources."@aws-sdk/credential-provider-sso-3.259.0" + sources."@aws-sdk/credential-provider-web-identity-3.257.0" + sources."@aws-sdk/eventstream-codec-3.258.0" + sources."@aws-sdk/eventstream-serde-browser-3.258.0" + sources."@aws-sdk/eventstream-serde-config-resolver-3.257.0" + sources."@aws-sdk/eventstream-serde-node-3.258.0" + sources."@aws-sdk/eventstream-serde-universal-3.258.0" + sources."@aws-sdk/fetch-http-handler-3.257.0" + sources."@aws-sdk/hash-blob-browser-3.257.0" + sources."@aws-sdk/hash-node-3.257.0" + sources."@aws-sdk/hash-stream-node-3.257.0" + sources."@aws-sdk/invalid-dependency-3.257.0" sources."@aws-sdk/is-array-buffer-3.201.0" - sources."@aws-sdk/md5-js-3.226.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.226.0" - sources."@aws-sdk/middleware-content-length-3.226.0" - sources."@aws-sdk/middleware-endpoint-3.226.0" - sources."@aws-sdk/middleware-expect-continue-3.226.0" - sources."@aws-sdk/middleware-flexible-checksums-3.226.0" - sources."@aws-sdk/middleware-host-header-3.226.0" - sources."@aws-sdk/middleware-location-constraint-3.226.0" - sources."@aws-sdk/middleware-logger-3.226.0" - sources."@aws-sdk/middleware-recursion-detection-3.226.0" - (sources."@aws-sdk/middleware-retry-3.235.0" // { + sources."@aws-sdk/md5-js-3.258.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.259.0" + sources."@aws-sdk/middleware-content-length-3.257.0" + sources."@aws-sdk/middleware-endpoint-3.257.0" + sources."@aws-sdk/middleware-expect-continue-3.257.0" + sources."@aws-sdk/middleware-flexible-checksums-3.259.0" + sources."@aws-sdk/middleware-host-header-3.257.0" + sources."@aws-sdk/middleware-location-constraint-3.257.0" + sources."@aws-sdk/middleware-logger-3.257.0" + sources."@aws-sdk/middleware-recursion-detection-3.257.0" + (sources."@aws-sdk/middleware-retry-3.259.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.231.0" - sources."@aws-sdk/middleware-sdk-sts-3.226.0" - sources."@aws-sdk/middleware-serde-3.226.0" - sources."@aws-sdk/middleware-signing-3.226.0" - sources."@aws-sdk/middleware-ssec-3.226.0" - sources."@aws-sdk/middleware-stack-3.226.0" - sources."@aws-sdk/middleware-user-agent-3.226.0" - sources."@aws-sdk/node-config-provider-3.226.0" - sources."@aws-sdk/node-http-handler-3.226.0" - sources."@aws-sdk/property-provider-3.226.0" - sources."@aws-sdk/protocol-http-3.226.0" - sources."@aws-sdk/querystring-builder-3.226.0" - sources."@aws-sdk/querystring-parser-3.226.0" - sources."@aws-sdk/s3-request-presigner-3.252.0" - sources."@aws-sdk/service-error-classification-3.229.0" - sources."@aws-sdk/shared-ini-file-loader-3.226.0" - sources."@aws-sdk/signature-v4-3.226.0" - sources."@aws-sdk/signature-v4-crt-3.226.0" - sources."@aws-sdk/signature-v4-multi-region-3.226.0" - sources."@aws-sdk/smithy-client-3.234.0" - sources."@aws-sdk/token-providers-3.252.0" - sources."@aws-sdk/types-3.226.0" - sources."@aws-sdk/url-parser-3.226.0" + sources."@aws-sdk/middleware-sdk-s3-3.257.0" + sources."@aws-sdk/middleware-sdk-sts-3.257.0" + sources."@aws-sdk/middleware-serde-3.257.0" + sources."@aws-sdk/middleware-signing-3.257.0" + sources."@aws-sdk/middleware-ssec-3.257.0" + sources."@aws-sdk/middleware-stack-3.257.0" + sources."@aws-sdk/middleware-user-agent-3.257.0" + sources."@aws-sdk/node-config-provider-3.259.0" + sources."@aws-sdk/node-http-handler-3.257.0" + sources."@aws-sdk/property-provider-3.257.0" + sources."@aws-sdk/protocol-http-3.257.0" + sources."@aws-sdk/querystring-builder-3.257.0" + sources."@aws-sdk/querystring-parser-3.257.0" + sources."@aws-sdk/s3-request-presigner-3.259.0" + sources."@aws-sdk/service-error-classification-3.257.0" + sources."@aws-sdk/shared-ini-file-loader-3.257.0" + sources."@aws-sdk/signature-v4-3.257.0" + sources."@aws-sdk/signature-v4-crt-3.257.0" + sources."@aws-sdk/signature-v4-multi-region-3.257.0" + sources."@aws-sdk/smithy-client-3.257.0" + sources."@aws-sdk/token-providers-3.259.0" + sources."@aws-sdk/types-3.257.0" + sources."@aws-sdk/url-parser-3.257.0" sources."@aws-sdk/util-arn-parser-3.208.0" sources."@aws-sdk/util-base64-3.208.0" sources."@aws-sdk/util-body-length-browser-3.188.0" sources."@aws-sdk/util-body-length-node-3.208.0" sources."@aws-sdk/util-buffer-from-3.208.0" sources."@aws-sdk/util-config-provider-3.208.0" - sources."@aws-sdk/util-create-request-3.234.0" - sources."@aws-sdk/util-defaults-mode-browser-3.234.0" - sources."@aws-sdk/util-defaults-mode-node-3.234.0" - sources."@aws-sdk/util-endpoints-3.245.0" - sources."@aws-sdk/util-format-url-3.226.0" + sources."@aws-sdk/util-create-request-3.257.0" + sources."@aws-sdk/util-defaults-mode-browser-3.257.0" + sources."@aws-sdk/util-defaults-mode-node-3.259.0" + sources."@aws-sdk/util-endpoints-3.257.0" + sources."@aws-sdk/util-format-url-3.257.0" sources."@aws-sdk/util-hex-encoding-3.201.0" sources."@aws-sdk/util-locate-window-3.208.0" - sources."@aws-sdk/util-middleware-3.226.0" - sources."@aws-sdk/util-retry-3.229.0" - sources."@aws-sdk/util-stream-browser-3.226.0" - sources."@aws-sdk/util-stream-node-3.226.0" + sources."@aws-sdk/util-middleware-3.257.0" + sources."@aws-sdk/util-retry-3.257.0" + sources."@aws-sdk/util-stream-browser-3.258.0" + sources."@aws-sdk/util-stream-node-3.257.0" sources."@aws-sdk/util-uri-escape-3.201.0" - sources."@aws-sdk/util-user-agent-browser-3.226.0" - sources."@aws-sdk/util-user-agent-node-3.226.0" - sources."@aws-sdk/util-utf8-browser-3.188.0" - sources."@aws-sdk/util-utf8-node-3.208.0" - sources."@aws-sdk/util-waiter-3.226.0" + sources."@aws-sdk/util-user-agent-browser-3.257.0" + sources."@aws-sdk/util-user-agent-node-3.259.0" + sources."@aws-sdk/util-utf8-3.254.0" + sources."@aws-sdk/util-utf8-browser-3.259.0" + sources."@aws-sdk/util-waiter-3.257.0" sources."@aws-sdk/xml-builder-3.201.0" sources."@braintree/sanitize-url-6.0.2" sources."@cronvel/get-pixels-3.4.1" @@ -115497,13 +115246,13 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - (sources."aws-crt-1.15.7" // { + (sources."aws-crt-1.15.8" // { dependencies = [ sources."mkdirp-1.0.4" sources."tar-6.1.13" ]; }) - (sources."aws-sdk-2.1296.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -115611,8 +115360,8 @@ in ]; }) sources."cwise-compiler-1.1.3" - sources."d3-7.8.1" - sources."d3-array-3.2.1" + sources."d3-7.8.2" + sources."d3-array-3.2.2" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" @@ -115743,7 +115492,7 @@ in sources."fstream-1.0.12" sources."function-bind-1.1.1" sources."gauge-1.2.7" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-prototype-chain-1.0.1" sources."get-stdin-5.0.1" sources."getpass-0.1.7" @@ -115772,7 +115521,7 @@ in sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -115860,7 +115609,7 @@ in sources."isstream-0.1.2" sources."jmespath-0.16.0" sources."jpeg-js-0.4.4" - sources."js-sdsl-4.1.4" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" @@ -116052,7 +115801,7 @@ in sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."npmlog-1.2.1" - sources."number-allocator-1.0.12" + sources."number-allocator-1.0.14" sources."number-is-nan-1.0.1" sources."nwsapi-2.2.2" sources."oauth-sign-0.9.0" @@ -116101,7 +115850,7 @@ in sources."proper-lockfile-2.0.1" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.1.2" sources."qs-6.5.3" sources."query-string-4.3.4" @@ -116293,7 +116042,7 @@ in sources."tr46-1.0.1" sources."traverse-0.3.9" sources."tree-kit-0.7.4" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -116332,7 +116081,7 @@ in }) sources."url-join-0.0.1" sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -116456,7 +116205,7 @@ in sha512 = "tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg=="; }; dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@jsdoc/salty-0.2.3" sources."@types/linkify-it-3.0.2" sources."@types/markdown-it-12.2.3" @@ -116541,7 +116290,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "https://jshint.com/"; + homepage = "http://jshint.com/"; license = "MIT"; }; production = true; @@ -116632,7 +116381,7 @@ in sources."form-data-4.0.0" sources."formidable-2.1.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."graphlib-2.1.8" sources."has-1.0.3" sources."has-symbols-1.0.3" @@ -116650,7 +116399,7 @@ in sources."object-inspect-1.12.3" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -116737,7 +116486,7 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -116873,7 +116622,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -117008,7 +116757,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-base-0.3.0" @@ -117198,7 +116947,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -117442,7 +117191,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.21" + sources."@oclif/command-1.8.22" sources."@oclif/config-1.18.6" sources."@oclif/errors-1.3.6" (sources."@oclif/help-1.0.5" // { @@ -117451,7 +117200,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.9" + sources."@oclif/parser-3.8.10" (sources."@oclif/plugin-help-3.3.1" // { dependencies = [ sources."@oclif/config-1.18.2" @@ -117464,7 +117213,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.33.0" // { + (sources."@putdotio/api-client-8.33.1" // { dependencies = [ sources."axios-0.21.4" ]; @@ -117548,7 +117297,7 @@ in sources."form-data-3.0.1" sources."fs-extra-8.1.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."graceful-fs-4.2.10" @@ -117612,7 +117361,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pkg-up-3.1.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -117640,7 +117389,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-2.7.2" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" @@ -117757,7 +117506,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.10" @@ -117819,7 +117568,7 @@ in ]; }) sources."socket.io-adapter-2.4.0" - (sources."socket.io-parser-4.2.1" // { + (sources."socket.io-parser-4.2.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -117839,7 +117588,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."type-is-1.6.18" - sources."ua-parser-js-0.7.32" + sources."ua-parser-js-0.7.33" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utf-8-validate-5.0.10" @@ -117875,13 +117624,13 @@ in sources."@ampproject/remapping-2.2.0" sources."@babel/cli-7.20.7" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -117903,15 +117652,15 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" sources."@babel/node-7.20.7" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-syntax-jsx-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/register-7.18.9" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -117969,7 +117718,7 @@ in sources."abab-2.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -118016,7 +117765,7 @@ in sources."bufferutil-4.0.7" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."canvas-2.11.0" sources."chalk-2.4.2" sources."chardet-1.5.1" @@ -118038,7 +117787,7 @@ in sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -118103,7 +117852,7 @@ in sources."ms-2.0.0" ]; }) - sources."express-validator-6.14.2" + sources."express-validator-6.14.3" sources."fast-glob-3.2.12" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -118149,7 +117898,7 @@ in sources."gauge-3.0.2" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."github-from-package-0.0.0" sources."glob-7.2.3" @@ -118362,7 +118111,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pvtsutils-1.3.2" sources."pvutils-1.1.3" sources."qs-6.11.0" @@ -118458,7 +118207,7 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.1.2" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-is-1.6.18" @@ -118468,7 +118217,7 @@ in sources."unpipe-1.0.0" sources."update-browserslist-db-1.0.10" sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -118745,7 +118494,7 @@ in sources."prompt-1.0.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.7" sources."readable-stream-1.1.14" @@ -118984,7 +118733,7 @@ in sources."prelude-ls-1.1.2" sources."prompt-1.0.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.7" sources."readable-stream-1.1.14" @@ -119244,57 +118993,57 @@ in sources."@npmcli/package-json-2.0.0" sources."@npmcli/promise-spawn-3.0.0" sources."@npmcli/run-script-4.2.1" - sources."@nrwl/cli-15.5.2" - (sources."@nrwl/devkit-15.5.2" // { + sources."@nrwl/cli-15.6.3" + (sources."@nrwl/devkit-15.6.3" // { dependencies = [ sources."semver-7.3.4" ]; }) - sources."@nrwl/tao-15.5.2" - sources."@octokit/auth-token-3.0.2" - sources."@octokit/core-4.1.0" - (sources."@octokit/endpoint-7.0.3" // { + sources."@nrwl/tao-15.6.3" + sources."@octokit/auth-token-3.0.3" + sources."@octokit/core-4.2.0" + (sources."@octokit/endpoint-7.0.5" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-5.0.4" - sources."@octokit/openapi-types-14.0.0" + sources."@octokit/graphql-5.0.5" + sources."@octokit/openapi-types-16.0.0" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-5.0.1" + sources."@octokit/plugin-paginate-rest-6.0.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-6.7.0" - (sources."@octokit/request-6.2.2" // { + sources."@octokit/plugin-rest-endpoint-methods-7.0.1" + (sources."@octokit/request-6.2.3" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/request-error-3.0.2" - sources."@octokit/rest-19.0.5" - sources."@octokit/types-8.1.1" + sources."@octokit/request-error-3.0.3" + sources."@octokit/rest-19.0.7" + sources."@octokit/types-9.0.0" sources."@parcel/watcher-2.0.4" sources."@phenomnomnominal/tsquery-4.1.1" sources."@swc-node/core-1.9.2" sources."@swc-node/register-1.5.5" sources."@swc-node/sourcemap-support-0.2.3" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" sources."@tootallnate/once-2.0.0" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@yarnpkg/lockfile-1.1.0" - (sources."@yarnpkg/parsers-3.0.0-rc.35" // { + (sources."@yarnpkg/parsers-3.0.0-rc.36" // { dependencies = [ sources."argparse-1.0.10" sources."js-yaml-3.14.1" @@ -119326,7 +119075,7 @@ in sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."axios-1.2.3" + sources."axios-1.2.6" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" @@ -119501,7 +119250,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-3.0.8" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" @@ -119710,7 +119459,7 @@ in }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-15.5.2" // { + (sources."nx-15.6.3" // { dependencies = [ sources."cli-spinners-2.6.1" sources."fast-glob-3.2.7" @@ -119879,7 +119628,7 @@ in sources."strip-bom-3.0.0" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" @@ -119955,7 +119704,7 @@ in sources."sax-1.2.4" sources."semver-5.7.1" sources."source-map-0.6.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -120013,7 +119762,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."atob-2.1.2" (sources."base-0.11.2" // { dependencies = [ @@ -120346,7 +120095,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -120469,7 +120218,7 @@ in sources."fresh-0.5.2" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.5.0" @@ -120625,7 +120374,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -121315,7 +121064,7 @@ in sources."parse5-7.1.2" sources."parse5-htmlparser2-tree-adapter-7.0.0" sources."progress-2.0.3" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."supports-color-7.2.0" @@ -121337,13 +121086,13 @@ in src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.0.0" // { dependencies = [ sources."debug-3.2.7" ]; }) - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.20.14" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" (sources."@babel/helper-compilation-targets-7.20.7" // { @@ -121386,13 +121135,13 @@ in sources."@babel/template-7.20.7" ]; }) - (sources."@babel/helpers-7.20.7" // { + (sources."@babel/helpers-7.20.13" // { dependencies = [ sources."@babel/template-7.20.7" ]; }) sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.0.0" sources."@babel/plugin-proposal-json-strings-7.18.6" @@ -121409,7 +121158,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.11" + sources."@babel/plugin-transform-block-scoping-7.20.14" sources."@babel/plugin-transform-classes-7.20.7" (sources."@babel/plugin-transform-computed-properties-7.20.7" // { dependencies = [ @@ -121431,7 +121180,7 @@ in sources."@babel/plugin-transform-object-super-7.18.6" sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-react-jsx-self-7.18.6" sources."@babel/plugin-transform-react-jsx-source-7.19.6" sources."@babel/plugin-transform-regenerator-7.20.5" @@ -121459,7 +121208,7 @@ in ]; }) sources."@babel/template-7.0.0" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@chemzqm/msgpack-lite-0.1.29" sources."@chemzqm/neovim-5.9.5" @@ -121527,7 +121276,7 @@ in ]; }) sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."atob-2.1.2" (sources."autodll-webpack-plugin-0.4.2" // { dependencies = [ @@ -121603,7 +121352,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."case-sensitive-paths-webpack-plugin-2.1.2" sources."chalk-2.4.2" sources."chart.js-2.9.4" @@ -121814,7 +121563,7 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."glob-7.1.2" @@ -122089,7 +121838,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" @@ -122114,7 +121863,7 @@ in sources."regenerator-runtime-0.13.11" (sources."regenerator-transform-0.15.1" // { dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" ]; }) sources."regex-not-1.0.2" @@ -122656,7 +122405,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."readable-stream-2.3.7" sources."readline-1.3.0" @@ -122831,7 +122580,7 @@ in sources."cosmiconfig-8.0.0" sources."cross-fetch-3.1.5" sources."debug-4.3.4" - sources."devtools-protocol-0.0.1068969" + sources."devtools-protocol-0.0.1082910" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -122868,8 +122617,8 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-19.5.2" - sources."puppeteer-core-19.5.2" + sources."puppeteer-19.6.2" + sources."puppeteer-core-19.6.2" sources."readable-stream-3.6.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" @@ -123034,7 +122783,7 @@ in sources."form-data-4.0.0" sources."formidable-2.1.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."graphlib-2.1.8" sources."has-1.0.3" sources."has-symbols-1.0.3" @@ -123057,7 +122806,7 @@ in sources."object-inspect-1.12.3" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -123325,7 +123074,7 @@ in sources."has-yarn-2.1.0" sources."hash-base-3.1.0" sources."homedir-polyfill-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.8.1" // { dependencies = [ sources."depd-1.1.2" @@ -123645,7 +123394,7 @@ in sources."glob-7.2.3" sources."graceful-fs-4.2.10" sources."has-unicode-2.0.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" @@ -123826,7 +123575,7 @@ in sources."fstream-ignore-1.0.5" sources."function-bind-1.1.1" sources."gauge-2.7.4" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-4.0.1" (sources."getpass-0.1.7" // { dependencies = [ @@ -124046,7 +123795,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = "https://github.com/node-inspector/node-inspector"; + homepage = "http://github.com/node-inspector/node-inspector"; }; production = true; bypassCache = true; @@ -124150,7 +123899,7 @@ in sha512 = "B6q576kLw96eKOiqNpNJsUiwl5vRipc46T0w/LUI7O3fPAVxwu5zklIBhE6Iefj8FV1IdbLwXULESqMWlwjlGQ=="; }; dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@mapbox/node-pre-gyp-1.0.10" sources."@node-red/editor-api-3.0.2" sources."@node-red/editor-client-3.0.2" @@ -124304,7 +124053,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-3.0.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."glob-7.2.3" sources."got-11.8.5" @@ -124320,7 +124069,7 @@ in }) sources."hpagent-1.0.0" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-5.0.1" // { @@ -124338,7 +124087,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" - sources."js-sdsl-4.1.4" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" sources."json-schema-traverse-1.0.0" @@ -124417,7 +124166,7 @@ in sources."normalize-url-6.1.0" sources."npmlog-5.0.1" sources."nth-check-2.1.1" - (sources."number-allocator-1.0.12" // { + (sources."number-allocator-1.0.14" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -124445,7 +124194,7 @@ in sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.10.3" sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" @@ -124508,7 +124257,7 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.0.0" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uglify-js-3.16.3" @@ -124673,7 +124422,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" (sources."readable-stream-2.3.7" // { dependencies = [ @@ -124958,7 +124707,7 @@ in sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.8" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ignore-5.2.4" @@ -125331,10 +125080,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "9.3.1"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-9.3.1.tgz"; - sha512 = "ydRVmnWEVXmc3DCM+F9BjiNj3IHkZ3Mwz5VbJYS2BpY/6d4PcKxNW+Xb0vzGeE6PkVhLcPxwhoIi+RFV2fSfEA=="; + url = "https://registry.npmjs.org/npm/-/npm-9.4.0.tgz"; + sha512 = "eT/yB9VFgnqJjMZN++RDcKPyuvEl3iM//bfJzAa3F9+x9l/x8XJUYnHAy0K6ep4JVNTxCUAp/wgy0pBicTZr5A=="; }; buildInputs = globalBuildInputs; meta = { @@ -125349,10 +125098,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "16.6.2"; + version = "16.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.6.2.tgz"; - sha512 = "J/L90a+NDDWscBQGKIsPKer+qbQEQRJDpK+BPsVZf9YWDN5DCAMicPqRb+Emnxfi8QboiNmvDJWRUFFWRQzDMg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.6.3.tgz"; + sha512 = "EKhsCbBcVrPlYKzaYQtRhGv9fxpexwROcvl5HebCUNpiCSlOWrzaJvrMlwi9i9GCyJCnH+YAeBPYdqnArA390A=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -125484,7 +125233,7 @@ in sources."has-unicode-2.0.1" sources."has-yarn-3.0.0" sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."http2-wrapper-2.2.0" sources."https-proxy-agent-5.0.1" @@ -125716,7 +125465,7 @@ in sources."strip-ansi-7.0.1" ]; }) - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" @@ -125813,7 +125562,7 @@ in sources."open-8.4.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."safe-buffer-5.2.1" @@ -125881,10 +125630,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.11.0.tgz"; - sha512 = "oABYZWFKW4PtEv0Kb3Zqg0mIi75J3gMvq9Km8fjo+Ku0gzpdXhUKkeQUisvJXBPsRBTGkWBDRtCuRhqakCNH4w=="; + url = "https://registry.npmjs.org/orval/-/orval-6.11.1.tgz"; + sha512 = "3QjI9i8mp/lT+ufJQWghQyCf6vNXqKVHva2IgLL/OWEuBA8AsGPXvJvCeqzFmi+fBSC7LzpR2Mkyle7dxfycLQ=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -125902,12 +125651,12 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@orval/angular-6.11.0" - sources."@orval/axios-6.11.0" - sources."@orval/core-6.11.0" - sources."@orval/msw-6.11.0" - sources."@orval/query-6.11.0" - sources."@orval/swr-6.11.0" + sources."@orval/angular-6.11.1" + sources."@orval/axios-6.11.1" + sources."@orval/core-6.11.1" + sources."@orval/msw-6.11.1" + sources."@orval/query-6.11.1" + sources."@orval/swr-6.11.1" sources."@rollup/plugin-commonjs-22.0.2" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ @@ -125956,7 +125705,7 @@ in sources."@types/node-18.11.18" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ajv-8.12.0" @@ -126080,7 +125829,7 @@ in sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" (sources."get-source-2.0.12" // { dependencies = [ sources."data-uri-to-buffer-2.0.2" @@ -126118,7 +125867,7 @@ in }) sources."iconv-lite-0.6.3" sources."ignore-5.2.4" - sources."immer-9.0.18" + sources."immer-9.0.19" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."internal-slot-1.0.4" @@ -126227,8 +125976,7 @@ in sources."printable-characters-1.0.42" sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" - sources."punycode-1.3.2" - sources."querystring-0.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" (sources."raw-body-2.5.1" // { dependencies = [ @@ -126291,20 +126039,15 @@ in sources."toidentifier-1.0.1" sources."tr46-0.0.3" sources."tsconfck-2.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-check-0.3.2" sources."typed-array-length-1.0.4" sources."typescript-4.9.4" sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" - (sources."uri-js-4.4.1" // { - dependencies = [ - sources."punycode-2.2.0" - ]; - }) + sources."uri-js-4.4.1" sources."urijs-1.19.11" - sources."url-0.11.0" sources."utility-types-3.10.0" sources."validate-npm-package-name-3.0.0" sources."validator-13.7.0" @@ -126348,14 +126091,14 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."json5-2.2.3" sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -126392,9 +126135,9 @@ in sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -126432,7 +126175,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.11" + sources."@babel/plugin-transform-block-scoping-7.20.14" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -126453,7 +126196,7 @@ in sources."@babel/plugin-transform-object-super-7.18.6" sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-regenerator-7.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" sources."@babel/plugin-transform-shorthand-properties-7.18.6" @@ -126469,9 +126212,9 @@ in ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@iarna/toml-2.2.5" sources."@jridgewell/gen-mapping-0.1.1" @@ -126531,7 +126274,7 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -126605,7 +126348,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -126631,7 +126374,7 @@ in sources."convert-source-map-1.9.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-js-compat-3.27.1" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -126801,7 +126544,7 @@ in sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-port-3.2.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" @@ -126853,7 +126596,7 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.9" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."terser-5.16.1" @@ -127140,7 +126883,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" (sources."purgecss-2.3.0" // { dependencies = [ sources."commander-5.1.0" @@ -127395,10 +127138,10 @@ in parcel = nodeEnv.buildNodePackage { name = "parcel"; packageName = "parcel"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/parcel/-/parcel-2.8.2.tgz"; - sha512 = "XMVf3Ip9Iokv0FC3ulN/B0cb5O21qaw0RhUPz7zULQlY794ZpFP9mNtN7HvCVEgjl5/q2sYMcTA8l+5QJ2zZ/Q=="; + url = "https://registry.npmjs.org/parcel/-/parcel-2.8.3.tgz"; + sha512 = "5rMBpbNE72g6jZvkdR5gS2nyhwIXaJy8i65osOqs/+5b7zgf3eMKgjSsDrv6bhz3gzifsba6MBJiZdBckl+vnA=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -127429,79 +127172,79 @@ in sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.2.0" sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.2.0" sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.2.0" - sources."@parcel/bundler-default-2.8.2" - sources."@parcel/cache-2.8.2" - sources."@parcel/codeframe-2.8.2" - sources."@parcel/compressor-raw-2.8.2" - sources."@parcel/config-default-2.8.2" - sources."@parcel/core-2.8.2" - sources."@parcel/diagnostic-2.8.2" - sources."@parcel/events-2.8.2" - sources."@parcel/fs-2.8.2" - sources."@parcel/fs-search-2.8.2" - sources."@parcel/graph-2.8.2" - sources."@parcel/hash-2.8.2" - sources."@parcel/logger-2.8.2" - sources."@parcel/markdown-ansi-2.8.2" - sources."@parcel/namer-default-2.8.2" - sources."@parcel/node-resolver-core-2.8.2" - sources."@parcel/optimizer-css-2.8.2" - sources."@parcel/optimizer-htmlnano-2.8.2" - sources."@parcel/optimizer-image-2.8.2" - sources."@parcel/optimizer-svgo-2.8.2" - sources."@parcel/optimizer-terser-2.8.2" - sources."@parcel/package-manager-2.8.2" - sources."@parcel/packager-css-2.8.2" - sources."@parcel/packager-html-2.8.2" - sources."@parcel/packager-js-2.8.2" - sources."@parcel/packager-raw-2.8.2" - sources."@parcel/packager-svg-2.8.2" - sources."@parcel/plugin-2.8.2" - sources."@parcel/reporter-cli-2.8.2" - sources."@parcel/reporter-dev-server-2.8.2" - sources."@parcel/resolver-default-2.8.2" - sources."@parcel/runtime-browser-hmr-2.8.2" - sources."@parcel/runtime-js-2.8.2" - sources."@parcel/runtime-react-refresh-2.8.2" - sources."@parcel/runtime-service-worker-2.8.2" + sources."@parcel/bundler-default-2.8.3" + sources."@parcel/cache-2.8.3" + sources."@parcel/codeframe-2.8.3" + sources."@parcel/compressor-raw-2.8.3" + sources."@parcel/config-default-2.8.3" + sources."@parcel/core-2.8.3" + sources."@parcel/diagnostic-2.8.3" + sources."@parcel/events-2.8.3" + sources."@parcel/fs-2.8.3" + sources."@parcel/fs-search-2.8.3" + sources."@parcel/graph-2.8.3" + sources."@parcel/hash-2.8.3" + sources."@parcel/logger-2.8.3" + sources."@parcel/markdown-ansi-2.8.3" + sources."@parcel/namer-default-2.8.3" + sources."@parcel/node-resolver-core-2.8.3" + sources."@parcel/optimizer-css-2.8.3" + sources."@parcel/optimizer-htmlnano-2.8.3" + sources."@parcel/optimizer-image-2.8.3" + sources."@parcel/optimizer-svgo-2.8.3" + sources."@parcel/optimizer-terser-2.8.3" + sources."@parcel/package-manager-2.8.3" + sources."@parcel/packager-css-2.8.3" + sources."@parcel/packager-html-2.8.3" + sources."@parcel/packager-js-2.8.3" + sources."@parcel/packager-raw-2.8.3" + sources."@parcel/packager-svg-2.8.3" + sources."@parcel/plugin-2.8.3" + sources."@parcel/reporter-cli-2.8.3" + sources."@parcel/reporter-dev-server-2.8.3" + sources."@parcel/resolver-default-2.8.3" + sources."@parcel/runtime-browser-hmr-2.8.3" + sources."@parcel/runtime-js-2.8.3" + sources."@parcel/runtime-react-refresh-2.8.3" + sources."@parcel/runtime-service-worker-2.8.3" sources."@parcel/source-map-2.1.1" - sources."@parcel/transformer-babel-2.8.2" - sources."@parcel/transformer-css-2.8.2" - (sources."@parcel/transformer-html-2.8.2" // { + sources."@parcel/transformer-babel-2.8.3" + sources."@parcel/transformer-css-2.8.3" + (sources."@parcel/transformer-html-2.8.3" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-image-2.8.2" - sources."@parcel/transformer-js-2.8.2" - sources."@parcel/transformer-json-2.8.2" - sources."@parcel/transformer-postcss-2.8.2" - (sources."@parcel/transformer-posthtml-2.8.2" // { + sources."@parcel/transformer-image-2.8.3" + sources."@parcel/transformer-js-2.8.3" + sources."@parcel/transformer-json-2.8.3" + sources."@parcel/transformer-postcss-2.8.3" + (sources."@parcel/transformer-posthtml-2.8.3" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-raw-2.8.2" - sources."@parcel/transformer-react-refresh-wrap-2.8.2" - (sources."@parcel/transformer-svg-2.8.2" // { + sources."@parcel/transformer-raw-2.8.3" + sources."@parcel/transformer-react-refresh-wrap-2.8.3" + (sources."@parcel/transformer-svg-2.8.3" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/types-2.8.2" - sources."@parcel/utils-2.8.2" + sources."@parcel/types-2.8.3" + sources."@parcel/utils-2.8.3" (sources."@parcel/watcher-2.1.0" // { dependencies = [ sources."node-addon-api-3.2.1" ]; }) - sources."@parcel/workers-2.8.2" + sources."@parcel/workers-2.8.3" sources."@swc/helpers-0.4.14" sources."@trysound/sax-0.2.0" sources."@types/parse-json-4.0.0" sources."abab-2.0.6" sources."abortcontroller-polyfill-1.7.5" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.2" @@ -127528,7 +127271,7 @@ in sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -127598,7 +127341,7 @@ in sources."get-port-4.2.0" sources."getpass-0.1.7" sources."glob-8.1.0" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -127656,7 +127399,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-5.1.6" - sources."msgpackr-1.8.1" + sources."msgpackr-1.8.2" sources."msgpackr-extract-2.2.0" sources."nanoid-3.3.4" sources."node-addon-api-4.3.0" @@ -127715,7 +127458,7 @@ in sources."posthtml-render-3.0.0" sources."prelude-ls-1.1.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" (sources."purgecss-5.0.0" // { dependencies = [ sources."commander-9.5.0" @@ -127755,7 +127498,7 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tr46-1.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -127915,7 +127658,7 @@ in sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -127996,7 +127739,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" (sources."raw-body-2.5.1" // { @@ -128267,7 +128010,7 @@ in sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-4.0.1" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -128632,7 +128375,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -128750,7 +128493,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.1" @@ -129110,7 +128853,7 @@ in }) sources."@pm2/pm2-version-check-1.0.4" sources."@tootallnate/once-1.1.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."amp-0.3.1" @@ -129280,10 +129023,10 @@ in sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.17.3" + sources."systeminformation-5.17.4" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tv4-1.3.0" sources."tx2-1.0.5" sources."type-check-0.3.2" @@ -129307,7 +129050,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Production process manager for Node.JS applications with a built-in load balancer."; - homepage = "https://pm2.keymetrics.io/"; + homepage = "http://pm2.keymetrics.io/"; license = "AGPL-3.0"; }; production = true; @@ -129317,10 +129060,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "7.25.0"; + version = "7.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-7.25.0.tgz"; - sha512 = "FGFQUON8kJ6ma39elJ8lyD8wPIfgp3opGJD9sX0TgIJk4zSr556qCgC8AN+3BFHe4yuRkEauf4JVLW2RKyyEcA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-7.26.1.tgz"; + sha512 = "l86ZNy8RZmG2aDxZVk6+vt9c8aV0tMZICQxPksRQOL5r2n92kgaIauYSFUZ+LNmPJFsbSGKpsvgOF41oiS7JWw=="; }; buildInputs = globalBuildInputs; meta = { @@ -129399,24 +129142,24 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/node-18.11.18" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -129665,9 +129408,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -129683,11 +129426,11 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" @@ -129709,7 +129452,7 @@ in sources."browserslist-4.21.4" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -130283,13 +130026,13 @@ in sources."follow-redirects-1.15.2" sources."fs-extra-10.1.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-symbols-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."https-proxy-agent-5.0.1" sources."ini-1.3.8" sources."ip-2.0.0" @@ -130307,7 +130050,7 @@ in sources."minimist-1.2.7" sources."moment-2.29.4" sources."ms-2.1.2" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."normalize-url-4.5.1" sources."object-inspect-1.12.3" sources."once-1.4.0" @@ -130355,10 +130098,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.290"; + version = "1.1.291"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.290.tgz"; - sha512 = "iHT8G2+R/GUfYWxxd4ud5Lj/0H0bE1eWVR0avKKgPtkBeLkUz3sorjKpfuaJdsuJNrunzMtZsmYPD366t39klg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.291.tgz"; + sha512 = "wkSlCEhF1OwtJqHuifwxk76UMr1NPqsAbPIlCh7tiZx8VUdZs17NCGNorhyb2M+GFEvp8pod9Xyu1LXN1JL2kQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -130373,10 +130116,10 @@ in quicktype = nodeEnv.buildNodePackage { name = "quicktype"; packageName = "quicktype"; - version = "20.0.26"; + version = "21.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype/-/quicktype-20.0.26.tgz"; - sha512 = "q0pOSWfVgGEATW96fvbAOEe9od48EqMCGpv86XNt9aznVngdB4eJRyPK1Z0Jvl10/cWDze2bvzPT2b+LChSfAQ=="; + url = "https://registry.npmjs.org/quicktype/-/quicktype-21.0.4.tgz"; + sha512 = "zpmXft8rIemnKKA/aNmwUk21QY5GDRSNJegD3ESPBAVt1/V40lsZDF3h1oYqjYCawOjEpPOizYaxMMNhbVEL3w=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -130385,18 +130128,18 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" sources."@mark.probst/typescript-json-schema-0.55.0" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -130405,7 +130148,7 @@ in sources."@types/node-16.18.11" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -130471,9 +130214,9 @@ in sources."path-is-absolute-1.0.1" sources."pluralize-8.0.0" sources."process-0.11.10" - sources."quicktype-core-20.0.26" - sources."quicktype-graphql-input-20.0.26" - sources."quicktype-typescript-input-20.0.26" + sources."quicktype-core-21.0.4" + sources."quicktype-graphql-input-21.0.4" + sources."quicktype-typescript-input-21.0.4" sources."readable-stream-4.3.0" sources."reduce-flatten-2.0.0" sources."require-directory-2.1.1" @@ -130566,7 +130309,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."gopd-1.0.1" sources."has-1.0.3" @@ -130653,13 +130396,13 @@ in sources."@ampproject/remapping-2.2.0" sources."@babel/cli-7.20.7" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -130696,9 +130439,9 @@ in sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -130737,7 +130480,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.11" + sources."@babel/plugin-transform-block-scoping-7.20.14" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -130758,7 +130501,7 @@ in sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-react-jsx-development-7.18.6" sources."@babel/plugin-transform-react-pure-annotations-7.18.6" sources."@babel/plugin-transform-regenerator-7.20.5" @@ -130784,9 +130527,9 @@ in sources."@babel/preset-react-7.18.6" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.18.9" - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -130802,7 +130545,7 @@ in sources."@types/parse-json-4.0.0" sources."@types/prop-types-15.7.5" sources."@types/q-1.5.5" - sources."@types/react-17.0.52" + sources."@types/react-17.0.53" sources."@types/scheduler-0.16.2" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -130871,7 +130614,7 @@ in }) sources."assign-symbols-1.0.0" sources."async-2.6.4" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-limiter-1.0.1" sources."atob-2.1.2" (sources."autoprefixer-9.8.8" // { @@ -130989,7 +130732,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -131066,7 +130809,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-js-compat-3.27.1" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."cosmiconfig-6.0.0" @@ -131366,7 +131109,7 @@ in sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-proxy-2.1.0" sources."get-stream-3.0.0" sources."get-symbol-description-1.0.0" @@ -131907,7 +131650,7 @@ in }) sources."pump-2.0.1" sources."pumpify-1.5.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.11.0" sources."query-string-5.1.1" @@ -132506,10 +132249,10 @@ in readability-cli = nodeEnv.buildNodePackage { name = "readability-cli"; packageName = "readability-cli"; - version = "2.4.2"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.4.2.tgz"; - sha512 = "dQ0EuULmLd65pa9H27xreYuQiNFerDQxI3weqPRHcuiFQnK0b4YNhcZHZw7w3a0YYpXVlcP6bKK/BaiUUuqBoQ=="; + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.4.4.tgz"; + sha512 = "KNVRUT4JKrnNCkD4IuMm9zU5bkFc699lue7xT66lIhjXTARwKlBRwiSZYgx7mCKC/Zj40dw89UULFAyihnXLXQ=="; }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.10" @@ -132517,7 +132260,7 @@ in sources."@tootallnate/once-2.0.0" sources."abab-2.0.6" sources."abbrev-1.1.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -132629,7 +132372,7 @@ in sources."path-is-absolute-1.0.1" sources."prelude-ls-1.1.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."querystringify-2.2.0" sources."readable-stream-3.6.0" sources."require-directory-2.1.1" @@ -132654,7 +132397,7 @@ in sources."type-check-0.3.2" sources."universalify-0.2.0" sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-3.0.0" @@ -132694,7 +132437,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.20.14" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" @@ -132704,10 +132447,10 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" - sources."@babel/runtime-7.20.7" + sources."@babel/parser-7.20.13" + sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@emotion/is-prop-valid-1.2.0" sources."@emotion/memoize-0.8.0" @@ -132721,7 +132464,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@redocly/ajv-8.11.0" - sources."@redocly/openapi-core-1.0.0-beta.120" + sources."@redocly/openapi-core-1.0.0-beta.122" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-8.4.10" @@ -132746,7 +132489,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" (sources."ajv-6.12.6" // { dependencies = [ @@ -132816,7 +132559,7 @@ in sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" sources."camelize-1.0.1" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" (sources."chalk-2.4.2" // { dependencies = [ sources."has-flag-3.0.0" @@ -132839,7 +132582,7 @@ in sources."configstore-5.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -132923,7 +132666,7 @@ in }) sources."hmac-drbg-1.0.1" sources."hoist-non-react-statics-3.3.2" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-client-1.3.5" sources."https-browserify-1.0.0" sources."iconv-lite-0.6.3" @@ -133136,7 +132879,7 @@ in }) (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) (sources."url-0.11.0" // { @@ -133198,7 +132941,7 @@ in }; dependencies = [ sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" @@ -133456,7 +133199,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."glob-8.0.3" sources."glob-parent-5.1.2" @@ -133468,7 +133211,7 @@ in sources."has-symbols-1.0.3" sources."has-yarn-2.1.0" sources."highlight.js-11.7.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" (sources."https-proxy-agent-2.2.4" // { dependencies = [ @@ -133662,10 +133405,10 @@ in rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.1.tgz"; - sha512 = "Z4Y81w8atcvaJuJuBB88VpADRH66okZAuEm+Jtaufa+s7rZmIz+Hik2G53kGaNytE7lsfXyWktTmfVz0H9xuDg=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz"; + sha512 = "BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -133680,10 +133423,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz"; - sha512 = "JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-3.12.0.tgz"; + sha512 = "4MZ8kA2HNYahIjz63rzrMMRvDqQDeS9LoriJvMuV0V6zIGysP36e9t4yObUfwdT9h/szXoHQideICftcdZklWg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -133717,16 +133460,16 @@ in sources."@types/node-14.17.34" sources."@types/semver-7.3.13" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.48.2" - sources."@typescript-eslint/parser-5.48.2" - sources."@typescript-eslint/scope-manager-5.48.2" - sources."@typescript-eslint/type-utils-5.48.2" - sources."@typescript-eslint/types-5.48.2" - sources."@typescript-eslint/typescript-estree-5.48.2" - sources."@typescript-eslint/utils-5.48.2" - sources."@typescript-eslint/visitor-keys-5.48.2" + sources."@typescript-eslint/eslint-plugin-5.49.0" + sources."@typescript-eslint/parser-5.49.0" + sources."@typescript-eslint/scope-manager-5.49.0" + sources."@typescript-eslint/type-utils-5.49.0" + sources."@typescript-eslint/types-5.49.0" + sources."@typescript-eslint/typescript-estree-5.49.0" + sources."@typescript-eslint/utils-5.49.0" + sources."@typescript-eslint/visitor-keys-5.49.0" sources."@vscode/test-electron-2.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -133770,8 +133513,8 @@ in sources."cross-spawn-7.0.3" sources."css-select-5.1.0" sources."css-what-6.1.0" - sources."d3-7.8.1" - sources."d3-array-3.2.1" + sources."d3-7.8.2" + sources."d3-array-3.2.2" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" @@ -133890,11 +133633,11 @@ in }) sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."github-from-package-0.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globby-11.1.0" sources."graceful-fs-4.2.10" sources."grapheme-splitter-1.0.4" @@ -133921,7 +133664,7 @@ in sources."is-path-inside-3.0.3" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -133979,7 +133722,7 @@ in sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" (sources."rc-1.2.8" // { @@ -134024,7 +133767,7 @@ in sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."traverse-0.3.9" - sources."tslib-2.4.1" + sources."tslib-2.5.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -134156,7 +133899,7 @@ in sources."formidable-1.0.11" sources."fresh-0.2.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-symbols-1.0.3" sources."http-auth-2.0.7" @@ -134265,13 +134008,13 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "14.1.2"; + version = "14.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-14.1.2.tgz"; - sha512 = "luwVfJwbeE7dhCKeRU0vIBpt4bXdbAfzwsWJIQ5eqrIW2e+4nLWXbSlZ0WzelSFHQq+FlueOW6dr90jEewS9zw=="; + url = "https://registry.npmjs.org/serve/-/serve-14.2.0.tgz"; + sha512 = "+HOw/XK1bW8tw5iBilBz/mJLWRzM8XM6MPxL4J/dKzdxq1vfdEWSwhaR7/yS8EJp5wzvP92p1qirysJvnEtjXg=="; }; dependencies = [ - sources."@zeit/schemas-2.21.0" + sources."@zeit/schemas-2.29.0" sources."accepts-1.3.8" sources."ajv-8.11.0" (sources."ansi-align-3.0.1" // { @@ -134340,7 +134083,7 @@ in sources."path-is-inside-1.0.2" sources."path-key-3.1.1" sources."path-to-regexp-2.2.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."registry-auth-token-3.3.2" @@ -134373,7 +134116,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."widest-line-4.0.1" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."strip-ansi-7.0.1" @@ -134393,10 +134136,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.26.0"; + version = "3.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.26.0.tgz"; - sha512 = "drVr4akkQwm2Pj7ZN9boh5PoI2nKvlXmy+Cb8Hh1Zv8ybsf47ZUQE6t7dakGA4irYf4SQCbVc72nKqISfarMCQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.27.0.tgz"; + sha512 = "+8EDo7x8IJxTj4KqQG71qpX7oq+EZy0NGm/04q3M5jK7L8rLowEtnzq82s93yeNSgmJSMopd3pTzuH9CCWkNMw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -134405,7 +134148,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@serverless/dashboard-plugin-6.2.2" // { + (sources."@serverless/dashboard-plugin-6.2.3" // { dependencies = [ sources."fs-extra-9.1.0" sources."open-7.4.2" @@ -134459,7 +134202,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1296.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -134652,7 +134395,7 @@ in sources."fs2-0.3.9" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-8.0.0" sources."get-stream-6.0.1" sources."glob-7.2.3" @@ -134667,7 +134410,7 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hexoid-1.0.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" @@ -134793,7 +134536,7 @@ in sources."process-utils-4.0.0" sources."promise-queue-2.2.5" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" @@ -134874,7 +134617,7 @@ in sources."tr46-0.0.3" sources."traverse-0.6.7" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-2.7.2" sources."type-fest-0.21.3" sources."unbzip2-stream-1.4.3" @@ -135013,7 +134756,7 @@ in sources."fresh-0.5.2" sources."from-0.1.7" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" sources."har-schema-2.0.0" @@ -135074,7 +134817,7 @@ in sources."performance-now-2.1.0" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" @@ -135560,10 +135303,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.1087.0"; + version = "1.1091.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.1087.0.tgz"; - sha512 = "4Ap2O59+qHCKmzeJu0Kq6S74M409UwRer3ss3wLCNO7vwj8hpfi4wvA+bZc8ywwKv028X9nLhw8hzcJ7bmsavQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.1091.0.tgz"; + sha512 = "NUofOS3cf4KoT0V3vS1NDC86eG86L29SIno8yIMiVvW7azOxw/IgO09oUhKzFUMXixzU0I9z6Ja+Uv0JsrMQnw=="; }; buildInputs = globalBuildInputs; meta = { @@ -135602,7 +135345,7 @@ in sources."node-gyp-build-4.6.0" sources."object-assign-4.1.1" sources."socket.io-adapter-2.4.0" - sources."socket.io-parser-4.2.1" + sources."socket.io-parser-4.2.2" sources."utf-8-validate-5.0.10" sources."vary-1.1.2" sources."ws-8.2.3" @@ -135758,7 +135501,7 @@ in sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-styles-6.2.1" ]; @@ -135782,10 +135525,10 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "12.0.5"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.0.5.tgz"; - sha512 = "nKils1bIf99WyDqr7252W6NhHjgJoL2mw7bvWb79uDzVd1xZceZ8zyy05behD92+xJIUzEibNMXwTuDFMwrHyg=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.1.0.tgz"; + sha512 = "XwbFwdes2SuETEj/a0WY2MjweFFzgn5phDum4WOdWjk+aay84xXPUl9BzevB89PLykx+4d9GRdXRaiY1VHzytg=="; }; dependencies = [ sources."argparse-2.0.1" @@ -135842,7 +135585,7 @@ in sources."push-stream-11.2.0" ]; }) - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-single-1.0.5" sources."async-write-2.1.0" sources."atob-2.1.2" @@ -136047,7 +135790,7 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."glob-6.0.4" @@ -136856,7 +136599,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1296.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -137065,7 +136808,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -137153,7 +136896,7 @@ in dependencies = [ sources."esprima-4.0.1" sources."js-yaml-3.14.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."uri-js-3.0.2" ]; }) @@ -137362,7 +137105,7 @@ in sources."har-validator-5.1.5" sources."http-signature-1.2.0" sources."oauth-sign-0.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" @@ -137540,7 +137283,7 @@ in sources."unpipe-1.0.0" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) (sources."url-0.10.3" // { @@ -137664,7 +137407,7 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@csstools/selector-specificity-2.0.2" + sources."@csstools/selector-specificity-2.1.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -137788,7 +137531,7 @@ in sources."postcss-safe-parser-6.0.0" sources."postcss-selector-parser-6.0.11" sources."postcss-value-parser-4.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -137960,7 +137703,7 @@ in sources."performance-now-2.1.0" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.5" sources."request-2.88.2" @@ -138004,17 +137747,17 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.0.2.tgz"; - sha512 = "DkhKhV0Jt0gh7q9DBB26+J2Vfb9y4/4JWxnbkXBZha7542LOhwvj3edJFjyJ+xjdaXyInZ+YRRYc3V6wytP2ew=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.0.3.tgz"; + sha512 = "ByBFXo3bfHRGIsYEasHkdMhLkNleVfszX/Ns1oip58tPJlKdo5Ssr8kgVIuo5oq00hss8AIcdesuy0Xt0BcTvg=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -138030,11 +137773,11 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ @@ -138049,18 +137792,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -138068,7 +137811,7 @@ in sources."@types/node-18.11.18" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.3" @@ -138085,7 +137828,7 @@ in sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138115,7 +137858,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" @@ -138213,11 +137956,10 @@ in sources."sass-1.57.1" sources."sax-1.2.4" sources."semver-6.3.0" - sources."sorcery-0.10.0" + sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-resolve-0.6.0" - sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" (sources."stylus-0.55.0" // { dependencies = [ @@ -138231,12 +137973,12 @@ in sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.55.1" - sources."svelte-preprocess-5.0.0" + sources."svelte-preprocess-5.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typescript-4.9.4" sources."update-browserslist-db-1.0.10" sources."v8-compile-cache-lib-3.0.1" @@ -138260,17 +138002,17 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.15.2"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.2.tgz"; - sha512 = "U8V3ZBx6IQbTfCkyf1Hss+xNmDTJJ2KyLLo7hv+JxBJpqZzBdfWkyJpCTrvN9FP10X4LFKbb3vIl558fKl9Meg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.3.tgz"; + sha512 = "HwPvDZGMCSBkdRD0cfEBTPfy5F3qxqcYNIyMrD0zUH9FoWy7gpEpUZVbCTZ7d5QQVst9rgNdGhzfd+O/s+3b8g=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -138286,11 +138028,11 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ @@ -138308,18 +138050,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -138332,8 +138074,8 @@ in sources."vscode-uri-2.1.2" ]; }) - sources."@vscode/l10n-0.0.10" - sources."acorn-8.8.1" + sources."@vscode/l10n-0.0.11" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.3" @@ -138349,7 +138091,7 @@ in sources."browserslist-4.21.4" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138382,7 +138124,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" @@ -138482,11 +138224,10 @@ in sources."sass-1.57.1" sources."sax-1.2.4" sources."semver-6.3.0" - sources."sorcery-0.10.0" + sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-resolve-0.6.0" - sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" (sources."stylus-0.55.0" // { dependencies = [ @@ -138500,19 +138241,19 @@ in sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.55.1" - sources."svelte-preprocess-5.0.0" + sources."svelte-preprocess-5.0.1" sources."svelte2tsx-0.6.0" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typescript-4.9.4" sources."update-browserslist-db-1.0.10" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" - sources."vscode-css-languageservice-6.2.1" - sources."vscode-html-languageservice-5.0.3" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" @@ -138605,7 +138346,7 @@ in sources."asap-2.0.6" sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" @@ -138780,7 +138521,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.2.3" @@ -139014,7 +138755,7 @@ in sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.8" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-4.0.0" sources."range-parser-1.2.1" (sources."raw-body-2.0.2" // { @@ -139251,18 +138992,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -139336,7 +139077,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; @@ -139510,7 +139251,7 @@ in sources."prism-media-0.0.4" sources."process-nextick-args-2.0.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."ramda-0.25.0" sources."rc-1.2.8" @@ -139698,7 +139439,7 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.6.1" @@ -139717,51 +139458,41 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.5.1"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.5.1.tgz"; - sha512 = "LoFU1yBIm/gxM++jDdvdfS2diW14NBHsimRyChi8Kb5h5pUHcG0rGfW2PflUzfYcHF0XykgW9WBdPd1WWnyS7Q=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.0.4.tgz"; + sha512 = "XBPK+cRMYLY3NodKoCFMncmVJRk59S+aSgkwpdNnV8VXFo1hF0EEysbwEp9s8ov0LhVO8flfd51/L+VlUFeTlg=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-12.3.0" - sources."@textlint/ast-tester-12.5.0" - sources."@textlint/ast-traverse-12.5.0" - (sources."@textlint/config-loader-12.5.0" // { - dependencies = [ - sources."rc-config-loader-4.1.2" - ]; - }) - sources."@textlint/feature-flag-12.5.0" - sources."@textlint/fixer-formatter-12.5.1" - sources."@textlint/kernel-12.5.0" - (sources."@textlint/linter-formatter-12.5.0" // { - dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" - ]; - }) - sources."@textlint/markdown-to-ast-12.5.0" - sources."@textlint/module-interop-12.5.0" - sources."@textlint/source-code-fixer-12.5.0" - sources."@textlint/text-to-ast-12.5.0" - sources."@textlint/textlint-plugin-markdown-12.5.0" - sources."@textlint/textlint-plugin-text-12.5.0" - sources."@textlint/types-12.5.0" - sources."@textlint/utils-12.5.0" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-tester-13.0.4" + sources."@textlint/ast-traverse-13.0.4" + sources."@textlint/config-loader-13.0.4" + sources."@textlint/feature-flag-13.0.4" + sources."@textlint/fixer-formatter-13.0.4" + sources."@textlint/kernel-13.0.4" + sources."@textlint/linter-formatter-13.0.4" + sources."@textlint/markdown-to-ast-13.0.4" + sources."@textlint/module-interop-13.0.4" + sources."@textlint/source-code-fixer-13.0.4" + sources."@textlint/text-to-ast-13.0.4" + sources."@textlint/textlint-plugin-markdown-13.0.4" + sources."@textlint/textlint-plugin-text-13.0.4" + sources."@textlint/types-13.0.4" + sources."@textlint/utils-13.0.4" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" + sources."argparse-1.0.10" sources."astral-regex-2.0.0" sources."bail-1.0.5" sources."balanced-match-1.0.2" - sources."boundary-1.0.1" + sources."boundary-2.0.0" sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" sources."ccount-1.1.0" sources."chalk-4.1.2" sources."character-entities-1.2.4" @@ -139773,9 +139504,7 @@ in sources."concat-map-0.0.1" sources."crypt-0.0.2" sources."debug-4.3.4" - sources."deep-equal-1.1.1" sources."deep-is-0.1.4" - sources."define-properties-1.1.4" sources."diff-4.0.2" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" @@ -139783,6 +139512,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" + sources."fast-equals-4.0.3" sources."fast-levenshtein-2.0.6" sources."fault-1.0.4" sources."file-entry-cache-5.0.1" @@ -139792,34 +139522,26 @@ in sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" sources."get-stdin-5.0.1" sources."glob-7.2.3" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" - sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-core-module-2.11.0" - sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-1.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-hexadecimal-1.0.4" sources."is-plain-obj-2.1.0" - sources."is-regex-1.1.4" sources."is-utf8-0.2.1" - sources."js-yaml-4.1.0" + sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-1.0.0" sources."json5-2.2.3" @@ -139860,8 +139582,6 @@ in sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."normalize-package-data-2.5.0" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" sources."once-1.4.0" sources."optionator-0.9.1" sources."p-limit-1.3.0" @@ -139879,11 +139599,11 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" - sources."punycode-2.2.0" - (sources."rc-config-loader-3.0.0" // { + sources."punycode-2.3.0" + (sources."rc-config-loader-4.1.2" // { dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" + sources."argparse-2.0.1" + sources."js-yaml-4.1.0" ]; }) sources."read-pkg-1.1.0" @@ -139897,7 +139617,6 @@ in sources."strip-bom-3.0.0" ]; }) - sources."regexp.prototype.flags-1.4.3" sources."remark-footnotes-3.0.0" sources."remark-frontmatter-3.0.0" sources."remark-gfm-1.0.0" @@ -139916,7 +139635,7 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-bom-2.0.0" - sources."structured-source-3.0.2" + sources."structured-source-4.0.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."table-6.8.1" @@ -139984,7 +139703,7 @@ in sources."define-properties-1.1.4" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" @@ -140016,7 +139735,7 @@ in sources."@babel/highlight-7.18.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" sources."@types/hast-2.3.4" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" @@ -140139,7 +139858,7 @@ in sources."hast-util-whitespace-1.0.4" sources."hastscript-6.0.0" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."ignore-5.2.4" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -140318,7 +140037,7 @@ in sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."term-size-2.2.1" - sources."textlint-rule-helper-2.2.4" + sources."textlint-rule-helper-2.3.0" sources."through-2.3.8" (sources."through2-2.0.0" // { dependencies = [ @@ -140459,61 +140178,77 @@ in sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" sources."@textlint/ast-node-types-4.4.3" - (sources."@textlint/ast-tester-12.5.0" // { + (sources."@textlint/ast-tester-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-12.6.1" ]; }) - (sources."@textlint/ast-traverse-12.5.0" // { + (sources."@textlint/ast-traverse-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-12.6.1" ]; }) - (sources."@textlint/config-loader-12.5.0" // { + (sources."@textlint/config-loader-13.0.4" // { dependencies = [ - sources."rc-config-loader-4.1.2" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-tester-13.0.4" + sources."@textlint/ast-traverse-13.0.4" + sources."@textlint/feature-flag-13.0.4" + sources."@textlint/kernel-13.0.4" + sources."@textlint/source-code-fixer-13.0.4" + sources."@textlint/types-13.0.4" + sources."@textlint/utils-13.0.4" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" ]; }) - sources."@textlint/feature-flag-12.5.0" - sources."@textlint/fixer-formatter-12.5.1" - (sources."@textlint/kernel-12.5.0" // { + sources."@textlint/feature-flag-12.6.1" + (sources."@textlint/fixer-formatter-13.0.4" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/types-13.0.4" ]; }) - (sources."@textlint/linter-formatter-12.5.0" // { + (sources."@textlint/kernel-12.6.1" // { dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" + sources."@textlint/ast-node-types-12.6.1" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" ]; }) - (sources."@textlint/markdown-to-ast-12.5.0" // { + (sources."@textlint/linter-formatter-13.0.4" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/types-13.0.4" ]; }) - sources."@textlint/module-interop-12.5.0" - sources."@textlint/source-code-fixer-12.5.0" - (sources."@textlint/text-to-ast-12.5.0" // { + (sources."@textlint/markdown-to-ast-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-12.6.1" ]; }) - sources."@textlint/textlint-plugin-markdown-12.5.0" - sources."@textlint/textlint-plugin-text-12.5.0" - (sources."@textlint/types-12.5.0" // { + sources."@textlint/module-interop-13.0.4" + sources."@textlint/source-code-fixer-12.6.1" + (sources."@textlint/text-to-ast-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-12.6.1" ]; }) - sources."@textlint/utils-12.5.0" + sources."@textlint/textlint-plugin-markdown-12.6.1" + sources."@textlint/textlint-plugin-text-12.6.1" + (sources."@textlint/types-12.6.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.6.1" + ]; + }) + sources."@textlint/utils-12.6.1" sources."@types/mdast-3.0.10" sources."@types/structured-source-3.0.0" sources."@types/unist-2.0.6" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" + sources."argparse-1.0.10" sources."astral-regex-2.0.0" sources."bail-1.0.5" sources."balanced-match-1.0.2" @@ -140544,6 +140279,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" + sources."fast-equals-4.0.3" sources."fast-levenshtein-2.0.6" sources."fault-1.0.4" sources."file-entry-cache-5.0.1" @@ -140554,7 +140290,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-5.0.1" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -140583,7 +140319,7 @@ in sources."is-plain-obj-2.1.0" sources."is-regex-1.1.4" sources."is-utf8-0.2.1" - sources."js-yaml-4.1.0" + sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-1.0.0" sources."json5-2.2.3" @@ -140647,11 +140383,11 @@ in sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" sources."property-information-5.6.0" - sources."punycode-2.2.0" - (sources."rc-config-loader-3.0.0" // { + sources."punycode-2.3.0" + (sources."rc-config-loader-4.1.2" // { dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" + sources."argparse-2.0.1" + sources."js-yaml-4.1.0" ]; }) sources."read-pkg-1.1.0" @@ -140695,12 +140431,25 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."table-6.8.1" sources."text-table-0.2.0" - (sources."textlint-12.5.1" // { + (sources."textlint-13.0.4" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-tester-13.0.4" + sources."@textlint/ast-traverse-13.0.4" + sources."@textlint/feature-flag-13.0.4" + sources."@textlint/kernel-13.0.4" + sources."@textlint/markdown-to-ast-13.0.4" + sources."@textlint/source-code-fixer-13.0.4" + sources."@textlint/text-to-ast-13.0.4" + sources."@textlint/textlint-plugin-markdown-13.0.4" + sources."@textlint/textlint-plugin-text-13.0.4" + sources."@textlint/types-13.0.4" + sources."@textlint/utils-13.0.4" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" ]; }) - sources."textlint-tester-12.5.0" + sources."textlint-tester-12.6.1" (sources."textlint-util-to-string-3.1.1" // { dependencies = [ sources."unified-8.4.2" @@ -140819,9 +140568,9 @@ in sources."sentence-splitter-3.2.2" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" - (sources."textlint-rule-helper-2.2.4" // { + (sources."textlint-rule-helper-2.3.0" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" sources."boundary-2.0.0" sources."structured-source-4.0.0" ]; @@ -140873,13 +140622,13 @@ in sha512 = "gO4N3OnPLvE6+fvJ1Y5m8MzDVrqMEWzW8pTGMXjL8VAXmQkD6YQ9eDMbsVN0/DzEe8tcsBqNgA/iIrQ64oECuQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" sources."@types/unist-2.0.6" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."split-lines-2.1.0" sources."structured-source-4.0.0" - sources."textlint-rule-helper-2.2.4" + sources."textlint-rule-helper-2.3.0" sources."unist-util-is-4.1.0" sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" @@ -140903,13 +140652,13 @@ in sha512 = "obQ3y0hqX6OWCrM8K5K6WSJGE4BOyNfGF6hUGPet56taTm/xzkRu8XA6vpn2GFr4zom/oMa0sBJ3OtDWCgrS/g=="; }; dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" sources."@types/unist-2.0.6" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" sources."structured-source-4.0.0" - sources."textlint-rule-helper-2.2.4" + sources."textlint-rule-helper-2.3.0" sources."unist-util-is-4.1.0" sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" @@ -140944,7 +140693,7 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."globalthis-1.0.3" sources."gopd-1.0.1" @@ -141001,7 +140750,7 @@ in sha512 = "yvOJavJD+PgyUzvsoLDDzDtgCVBva/HNhEvsFnYVugrWz0qy2hr+/4B4wkzjro4wfPbwz20GQe5h13N4DeUEeA=="; }; dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" (sources."@eslint/eslintrc-1.4.1" // { dependencies = [ sources."debug-4.3.4" @@ -141019,10 +140768,10 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" sources."@types/json5-0.0.29" sources."@types/unist-2.0.6" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."adverb-where-0.2.5" sources."ajv-6.12.6" @@ -141036,7 +140785,7 @@ in sources."array.prototype.tosorted-1.1.1" sources."ast-types-flow-0.0.7" sources."available-typed-arrays-1.0.5" - sources."axe-core-4.6.2" + sources."axe-core-4.6.3" sources."axobject-query-3.1.1" sources."balanced-match-1.0.2" sources."boundary-2.0.0" @@ -141105,11 +140854,11 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globalthis-1.0.3" sources."gopd-1.0.1" sources."grapheme-splitter-1.0.4" @@ -141150,7 +140899,7 @@ in sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" @@ -141189,7 +140938,7 @@ in sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" sources."prop-types-15.8.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."react-is-16.13.1" sources."regenerator-runtime-0.13.11" @@ -141216,7 +140965,7 @@ in sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."text-table-0.2.0" - sources."textlint-rule-helper-2.2.4" + sources."textlint-rule-helper-2.3.0" sources."too-wordy-0.3.4" sources."tsconfig-paths-3.14.1" sources."type-check-0.4.0" @@ -141327,7 +141076,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -141397,7 +141146,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-3.0.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -141413,7 +141162,7 @@ in sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" @@ -141538,7 +141287,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -141606,7 +141355,7 @@ in sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -141729,7 +141478,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -141799,7 +141548,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-3.0.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -141815,7 +141564,7 @@ in sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" @@ -141940,7 +141689,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -142009,7 +141758,7 @@ in sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -142147,7 +141896,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -142225,7 +141974,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-2.7.4" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -142241,7 +141990,7 @@ in sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -142364,7 +142113,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -142822,7 +142571,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -142908,7 +142657,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -143061,7 +142810,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -143290,7 +143039,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -143376,7 +143125,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -143529,7 +143278,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -144061,10 +143810,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.148.0"; + version = "0.149.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.148.0.tgz"; - sha512 = "8uzVV+qhTPi0bOFs/3te3RW6hb3urL8jYEl6irjCWo/l6sr8MPNMcClFev/MMYeIxr0gmDcoXTy/8LXh/LXkfw=="; + url = "https://registry.npmjs.org/three/-/three-0.149.0.tgz"; + sha512 = "tohpUxPDht0qExRLDTM8sjRLc5d9STURNrdnK3w9A+V4pxaTBfKWWT/IqtiLfg23Vfc3Z+ImNfvRw1/0CtxrkQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -144164,7 +143913,7 @@ in sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" sources."humanize-0.0.9" @@ -144199,7 +143948,7 @@ in sources."performance-now-2.1.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."quick-lru-5.1.1" (sources."request-2.88.2" // { @@ -144513,24 +144262,24 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/node-18.11.18" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" sources."create-require-1.1.1" @@ -144592,10 +144341,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-3.0.2.tgz"; - sha512 = "KJ5kdKzdlNO0mfHbnb9nDKiL244fEd/fqW+b8trVchaLcCFo1aAd0sGX/vP563tdstBew/P1TzKLTnYa17/b8A=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-3.0.3.tgz"; + sha512 = "7FQOXbyWQOnRmOujX/Td2/mBICLuDaVdecALzwx5x7CreV5/GL8+o1KLIMvS7D3/OShV0CiRGmkNmF3Y5L/pdg=="; }; buildInputs = globalBuildInputs; meta = { @@ -144645,17 +144394,17 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.22"; + version = "1.5.23"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.22.tgz"; - sha512 = "zLD9pr4aFn0wzP31xUyag5jpaWmjJHEBp5+xdOC5j0PgmacgKn+PloZYg2rB1rQ/zmOJTo5nOYhkNAoledz9ZA=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.23.tgz"; + sha512 = "3FJW6C12Cn71UiRPTUKmyUYy4qPrJjY7El8bEMqOvakn6knHMuPuM7ijOiNGm7nfKdsRY95gR7pDveqULd367w=="; }; dependencies = [ sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@pnpm/network.ca-file-1.0.2" sources."@pnpm/npm-conf-1.0.5" - sources."@primer/octicons-17.8.0" + sources."@primer/octicons-17.10.2" sources."@sindresorhus/is-5.3.0" sources."@socket.io/component-emitter-3.1.0" sources."@szmarczak/http-timer-5.0.1" @@ -144775,7 +144524,7 @@ in sources."destroy-1.2.0" sources."detective-5.2.1" sources."diff-5.1.0" - sources."diff2html-3.4.29" + sources."diff2html-3.4.31" (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -144829,7 +144578,7 @@ in sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-6.0.1" sources."getmac-5.20.0" sources."glob-7.2.3" @@ -144853,7 +144602,7 @@ in ]; }) sources."htmlescape-1.1.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http2-wrapper-2.2.0" sources."https-browserify-1.0.0" @@ -144921,7 +144670,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."mkdirp-1.0.4" + sources."mkdirp-2.1.3" sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."moment-2.29.4" @@ -144993,7 +144742,7 @@ in sources."resolve-1.22.1" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" - sources."rimraf-3.0.2" + sources."rimraf-4.1.2" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.2" @@ -145030,7 +144779,7 @@ in ]; }) sources."socket.io-adapter-2.4.0" - (sources."socket.io-parser-4.2.1" // { + (sources."socket.io-parser-4.2.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -145084,7 +144833,7 @@ in sources."tty-browserify-0.0.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."uid-safe-2.1.5" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.3" @@ -145215,8 +144964,8 @@ in sources."trough-2.1.0" sources."typedarray-0.0.6" sources."unified-engine-10.1.0" - sources."unist-util-inspect-7.0.1" - sources."unist-util-stringify-position-3.0.2" + sources."unist-util-inspect-7.0.2" + sources."unist-util-stringify-position-3.0.3" sources."util-deprecate-1.0.2" sources."vfile-5.3.6" sources."vfile-message-3.1.3" @@ -145276,7 +145025,7 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."d3-array-3.2.1" + sources."d3-array-3.2.2" sources."d3-color-3.1.0" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" @@ -145436,7 +145185,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" - sources."d3-array-3.2.1" + sources."d3-array-3.2.2" sources."d3-color-3.1.0" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" @@ -145533,16 +145282,39 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "28.12.6"; + version = "28.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-28.12.6.tgz"; - sha512 = "hDR6CfEu2kp5QNbQwS7tS87t7BTYkkF62lIlDx5KXSD/1OniYmVr8P1fyWNmkQ1biRjMNMa6/MMHT/md5b7Qlg=="; + url = "https://registry.npmjs.org/vercel/-/vercel-28.14.0.tgz"; + sha512 = "WMAWwJpj7zxPyMpnpEB4ofsu6ERvjXxzjtsd7AfzNBrgRZ88yBZ3yW5vKHPTVnEtJX8BvGq5o5lBQJOKlm2nfg=="; }; dependencies = [ + sources."@babel/runtime-7.12.1" sources."@cspotcode/source-map-support-0.8.1" sources."@edge-runtime/format-1.1.0" sources."@edge-runtime/primitives-2.0.0" sources."@edge-runtime/vm-2.0.0" + sources."@esbuild/android-arm-0.16.17" + sources."@esbuild/android-arm64-0.16.17" + sources."@esbuild/android-x64-0.16.17" + sources."@esbuild/darwin-arm64-0.16.17" + sources."@esbuild/darwin-x64-0.16.17" + sources."@esbuild/freebsd-arm64-0.16.17" + sources."@esbuild/freebsd-x64-0.16.17" + sources."@esbuild/linux-arm-0.16.17" + sources."@esbuild/linux-arm64-0.16.17" + sources."@esbuild/linux-ia32-0.16.17" + sources."@esbuild/linux-loong64-0.16.17" + sources."@esbuild/linux-mips64el-0.16.17" + sources."@esbuild/linux-ppc64-0.16.17" + sources."@esbuild/linux-riscv64-0.16.17" + sources."@esbuild/linux-s390x-0.16.17" + sources."@esbuild/linux-x64-0.16.17" + sources."@esbuild/netbsd-x64-0.16.17" + sources."@esbuild/openbsd-x64-0.16.17" + sources."@esbuild/sunos-x64-0.16.17" + sources."@esbuild/win32-arm64-0.16.17" + sources."@esbuild/win32-ia32-0.16.17" + sources."@esbuild/win32-x64-0.16.17" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" @@ -145555,18 +145327,18 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@rollup/pluginutils-4.2.1" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@ts-morph/common-0.11.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" @@ -145574,27 +145346,34 @@ in sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.11" sources."@types/node-14.18.33" - sources."@vercel/build-utils-5.9.0" - sources."@vercel/go-2.2.30" - sources."@vercel/hydrogen-0.0.44" - sources."@vercel/next-3.3.15" + sources."@vercel/build-utils-6.0.0" + sources."@vercel/gatsby-plugin-vercel-analytics-1.0.7" + (sources."@vercel/gatsby-plugin-vercel-builder-1.0.2" // { + dependencies = [ + sources."ajv-8.12.0" + sources."esbuild-0.16.17" + ]; + }) + sources."@vercel/go-2.2.31" + sources."@vercel/hydrogen-0.0.45" + sources."@vercel/next-3.3.19" sources."@vercel/nft-0.22.5" - sources."@vercel/node-2.8.13" - sources."@vercel/node-bridge-3.1.9" - sources."@vercel/python-3.1.40" - sources."@vercel/redwood-1.0.51" - sources."@vercel/remix-1.2.5" + sources."@vercel/node-2.8.16" + sources."@vercel/node-bridge-3.1.10" + sources."@vercel/python-3.1.41" + sources."@vercel/redwood-1.0.52" + sources."@vercel/remix-1.2.8" (sources."@vercel/routing-utils-2.1.8" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" ]; }) - sources."@vercel/ruby-1.3.56" - sources."@vercel/static-build-1.1.7" + sources."@vercel/ruby-1.3.57" + sources."@vercel/static-build-1.3.0" sources."@vercel/static-config-2.0.11" sources."abbrev-1.1.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ajv-8.6.3" @@ -145643,6 +145422,7 @@ in sources."esbuild-windows-64-0.14.47" sources."esbuild-windows-arm64-0.14.47" sources."estree-walker-2.0.2" + sources."etag-1.8.1" sources."exit-hook-2.2.1" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" @@ -145650,6 +145430,7 @@ in sources."fastq-1.15.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" + sources."fs-extra-11.1.0" (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" @@ -145672,6 +145453,7 @@ in sources."is-number-7.0.0" sources."json-schema-to-ts-1.6.4" sources."json-schema-traverse-1.0.0" + sources."jsonfile-6.1.0" sources."lru-cache-6.0.0" sources."make-dir-3.1.0" sources."make-error-1.3.6" @@ -145701,9 +145483,10 @@ in sources."picomatch-2.3.1" sources."pretty-bytes-5.6.0" sources."pretty-ms-7.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.0" + sources."regenerator-runtime-0.13.11" sources."require-from-string-2.0.2" sources."resolve-from-5.0.0" sources."reusify-1.0.4" @@ -145725,9 +145508,11 @@ in sources."ts-node-10.9.1" sources."ts-toolbelt-6.15.5" sources."typescript-4.3.4" + sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" + sources."web-vitals-0.2.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wide-align-1.1.5" @@ -145858,10 +145643,10 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.3" @@ -145904,7 +145689,7 @@ in sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" sources."resolve-1.22.1" @@ -146139,16 +145924,16 @@ in sha512 = "r8+ZWDHRAnUPQMyZQa2eZzZyYE8wGia3SCL9ZtVjl6S2MLA5l6NVg3z8Atz4nDQ9JPih858bj0vnthGsjhNLjg=="; }; dependencies = [ - sources."@vscode/l10n-0.0.10" - sources."core-js-3.27.1" + sources."@vscode/l10n-0.0.11" + sources."core-js-3.27.2" sources."jsonc-parser-3.2.0" sources."picomatch-2.3.1" sources."regenerator-runtime-0.13.11" sources."request-light-0.5.8" sources."typescript-4.9.4" - sources."vscode-css-languageservice-6.2.1" - sources."vscode-html-languageservice-5.0.3" - sources."vscode-json-languageservice-5.1.3" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" + sources."vscode-json-languageservice-5.1.4" sources."vscode-jsonrpc-8.1.0-next.7" sources."vscode-languageserver-8.1.0-next.6" (sources."vscode-languageserver-protocol-3.17.3-next.6" // { @@ -146360,7 +146145,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-metadata-1.0.0" (sources."readable-stream-2.3.7" // { @@ -146460,7 +146245,7 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@adobe/css-tools-4.0.2" + sources."@adobe/css-tools-4.1.0" sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" @@ -146814,7 +146599,7 @@ in sources."hosted-git-info-2.8.9" sources."html-void-elements-1.0.5" sources."html-whitespace-sensitive-tag-names-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" (sources."import-fresh-3.3.0" // { @@ -147065,7 +146850,7 @@ in sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."quick-lru-1.1.0" sources."rc-1.2.8" sources."read-pkg-3.0.0" @@ -147319,7 +147104,7 @@ in sources."unist-util-inspect-4.1.4" sources."unist-util-is-2.1.3" sources."unist-util-modify-children-1.1.6" - sources."unist-util-stringify-position-3.0.2" + sources."unist-util-stringify-position-3.0.3" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { dependencies = [ @@ -147429,207 +147214,130 @@ in wavedrom-cli = nodeEnv.buildNodePackage { name = "wavedrom-cli"; packageName = "wavedrom-cli"; - version = "2.8.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom-cli/-/wavedrom-cli-2.8.1.tgz"; - sha512 = "slGcIXCA/j5d2uzQ7flA4/veF0P0eE+Om/Bw7uEO2LC9a3mVNdB+2bSR1CILMjvgyFy9Q9D6eseomQgp7UW5Dg=="; + url = "https://registry.npmjs.org/wavedrom-cli/-/wavedrom-cli-3.1.1.tgz"; + sha512 = "EwAUg6706mBujMLbb4Czhe9Ax5Dw3x64t/X2hn+vIVvVexAANSifVg3yB7ILZmeRSGmv9uYo6kL5J1c/DiGdaw=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.20.7" - sources."@mapbox/node-pre-gyp-1.0.10" - sources."@tootallnate/once-1.1.2" - sources."@types/raf-3.4.0" - sources."abab-2.0.6" - sources."abbrev-1.1.1" - sources."acorn-8.8.1" - (sources."acorn-globals-6.0.0" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) - sources."acorn-walk-7.2.0" - sources."agent-base-6.0.2" + sources."@babel/runtime-7.20.13" + sources."@jimp/bmp-0.16.2" + sources."@jimp/core-0.16.2" + sources."@jimp/custom-0.16.2" + sources."@jimp/gif-0.16.2" + sources."@jimp/jpeg-0.16.2" + sources."@jimp/plugin-blit-0.16.2" + sources."@jimp/plugin-blur-0.16.2" + sources."@jimp/plugin-circle-0.16.2" + sources."@jimp/plugin-color-0.16.2" + sources."@jimp/plugin-contain-0.16.2" + sources."@jimp/plugin-cover-0.16.2" + sources."@jimp/plugin-crop-0.16.2" + sources."@jimp/plugin-displace-0.16.2" + sources."@jimp/plugin-dither-0.16.2" + sources."@jimp/plugin-fisheye-0.16.2" + sources."@jimp/plugin-flip-0.16.2" + sources."@jimp/plugin-gaussian-0.16.2" + sources."@jimp/plugin-invert-0.16.2" + sources."@jimp/plugin-mask-0.16.2" + sources."@jimp/plugin-normalize-0.16.2" + sources."@jimp/plugin-print-0.16.2" + sources."@jimp/plugin-resize-0.16.2" + sources."@jimp/plugin-rotate-0.16.2" + sources."@jimp/plugin-scale-0.16.2" + sources."@jimp/plugin-shadow-0.16.2" + sources."@jimp/plugin-threshold-0.16.2" + sources."@jimp/plugins-0.16.2" + sources."@jimp/png-0.16.2" + sources."@jimp/tiff-0.16.2" + sources."@jimp/types-0.16.2" + sources."@jimp/utils-0.16.2" + sources."@resvg/resvg-js-2.2.0" + sources."@resvg/resvg-js-android-arm-eabi-2.2.0" + sources."@resvg/resvg-js-android-arm64-2.2.0" + sources."@resvg/resvg-js-darwin-arm64-2.2.0" + sources."@resvg/resvg-js-darwin-x64-2.2.0" + sources."@resvg/resvg-js-linux-arm-gnueabihf-2.2.0" + sources."@resvg/resvg-js-linux-arm64-gnu-2.2.0" + sources."@resvg/resvg-js-linux-arm64-musl-2.2.0" + sources."@resvg/resvg-js-linux-x64-gnu-2.2.0" + sources."@resvg/resvg-js-linux-x64-musl-2.2.0" + sources."@resvg/resvg-js-win32-arm64-msvc-2.2.0" + sources."@resvg/resvg-js-win32-ia32-msvc-2.2.0" + sources."@resvg/resvg-js-win32-x64-msvc-2.2.0" + sources."@types/node-16.9.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" - sources."asynckit-0.4.0" + sources."any-base-1.1.0" sources."atob-2.1.2" - sources."balanced-match-1.0.2" - sources."bit-field-1.7.0" - sources."brace-expansion-1.1.11" - sources."browser-process-hrtime-1.0.0" + sources."base64-js-1.5.1" + (sources."bit-field-1.7.0" // { + dependencies = [ + sources."fs-extra-10.1.0" + ]; + }) + sources."bmp-js-0.1.0" sources."btoa-1.2.1" - sources."bufferutil-4.0.7" - sources."canvas-2.11.0" - sources."canvg-3.0.7" - sources."chownr-2.0.0" + sources."buffer-5.7.1" + sources."buffer-equal-0.0.1" sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-js-pure-3.27.1" - sources."cssom-0.4.4" - (sources."cssstyle-2.3.0" // { - dependencies = [ - sources."cssom-0.3.8" - ]; - }) - (sources."data-urls-2.0.0" // { - dependencies = [ - sources."tr46-2.1.0" - sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.7.0" - ]; - }) - sources."debug-4.3.4" - sources."decimal.js-10.4.3" - sources."decompress-response-4.2.1" - sources."deep-is-0.1.4" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."detect-libc-2.0.1" - (sources."domexception-2.0.1" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) + sources."dom-walk-0.1.2" sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" sources."escalade-3.1.1" - sources."escodegen-2.0.0" - sources."esprima-4.0.1" sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-levenshtein-2.0.6" - sources."form-data-3.0.1" - sources."fs-extra-10.1.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."fs.realpath-1.0.0" - sources."gauge-3.0.2" + sources."exif-parser-0.1.12" + sources."file-type-9.0.0" + sources."fs-extra-11.1.0" sources."get-caller-file-2.0.5" - sources."glob-7.2.3" + sources."gifwrap-0.9.4" + sources."global-4.4.0" sources."graceful-fs-4.2.10" - sources."has-unicode-2.0.1" - sources."html-encoding-sniffer-2.0.1" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" + sources."ieee754-1.2.1" + sources."image-q-4.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."is-potential-custom-element-name-1.0.1" - (sources."jsdom-16.7.0" // { - dependencies = [ - sources."tr46-2.1.0" - sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.7.0" - ]; - }) + sources."is-function-1.0.2" + sources."jimp-0.16.2" + sources."jpeg-js-0.4.4" sources."json5-2.2.3" sources."jsonfile-6.1.0" - sources."levn-0.3.0" - sources."lodash-4.17.21" + sources."load-bmfont-1.4.1" sources."logidrom-0.3.1" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-2.1.0" - sources."minimatch-3.1.2" - sources."minipass-4.0.0" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.2" - sources."nan-2.17.0" - sources."node-fetch-2.6.8" - sources."node-gyp-build-4.6.0" - sources."nopt-5.0.0" - sources."npmlog-5.0.1" - sources."nwsapi-2.2.2" - sources."object-assign-4.1.1" - sources."once-1.4.0" + sources."mime-1.6.0" + sources."min-document-2.19.0" + sources."minimist-1.2.7" + sources."mkdirp-0.5.6" + sources."omggif-1.0.10" sources."onml-2.1.0" - sources."optionator-0.8.3" - sources."parse5-6.0.1" - sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" - sources."prelude-ls-1.1.2" - sources."psl-1.9.0" - sources."punycode-2.2.0" - sources."querystringify-2.2.0" - sources."raf-3.4.1" - sources."readable-stream-3.6.0" + sources."pako-1.0.11" + sources."parse-bmfont-ascii-1.0.6" + sources."parse-bmfont-binary-1.0.6" + sources."parse-bmfont-xml-1.1.4" + sources."parse-headers-2.0.5" + sources."phin-2.9.3" + sources."pixelmatch-4.0.2" + sources."pngjs-3.4.0" + sources."process-0.11.10" sources."regenerator-runtime-0.13.11" sources."require-directory-2.1.1" - sources."requires-port-1.0.0" - sources."rgbcolor-1.0.1" - sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."saxes-5.0.1" - sources."semver-7.3.8" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" - sources."source-map-0.6.1" - sources."stackblur-canvas-2.5.0" sources."string-width-4.2.3" - sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."svg-pathdata-5.0.5" - sources."svg2img-0.9.4" - sources."symbol-tree-3.2.4" - sources."tar-6.1.13" - (sources."tough-cookie-4.1.2" // { - dependencies = [ - sources."universalify-0.2.0" - ]; - }) - sources."tr46-0.0.3" + sources."svg2img-1.0.0-beta.2" + sources."timm-1.7.1" + sources."tinycolor2-1.5.2" sources."tspan-0.4.0" - sources."type-check-0.3.2" sources."universalify-2.0.0" - sources."url-parse-1.5.10" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-2.0.0" - sources."wavedrom-2.9.1" - sources."webidl-conversions-3.0.1" - (sources."whatwg-encoding-1.0.5" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-5.0.0" - sources."wide-align-1.1.5" - sources."word-wrap-1.2.3" + sources."utif-2.0.1" + sources."wavedrom-3.1.1" sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."ws-7.5.9" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.2.0" + sources."xhr-2.6.0" + sources."xml-parse-from-string-1.0.1" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" + sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yallist-4.0.0" sources."yargs-17.6.2" sources."yargs-parser-21.1.1" ]; @@ -147646,10 +147354,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "7.4.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-7.4.0.tgz"; - sha512 = "dT2HJaGNXxRNuOtzaVBtEULccL0kM2SN1ark1NnN/ZSlbucobBxCDj6119iki72YyuXpaXZCJGqfZtVf1Znocg=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-7.5.0.tgz"; + sha512 = "Ymflj7Aq/LOD+zGoyvwRbAPx/yMJeig2OEb/rRXYrWl6NWRI5E0c2iWGqlBcnL45iKrOzz70H438dVeJk0w2ug=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -147665,7 +147373,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.20.1" + sources."@babel/runtime-7.20.13" sources."@devicefarmer/adbkit-3.2.3" sources."@devicefarmer/adbkit-logcat-2.1.2" sources."@devicefarmer/adbkit-monkey-1.2.1" @@ -147679,7 +147387,7 @@ in sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" - sources."@mdn/browser-compat-data-5.2.17" + sources."@mdn/browser-compat-data-5.2.29" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -147693,18 +147401,17 @@ in sources."@types/yauzl-2.10.0" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" - sources."addons-linter-5.23.0" + sources."addons-linter-5.27.0" sources."addons-moz-compare-1.3.0" - (sources."addons-scanner-utils-8.1.0" // { + (sources."addons-scanner-utils-8.3.0" // { dependencies = [ sources."node-fetch-2.6.7" ]; }) sources."adm-zip-0.5.10" - sources."ajv-8.11.2" - sources."ajv-merge-patch-5.0.1" + sources."ajv-8.12.0" (sources."ansi-align-3.0.1" // { dependencies = [ sources."string-width-4.2.3" @@ -147761,7 +147468,7 @@ in }) sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."camelcase-7.0.0" + sources."camelcase-7.0.1" sources."caseless-0.12.0" sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.12" @@ -147799,7 +147506,7 @@ in sources."content-type-1.0.4" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.25.3" + sources."core-js-3.27.1" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" (sources."crypto-random-string-4.0.0" // { @@ -147856,14 +147563,14 @@ in sources."escape-goat-4.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.28.0" // { + (sources."eslint-8.32.0" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" sources."strip-json-comments-3.1.1" ]; }) - sources."eslint-plugin-no-unsanitized-4.0.1" + sources."eslint-plugin-no-unsanitized-4.0.2" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -147890,11 +147597,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - (sources."fast-json-patch-2.2.1" // { - dependencies = [ - sources."fast-deep-equal-2.0.1" - ]; - }) + sources."fast-json-patch-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-3.1.2" @@ -147917,14 +147620,14 @@ in sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.7" - sources."fluent-syntax-0.13.0" + sources."fluent-syntax-0.14.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."form-data-encoder-2.1.4" sources."formdata-polyfill-4.0.10" sources."forwarded-0.2.0" sources."fresh-0.5.2" - (sources."fs-extra-10.1.0" // { + (sources."fs-extra-11.1.0" // { dependencies = [ sources."universalify-2.0.0" ]; @@ -147939,10 +147642,10 @@ in ]; }) sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."getpass-0.1.7" - (sources."glob-8.0.3" // { + (sources."glob-8.1.0" // { dependencies = [ sources."brace-expansion-2.0.1" sources."minimatch-5.1.6" @@ -147951,7 +147654,7 @@ in sources."glob-parent-6.0.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.1" - sources."globals-13.19.0" + sources."globals-13.20.0" (sources."got-12.5.3" // { dependencies = [ sources."get-stream-6.0.1" @@ -147973,7 +147676,7 @@ in sources."has-symbols-1.0.3" sources."has-yarn-3.0.0" sources."htmlparser2-8.0.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-signature-1.2.0" sources."http2-wrapper-2.2.0" @@ -148013,8 +147716,8 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jed-1.1.1" - sources."jose-4.11.1" - sources."js-sdsl-4.2.0" + sources."jose-4.11.2" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" @@ -148030,11 +147733,7 @@ in sources."universalify-2.0.0" ]; }) - (sources."jsonwebtoken-8.5.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."jsonwebtoken-9.0.0" sources."jsprim-1.4.2" (sources."jszip-3.10.1" // { dependencies = [ @@ -148057,14 +147756,8 @@ in }) sources."lines-and-columns-2.0.3" sources."locate-path-6.0.0" - sources."lodash.includes-4.3.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isinteger-4.0.4" - sources."lodash.isnumber-3.0.3" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" + sources."lodash-4.17.21" sources."lodash.merge-4.6.2" - sources."lodash.once-4.1.1" sources."lowercase-keys-3.0.0" sources."lru-cache-6.0.0" sources."make-error-1.3.6" @@ -148137,10 +147830,10 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picocolors-1.0.0" - sources."pino-8.7.0" + sources."pino-8.8.0" sources."pino-abstract-transport-1.0.0" sources."pino-std-serializers-6.1.0" - sources."postcss-8.4.19" + sources."postcss-8.4.21" sources."prelude-ls-1.2.1" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -148150,7 +147843,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-3.1.0" sources."qs-6.11.0" sources."queue-6.0.2" @@ -148228,7 +147921,7 @@ in sources."shell-quote-1.7.3" sources."shellwords-0.1.1" sources."side-channel-1.0.4" - sources."sign-addon-5.1.0" + sources."sign-addon-5.2.0" sources."signal-exit-3.0.7" sources."sonic-boom-3.2.1" sources."source-map-0.6.1" @@ -148288,7 +147981,7 @@ in ]; }) sources."uri-js-4.4.1" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -148308,7 +148001,7 @@ in sources."widest-line-4.0.1" sources."winreg-0.0.12" sources."word-wrap-1.2.3" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" @@ -148317,7 +148010,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-8.11.0" + sources."ws-8.12.0" sources."xdg-basedir-5.1.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -148380,13 +148073,13 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.21.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."electron-to-chromium-1.4.284" @@ -148416,7 +148109,7 @@ in sources."neo-async-2.6.2" sources."node-releases-2.0.8" sources."picocolors-1.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.1.1" @@ -148484,13 +148177,13 @@ in sources."@webpack-cli/serve-2.0.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.21.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.19" @@ -148543,7 +148236,7 @@ in sources."path-parse-1.0.7" sources."picocolors-1.0.0" sources."pkg-dir-4.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."rechoir-0.8.0" sources."resolve-1.22.1" @@ -148609,8 +148302,8 @@ in sources."@types/eslint-8.4.10" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" - sources."@types/express-4.17.15" - sources."@types/express-serve-static-core-4.17.32" + sources."@types/express-4.17.16" + sources."@types/express-serve-static-core-4.17.33" sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" sources."@types/mime-3.0.1" @@ -148640,7 +148333,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -148664,7 +148357,7 @@ in sources."bufferutil-4.0.7" sources."bytes-3.0.0" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.19" @@ -148727,7 +148420,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-6.0.1" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -148808,7 +148501,7 @@ in sources."ipaddr.js-1.9.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -148885,7 +148578,7 @@ in sources."unpipe-1.0.0" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -148958,7 +148651,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -148966,7 +148659,7 @@ in sources."braces-3.0.2" sources."browserslist-4.21.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" @@ -149015,7 +148708,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."require-from-string-2.0.2" @@ -149410,7 +149103,7 @@ in ]; }) sources."torrent-piece-2.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.21.3" sources."typedarray-0.0.6" sources."uint64be-2.0.2" @@ -149469,10 +149162,10 @@ in "@withgraphite/graphite-cli" = nodeEnv.buildNodePackage { name = "_at_withgraphite_slash_graphite-cli"; packageName = "@withgraphite/graphite-cli"; - version = "0.20.12"; + version = "0.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-0.20.12.tgz"; - sha512 = "Dki/T3/T3Anl9swh2AbQz2M9ne3jK6kTuInhd5ZIUY9CdXJd1olK1w7o6TWcN6Ez2qT0SQbt9lsjZQEH2vMxxQ=="; + url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-0.20.13.tgz"; + sha512 = "7no/PSf+6WElM1fSgihirkMB6Kz9sLO852q/o/mrzBZuGcHjQeN8bLp1AuK5eKzUo8yohJaVgYqDWtKiLWmU7Q=="; }; dependencies = [ sources."@withgraphite/graphite-cli-routes-0.23.0" @@ -149548,10 +149241,10 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-2.8.0.tgz"; - sha512 = "CAhjoeTnVFB65HPmOSquXbQ37lc2X77iOirX4tRMuRNKQng2NztHOfo++6BZdlV29E4IPD9boTRXck3R+O8mrg=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-2.8.1.tgz"; + sha512 = "O4wUr6/FUpk9KVstOUVYbiiZcWc1jKo7q0FfdwEjnMB3oN7Ofs6cIiX++Lzj1ldFSCOw2/aW3UYgixch6B2WCA=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" @@ -149625,7 +149318,7 @@ in sources."get-stream-6.0.1" sources."glob-parent-5.1.2" sources."html-rewriter-wasm-0.4.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."human-signals-3.0.1" sources."ioredis-4.28.5" sources."is-binary-path-2.1.0" @@ -149690,7 +149383,7 @@ in sources."to-regex-range-5.0.1" sources."undici-5.9.1" sources."urlpattern-polyfill-4.0.3" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."validate-npm-package-name-4.0.0" sources."which-2.0.2" sources."ws-8.12.0" @@ -149735,7 +149428,7 @@ in sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; }; dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" (sources."@eslint/eslintrc-1.4.1" // { dependencies = [ sources."debug-4.3.4" @@ -149754,7 +149447,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@types/json5-0.0.29" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."adverb-where-0.2.5" sources."ajv-6.12.6" @@ -149768,7 +149461,7 @@ in sources."array.prototype.tosorted-1.1.1" sources."ast-types-flow-0.0.7" sources."available-typed-arrays-1.0.5" - sources."axe-core-4.6.2" + sources."axe-core-4.6.3" sources."axobject-query-3.1.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" @@ -149836,11 +149529,11 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globalthis-1.0.3" sources."gopd-1.0.1" sources."grapheme-splitter-1.0.4" @@ -149881,7 +149574,7 @@ in sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" @@ -149920,7 +149613,7 @@ in sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" sources."prop-types-15.8.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."react-is-16.13.1" sources."regenerator-runtime-0.13.11" @@ -150003,7 +149696,7 @@ in sources."fast-deep-equal-3.1.3" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."request-light-0.5.8" sources."require-from-string-2.0.2" sources."uri-js-4.4.1" @@ -150129,7 +149822,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@gar/promisify-1.1.3" sources."@isaacs/string-locale-compare-1.1.0" sources."@nodelib/fs.scandir-2.1.5" @@ -150301,7 +149994,7 @@ in sources."config-chain-1.1.13" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -150387,7 +150080,7 @@ in sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."gauge-1.2.7" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-4.0.1" sources."get-stream-4.1.0" (sources."glob-8.1.0" // { @@ -150520,7 +150213,7 @@ in sources."cacheable-request-6.1.0" sources."get-stream-5.2.0" sources."got-9.6.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."lowercase-keys-2.0.0" sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" @@ -150552,7 +150245,7 @@ in sources."make-dir-3.1.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" ]; }) sources."map-age-cleaner-0.1.3" @@ -150564,7 +150257,7 @@ in }) sources."mem-5.1.1" sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.5.0" + sources."mem-fs-editor-9.6.0" (sources."meow-5.0.0" // { dependencies = [ sources."read-pkg-up-3.0.0" @@ -150636,7 +150329,7 @@ in sources."cacheable-request-6.1.0" sources."get-stream-5.2.0" sources."got-9.6.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."lowercase-keys-2.0.0" sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" @@ -150666,7 +150359,7 @@ in sources."@tootallnate/once-2.0.0" sources."cacache-16.1.3" sources."debug-4.3.4" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."lru-cache-7.14.1" (sources."make-fetch-happen-10.2.1" // { @@ -150734,7 +150427,7 @@ in sources."defer-to-connect-2.0.1" sources."get-stream-5.2.0" sources."got-11.8.6" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."json-buffer-3.0.1" sources."keyv-4.5.2" sources."lowercase-keys-2.0.0" @@ -150959,7 +150652,7 @@ in sources."to-regex-range-5.0.1" sources."treeverse-1.0.4" sources."trim-newlines-2.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-0.0.6" (sources."twig-1.15.4" // { dependencies = [ @@ -151110,10 +150803,10 @@ in "@zwave-js/server" = nodeEnv.buildNodePackage { name = "_at_zwave-js_slash_server"; packageName = "@zwave-js/server"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.24.1.tgz"; - sha512 = "QRBETwKH0V8jTyRXyvko/gdhGck8cXEK/8rnoGAtWjpch/tr83HXNJMdZZhD6KLO9iDl5avWeA+w1m226lwTGg=="; + url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.25.0.tgz"; + sha512 = "+2WlJQ7M9D0mNrE1ovEFNqmDyhewY0kIMtddbbZVGtV2YYRzdBTZfqqwfzFhUAFdeEMyOn6gSIHDmw66t8FbSQ=="; }; dependencies = [ sources."@alcalzone/jsonl-db-2.5.3" @@ -151135,23 +150828,23 @@ in sources."@esm2cjs/p-timeout-5.1.0" sources."@esm2cjs/responselike-3.0.0" sources."@homebridge/ciao-1.1.5" - (sources."@sentry/core-7.31.1" // { + (sources."@sentry/core-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/integrations-7.31.1" // { + (sources."@sentry/integrations-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.31.1" // { + (sources."@sentry/node-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.31.1" - (sources."@sentry/utils-7.31.1" // { + sources."@sentry/types-7.34.0" + (sources."@sentry/utils-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -151171,14 +150864,14 @@ in sources."@serialport/parser-spacepacket-10.5.0" sources."@serialport/stream-10.5.0" sources."@types/http-cache-semantics-4.0.1" - sources."@zwave-js/cc-10.4.0" - sources."@zwave-js/config-10.4.0" - sources."@zwave-js/core-10.4.0" - sources."@zwave-js/host-10.4.0" - sources."@zwave-js/nvmedit-10.4.0" - sources."@zwave-js/serial-10.4.0" + sources."@zwave-js/cc-10.5.2" + sources."@zwave-js/config-10.5.2" + sources."@zwave-js/core-10.5.0" + sources."@zwave-js/host-10.5.2" + sources."@zwave-js/nvmedit-10.5.0" + sources."@zwave-js/serial-10.5.2" sources."@zwave-js/shared-10.4.0" - sources."@zwave-js/testing-10.4.0" + sources."@zwave-js/testing-10.5.2" sources."agent-base-6.0.2" sources."alcalzone-shared-4.0.8" sources."ansi-colors-4.1.3" @@ -151219,7 +150912,7 @@ in sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" sources."graceful-fs-4.2.10" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-2.2.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" @@ -151280,9 +150973,9 @@ in sources."strip-final-newline-2.0.0" sources."text-hex-1.0.0" sources."triple-beam-1.3.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."universalify-2.0.0" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."which-2.0.2" sources."winston-3.8.2" @@ -151295,7 +150988,7 @@ in sources."yallist-4.0.0" sources."yargs-17.6.2" sources."yargs-parser-21.1.1" - sources."zwave-js-10.4.0" + sources."zwave-js-10.5.4" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index b075ea53021a..c3d7204f3635 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -11,10 +11,11 @@ buildDunePackage rec { version = "0.6.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz"; - sha256 = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; + hash = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; }; patches = [ diff --git a/pkgs/development/ocaml-modules/carton/git.nix b/pkgs/development/ocaml-modules/carton/git.nix index 7e08e69543d7..b361ee1447b2 100644 --- a/pkgs/development/ocaml-modules/carton/git.nix +++ b/pkgs/development/ocaml-modules/carton/git.nix @@ -9,6 +9,7 @@ buildDunePackage { pname = "carton-git"; inherit (carton) version src postPatch; + duneVersion = "3"; propagatedBuildInputs = [ carton diff --git a/pkgs/development/ocaml-modules/carton/lwt.nix b/pkgs/development/ocaml-modules/carton/lwt.nix index 2c0cf34ae5a4..60e45823eb50 100644 --- a/pkgs/development/ocaml-modules/carton/lwt.nix +++ b/pkgs/development/ocaml-modules/carton/lwt.nix @@ -11,6 +11,7 @@ buildDunePackage { pname = "carton-lwt"; inherit (carton) version src postPatch; + duneVersion = "3"; propagatedBuildInputs = [ carton diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index a8b460f426ba..c67cfac5410a 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -1,22 +1,24 @@ { lib, fetchurl, buildDunePackage , checkseum, optint, cmdliner , bigstringaf, alcotest, camlzip, base64, ctypes, fmt, crowbar, rresult +, astring, bos }: buildDunePackage rec { pname = "decompress"; - version = "1.5.1"; + version = "1.5.2"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-${version}.tbz"; - sha256 = "sha256-y/OVojFxhksJQQvvtS38SF7ZnMEQhAtwDey0ISwypP4="; + hash = "sha256-qMmmuhMlFNVq02JvvV55EkhEg2AQNQ7hYdQ7spv1di4="; }; buildInputs = [ cmdliner ]; propagatedBuildInputs = [ optint checkseum ]; - nativeCheckInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 crowbar rresult ]; + nativeCheckInputs = [ alcotest astring bigstringaf bos ctypes fmt camlzip base64 crowbar rresult ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix index 41dc6394e84c..5dedd200a825 100644 --- a/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -10,12 +10,14 @@ buildDunePackage rec { pname = "pbkdf"; version = "1.2.0"; + duneVersion = "3"; + src = fetchzip { url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${version}.tar.gz"; sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI="; }; - minimalOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ cstruct mirage-crypto ]; nativeCheckInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 41e13f21a412..1cb14f75faa8 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -8,12 +8,10 @@ buildDunePackage rec { owner = "ACoquereau"; repo = pname; rev = version; - sha256 = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs="; + hash = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs="; }; - useDune2 = true; - - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index 1cc85833d584..8358be50032a 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -28,6 +28,10 @@ buildDunePackage rec { "CHANGES.md" ]; }) + (fetchpatch { + url = "https://github.com/thierry-martinez/pyml/commit/97407473800b3f6215190643c1e6b9bd25d5caeb.patch"; + hash = "sha256-7CrVuV4JT7fyi/ktWz4nNOG/BbqsQVCoJwCAhE2y4YU="; + }) ]; buildInputs = [ @@ -40,7 +44,7 @@ buildDunePackage rec { ]; nativeCheckInputs = [ - python3.pkgs.numpy + python3.pkgs.numpy python3.pkgs.ipython ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index db107003df04..a7d1f573c69a 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config +, AudioToolbox, Cocoa, CoreAudio, CoreVideo, ForceFeedback }: if lib.versionOlder ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" @@ -20,7 +21,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = [ SDL2 ctypes ]; + propagatedBuildInputs = [ SDL2 ctypes ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; preConfigure = '' # The following is done to avoid an additional dependency (ncurses) diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index ca43befd033b..5c6cf00cd232 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.8"; + version = "0.5.9"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "581e062ae878cc087d3d0948670d46b16589df0790bf814524b0587a359f2ada"; + sha256 = "sha256-MLZCoypbZxFhq++ejsNjUvLniiTOhJBU7axpRti53cY="; }; propagatedBuildInputs = [ agate sqlalchemy ]; diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index 534e8441e77a..9a302f5af088 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-generic-client"; - version = "0.1"; + version = "0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-generic-client"; rev = "refs/tags/v${version}"; - hash = "sha256-6Gc3SRRQiISBZnCg7a+rCQHR4NQipBHmG5gWZZXIsxY="; + hash = "sha256-toDvliFMxicaEhlxb7wCadDJErpsIPcZbJz7TpO83GE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix index bd693ead16c7..0635b941c939 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-dbfs"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WQyYgjEe2oxNXBcHMhFXJ++XlIWf/rtJylvb6exwg7k="; + hash = "sha256-R3ov7EssN9kcf8SA8juPu9+TEptzo9Vkb8YwzwFlMQ4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 968726297711..954e3df9637d 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.16.6"; + version = "0.16.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2q8VSYPeRVRWsfG9f95lxTE1qohZen6FxghiH9Mxnjg="; + hash = "sha256-26JjUlFLyNtm93/UkvEO+eV22ZHI1gxWecf2cuBifgE="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index d5fe92f320b0..6334df663747 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "5.0.0"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-BciA3sFyja5xo9yS3WVglC73y8gTfw8UejdEzbD4HYE="; + hash = "sha256-xl+KbNGceJWFvJKH8Aw02Ho+wMAxvxPZ4T09Qimn7OU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index ec351457a222..16786b2e0189 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pythonOlder , ecdsa -, pysha3 , coincurve , pynacl , crcmod @@ -14,21 +13,26 @@ }: buildPythonPackage rec { - pname = "bip_utils"; + pname = "bip-utils"; version = "2.7.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ebellocchia"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-m7/CC5/T6qR2Ot4y5WQlzOAR0czz6XHCjJskES+2nns="; + repo = "bip_utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-m7/CC5/T6qR2Ot4y5WQlzOAR0czz6XHCjJskES+2nns="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "coincurve>=15.0.1,<18.0.0" "coincurve" + ''; + propagatedBuildInputs = [ ecdsa - pysha3 cbor2 pynacl coincurve @@ -42,10 +46,11 @@ buildPythonPackage rec { "bip_utils" ]; - meta = { + meta = with lib; { description = "Implementation of BIP39, BIP32, BIP44, BIP49 and BIP84 for wallet seeds, keys and addresses generation"; homepage = "https://github.com/ebellocchia/bip_utils"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ prusnak stargate01 ]; + changelog = "https://github.com/ebellocchia/bip_utils/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ prusnak stargate01 ]; }; } diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 20525c0f267e..8b28cfacf1ac 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -1,32 +1,34 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , python-dateutil , python-slugify -, requests -, pytestCheckHook , pythonAtLeast , pythonOlder +, requests +, sortedcontainers }: buildPythonPackage rec { pname = "blinkpy"; - version = "0.19.2"; + version = "0.20.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-depaXtbXo5F1JC3M24i6ynWhpm9x9O7UCjkoSzFaSZI="; + hash = "sha256-6la8rCmMtH2N4/P5OVGht1wgSuiW16MmF5a422LADV4="; }; propagatedBuildInputs = [ python-dateutil python-slugify requests + sortedcontainers ]; nativeCheckInputs = [ @@ -52,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the Blink Camera system"; homepage = "https://github.com/fronzbot/blinkpy"; + changelog = "https://github.com/fronzbot/blinkpy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 114c7275f380..08e0b559b0f2 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "cachetools"; - version = "5.2.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tkem"; repo = pname; - rev = "v${version}"; - hash = "sha256-DheHTD62f1ZxoiS0y0/CzDMHvKGmEiEUAX6oaqTpB78="; + rev = "refs/tags/v${version}"; + hash = "sha256-1B/vAfGroGABijMWuiKmIkMyjNSp2B3VkH7s1NMlbw0="; }; nativeCheckInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extensible memoizing collections and decorators"; homepage = "https://github.com/tkem/cachetools"; + changelog = "https://github.com/tkem/cachetools/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 69353dcaec28..e750bbece81d 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -23,7 +23,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - hypothesis + # "hypothesis" indirectly depends on chardet to build its documentation. + (hypothesis.override { enableDocumentation = false; }) pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index ead0a1b1a5c0..b8cf310a06ee 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -62,7 +62,8 @@ buildPythonPackage rec { nativeCheckInputs = [ cryptography-vectors - hypothesis + # "hypothesis" indirectly depends on cryptography to build its documentation + (hypothesis.override { enableDocumentation = false; }) iso8601 pretend py diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix index f2e0a4b2d96c..a33a26d5224d 100644 --- a/pkgs/development/python-modules/dacite/default.nix +++ b/pkgs/development/python-modules/dacite/default.nix @@ -2,13 +2,12 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder -, pythonAtLeast , pytestCheckHook }: buildPythonPackage rec { pname = "dacite"; - version = "1.7.0"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,9 +16,14 @@ buildPythonPackage rec { owner = "konradhalas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+yWvlJcOmqDkHl3JZfPnIV3C4ieSo4FiBvoUZ0+J4N0="; + hash = "sha256-aQwQHFWaXwTaA6GQgDcWT6ivE9YtWtHCTOtxDi503+M="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--benchmark-autosave --benchmark-json=benchmark.json" "" + ''; + nativeCheckInputs = [ pytestCheckHook ]; @@ -28,6 +32,10 @@ buildPythonPackage rec { "dacite" ]; + disabledTestPaths = [ + "tests/performance" + ]; + meta = with lib; { description = "Python helper to create data classes from dictionaries"; homepage = "https://github.com/konradhalas/dacite"; diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index d9128cdc9dc1..6d41bc86ba08 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "3.7.1"; + version = "3.7.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y4LSWo6sbHn239qSdQjwfZO4cyNyoGFQVVGvZbRgYfQ="; + sha256 = "sha256-kHiYknmteenBgce63EpzhGBEUYcQHrDLreZ1k01eRkQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dictpath/default.nix b/pkgs/development/python-modules/dictpath/default.nix deleted file mode 100644 index 8fbe1661ecda..000000000000 --- a/pkgs/development/python-modules/dictpath/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, six -}: - -buildPythonPackage rec { - pname = "dictpath"; - version = "0.4.3"; - - src = fetchFromGitHub { - owner = "p1c2u"; - repo = "dictpath"; - rev = "refs/tags/${version}"; - sha256 = "sha256-4QRFjbeaggoEPVGAmSY+qVMNW0DKqarNfRXaH6B58ew="; - }; - - postPatch = '' - sed -i "/^addopts/d" setup.cfg - ''; - - nativeCheckInputs = [ - pytestCheckHook - six - ]; - - pythonImportsCheck = [ "dictpath" ]; - - meta = with lib; { - description = "Object-oriented dictionary paths"; - homepage = "https://github.com/p1c2u/dictpath"; - license = licenses.asl20; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 2d2e4c7a479a..f6568e691fa1 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.11.1"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V6vZij0/g0hO+fkfklX00jyLMJfs22R8e5sASdYAt/g="; + hash = "sha256-koSGHe5aJy4OGjdYzT87cYCxvRdUh12naHbyp/Rsy2E="; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enlighten Progress Bar for Python Console Apps"; homepage = "https://github.com/Rockhopper-Technologies/enlighten"; + changelog = "https://github.com/Rockhopper-Technologies/enlighten/releases/tag/${version}"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index 008aa6038826..7f5b436a14f5 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -4,6 +4,7 @@ , pythonOlder , pytest , pysha3 +, safe-pysha3 , pycryptodome }: @@ -31,7 +32,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { pycryptodome = [ pycryptodome ]; - pysha3 = [ pysha3 ]; + pysha3 = if pythonOlder "3.9" then [ pysha3 ] else [ safe-pysha3 ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 354b10749938..659a2314d6dd 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -1,25 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, linuxHeaders }: +{ lib +, buildPythonPackage +, fetchPypi +, linuxHeaders +, pythonOlder +}: buildPythonPackage rec { pname = "evdev"; - version = "1.6.0"; + version = "1.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7PoBtchPfoxs7TNnrJUoj0PNhO+/1919DNv8DRjIemo="; + hash = "sha256-KZ24YozHOyN/wcxX08KUj6oHVuKli2GUtb+B3CCB8eM="; }; - buildInputs = [ linuxHeaders ]; + buildInputs = [ + linuxHeaders + ]; patchPhase = '' - substituteInPlace setup.py --replace /usr/include/linux ${linuxHeaders}/include/linux + substituteInPlace setup.py \ + --replace /usr/include/linux ${linuxHeaders}/include/linux ''; doCheck = false; + pythonImportsCheck = [ + "evdev" + ]; + meta = with lib; { description = "Provides bindings to the generic input event interface in Linux"; - homepage = "https://pythonhosted.org/evdev"; + homepage = "https://python-evdev.readthedocs.io/"; + changelog = "https://github.com/gvalkov/python-evdev/blob/v${version}/docs/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 9120017a7da5..5e7930bbc9cd 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.0.4"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "exceptiongroup"; rev = version; - hash = "sha256-csyDWVvcsAMzgomb0xq0NbVP7qYQpDv9obBGANlwiVI="; + hash = "sha256-XQcYYz4MOxWj9QlgM6KuwBaCHjYzGRkQw3cN5WBSnAo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index e2c64333df02..d4a878b6a15f 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.5.0"; + version = "2.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-yb6Tuko7swrrFRQmtXAhm1kl16O813epOOCzOMEg58E="; + hash = "sha256-COGzi/zK6ss47Qi2ll2e92V5WzzxdM5Z5cNmX3b1EH0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 3b2cde0121c7..ec2e0ee13b71 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.6.1"; + version = "0.7.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JLwvJcYcSe5Z7In34pQqHptd8TCrXJeJ6zPiGGv4T14="; + hash = "sha256-rt+Qg1H9t5PC4cyis9xuyf8myfxWLkTq3aD83+O4qmA="; }; propagatedBuildInputs = [ colorama tqdm ]; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index f4e54cd19762..79301cf60031 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.10.3"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kbr"; repo = pname; - rev = version; - sha256 = "sha256-eRvo40VXgo+SQGeh88vRfHPnbrsVDyz03ToIgwRc43Q="; + rev = "refs/tags/${version}"; + hash = "sha256-BHlOX5STnKaIOM5tiBZ9JHNQIYVZfIPDMuSw6DAJliA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index a24ea8ab9723..7c4a5507b540 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -5,16 +5,27 @@ buildPythonPackage rec { pname = "future"; - version = "0.18.2"; + version = "0.18.3"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"; + hash = "sha256-NKF0Nu0elml6hvnePRWjsL4B2LyN6cHf/Vn7gjTtUwc="; }; + pythonImportsCheck = [ + "future.builtins" + "future.moves" + "future.standard_library" + "past.builtins" + "past.translation" + ]; + doCheck = false; meta = { + changelog = "https://github.com/PythonCharmers/python-future/blob/v${version}/docs/whatsnew.rst"; description = "Clean single-source support for Python 3 and 2"; longDescription = '' python-future is the missing compatibility layer between Python 2 and @@ -29,7 +40,7 @@ buildPythonPackage rec { ''; homepage = "https://python-future.org"; downloadPage = "https://github.com/PythonCharmers/python-future/releases"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ prikhi ]; }; } diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 96f540088dc6..05b638559aec 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -5,18 +5,21 @@ , pytest-benchmark , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "getmac"; - version = "0.8.3"; + version = "0.9.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "GhostofGoes"; repo = pname; - rev = version; - sha256 = "sha256-X4uuYisyobCxhoywaSXBZjVxrPAbBiZrWUJAi2/P5mw="; + rev = "refs/tags/${version}"; + hash = "sha256-U04mtg7DCC78X5Fd0wGaHrf8XkUpDLi4+ctKCyR4dKg="; }; nativeCheckInputs = [ @@ -43,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to get the MAC address of network interfaces and hosts on the local network"; homepage = "https://github.com/GhostofGoes/getmac"; + changelog = "https://github.com/GhostofGoes/getmac/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ colemickens ]; }; diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index e943ab50dd65..c9615f1ca30e 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.21"; + version = "0.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ojVwvWj7DLCUzVKCdotRSUQHP1utS60TVFctDzUaN2w="; + sha256 = "sha256-mRI+SalWNGLEwL8UcQIrsEKOpzgat9VdmdV1E5H48aY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index b94fd0635353..d167a07fa611 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zeD1n625F0aHRiUrr0sR6gD21obvAhORg+r5IfOu5rQ="; + hash = "sha256-8RVEoh6jVW9w66x7wzj/qKGXkTg07N2IU9F2uHCCOqo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index a5b2a8fffc28..5935073b1d82 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.1.7"; + version = "2023.1.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-n/j884ttxFCkNnpRuHquzDeWsJchHS0A13CR2CtO4lo="; + sha256 = "sha256-CzvSISNf+cxcpWwttc+K0/EmG/Z7lWtJLX9ahO0/Pq4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 52425fe3a614..c8949968536c 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -16,7 +16,7 @@ let pname = "hassil"; - version = "0.2.5"; + version = "0.2.6"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-/KEYTY3Y/KKP/r2OBf3R/jE7Sp/hNygC/Gdzk9XIf/0="; + hash = "sha256-KbzGZLW+HrG4meOa0mVTh3jmt43gRxl9yN9asWMDxiY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index aa39edd5c24d..33348ff252c7 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -11,8 +11,8 @@ }: buildPythonPackage rec { - version = "4.4.0"; pname = "humanize"; + version = "4.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-humanize"; repo = pname; - rev = version; - hash = "sha256-XxlmOs3sfHOLTkrKGsHRiBWpuCIPJua2VkKxDmjOeWE="; + rev = "refs/tags/${version}"; + hash = "sha256-vTfK45sZ9m7TUQJwZpQWhOXgZzO46CwCsnNP+PI1YfA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python humanize utilities"; homepage = "https://github.com/python-humanize/humanize"; + changelog = "https://github.com/python-humanize/humanize/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ rmcgibbo Luflosi ]; }; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 994262a9871a..61b4f87a6793 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,11 +9,18 @@ , pytest-xdist , sortedcontainers , pythonOlder +, sphinxHook +, sphinx-rtd-theme +, sphinx-hoverxref +, sphinx-codeautolink +# Used to break internal dependency loop. +, enableDocumentation ? true }: buildPythonPackage rec { pname = "hypothesis"; version = "6.61.0"; + outputs = [ "out" ] ++ lib.optional enableDocumentation "doc"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +32,28 @@ buildPythonPackage rec { hash = "sha256-gTcdJaOgP8Nc4fN8UH6+sLedivq5ZNxMRULajFOVnSo="; }; + # I tried to package sphinx-selective-exclude, but it throws + # error about "module 'sphinx' has no attribute 'directives'". + # + # It probably has to do with monkey-patching internals of Sphinx. + # On bright side, this extension does not introduces new commands, + # only changes "::only" command, so we probably okay with stock + # implementation. + # + # I wonder how upstream of "hypothesis" builds documentation. + postPatch = '' + sed -i -e '/sphinx_selective_exclude.eager_only/ d' docs/conf.py + ''; + postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; + nativeBuildInputs = lib.optionals enableDocumentation [ + sphinxHook + sphinx-rtd-theme + sphinx-hoverxref + sphinx-codeautolink + ]; + propagatedBuildInputs = [ attrs sortedcontainers diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index c0db14ca1fdd..2d705352d1b3 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.16"; + version = "2.5.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4A+3O3z2bdJ/bUcIy9H8HTxaARxWJ7uDM4gD+dRFLtE="; + sha256 = "sha256-urviMomTJdbublr2nCj25R/xbs/pEsRKWxmklneTjOQ="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 584aa0050ed5..8d6677b046af 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -1,26 +1,37 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.2.0"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AP8yf2eEBT8LWs03hKihCgbBkS9sEUg5NkYdagFiqwA="; + hash = "sha256-QaWRafp0901vQFMtlmFzkugNsM4PHRll+FUZlEz6E5g="; }; + nativeBuildInputs = [ + setuptools + ]; + # upstream has no tests doCheck = false; - pythonImportsCheck = [ "insteon_frontend" ]; + pythonImportsCheck = [ + "insteon_frontend" + ]; - meta = { + meta = with lib; { description = "The Insteon frontend for Home Assistant"; homepage = "https://github.com/teharris1/insteon-panel"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 2bede522584c..e0021cbc39e0 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "3.2.0"; + version = "3.3.0"; format = "setuptools"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cB7nRDmO2NNaHjNkHCuXH0+15WZfxseS8DBdIqefSzk="; + sha256 = "sha256-PLf+PMIXlaoL974e7coQCQKH6cVBYODPhkDxa2vhTB0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index c3e022cdb38b..af90e739163c 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -25,7 +25,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - hypothesis + # "hypothesis" indirectly depends on iso8601 to build its documentation + (hypothesis.override { enableDocumentation = false; }) pytestCheckHook pytz ]; diff --git a/pkgs/development/python-modules/iteration-utilities/default.nix b/pkgs/development/python-modules/iteration-utilities/default.nix new file mode 100644 index 000000000000..fd17b76103ba --- /dev/null +++ b/pkgs/development/python-modules/iteration-utilities/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "iteration-utilities"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "MSeifert04"; + repo = "iteration_utilities"; + rev = "v${version}"; + sha256 = "sha256-Q/ZuwAf+NPikN8/eltwaUilnLw4DKFm864tUe6GLDak="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "iteration_utilities" ]; + + meta = with lib; { + description = "Utilities based on Pythons iterators and generators"; + homepage = "https://github.com/MSeifert04/iteration_utilities"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix index 6a8c0fd1ea4a..7a882c80195c 100644 --- a/pkgs/development/python-modules/jaraco-context/default.nix +++ b/pkgs/development/python-modules/jaraco-context/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "jaraco-context"; - version = "4.2.0"; + version = "4.3.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.context"; rev = "refs/tags/v${version}"; - sha256 = "sha256-J7vL+pvwXcKEkqZn44/U01HmP1CI5kIGsJ1aJevp0I4="; + hash = "sha256-YdbkpKv7k62uyhmjKoxeA9uf5BWnRD/rK+z46FJN4xk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,11 +32,14 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ "jaraco.context" ]; + pythonImportsCheck = [ + "jaraco.context" + ]; meta = with lib; { description = "Python module for context management"; homepage = "https://github.com/jaraco/jaraco.context"; + changelog = "https://github.com/jaraco/jaraco.context/blob/v${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/jinja2-ansible-filters/default.nix b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix new file mode 100644 index 000000000000..33975ee204ea --- /dev/null +++ b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, jinja2 +, pyyaml +}: + +buildPythonPackage rec { + pname = "jinja2-ansible-filters"; + version = "1.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-B8EM9E1wc/TwEQLKEtmi3DG0HUfkxh7ZLvam0mabNWs="; + }; + + propagatedBuildInputs = [ + jinja2 + pyyaml + ]; + + # no tests include in sdist, and source not available + doCheck = false; + + pythonImportsCheck = [ "jinja2_ansible_filters" ]; + + meta = with lib; { + description = "Jinja2 Ansible Filters"; + homepage = "https://pypi.org/project/jinja2-ansible-filters/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 3e4f31dff60a..0a9e26771c4a 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , six , attrs , twisted @@ -9,17 +10,30 @@ , autobahn , treq , mock +, pythonOlder }: buildPythonPackage rec { - version = "0.4.1"; pname = "magic-wormhole-mailbox-server"; + version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb"; }; + patches = [ + (fetchpatch { + # Remove the 'U' open mode removed, https://github.com/magic-wormhole/magic-wormhole-mailbox-server/pull/34 + name = "fix-for-python-3.11.patch"; + url = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/4b358859ba80de37c3dc0a5f67ec36909fd48234.patch"; + hash = "sha256-RzZ5kD+xhmFYusVzAbGE+CODXtJVR1zN2rZ+VGApXiQ="; + }) + ]; + propagatedBuildInputs = [ attrs six @@ -33,6 +47,7 @@ buildPythonPackage rec { mock twisted ]; + checkPhase = '' trial -j$NIX_BUILD_CORES wormhole_mailbox_server ''; @@ -40,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Securely transfer data between computers"; homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; + changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index fb44a1281c54..e467023a8793 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.1"; + version = "0.13.2"; disabled = pythonOlder "3.5"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-/HcWVXguZf9cCGY0xlC7uMnLkSAqZ0DIAC6JUw2KKDs="; + hash = "sha256-gZl2VH7qCmjrM/UrXPief8hCQKkBHdjG8w0MQvkZ7wk="; }; patches = [ diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index ff92d814a099..dd3553419792 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -1,40 +1,67 @@ { lib , buildPythonPackage -, fetchPypi -, aiohttp +, fetchFromGitHub , pythonOlder -, sqlalchemy -, ruamel-yaml -, CommonMark -, lxml + # deps +, aiohttp +, attrs +, yarl + # optional deps +, python-magic +, python-olm +, unpaddedbase64 +, pycryptodome + # check deps +, pytestCheckHook +, pytest-asyncio , aiosqlite +, sqlalchemy +, asyncpg }: buildPythonPackage rec { pname = "mautrix"; - version = "0.18.9"; + version = "0.19.3"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Ihaz/izB9L6osu3CPwBWOwLZ2JOLKhsDuqOUf/B02qI="; + src = fetchFromGitHub { + owner = "mautrix"; + repo = "python"; + rev = "v${version}"; + hash = "sha256-7nvy2/DUS2BkcyQUUG8+aT/JHcPu141e5YWOiccS6cU="; }; propagatedBuildInputs = [ aiohttp - - # defined in optional-requirements.txt - sqlalchemy - aiosqlite - ruamel-yaml - CommonMark - lxml + attrs + yarl ]; - # no tests available - doCheck = false; + passthru.optional-dependencies = { + detect_mimetype = [ + python-magic + ]; + encryption = [ + python-olm + unpaddedbase64 + pycryptodome + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + pytest-asyncio + aiosqlite + sqlalchemy + asyncpg + ] ++ passthru.optional-dependencies.encryption; + + SQLALCHEMY_SILENCE_UBER_WARNING = 1; pythonImportsCheck = [ "mautrix" @@ -45,6 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/tulir/mautrix-python"; changelog = "https://github.com/mautrix/python/releases/tag/v${version}"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanloutre ma27 sumnerevans ]; + maintainers = with maintainers; [ nyanloutre ma27 sumnerevans nickcao ]; }; } diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 6fbb4aa877fb..e97c739c21e2 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 = "2.0.9"; + version = "2.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-3OA61cuj9u6ejkQJgCjnu8ERjACKXz2hUekbvZqiPJ8="; + hash = "sha256-p3ELXfTe0bHrsinEz+iXZIifJykdnW5i7FFLsAhtyoc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix new file mode 100644 index 000000000000..57f900c6ab12 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, beautifulsoup4 +, jsbeautifier +, mkdocs +, mkdocs-material +, pymdown-extensions +, pyyaml +, requests +}: + +buildPythonPackage rec { + pname = "mkdocs-mermaid2-plugin"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "fralau"; + repo = "mkdocs-mermaid2-plugin"; + rev = "v${version}"; + sha256 = "sha256-Oe6wkVrsB0NWF+HHeifrEogjxdGPINRDJGkh9p+GoHs="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + jsbeautifier + mkdocs + mkdocs-material + pymdown-extensions + pyyaml + requests + ]; + + # non-traditional python tests (e.g. nodejs based tests) + doCheck = false; + + pythonImportsCheck = [ "mermaid2" ]; + + meta = with lib; { + description = "A MkDocs plugin for including mermaid graphs in markdown sources"; + homepage = "https://github.com/fralau/mkdocs-mermaid2-plugin"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/moku/default.nix b/pkgs/development/python-modules/moku/default.nix index e93f1a054fac..3aba750f22e7 100644 --- a/pkgs/development/python-modules/moku/default.nix +++ b/pkgs/development/python-modules/moku/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "moku"; - version = "2.5.1"; + version = "2.6.0"; /* @@ -22,7 +22,7 @@ buildPythonPackage rec { */ src = fetchPypi { inherit pname version; - hash = "sha256-oFRwJ6i4wfjA3E2QMqE4ybutT7OZiFZ3LYXoplY3D/I="; + hash = "sha256-tG54V26H7viu5DPs3EWTg7ouCsdC3EXoeb8iexO6YBw="; }; /* diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 2c6fe00e9d2f..42067f594e8b 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "1.0.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fBEdpM79JEQzy2M3ev8IGkD4S92unm83bGfwhsD4Bto="; + sha256 = "sha256-rFUd5pK+aupbQ6w/LDN4DflAATrG3QcY+1Usi1YLpmE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index ff7bc68dd23c..5640c01d6430 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -77,7 +77,8 @@ in buildPythonPackage rec { nativeCheckInputs = [ pytest - hypothesis + # "hypothesis" indirectly depends on numpy to build its documentation. + (hypothesis.override { enableDocumentation = false; }) typing-extensions ]; diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix new file mode 100644 index 000000000000..7f9fd5c85b16 --- /dev/null +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -0,0 +1,59 @@ +{ aiohttp +, botocore +, buildPythonPackage +, certifi +, fetchFromGitHub +, lib +, mock +, pytest-asyncio +, pytestCheckHook +, pyyaml +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "opensearch-py"; + version = "2.1.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "opensearch-project"; + repo = "opensearch-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-uJ6fdRPDK76qKHE4E6dI01vKgvfqbc6A1RCwnOtuOTY="; + }; + + propagatedBuildInputs = [ + botocore + certifi + requests + urllib3 + ]; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + pyyaml + ] ++ passthru.optional-dependencies.async; + + disabledTestPaths = [ + # require network + "test_opensearchpy/test_async/test_connection.py" + "test_opensearchpy/test_async/test_server" + "test_opensearchpy/test_connection.py" + "test_opensearchpy/test_server" + "test_opensearchpy/test_server_secured" + ]; + + passthru.optional-dependencies.async = [ aiohttp ]; + + meta = { + description = "Python low-level client for OpenSearch"; + homepage = "https://github.com/opensearch-project/opensearch-py"; + changelog = "https://github.com/opensearch-project/opensearch-py/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mcwitt ]; + }; +} diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 50ea51adecb1..4890614ed5a9 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -16,20 +16,20 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.8.2"; + version = "3.8.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - hash = "sha256-jiyYCjZ6c62zmm4Ge9KbEI8/PtPunu79HVODyoHFdSg="; + hash = "sha256-XQBiE8hmLC/AIRt0eJri/ilPHUEYiOxd0onRBQsx+pM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-z1B0oSp37OGJ21Q57UUfmSRfUWLftiiBayN9y6yKNyg="; + hash = "sha256-O2W9zO7qHWG+78T+uECICAmecaSIbTTJPktJIPZYElE="; }; format = "pyproject"; @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"; homepage = "https://github.com/ijl/orjson"; + changelog = "https://github.com/ijl/orjson/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; platforms = platforms.unix; maintainers = with maintainers; [ misuzu ]; diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix index bc3b1aa62f96..219bb1f2910a 100644 --- a/pkgs/development/python-modules/p1monitor/default.nix +++ b/pkgs/development/python-modules/p1monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "p1monitor"; - version = "2.2.0"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-p1monitor"; - rev = "refs/tags/${version}"; - hash = "sha256-HaTwqTKqTuXZVt2fhKXyXEEYZCSau/YY6DRg6YHIhOI="; + rev = "refs/tags/v${version}"; + hash = "sha256-jmSSejflez3AmIp7PY6m0+vW8YZuNgUj8lwyu0roLYc="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with the P1 Monitor"; homepage = "https://github.com/klaasnicolaas/python-p1monitor"; - changelog = "https://github.com/klaasnicolaas/python-p1monitor/releases/tag/${version}"; + changelog = "https://github.com/klaasnicolaas/python-p1monitor/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix deleted file mode 100644 index c657a2fa1b12..000000000000 --- a/pkgs/development/python-modules/pafy/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, youtube-dl, fetchPypi }: -buildPythonPackage rec { - pname = "pafy"; - version = "0.5.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "364f1d1312c89582d97dc7225cf6858cde27cb11dfd64a9c2bab1a2f32133b1e"; - }; - - # No tests included in archive - doCheck = false; - - propagatedBuildInputs = [ youtube-dl ]; - - meta = with lib; { - description = "A library to download YouTube content and retrieve metadata"; - homepage = "https://github.com/mps-youtube/pafy"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ odi ]; - }; -} - diff --git a/pkgs/development/python-modules/pathable/default.nix b/pkgs/development/python-modules/pathable/default.nix index b7ab5b9d32dd..789162b1fe52 100644 --- a/pkgs/development/python-modules/pathable/default.nix +++ b/pkgs/development/python-modules/pathable/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for object-oriented paths"; homepage = "https://github.com/p1c2u/pathable"; + changelog = "https://github.com/p1c2u/pathable/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix index c5492c149f27..feb347b797c7 100644 --- a/pkgs/development/python-modules/pathy/default.nix +++ b/pkgs/development/python-modules/pathy/default.nix @@ -12,20 +12,20 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.6.1"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "838624441f799a06b446a657e4ecc9ebc3fdd05234397e044a7c87e8f6e76b1c"; + hash = "sha256-TNbnG0zV/4dc+7lJrZ+lUZ2NHb5p1fwdGyOqPLBJYYs="; }; propagatedBuildInputs = [ + google-cloud-storage smart-open typer - google-cloud-storage ]; nativeCheckInputs = [ @@ -33,15 +33,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Support for smart-open >= 6.0.0, https://github.com/justindujardin/pathy/pull/71 - (fetchpatch { - name = "support-later-smart-open.patch"; - url = "https://github.com/justindujardin/pathy/commit/ba1c23df6ee5d1e57bdfe845ff6a9315cba3df6a.patch"; - sha256 = "sha256-V1i4tx73Xkdqb/wZhQIv4p6FVpF9SEfDhlBkwaaRE3w="; - }) - ]; - disabledTestPaths = [ # Exclude tests that require provider credentials "pathy/_tests/test_clients.py" diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index b8e386d7c209..7692ab2fceed 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -5,6 +5,7 @@ , jinja2 , markupsafe , poetry-core +, poetry , pytestCheckHook , pythonOlder , tomlkit @@ -37,8 +38,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + poetry ]; + # virtualenv: error: argument dest: the destination . is not write-able at / + doCheck = false; + disabledTests = [ # these require .git, but leaveDotGit = true doesn't help "test__get_version__defaults" diff --git a/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock b/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock index ded748b62770..0a31c382b1d4 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock +++ b/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock @@ -10,9 +10,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "autocfg" @@ -28,31 +28,13 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" -version = "0.7.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", - "byte-tools", - "byteorder", "generic-array", ] -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "byteorder" version = "1.4.3" @@ -66,57 +48,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "ctor" -version = "0.1.23" +name = "cpufeatures" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", "syn", ] [[package]] -name = "curve25519-dalek" -version = "2.1.3" +name = "curve25519-dalek-ng" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ "byteorder", "digest", "rand_core", - "subtle", + "subtle-ng", "zeroize", ] [[package]] name = "digest" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ "generic-array", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "generic-array" -version = "0.12.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", + "version_check", ] [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -125,9 +111,9 @@ dependencies = [ [[package]] name = "ghost" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" +checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" dependencies = [ "proc-macro2", "quote", @@ -136,22 +122,9 @@ dependencies = [ [[package]] name = "hex-literal" -version = "0.2.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70693199b3cf4552f3fa720b54163927a3ebed2aef240efaf556033ab336a11" -dependencies = [ - "hex-literal-impl", - "proc-macro-hack", -] - -[[package]] -name = "hex-literal-impl" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59448fc2f82a5fb6907f78c3d69d843e82ff5b051923313cc4438cb0c7b745a8" -dependencies = [ - "proc-macro-hack", -] +checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" [[package]] name = "indoc" @@ -209,15 +182,18 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "libc" -version = "0.2.134" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "lock_api" @@ -231,9 +207,9 @@ dependencies = [ [[package]] name = "merlin" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", @@ -243,9 +219,9 @@ dependencies = [ [[package]] name = "opaque-debug" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "parking_lot" @@ -260,9 +236,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -291,30 +267,24 @@ dependencies = [ "proc-macro-hack", ] -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] [[package]] name = "py-sr25519-bindings" -version = "0.1.5" +version = "0.2.0" dependencies = [ "hex-literal", "pyo3", @@ -361,54 +331,22 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -420,19 +358,18 @@ dependencies = [ [[package]] name = "schnorrkel" -version = "0.9.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" +checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" dependencies = [ "arrayref", "arrayvec", - "curve25519-dalek", - "getrandom", + "curve25519-dalek-ng", "merlin", - "rand", "rand_core", + "serde_bytes", "sha2", - "subtle", + "subtle-ng", "zeroize", ] @@ -443,14 +380,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "sha2" -version = "0.8.2" +name = "serde" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" + +[[package]] +name = "serde_bytes" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" +dependencies = [ + "serde", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer", + "cfg-if", + "cpufeatures", "digest", - "fake-simd", "opaque-debug", ] @@ -461,16 +414,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] -name = "subtle" -version = "2.4.1" +name = "subtle-ng" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -491,15 +444,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-ident" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-xid" @@ -509,15 +462,21 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unindent" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "winapi" @@ -552,9 +511,9 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index dd940f0ee43e..ed2c0022a0a3 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -1,31 +1,36 @@ { lib +, aiohttp +, async-timeout , buildPythonPackage , fetchFromGitHub , poetry-core , pytestCheckHook -, requests -, urllib3 +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "1.0.8"; + version = "2.1.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "mib1185"; - repo = "synologydsm-api"; - rev = "v${version}"; - sha256 = "sha256-9bh7uLt9+uda6yFCWV6xUh//jFC4DgiS+KtRXQrU3A8="; + repo = "py-synologydsm-api"; + rev = "refs/tags/v${version}"; + hash = "sha256-bolcqPIBHglZ7Em8/66MBypivDPehdgTaPOxAjR9Bd0="; }; nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ - requests - urllib3 + aiohttp + async-timeout ]; nativeCheckInputs = [ @@ -38,7 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for Synology DSM"; - homepage = "https://github.com/hacf-fr/synologydsm-api"; + homepage = "https://github.com/mib1185/py-synologydsm-api"; + changelog = "https://github.com/mib1185/py-synologydsm-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ uvnikita ]; }; diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index fceece73a52b..7c1c76c4adb5 100644 --- a/pkgs/development/python-modules/pyaftership/default.nix +++ b/pkgs/development/python-modules/pyaftership/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyaftership"; - version = "21.11.0"; + version = "23.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-SN7fvI/+VHYn2eYQe5wp6lEZ73YeZbsiPjDiq/Ibk3Q="; + rev = "refs/tags/${version}"; + hash = "sha256-njlDScmxIYWxB4EL9lOSGCXqZDzP999gI9EkpcZyFlE="; }; propagatedBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper package for the AfterShip API"; homepage = "https://github.com/ludeeus/pyaftership"; + changelog = "https://github.com/ludeeus/pyaftership/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; }; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 1286805a918c..a5154a3e4abd 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - hash = "sha256-YxAkozyWNTKMCIEk3AhHZbRHtzhRrCSB3wh/Qy9CIyU="; + hash = "sha256-Rlr6Ec6BEujTxQkQ9UP+6u0cYeFsJlj7U346MtRM6QM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 20514c064627..2d0b967cb347 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.8.0"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mustang51"; repo = pname; rev = "v${version}"; - hash = "sha256-AZDwoq4lCThzwHI0WCzrV9Il2MHp0LKxWg/dscGw0q0="; + hash = "sha256-cJkrBt4HRH2SX4YWo+gK4rd7uyZRzLUvFXJ6L5nxzeM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 17966ad58b21..38b71b80e782 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "22.8.0"; + version = "23.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-30UHbxs0WZyIVyq0ai2PsoPTkvoYawS1OBhVbV0JVN8="; + sha256 = "sha256-HMJqZn0yzN2dP5WTRCbem1Xw8nyH2Hy7oVP4kEKHHAo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index b2035077fa0d..ec6d51191966 100644 --- a/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/pkgs/development/python-modules/pyhiveapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.5.14"; + version = "0.5.15"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "refs/tags/v${version}"; - hash = "sha256-YBcVoffcM3nkVmuPKE6WR/1TqAiz6ePzCxcrntqCQkY="; + hash = "sha256-tR2PCR1qGn4KnqAjEpcRTcVlMEpKCwn5RAm99AXBSnk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index d0f4437cddb3..e1a3d542581f 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -1,15 +1,17 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, requests -, python-dateutil , aiohttp +, buildPythonPackage +, colorlog +, fetchFromGitHub +, python-dateutil , pythonOlder +, requests +, setuptools-scm }: buildPythonPackage rec { pname = "pyisy"; - version = "3.0.12"; + version = "3.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,17 +20,23 @@ buildPythonPackage rec { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-i9xC1Vijf/pU7WmRaosdEs5tPNos2hq3cGkT8MGM1Ro="; + hash = "sha256-X/flikSo0PKHz4iBw4AjhCwpTtt2P+1jrlTAanYgO1A="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' substituteInPlace setup.py \ - --replace "setuptools-git-version" "" \ --replace 'version_format="{tag}"' 'version="${version}"' ''; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ aiohttp + colorlog python-dateutil requests ]; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 04e397e59704..8b1b41cf3c44 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.1.1"; + version = "2023.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nWKBbb2S8V81KQihGQYg9GBK97xv5FXuem5pUPB+cew="; + hash = "sha256-PSg0u4Beg0OVUMxaBCPxJSVO/MxBvCpDu2rQhiYT9OM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 766ef2703984..bd4ab4f0233d 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.3.4"; + version = "5.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; rev = "refs/tags/${version}"; - hash = "sha256-qg/aFK7rt2a/ZcLm+VSlq8UYBh6zS0/VVLqRAN7kLus="; + hash = "sha256-cxWPnq+xGDaJ1rj/K25ELATFAW+/eteilrnqrCftW0Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 00351c5dc516..72ba19f8a2e8 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -12,7 +12,9 @@ , pytest-httpx , pytest-mock , pytestCheckHook +, pythonAtLeast , pythonOlder +, pythonRelaxDepsHook , qcs-api-client , respx , retry @@ -24,7 +26,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "3.3.2"; + version = "3.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,12 +34,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rigetti"; repo = pname; - rev = "v${version}"; - hash = "sha256-Ur7dRxmnaAWXHk7c6NC3lBw59RRgh9vwAHFW00fViD4="; + rev = "refs/tags/v${version}"; + hash = "sha256-jA6nYQSfdxd9FCTMQlYTe/EbV39vV0h9F9Fgf1M0+SY="; }; + pythonRelaxDeps = [ + "lark" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -55,21 +62,18 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ pytest-asyncio pytest-freezegun pytest-httpx pytest-mock - pytestCheckHook respx ipython ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'lark = "^0.11.1"' 'lark = "*"' \ - --replace 'qcs-api-client = ">=0.8.1,<0.21.0"' 'qcs-api-client = "*"' - ''; - disabledTestPaths = [ # Tests require network access "test/e2e/" @@ -85,6 +89,8 @@ buildPythonPackage rec { "test/unit/test_reference_wavefunction.py" # Out-dated "test/unit/test_qpu_client.py" + "test/unit/test_qvm_client.py" + "test/unit/test_reference_density.py" ]; disabledTests = [ @@ -102,6 +108,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for creating Quantum Instruction Language (Quil) programs"; homepage = "https://github.com/rigetti/pyquil"; + changelog = "https://github.com/rigetti/pyquil/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 44a7779d3a59..426459a67fb4 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -13,28 +13,48 @@ , webob , zope_deprecation , zope_interface +, pythonOlder }: buildPythonPackage rec { pname = "pyramid"; - version = "2.0"; + version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77"; + hash = "sha256-+r/XRQOeJq1bCRX8OW6HJcD4o9F7lB+WEezR7XbP59o="; }; - nativeCheckInputs = [ webtest zope_component ]; + propagatedBuildInputs = [ + hupper + pastedeploy + plaster + plaster-pastedeploy + repoze_lru + translationstring + venusian + webob + zope_deprecation + zope_interface + ]; - propagatedBuildInputs = [ hupper pastedeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ]; + nativeCheckInputs = [ + webtest + zope_component + ]; - pythonImportsCheck = [ "pyramid" ]; + pythonImportsCheck = [ + "pyramid" + ]; meta = with lib; { - description = "The Pyramid Web Framework, a Pylons project"; + description = "Python web framework"; homepage = "https://trypyramid.com/"; + changelog = "https://github.com/Pylons/pyramid/blob/${version}/CHANGES.rst"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index fc8bdc2ab0d1..db7848a9282a 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "pysvn"; - version = "1.9.18"; + version = "1.9.20"; format = "other"; src = fetchurl { - url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; - hash = "sha256-lUPsNumMYwZoiR1Gt/hqdLLoHOZybRxwvu9+eU1CY78="; + url = "mirror://sourceforge/project/pysvn/pysvn/V${version}/pysvn-${version}.tar.gz"; + hash = "sha256-LbAz+KjEY3nkSJAzJNwlnSRYoWr4i1ITRUPV3ZBH7cc="; }; patches = [ @@ -62,8 +62,7 @@ buildPythonPackage rec { runHook postCheck ''; - # FIXME https://github.com/NixOS/nixpkgs/issues/175227 - # pythonImportsCheck = [ "pysvn" ]; + pythonImportsCheck = [ "pysvn" ]; installPhase = '' dest=$(toPythonPath $out)/pysvn diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 40edcd264ed3..801dabdf4ead 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.37.0"; + version = "0.37.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-+bkEaXIvIX67D8b3CIhNM/rz2DjUbpjsshImoUopjlA="; + hash = "sha256-6td0ueo21h3B2ITV6wXehiwDPIB8+4m0K5hnMm8Mu54="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix index a9e5ff4510c0..5d2c51675c43 100644 --- a/pkgs/development/python-modules/pytautulli/default.nix +++ b/pkgs/development/python-modules/pytautulli/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytautulli"; - version = "23.1.0"; + version = "23.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wNR97rGmm/Tmx/o0+r6BTL1muNv25nq9nZaE8/SAi14="; + hash = "sha256-5wE8FjLFu1oQkVqnWsbp253dsQ1/QGWC6hHSIFwLajY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index b9def8d834af..6fd0cefb51c3 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-benchmark"; - version = "3.4.1"; + version = "4.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "ionelmc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qc/8Epax5bPUZvhq42xSj6NUq0T4gbO5dDDS6omWBOU="; + hash = "sha256-f9Ty4+5PycraxoLUSa9JFusV5Cot6bBWKfOGHZIRR3o="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pyyaml-include/default.nix b/pkgs/development/python-modules/pyyaml-include/default.nix new file mode 100644 index 000000000000..e6effdd72740 --- /dev/null +++ b/pkgs/development/python-modules/pyyaml-include/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi +, pytestCheckHook +, pyyaml +, setuptools-scm +, setuptools-scm-git-archive +, toml +}: + +buildPythonPackage rec { + pname = "pyyaml-include"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-9/vrjnG1C+Dm4HRy98edv7GhW63pyToHg2n/SeV+Z3E="; + }; + + nativeBuildInputs = [ + pyyaml + setuptools-scm + setuptools-scm-git-archive + toml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "yamlinclude" ]; + + meta = with lib; { + description = "Extending PyYAML with a custom constructor for including YAML files within YAML files"; + homepage = "https://github.com/tanbro/pyyaml-include"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 74b688c232f4..48b0e0ac7e04 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -11,7 +11,9 @@ , pytest-asyncio , pytestCheckHook , python-dateutil +, pythonAtLeast , pythonOlder +, pythonRelaxDepsHook , respx , retrying , rfc3339 @@ -20,7 +22,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.2"; + version = "0.21.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,11 +31,26 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-gQow1bNRPhUm4zRu2T5FpcgOTcS2F1TQIz8WP1K0Xww="; + hash = "sha256-GEsCyqawLX6fTICjAOOREsO5FsmV6U/5+sDOW1v+VKE="; }; + patches = [ + # Switch to poetry-core, https://github.com/rigetti/qcs-api-client-python/pull/2 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/rigetti/qcs-api-client-python/commit/32f0b3c7070a65f4edf5b2552648d88435469e44.patch"; + hash = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ="; + }) + ]; + + pythonRelaxDeps = [ + "attrs" + "httpx" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -54,32 +71,8 @@ buildPythonPackage rec { respx ]; - patches = [ - # Switch to poetry-core, https://github.com/rigetti/qcs-api-client-python/pull/2 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/rigetti/qcs-api-client-python/commit/32f0b3c7070a65f4edf5b2552648d88435469e44.patch"; - hash = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'attrs = "^20.1.0"' 'attrs = "*"' \ - --replace 'httpx = "^0.15.0"' 'httpx = "*"' \ - --replace 'iso8601 = "^0.1.13"' 'iso8601 = "*"' \ - --replace 'pydantic = "^1.7.2"' 'pydantic = "*"' \ - --replace 'pyjwt = "^1.7.1"' 'pyjwt = "*"' - ''; - - disabledTestPaths = [ - # Test is outdated - "tests/test_client/test_additional_properties.py" - "tests/test_client/test_auth.py" - "tests/test_client/test_client.py" - "tests/test_client/test_datetime.py" - "tests/test_imports.py" - ]; + # Tests are failing on Python 3.11, Fatal Python error: Aborted + doCheck = !(pythonAtLeast "3.11"); pythonImportsCheck = [ "qcs_api_client" @@ -88,6 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing the Rigetti QCS API"; homepage = "https://qcs-api-client-python.readthedocs.io/"; + changelog = "https://github.com/rigetti/qcs-api-client-python/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index 431b5c9bfa10..9c54df213dc3 100644 --- a/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "qimage2ndarray"; - version = "1.9.0"; + version = "1.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-p5B1xtDYRDxEIu6WmlQJ5E/QJUVxYEzOqHXGyV4/Veo="; + sha256 = "sha256-NyUQJEbcimlrLsd1sdKvQ7E69qf56+6KNxFbuVQ6LFg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 649a1192afd0..d16cff4f9280 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - hidredis = [ + hiredis = [ hiredis ]; ocsp = [ diff --git a/pkgs/development/python-modules/remote-pdb/default.nix b/pkgs/development/python-modules/remote-pdb/default.nix new file mode 100644 index 000000000000..174b0bff311d --- /dev/null +++ b/pkgs/development/python-modules/remote-pdb/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchFromGitHub, lib }: +buildPythonPackage rec { + pname = "remote-pdb"; + version = "2.1.0"; + src = fetchFromGitHub { + owner = "ionelmc"; + repo = "python-remote-pdb"; + rev = "v${version}"; + sha256 = "sha256-/7RysJOJigU4coC6d/Ob2lrtw8u8nLZI8wBk4oEEY3g="; + }; + meta = with lib; { + description = "Remote vanilla PDB (over TCP sockets)."; + homepage = "https://github.com/ionelmc/python-remote-pdb"; + license = licenses.bsd2; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/reportengine/default.nix b/pkgs/development/python-modules/reportengine/default.nix index a7f0df89c34c..17720e8bec2b 100644 --- a/pkgs/development/python-modules/reportengine/default.nix +++ b/pkgs/development/python-modules/reportengine/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "reportengine"; - version = "0.30.dev0"; + version = "0.31"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "eb612994b7f364e872301b4569b544648e95e587d803284ddb5610efc8f2170f"; + sha256 = "sha256-jrt+ml8o1PUidV1bY0hCyNgcPaVTBloW574/i5Pl7iE="; }; nativeBuildInputs = [ flit ]; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 8f68f1459e55..dfa4b16c8e98 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -18,21 +18,18 @@ buildPythonPackage rec { pname = "requests"; - version = "2.28.1"; + version = "2.28.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; __darwinAllowLocalNetworking = true; src = fetchPypi { inherit pname version; - hash = "sha256-fFWZsQL+3apmHIJsVqtP7ii/0X9avKHrvj5/GdfJeYM="; + hash = "sha256-mLGyeC48bEkEk4uEwOuTJyEGnf25E0MTvv98g8LfJL8="; }; - patches = [ - ./relax-charset-normalizer.patch - ]; - propagatedBuildInputs = [ brotlicffi certifi @@ -90,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP library for Python"; homepage = "http://docs.python-requests.org/"; + changelog = "https://github.com/psf/requests/blob/v${version}/HISTORY.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/requests/relax-charset-normalizer.patch b/pkgs/development/python-modules/requests/relax-charset-normalizer.patch deleted file mode 100644 index ef14c09fffb8..000000000000 --- a/pkgs/development/python-modules/requests/relax-charset-normalizer.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 54ae822ce968f49a4d5a10e30c5d75e76c887fe4 Mon Sep 17 00:00:00 2001 -From: deedy5 <65482418+deedy5@users.noreply.github.com> -Date: Thu, 20 Oct 2022 18:26:18 +0000 -Subject: [PATCH] Allow charset normalizer >=2 and <4 (#6261) - ---- - requests/__init__.py | 4 ++-- - setup.cfg | 2 +- - setup.py | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/requests/__init__.py b/requests/__init__.py -index 7ac8e29..22db3c1 100644 ---- a/requests/__init__.py -+++ b/requests/__init__.py -@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver - elif charset_normalizer_version: - major, minor, patch = charset_normalizer_version.split(".")[:3] - major, minor, patch = int(major), int(minor), int(patch) -- # charset_normalizer >= 2.0.0 < 3.0.0 -- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0) -+ # charset_normalizer >= 2.0.0 < 4.0.0 -+ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0) - else: - raise Exception("You need either charset_normalizer or chardet installed") - -diff --git a/setup.cfg b/setup.cfg -index 93d1f99..ea45aaf 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -5,7 +5,7 @@ provides-extra = - use_chardet_on_py3 - requires-dist = - certifi>=2017.4.17 -- charset_normalizer>=2,<3 -+ charset_normalizer>=2,<4 - idna>=2.5,<4 - urllib3>=1.21.1,<1.27 - -diff --git a/setup.py b/setup.py -index 23977ed..092b40d 100755 ---- a/setup.py -+++ b/setup.py -@@ -59,7 +59,7 @@ if sys.argv[-1] == "publish": - sys.exit() - - requires = [ -- "charset_normalizer>=2,<3", -+ "charset_normalizer>=2,<4", - "idna>=2.5,<4", - "urllib3>=1.21.1,<1.27", - "certifi>=2017.4.17", --- -2.38.1 - diff --git a/pkgs/development/python-modules/rpi-gpio2/default.nix b/pkgs/development/python-modules/rpi-gpio2/default.nix index 3adf7a35ea74..aaf958d26922 100644 --- a/pkgs/development/python-modules/rpi-gpio2/default.nix +++ b/pkgs/development/python-modules/rpi-gpio2/default.nix @@ -1,13 +1,15 @@ -{ lib, libgpiod, buildPythonPackage, fetchurl }: +{ lib, libgpiod, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "rpi-gpio2"; version = "0.3.0a3"; # PyPi source does not work for some reason - src = fetchurl { - url = "https://github.com/underground-software/RPi.GPIO2/archive/refs/tags/v${version}.tar.gz"; - sha256 = "sha256-AY1AD2Yu66eJUqB4OStZnUeEhmISLVRrTOAcmEHjuOM="; + src = fetchFromGitHub { + owner = "underground-software"; + repo = "RPi.GPIO2"; + rev = "v${version}"; + hash = "sha256-8HQbEnO+4Ppo2Z3HBulbBcSKJF1bNNQYz8k6aUt65oc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/safe-pysha3/default.nix b/pkgs/development/python-modules/safe-pysha3/default.nix new file mode 100644 index 000000000000..cf654cfd714b --- /dev/null +++ b/pkgs/development/python-modules/safe-pysha3/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, python +}: + +buildPythonPackage rec { + pname = "safe-pysha3"; + version = "1.0.3"; + format = "setuptools"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Kd+lb9t5ney50BvdfbwPKAb0Ro0sKW+DtuN9hlMZF8I="; + }; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} tests.py + + runHook postCheck + ''; + + pythonImportsCheck = [ + "sha3" + ]; + + meta = { + changelog = "https://github.com/5afe/pysha3/releases/tag/v${version}"; + description = "SHA-3 (Keccak) for Python 3.9 - 3.11"; + homepage = "https://github.com/5afe/pysha3"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index a58cf5818b72..381c7688be18 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -1,19 +1,23 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub -, stdenv , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "simplejson"; - version = "3.18.0"; + version = "3.18.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-X1lD/kCbKDPPgpr2deoVbC5LADqBlNZHvDg7206E9ZE="; + hash = "sha256-m5V1wmqkPxZBH25vWajztwa3HF4KtH+HXXs4TCecTm8="; }; nativeCheckInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - pythonImportsCheck = [ "simplejson" ]; + pythonImportsCheck = [ + "simplejson" + ]; meta = with lib; { description = "Extensible JSON encoder/decoder for Python"; @@ -33,6 +39,7 @@ buildPythonPackage rec { for unicode characters). ''; homepage = "https://github.com/simplejson/simplejson"; + changelog = "https://github.com/simplejson/simplejson/blob/v${version}/CHANGES.txt"; license = with licenses; [ mit afl21 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/spacy/legacy.nix b/pkgs/development/python-modules/spacy/legacy.nix index 6e88e9f02dea..a68ea0456fe5 100644 --- a/pkgs/development/python-modules/spacy/legacy.nix +++ b/pkgs/development/python-modules/spacy/legacy.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "spacy-legacy"; - version = "3.0.9"; + version = "3.0.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-T33LxObI6MtOrbsAn5wKGipnRC4AMsjWd2yUcMN1mQM="; + sha256 = "sha256-s31uDJtuHXyhz1vHFSq2SkxGcfWcha2vej/LhwNXp3Q="; }; # nativeCheckInputs = [ pytestCheckHook spacy ]; diff --git a/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/pkgs/development/python-modules/sphinx-codeautolink/default.nix new file mode 100644 index 000000000000..c9dcec606fa1 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +, sphinx-rtd-theme +, matplotlib +, ipython +# runtime dependencies +, sphinx +, beautifulsoup4 +# check dependencies +, pytest +}: + +buildPythonPackage rec { + pname = "sphinx-codeautolink"; + version = "0.12.1"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "felix-hilden"; + repo = "sphinx-codeautolink"; + rev = "v${version}"; + hash = "sha256-x81jhYknJ6lsLxR5ZyuYNNz/zt0kto6bNyaeZmPKDIE="; + }; + + nativeBuildInputs = [ + pythonImportsCheckHook + sphinxHook + sphinx-rtd-theme + matplotlib + ipython + ]; + + sphinxRoot = "docs/src"; + + propagatedBuildInputs = [ sphinx beautifulsoup4 ]; + + nativeCheckInputs = [ pytest ]; + + pythonImportsCheck = [ "sphinx_codeautolink" ]; + + meta = with lib; { + description = "A sphinx extension that makes code examples clickable"; + homepage = "https://github.com/felix-hilden/sphinx-codeautolink"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix new file mode 100644 index 000000000000..c606297e1afc --- /dev/null +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +, sphinx-notfound-page +, sphinx-prompt +, sphinx-rtd-theme +, sphinx-tabs +, sphinx-version-warning +, sphinxcontrib-autoapi +, sphinxcontrib-bibtex +, sphinxemoji +# runtime dependencies +, sphinx +, sphinx-jquery +}: + +buildPythonPackage rec { + pname = "sphinx-hoverxref"; + version = "1.3.0"; + format = "flit"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "readthedocs"; + repo = "sphinx-hoverxref"; + rev = version; + hash = "sha256-DJ+mHu9IeEYEyf/SD+nDNtWpTf6z7tQzG0ogaECDpkU="; + }; + + nativeBuildInputs = [ + flit-core + pythonImportsCheckHook + + sphinxHook + sphinx-notfound-page + sphinx-prompt + sphinx-rtd-theme + sphinx-tabs + sphinx-version-warning + sphinxcontrib-autoapi + sphinxcontrib-bibtex + sphinxemoji + ]; + + propagatedBuildInputs = [ sphinx sphinx-jquery ]; + + pythonImportsCheck = [ "hoverxref" ]; + + meta = with lib; { + description = "A sphinx extension for creating tooltips on the cross references of the documentation"; + longDescription = '' + sphinx-hoverxref is a Sphinx extension to show a floating window + (tooltips or modal dialogues) on the cross references of the + documentation embedding the content of the linked section on them. + + With sphinx-hoverxref, you don’t need to click a link to see what’s + in there. + ''; + homepage = "https://github.com/readthedocs/sphinx-hoverxref"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-jquery/default.nix b/pkgs/development/python-modules/sphinx-jquery/default.nix new file mode 100644 index 000000000000..6bbf8687f5a1 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-jquery/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonImportsCheckHook +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-jquery"; + version = "3.0.0"; + format = "flit"; + + src = fetchFromGitHub { + owner = "sphinx-contrib"; + repo = "jquery"; + rev = "v${version}"; + hash = "sha256-argG+jMUqLiWo4lKWAmHmUxotHl+ddJuJZ/zcUl9u5Q="; + }; + + nativeBuildInputs = [ + pythonImportsCheckHook + flit-core + ]; + + propagatedBuildInputs = [ sphinx ]; + + pythonImportsCheck = [ "sphinxcontrib.jquery" ]; + + meta = with lib; { + description = "A sphinx extension that ensures that jQuery is installed for use in Sphinx themes or extensions"; + homepage = "https://github.com/sphinx-contrib/jquery"; + license = licenses.bsd0; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix new file mode 100644 index 000000000000..dd2efe81fd15 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +, sphinx-prompt +, sphinx-rtd-theme +, sphinx-tabs +, sphinxcontrib-autoapi +, sphinxemoji +# runtime dependencies +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-notfound-page"; + version = "0.8.3"; + format = "flit"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "readthedocs"; + repo = "sphinx-notfound-page"; + rev = version; + hash = "sha256-9iP6X2dqtMC3+CIrNI3fGDLL8xyXVAWNhN90DlMa9JU="; + }; + + nativeBuildInputs = [ + flit-core + pythonImportsCheckHook + sphinxHook + sphinx-prompt + sphinx-rtd-theme + sphinx-tabs + sphinxcontrib-autoapi + sphinxemoji + ]; + + propagatedBuildInputs = [ sphinx ]; + + pythonImportsCheck = [ "notfound" ]; + + meta = with lib; { + description = "A sphinx extension to create a custom 404 page with absolute URLs hardcoded"; + homepage = "https://github.com/readthedocs/sphinx-notfound-page"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix new file mode 100644 index 000000000000..cc5d5f0b2eca --- /dev/null +++ b/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinxHook +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-prompt"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "sbrunner"; + repo = "sphinx-prompt"; + rev = version; + hash = "sha256-ClUPAIyPrROJw4GXeakA8U443Vlhy3P/2vFnAtyrPHU="; + }; + + propagatedBuildInputs = [ sphinx ]; + + meta = with lib; { + description = "A sphinx extension for creating unselectable prompt"; + homepage = "https://github.com/sbrunner/sphinx-prompt"; + license = licenses.bsd3; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-tabs/default.nix b/pkgs/development/python-modules/sphinx-tabs/default.nix new file mode 100644 index 000000000000..a2714c2d1260 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-tabs/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +# runtime dependencies +, sphinx +, pygments +, docutils +# test dependencies +, pytest +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "sphinx-tabs"; + version = "3.4.1"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "sphinx-tabs"; + rev = "v${version}"; + hash = "sha256-5lpo7NRCksXJOdbLSFjDxQV/BsxRBb93lA6tavz6YEs="; + }; + + postPatch = '' + substituteInPlace setup.py --replace 'docutils~=0.18.0' 'docutils' + ''; + + nativeBuildInputs = [ + pythonImportsCheckHook + sphinxHook + ]; + + propagatedBuildInputs = [ + sphinx + pygments + docutils + ]; + + nativeCheckInputs = [ pytest + beautifulsoup4 + ]; + + pythonImportsCheck = [ "sphinx_tabs" ]; + + meta = with lib; { + description = "A sphinx extension for creating tabbed content when building HTML."; + homepage = "https://github.com/executablebooks/sphinx-tabs"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix new file mode 100644 index 000000000000..bf57d4f2fd83 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pythonImportsCheckHook +, sphinx +, sphinxHook +, sphinxcontrib-autoapi +, sphinx-rtd-theme +, sphinx-tabs +, sphinx-prompt +, sphinxemoji +}: + +# Latest tagged release release "1.1.2" (Nov 2018) does not contain +# documenation, it was added in commits Aug 10, 2019. Repository does not have +# any activity since then. +buildPythonPackage rec { + pname = "sphinx-version-warning"; + version = "unstable-2019-08-10"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "humitos"; + repo = "sphinx-version-warning"; + rev = "a82156c2ea08e5feab406514d0ccd9d48a345f48"; + hash = "sha256-WnJYMk1gPLT0dBn7lmxVDNVkLYkDCgQOtM9fQ3kc6k0="; + }; + + # It tries to write to file relative to it own location at runtime + # and gets permission denied, since Nix store is immutable. + patches = [ + (fetchpatch { + url = "https://github.com/humitos/sphinx-version-warning/commit/cb1b47becf2a0d3b2570ca9929f42f7d7e472b6f.patch"; + hash = "sha256-Vj0QAHIBmc0VxE+TTmJePzvr5nc45Sn2qqM+C/pkgtM="; + }) + ]; + + nativeBuildInputs = [ + pythonImportsCheckHook + sphinxHook + sphinxcontrib-autoapi + sphinx-rtd-theme + sphinx-tabs + sphinx-prompt + sphinxemoji + ]; + + propagatedBuildInputs = [ sphinx ]; + + pythonImportsCheck = [ "versionwarning" ]; + + meta = with lib; { + description = "A sphinx extension to show a warning banner at the top of your documentation"; + homepage = "https://github.com/humitos/sphinx-version-warning"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 49a8ca0c9971..0f0f455a4235 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -143,7 +143,8 @@ buildPythonPackage rec { nativeCheckInputs = [ git glibcLocales - hypothesis + # "hypothesis" indirectly depends on twisted to build its documentation. + (hypothesis.override { enableDocumentation = false; }) pyhamcrest ] ++ passthru.optional-dependencies.conch diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index f7c830996f74..96a5c74aec2a 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "1.5.0"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lyz-code"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TdW2vVj5wZw8xANSRY8ke1ECw8UTDwRjJDD1g+p9DV4="; + hash = "sha256-OXo9PkvKn+XPxfXUObwps62lwNo6lE4Ot5L0lZPIYPw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index f9d1c4549a79..5d69cef598d0 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.0.10"; + version = "5.0.13"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-NrFkLZiqX21BSIuE8qF7lurNWKgmf7PAa/1IpPbcUf0="; + sha256 = "sha256-kjAC21gZ3VKM+WFKV3tOPzIaG3t9rUSo2M3CEsA1q+I="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index ec333520ca54..0a9cefb57b06 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.12.0"; + version = "2.12.1"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-V+UXodw84NGZPi3Ws4hKyftqnGibn9uFgrkGXxpRAZc="; + sha256 = "sha256-rJdB1G2/Fbs5zwfXF/Q79k1IztkOJrL7b0sjH5kcEMs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 55c6a3475879..1a7e13e0ec3d 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.16.2"; + version = "10.17.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-Pab4IYktNWWTudAY7Zx9dI+fRp0yihD78L0MmBHxeNY="; + sha256 = "sha256-a25MA/fDjCvsKzEh34IM34TyXECJ0j07H9jr6JX1uc0="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-OlsNFhduilo8fJs/mynrAiwuXcfCZERdaJk3VcAUCJw="; + vendorHash = "sha256-Cb4RVY+E8QcvxSworBujsvqSSGxFGfW0W7nFjmpfLQ8="; doCheck = false; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index aa7f997d1935..81f6c8dcff67 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 = "5eeee846642c8226931263ed758ef80f077cadaf"; - version = "2022-11-11"; + rev = "32c96866364964b3e2f7272e0f9ef3e1a76ea7d7"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "2eUGQa0SdfnENbnjy9ZDxd0lKhUrzmTyDLB4fupqVIs="; + sha256 = "AgwqWmNkUkyQDu6R8LO86/JYJJHI6ZjEhPglt/jWBRY="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/development/tools/build-managers/wafHook/default.nix index 2131caede3c8..f0f3a683aab0 100644 --- a/pkgs/development/tools/build-managers/wafHook/default.nix +++ b/pkgs/development/tools/build-managers/wafHook/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, pkgs, makeSetupHook, waf }: makeSetupHook { + name = "waf-hook"; substitutions = { inherit waf; crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 6998c9b8fb1c..9fd3a86f597d 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -5,19 +5,19 @@ }: buildGoModule rec { pname = "coder"; - version = "0.14.3"; + version = "0.15.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-S+s6cOO2iISW3x+JM6mkpAC6KJv/x84RgXuaiFHZs+I="; + hash = "sha256-d3Cg7G1rjxEqKMsIqxZ6ZZDEMIoisDtjZMmyixZRpF4="; }; # integration tests require network access doCheck = false; - vendorHash = "sha256-nqmwwdIOm6jTPTAuvIqPf0xgVgIbKsUIs0Mbfka0jyU="; + vendorHash = "sha256-F9r99WhL1Uv5NNVlQYpQc282BAl8bUhJI5mZZYwyEEg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix new file mode 100644 index 000000000000..1d15cdc60479 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "drone-runner-ssh"; + version = "unstable-2022-12-22"; + + src = fetchFromGitHub { + owner = "drone-runners"; + repo = pname; + rev = "ee70745c60e070a7fac57d9cecc41252e7a3ff55"; + sha256 = "sha256-YUyhEA1kYIFLN+BI2A8PFeSgifoVNmNPKtdS58MwwVU="; + }; + + vendorHash = "sha256-Vj6ZmNwegKBVJPh6MsjtLMmX9WR76msuR2DPM8Qyhe0="; + + meta = with lib; { + description = "Experimental Drone runner that executes a pipeline on a remote machine"; + homepage = "https://github.com/drone-runners/drone-runner-ssh"; + license = licenses.unfreeRedistributable; + maintainers = teams.c3d2.members; + }; +} diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 9e4dda547544..136e7c9baf84 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -22,8 +22,9 @@ buildGoModule rec { doCheck = false; meta = with lib; { + description = "Continuous Integration platform built on container technology"; + homepage = "https://github.com/harness/drone"; maintainers = with maintainers; [ elohmeier vdemeester techknowlogick ]; license = with licenses; if enableUnfree then unfreeRedistributable else asl20; - description = "Continuous Integration platform built on container technology"; }; } diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/development/tools/cpm-cmake/default.nix index 9689df362aa8..f4f814f2d9f0 100644 --- a/pkgs/development/tools/cpm-cmake/default.nix +++ b/pkgs/development/tools/cpm-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-XI3yDBhmglQnIe/t6sfL9WxaclqtOgE1kDmocQL+xnA="; + hash = "sha256-zZUk0brG9dAfQRN1LzKRo5/ZAG35TblY0nZvVhy6azE="; }; dontConfigure = true; diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index f4b155da7265..1759596e8f71 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.15"; + version = "0.8.16"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JCBlP8ESCiqr4pk8QyG5CVs+3qSlnvw0jYS5R0Civk0="; + hash = "sha256-JCBlP8ESCiqr4pk8QyG5CVs+3qSlnvw0jYS5R0Civk0="; }; - vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; + vendorHash = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix index 733282cd4067..ccf3bd4a23d3 100644 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, makeWrapper, requireFile, unzip, jdk }: let - version = "22.3.1"; - fileVersion = "1032109-01"; + version = "22.4.0.342.1212"; + fileVersion = "1032835-01"; in stdenv.mkDerivation { @@ -37,7 +37,7 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "0yqj8m2zwl8m7zxrzjnbl2rqnl2imn5h1bfpnmklp03nkakbzjbn"; + sha256 = "0i4xsj502s465fgmlcqn80r8rqzr11mv74x9fzrlbqmkkh5c782k"; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index e33d773a40e3..264e949095b4 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-UXuRhozEC6zjOzjRi88mS7vyMqvBSnFCj6HXC4zZEp0="; + sha256 = "sha256-Ny0lZRNeQSJtxAURFnSuPNiUVWHE47GLbA1mtHgA3O4="; }; - vendorHash = "sha256-SV7G/FZ7kj2ghr15oTMK25Y4SjaIfRc3UfxMPFr4src="; + vendorHash = "sha256-jqDZmlCEgU4Nqc2vNH6NGdM74mywdVIj5v96tmRCvjQ="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/godot/3/dont_clobber_environment.patch b/pkgs/development/tools/godot/3/dont_clobber_environment.patch index 74e1241513ba..cfd3113a6aae 100644 --- a/pkgs/development/tools/godot/3/dont_clobber_environment.patch +++ b/pkgs/development/tools/godot/3/dont_clobber_environment.patch @@ -1,19 +1,23 @@ -diff --git a/SConstruct b/SConstruct -index d138c7b250..c925bf908e 100644 +scons does not use os environment by default: + https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html + +nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables +to be passed through like NIX_CFLAGS_COMPILE_BEFORE. --- a/SConstruct +++ b/SConstruct -@@ -65,10 +65,10 @@ elif platform_arg == "javascript": - # want to have to pull in manually. - # Then we prepend PATH to make it take precedence, while preserving SCons' own entries. - env_base = Environment(tools=custom_tools) +@@ -67,14 +67,7 @@ elif platform_arg == "javascript": + elif os.name == "nt" and methods.get_cmdline_bool("use_mingw", False): + custom_tools = ["mingw"] + +-# We let SCons build its default ENV as it includes OS-specific things which we don't +-# want to have to pull in manually. +-# Then we prepend PATH to make it take precedence, while preserving SCons' own entries. +-env_base = Environment(tools=custom_tools) -env_base.PrependENVPath("PATH", os.getenv("PATH")) -env_base.PrependENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH")) -if "TERM" in os.environ: # Used for colored output. - env_base["ENV"]["TERM"] = os.environ["TERM"] -+for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): -+ if (k in os.environ): -+ env_base["ENV"][k] = os.environ[k] -+ - ++env_base = Environment(ENV = os.environ, tools=custom_tools) + env_base.disabled_modules = [] env_base.use_ptrcall = False diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 071f944a82f3..1a1c3e7a9961 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 = "5.1.4"; + version = "5.1.6"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D6Y3I5UPChdLlTZ49iToQpE8CrHh3VjWV6PI7fRhU/A="; + sha256 = "sha256-ybcX2dm+gnvhWAcraCq22uGqe8NdqNd8QMNKVkqgNqY="; }; - cargoSha256 = "sha256-GqfQD8NK/HYODEGUmfo+MMVsWg2CabZFLfBTp4UXV2Q="; + cargoHash = "sha256-GzRxXBDMALaXLhpklVoSn+8uCgws5AjkC+fynym0iYo="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index c3af6e9c1a4b..d18b32c6f440 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/pkgs/development/tools/kafkactl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lwyM2l4eBCtkyAtG51cEy29Jw/vakjrfYVBSZ9pIBFs="; + sha256 = "sha256-ZEXW9nqkR0yuVIY9qr1RyKVE7tSlP59Xb4JZfdAK2To="; }; - vendorSha256 = "sha256-ba7amhYuCB3k1esu1qYBCgUZMjlq5iac498TMqeGuz0="; + vendorHash = "sha256-e7SJjDWcHPgupZujeRD3Zg6vFAudDC3V60R2B61fjGU="; doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 6efeaad63848..28c80444650d 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.1.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sufP/+YixgrOCJJ4P1SjmZpRlSaufRmnVDiv6H+RCyQ="; + sha256 = "sha256-8CZcPZLainc7iRZ5Ul27QxW3oK7sikCjzCBEkfCeNUc="; }; - vendorHash = "sha256-WZb8VsFKpvvMys1iK3irEsWCnvKaKDzuyFertVswpdE="; + vendorHash = "sha256-GBjMN6pyB+48e5LNqLBbh6a5fC9P0T53CZUPGNcbBDc="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index d6974aff86cf..036c5057d899 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-lRWL8J83U8W/QdxNew9To4kbqhmqt0KUQMnaODTfT1U="; + hash = "sha256-7Mv1+c8X+rZQyw3y+eGvSyqVqiSPdTj1WxoUv1mynSs="; }; - cargoHash = "sha256-IGEmcFmkEm+seGf9eLokU7pjRNgwOaJr+mf152yogw8="; + cargoHash = "sha256-0fJIp2zlZkeidTFg6jQs6S2mVHJL8flqiZtTvM0F9OQ="; postPatch = '' rm .cargo/config.toml diff --git a/pkgs/development/tools/ls-lint/default.nix b/pkgs/development/tools/ls-lint/default.nix new file mode 100644 index 000000000000..e42f7f50122a --- /dev/null +++ b/pkgs/development/tools/ls-lint/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ls-lint"; + version = "1.11.2"; + + src = fetchFromGitHub { + owner = "loeffel-io"; + repo = "ls-lint"; + rev = "v${version}"; + sha256 = "sha256-mt1SvRHtAA0lChZ//8XIQGDPg1l1EOMkPIAe8YKhMSs="; + }; + + vendorSha256 = "sha256-OEwN9kj1npI+H7DY+e3tl5TIY/qr4y2CgAV5fwNA9l4="; + + meta = with lib; { + description = "An extremely fast file and directory name linter"; + homepage = "https://ls-lint.org/"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix index aa3b29275132..d31268f9cedd 100644 --- a/pkgs/development/tools/marksman/default.nix +++ b/pkgs/development/tools/marksman/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "marksman"; - version = "2022-12-28"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "artempyanykh"; repo = "marksman"; rev = version; - sha256 = "sha256-IOmAOO45sD0TkphbHWLCXXyouxKNJoiNYHXV/bw0xH4="; + sha256 = "sha256-UPPO4ueu7gMR7a573M2/xT3N0QgRSNBshJAqoyXEZpc="; }; projectFile = "Marksman/Marksman.fsproj"; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 9c254bb2c79a..f6d5103745b7 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - hash = "sha256-oPMojw6CGncBJ8PZOTrzvQu2gRs1cw1Jwi38eOZggI8="; + hash = "sha256-v+8zfNV93nrRSwfn1u7SNYv7WYY74R8nPJFmreDb7i4="; }; vendorHash = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw="; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 8d3d492649e5..a7c8c1f8db30 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.8.2"; + version = "3.8.3"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-a07vFya7c8ai0YjNvXCAWSoQLH81U4cIr0QsgX3WcJY="; + sha256 = "sha256-IrgypySq5RUi9X3pVC0t+Ezw7aNu8mIKZYY4CEaKhU4="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 4f9a92d362bc..161dca6f1805 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -22,9 +22,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl autoconf ]; buildInputs = [ autoconf ]; - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; doCheck = false; # takes _a lot_ of time, fails 11 of 782 tests # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix index 470827c2b45e..f0df759ee2cf 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation rec { patches = [ ./help2man-SOURCE_DATE_EPOCH-support.patch ]; - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths doInstallCheck = false; # runs the same thing, fails the same tests diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 65d6185f50c0..0d9572c6f314 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths doInstallCheck = false; # runs the same thing, fails the same tests diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 3d53c5122f00..39e852a60bbb 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -15,7 +15,6 @@ in , noSysDirs , perl , substitute -, texinfo , zlib , enableGold ? withGold stdenv.targetPlatform @@ -52,7 +51,7 @@ let targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = targetPrefix + "binutils"; inherit version; @@ -110,10 +109,12 @@ stdenv.mkDerivation { strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; + # texinfo was removed here in https://github.com/NixOS/nixpkgs/pull/210132 + # to reduce rebuilds during stdenv bootstrap. Please don't add it back without + # checking the impact there first. nativeBuildInputs = [ bison perl - texinfo ] ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ] ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ] @@ -144,6 +145,20 @@ stdenv.mkDerivation { for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in gold/Makefile.in; do sed -i "$i" -e 's|ln |ln -s |' done + + # autoreconfHook is not included for all targets. + # Call it here explicitly as well. + ${finalAttrs.postAutoreconf} + ''; + + postAutoreconf = '' + # As we regenerated configure build system tries hard to use + # texinfo to regenerate manuals. Let's avoid the dependency + # on texinfo in bootstrap path and keep manuals unmodified. + touch gas/doc/.dirstamp + touch gas/doc/asconfig.texi + touch gas/doc/as.1 + touch gas/doc/as.info ''; # As binutils takes part in the stdenv building, we don't want references @@ -226,4 +241,4 @@ stdenv.mkDerivation { # collision due to the ld/as wrappers/symlinks in the latter. priority = 10; }; -} +}) diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index 8dddea94f05e..b34c460fa16c 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.2.4"; + version = "6.2.5"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-Y2MFxceOS3H4Ya0EupgQqtOnkhEk6DXbg6rix3J9OtM="; + sha256 = "sha256-IdJlYCoI8wTl1kIY5M5Lfn+Y9WjSZkLuWI5pFsfAO0I="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 7eead6137e97..2b71fa711670 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -37,6 +37,18 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; }) + (fetchpatch { + name = "use-curlopt_protocols_str-for-new-libcurl.patch"; + url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=6560fb26a62ef135a804357ef4f15a47de3e49b3;hp=a5b07cdf9c491fb7a4a16598c482c68b718f59b9"; + excludes = [ "debuginfod/ChangeLog" ]; # Doesn't apply + sha256 = "sha256-yjeliqojRGvfwbXynmxFGyKqAY7AEr0mbSGQEliYhZ4="; + }) + (fetchpatch { + name = "fix-usage-of-deprecated-curlinfo.patch"; + url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=d2bf497b12fbd49b4996ccf0744303ffd67735b1;hp=6ecd16410ce1fe5cb0ac5b7c3342c5cc330e3a04"; + excludes = [ "debuginfod/ChangeLog" ]; # Doesn't apply + sha256 = "sha256-zMx/TazM7vXJre2XagIWvwRS8cd8pbzMTmAbpbqZmx0="; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; postPatch = '' diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 8625a421af64..a2c58010eff7 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, m4, perl, help2man +{ lib, stdenv, fetchurl, fetchpatch, m4 , runtimeShell , file }: @@ -23,28 +23,22 @@ stdenv.mkDerivation rec { # https://lists.gnu.org/archive/html/autotools-announce/2022-03/msg00000.html FILECMD = "${file}/bin/file"; - # Normally we'd use autoreconfHook, but that includes libtoolize. - postPatch = '' - aclocal -I m4 - automake - autoconf - - pushd libltdl - aclocal -I ../m4 - automake - autoconf - popd - '' + + postPatch = # libtool commit da2e352735722917bf0786284411262195a6a3f6 changed # the shebang from `/bin/sh` (which is a special sandbox exception) # to `/usr/bin/env sh`, meaning that we now need to patch shebangs # in libtoolize.in: '' substituteInPlace libtoolize.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' + # avoid help2man run after 'libtoolize.in' update + touch doc/libtoolize.1 ''; strictDeps = true; - nativeBuildInputs = [ autoconf automake help2man m4 perl ]; + # As libtool is an early bootstrap dependency try hard not to + # add autoconf and automake or help2man dependencies here. That way we can + # avoid pulling in perl and get away with just an `m4` depend. + nativeBuildInputs = [ m4 file ]; propagatedBuildInputs = [ m4 file ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index ac80fc471e06..017367e90ba6 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { pname = "lsof"; - version = "4.96.4"; + version = "4.96.5"; src = fetchFromGitHub { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "sha256-S+8KizjayqeiWsMySWjRoZQf7ODCjdMq5ULoetOdYiA="; + hash = "sha256-3ZEGCKc7inbqcE4LuhfKON3C8LebVOlZPEhOHVgx8Lo="; }; patches = [ diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh index 576b9ca2103e..8f010a3f4d0b 100644 --- a/pkgs/development/tools/misc/patchelf/setup-hook.sh +++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh @@ -8,7 +8,7 @@ patchELF() { local dir="$1" [ -e "$dir" ] || return 0 - header "shrinking RPATHs of ELF executables and libraries in $dir" + echo "shrinking RPATHs of ELF executables and libraries in $dir" local i while IFS= read -r -d $'\0' i; do @@ -17,6 +17,4 @@ patchELF() { echo "shrinking $i" patchelf --shrink-rpath "$i" || true done < <(find "$dir" -type f -print0) - - stopNest } diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 9e14815910ed..d4feca6dfe6e 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { rm -f check/check-requires-private check/check-gtk check/missing ''; - buildInputs = lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; + buildInputs = [ libiconv ]; configureFlags = [ "--with-internal-glib" ] ++ lib.optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 19f8929ff58d..befeafa87a92 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "0.3.3"; + version = "0.3.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-0JOA+T6GJnMUSK+oldZ+8XtgrDDLkccUKYYzjMExM7M="; + sha256 = "sha256-M4rd7179hpQW8jqjCY9ce64AhE6YWOC32tJg3v+00bo="; }; - cargoSha256 = "sha256-282IAKbou3+0CYMcAhPNr35N3ugrN/fY82KTzyoTy2o="; + cargoHash = "sha256-3HcgnC2PQUyINm2gjxzqbCicvcGvpYtQn1p3qnqBzjc="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index b6c018693e5e..bb55ba807964 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.9.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-i4+MOEZWt+Qb05HgXcGR0uDuMoOAyMhVeLPQwnGiEw8="; + hash = "sha256-5zE5a+BYzQjgVb0Ti7bSQrGzTyysOTTR0NMOO5IKG68="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index aabd70f1a86e..6c6e88fc153d 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.127.0"; + version = "0.128.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-GWfEazFrGlH26X0ILMMQTGlzIKm/S9TPCT4ViF+AA+k="; + sha256 = "sha256-2EIaK7UyJH9YEKlOGnnKrq3ucVgEjbF2jVui0bASNcA="; }; - vendorHash = "sha256-5dWZLVPRKJWNtNJ5swIMgSFP2idD34sR/hzQ/+HuykU="; + vendorHash = "sha256-uQ8/cNNFelG8zzrcEs9fEs8KkY6/odwOGmwMmyxUKS4="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index 8179f117fd43..9b75282fbf08 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tD6Z7W/sPwHKqvCXjXLlxkGj3FZ4+QCv9vn7KdCmSv4="; + sha256 = "sha256-pWX3dZqZ9UZ/k8c1K0xAgonsxZVrutWJ1PROQusO9vQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorSha256 = "sha256-sa4OkTSRyoPFXTGmjpiqBug+EKgxkcJrNxQwbTRfN2A="; + vendorHash = "sha256-IfayKnHCe1HHSi7YPNz8Wlz1TSAiVGs0rxpY9HYG3s8="; ldflags = [ "-s" @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.2.4.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.2.5.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 54ff2962f983..2789a3d608f2 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.237"; + version = "0.0.238"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c2mD03gxbBnnifTXPpdJk4kwpeHdrwckymaFGKJwDc8="; + sha256 = "sha256-hsJJsPJQrkzn+otpFhsESLRhfYEcUSXJULkScWPyQNk="; }; - cargoSha256 = "sha256-pYOMCmNrI4uzqXkbc2D9UvNHg2PlibmEhtml+A1V1BQ="; + cargoSha256 = "sha256-stEPoiXKXnjYcKqlJPwcjWAV4W2GLIp2lQ0ejVd/EF8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index 89ccdaf7ec79..c6ee65d79cd1 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; - version = "0.9.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "TekWizely"; repo = "run"; rev = "v${version}"; - sha256 = "sha256-ClSB+v153Tj1cKLSmT9Z0IEyc+OABPeG519PzT03pX0="; + sha256 = "sha256-EIzIkew1JXPeUN3guLEjAwR0kBDrMkQtSUiBJd+Ww7E="; }; - vendorSha256 = "sha256-4n8RRnDNu1Khv3V5eUB/eaFFJGVD/GdqMOywksc2LPw="; + vendorHash = "sha256-BAyhuE9hGGDfDGmXQ7dseUvHlK5vC87uLT78lHSvLeg="; doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index 098f2ab41395..94ee2371ce9f 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-embed"; - version = "0.14.2"; + version = "0.16.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rSixQ9ZGO5iqreW+WKdHx0vlwacJzJ2L7qPWVjT3Xls="; + sha256 = "sha256-YAeE3pDw5xqSn4rAv3lxJtKQHki1bf97CJHBEK8JoiA="; }; - cargoSha256 = "sha256-O/vMXWyNUdMyH2Pb6DK2AbqOMagmsMNgp5OyIyAiiqg="; + cargoSha256 = "sha256-p6d8vdiAVkufTQv3FliKCBgF5ZXM24UnG96EzlpyfZE="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 86b0a7ed6fbf..3fd76ed2bc86 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.14.2"; + version = "0.16.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-7sWfMFFjFUdnoMV1O8mzyHAAS8Pvvf1xsY717ZeD7i8="; + sha256 = "sha256-Zwb9jUZwkvuBzvACMwKwpAHEMkjLVDkXfDLo4ntG3+k="; }; - cargoSha256 = "sha256-yae+hh2jrQn6ryn/WPFZmiZrq7d+osegD/MyBk8OOLg="; + cargoSha256 = "sha256-giGSTMtGTIw4ZZglHqbW2sGKO/D/3TVQR5olTgitBjE="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 52a89b92047d..576c9eacd74d 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-5j7zTAFUkevhSpiOn8KNG5+N7M9M1+c6hAKpDwPXdBQ="; + sha256 = "sha256-G9ResHOBEqnKsMXVbr8q1rvywFI8LJcb8gR7hMTI0p4="; }; - cargoSha256 = "sha256-jCbs/y0L9YP9VDEtofeqWXbUlsBpVRMbjIYtPRlmQVY="; + cargoSha256 = "sha256-p6mq+P9ntlhjMPHpcwXV9XBlAX6R63Iqastl9ZHI8Vs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 8103229bb66a..6ed10aee16ec 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -5,25 +5,27 @@ , openssl , stdenv , curl +, CoreFoundation , Security , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.11.1"; + version = "0.11.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-vEgYmtRAashBRsGDExewqaGsVYF7EJ4ky+cE/PMFW38="; + sha256 = "sha256-SkFMdE7VAZrT7e5SMrfW8bBA6zPqQV7LhSy3OmshUAs="; }; - cargoSha256 = "sha256-xstcKIXQDk4ngwWSzMueO47U2oFRHAqvvjRnDXFsPE8="; + cargoHash = "sha256-ZcG/4vyrcJNAMiZdR3MFyqX5Udn8wGAfiGT5uP1BSMo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl + CoreFoundation Security SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 71a340564343..359f5dbe64d2 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.16.2"; + version = "0.17.1"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2t3LWb2oeCYDAePXX1YuIN0o4LLEL58Hxt/1sNeuD3M="; + sha256 = "sha256-zObflf9BKq24km54LW7It4Lvff0OKYNDb02uatdX7g4="; }; - cargoSha256 = "sha256-K+eLQ7zGEGkh4vMABWucY/Ho2id/afwl4FSo5+Ca1Ec="; + cargoSha256 = "sha256-itL6WpM4OLn4mzdB0ytM2J7F1fRDrXwCaI/8WdLo6y0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/development/tools/rust/cargo-temp/default.nix index a51185096d7e..c94c1eb56a09 100644 --- a/pkgs/development/tools/rust/cargo-temp/default.nix +++ b/pkgs/development/tools/rust/cargo-temp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "yozhgoor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N5PRwUSUAFwvbyq5Uo6nEr05QqmeA1yI9ru0VRnrXa8="; + sha256 = "sha256-Z6qmtZfnpEZ1/XkmAijDo4nRfZOPW9hEIFTycdOYILk="; }; - cargoSha256 = "sha256-vzru7+EA41kQGciA4q03bvcIYOMGYLAiws35ZMh413g="; + cargoSha256 = "sha256-EDdOnkOk5VIrzjJSTojdjmGAEDPMqW4PPE0JP+GUYnE="; meta = with lib; { description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs-cli/default.nix index 9992e09d98b1..d4140bc0b523 100644 --- a/pkgs/development/tools/rust/probe-rs-cli/default.nix +++ b/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs-cli"; - version = "0.14.2"; + version = "0.16.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-CrBgj0M3slhPrAYc2+I80ZfUC/CJzcmFwLc9yX2SSR4="; + sha256 = "sha256-YNOD0hDDQ6M496m9lps28UX41pMO1r/CE30rcS53h48="; }; - cargoSha256 = "sha256-nHjVldLsi9Xr6pPOeLpb6anvno2244g/LNIv7DnbSI4="; + cargoSha256 = "sha256-/1bnDtfNxnOI4Inmnd+r2epT236ghQsiNuoAuROEfPM="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index aaae3082d320..08bcde3ae510 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -16,18 +16,18 @@ buildGoModule rec { pname = "skopeo"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-Q6gdkaIYTDUqDbjmE9TcRtQcHjpOJ3bXLJtN8NPp9KA="; + hash = "sha256-P556Is03BeC0Tf+kNv+Luy0KASgTXsyZ/MrPaPFUHE8="; }; outputs = [ "out" "man" ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/swiftpm2nix/default.nix b/pkgs/development/tools/swiftpm2nix/default.nix new file mode 100644 index 000000000000..25d6b06ef98b --- /dev/null +++ b/pkgs/development/tools/swiftpm2nix/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, callPackage, makeWrapper, jq, nix-prefetch-git }: + +stdenv.mkDerivation { + name = "swiftpm2nix"; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + install -vD ${./swiftpm2nix.sh} $out/bin/swiftpm2nix + wrapProgram $out/bin/$name \ + --prefix PATH : ${lib.makeBinPath [ jq nix-prefetch-git ]} \ + ''; + + preferLocalBuild = true; + + passthru = callPackage ./support.nix { }; + + meta = { + description = "Generate a Nix expression to fetch swiftpm dependencies"; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/swiftpm2nix/support.nix b/pkgs/development/tools/swiftpm2nix/support.nix new file mode 100644 index 000000000000..94076517ebfc --- /dev/null +++ b/pkgs/development/tools/swiftpm2nix/support.nix @@ -0,0 +1,56 @@ +{ lib, fetchgit, formats }: +with lib; +let + json = formats.json { }; +in rec { + + # Derive a pin file from workspace state. + mkPinFile = workspaceState: + assert workspaceState.version == 5; + json.generate "Package.resolved" { + version = 1; + object.pins = map (dep: { + package = dep.packageRef.name; + repositoryURL = dep.packageRef.location; + state = dep.state.checkoutState; + }) workspaceState.object.dependencies; + }; + + # Make packaging helpers from swiftpm2nix generated output. + helpers = generated: let + inherit (import generated) workspaceStateFile hashes; + workspaceState = builtins.fromJSON (builtins.readFile workspaceStateFile); + pinFile = mkPinFile workspaceState; + in rec { + + # Create fetch expressions for dependencies. + sources = listToAttrs ( + map (dep: nameValuePair dep.subpath (fetchgit { + url = dep.packageRef.location; + rev = dep.state.checkoutState.revision; + sha256 = hashes.${dep.subpath}; + })) workspaceState.object.dependencies + ); + + # Configure phase snippet for use in packaging. + configure = '' + mkdir -p .build/checkouts + ln -sf ${pinFile} ./Package.resolved + install -m 0600 ${workspaceStateFile} ./.build/workspace-state.json + '' + + concatStrings (mapAttrsToList (name: src: '' + ln -s '${src}' '.build/checkouts/${name}' + '') sources) + + '' + # Helper that makes a swiftpm dependency mutable by copying the source. + swiftpmMakeMutable() { + local orig="$(readlink .build/checkouts/$1)" + rm .build/checkouts/$1 + cp -r "$orig" .build/checkouts/$1 + chmod -R u+w .build/checkouts/$1 + } + ''; + + }; + +} diff --git a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh b/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh new file mode 100755 index 000000000000..72051b4e448d --- /dev/null +++ b/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +# Generates a Nix expression to fetch swiftpm dependencies, and a +# configurePhase snippet to prepare a working directory for swift-build. + +set -eu -o pipefail +shopt -s lastpipe + +stateFile=".build/workspace-state.json" +if [[ ! -f "$stateFile" ]]; then + echo >&2 "Missing $stateFile. Run 'swift package resolve' first." + exit 1 +fi + +if [[ "$(jq .version $stateFile)" != "5" ]]; then + echo >&2 "Unsupported $stateFile version" + exit 1 +fi + +# Iterate dependencies and prefetch. +hashes="" +jq -r '.object.dependencies[] | "\(.subpath) \(.packageRef.location) \(.state.checkoutState.revision)"' $stateFile \ +| while read -r name url rev; do + echo >&2 "-- Fetching $name" + sha256="$(nix-prefetch-git $url $rev | jq -r .sha256)" + hashes+=" + \"$name\" = \"$sha256\";" + echo >&2 +done +hashes+=$'\n'" " + +# Generate output. +mkdir -p nix +# Copy the workspace state, but clear 'artifacts'. +jq '.object.artifacts = []' < $stateFile > nix/workspace-state.json +# Build an expression for fetching sources, and preparing the working directory. +cat > nix/default.nix << EOF +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = {$hashes}; +} +EOF +echo >&2 "-- Generated ./nix" diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/pkgs/development/tools/xcbuild/sdks.nix index 5ff3ca6808dc..e1b8254d7fd8 100644 --- a/pkgs/development/tools/xcbuild/sdks.nix +++ b/pkgs/development/tools/xcbuild/sdks.nix @@ -2,7 +2,7 @@ , writeText, version, xcodePlatform }: let - inherit (lib.generators) toPlist; + inherit (lib.generators) toPlist toJSON; SDKSettings = { CanonicalName = sdkName; @@ -22,6 +22,7 @@ in runCommand "SDKs" {} '' sdk=$out/${sdkName}.sdk install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $sdk/SDKSettings.plist + install -D ${writeText "SDKSettings.json" (toJSON {} SDKSettings)} $sdk/SDKSettings.json install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $sdk/System/Library/CoreServices/SystemVersion.plist ln -s $sdk $sdk/usr diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 2dbea4e3833a..35eddd40f859 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -77,7 +77,7 @@ while [ $# -gt 0 ]; do --toolchain | -toolchain) shift ;; --find | -find | -f) shift - command -v $1 ;; + command -v $1 || exit 1 ;; --log | -log) ;; # noop --verbose | -verbose) ;; # noop --no-cache | -no-cache) ;; # noop diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index c97bfd090987..e12230f4531b 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.450"; + version = "0.0.451"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-UfqjrWzpi1axud4MkrJxIwq1vzqHZ0qAvI1kNh/tywY="; + sha256 = "sha256-Tm05vO1mdeTGLpz++rahUubb69ajw04eK57VKZFUoDo="; }; - vendorHash = "sha256-ljyaF6Yz3bz5vjwZfDgYBb3o2l90YnV5DgolaDH3B9o="; + vendorHash = "sha256-oJa+HUuv8RG4ldAe/cS8iR6QcWdPl8BgHE4sRASauRM="; subPackages = [ "." ]; diff --git a/pkgs/games/itchiodl/default.nix b/pkgs/games/itchiodl/default.nix new file mode 100644 index 000000000000..c68be798f4dc --- /dev/null +++ b/pkgs/games/itchiodl/default.nix @@ -0,0 +1,35 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "itchiodl"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "Emersont1"; + repo = "itchio"; + rev = "v${version}"; + hash = "sha256-tylMEsUdeMUuLcxRMkkJE7vPAVuqc/cVJ4DB3xmV+iA="; + }; + + format = "pyproject"; + + nativeBuildInputs = with python3Packages; [ + poetry-core + ]; + + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + clint + requests + ]; + + meta = with lib; { + homepage = "https://github.com/Emersont1/itchio"; + description = "itch.io download tool"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 59c897ba3713..d9cc93e82348 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -12,7 +12,9 @@ with lib; let path = makeBinPath ([ mono python3 ] ++ optional (zenity != null) zenity); rpath = makeLibraryPath [ lua freetype openal SDL2 ]; - mkdirp = makeSetupHook { } ./mkdirp.sh; + mkdirp = makeSetupHook { + name = "openra-mkdirp-hook"; + } ./mkdirp.sh; in { patchEngine = dir: version: '' diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 44a5b95974ed..6fbe73a6bedf 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -28,13 +28,13 @@ let runescape = stdenv.mkDerivation rec { pname = "runescape-launcher"; - version = "2.2.9"; + version = "2.2.10"; # Packages: https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages # upstream is https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb src = fetchurl { url = "https://archive.org/download/${pname}_${version}_amd64/${pname}_${version}_amd64.deb"; - sha256 = "1zilpxh8k8baylbl9nqq9kgjiv2xzw4lizbgcmzky5rhmych8n4g"; + sha256 = "1v96vjiblphhbqhpp3m7wbvdvcnp76ncdlf4pdcr2z1dz8nh6shg"; }; nativeBuildInputs = [ diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index 2c55b6b50cef..0e46011e7e10 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -1,75 +1,34 @@ { lib -, pkgs , stdenvNoCC , fetchFromGitHub , pkgsCross +, stdenv +, bash }: stdenvNoCC.mkDerivation (finalAttrs: let - system = lib.toLower stdenvNoCC.targetPlatform.uname.system; - - # DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that - # needs to be built with a cross-compiler. - dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { - inherit (finalAttrs) src version dxvkPatches; - }; - dxvk64 = pkgsCross.mingwW64.callPackage ./dxvk.nix { - inherit (finalAttrs) src version dxvkPatches; - }; - - # Split out by platform to make maintenance easy in case supported versions on Darwin and other - # platforms diverge (due to the need for Darwin-specific patches that would fail to apply). - # Should that happen, set `darwin` to the last working `rev` and `hash`. - srcs = rec { - darwin = { - rev = "v${finalAttrs.version}"; - hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; - version = "1.10.3"; - }; - default = { - rev = "v${finalAttrs.version}"; - hash = "sha256-mboVLdPgZMzmqyeF0jAloEz6xqfIDiY/X98e7l2KZnw="; - version = "2.0"; - }; - }; + dxvk32 = if stdenv.isDarwin then pkgsCross.mingw32.dxvk_1 else pkgsCross.mingw32.dxvk_2; + dxvk64 = if stdenv.isDarwin then pkgsCross.mingwW64.dxvk_1 else pkgsCross.mingwW64.dxvk_2; in { name = "dxvk"; - inherit (srcs."${system}" or srcs.default) version; - - src = fetchFromGitHub { - owner = "doitsujin"; - repo = "dxvk"; - inherit (srcs."${system}" or srcs.default) rev hash; - }; - - # Override this to patch DXVK itself (rather than the setup script). - dxvkPatches = lib.optionals stdenvNoCC.isDarwin [ - # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. - # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. - ./darwin-dxvk-compat.patch - # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. - # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ - ./darwin-thread-primitives.patch - ]; + inherit (dxvk64) version; outputs = [ "out" "bin" "lib" ]; - # Also copy `mcfgthread-12.dll` due to DXVK’s being built in a MinGW cross environment. - patches = [ ./mcfgthread.patch ]; - + dontUnpack = true; dontConfigure = true; dontBuild = true; installPhase = '' mkdir -p $out/bin $bin $lib - # Replace both basedir forms to support both DXVK 2.0 and older versions. - substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \ + substitute ${./setup_dxvk.sh} $out/bin/setup_dxvk.sh \ + --subst-var-by bash ${bash} \ + --subst-var-by dxvk32 ${dxvk32} \ + --subst-var-by dxvk64 ${dxvk64} \ --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \ - --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \ - --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" \ - --replace 'basedir="$(dirname "$(readlink -f "$0")")"' "basedir=$bin" + --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" chmod a+x $out/bin/setup_dxvk.sh declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) for arch in "''${!dxvks[@]}"; do @@ -79,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: ''; meta = { - description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + description = "Setup script for DXVK"; homepage = "https://github.com/doitsujin/dxvk"; changelog = "https://github.com/doitsujin/dxvk/releases"; maintainers = [ lib.maintainers.reckenrode ]; diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/misc/dxvk/dxvk.nix index 7607c9ee4412..793264f9b30b 100644 --- a/pkgs/misc/dxvk/dxvk.nix +++ b/pkgs/misc/dxvk/dxvk.nix @@ -5,31 +5,81 @@ , meson , ninja , windows -, src -, version +, dxvkVersion , spirv-headers , vulkan-headers -, dxvkPatches +, SDL2 +, glfw +, pkgsBuildHost +, sdl2Support ? true +, glfwSupport ? false }: +# SDL2 and GLFW support are mutually exclusive. +assert !sdl2Support || !glfwSupport; + let # DXVK 2.0+ no longer vendors certain dependencies. This derivation also needs to build on Darwin, # which does not currently support DXVK 2.0, so adapt conditionally for this situation. - isDxvk2 = lib.versionAtLeast version "2.0"; + isDxvk2 = lib.versionAtLeast (srcs.${dxvkVersion}.version) "2.0"; + + # DXVK has effectively the same build script regardless of platform. + srcs = { + "1.10" = rec { + version = "1.10.3"; + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + rev = "v${version}"; + hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; + }; + # These patches are required when using DXVK with Wine on Darwin. + patches = lib.optionals stdenv.buildPlatform.isDarwin [ + # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. + # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. + ./darwin-dxvk-compat.patch + # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. + # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ + ./darwin-thread-primitives.patch + ]; + }; + "2.1" = rec { + version = "2.1"; + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + rev = "v${version}"; + hash = "sha256-A4KR11brfQbR56dGt371MRwMN/H6HFAU8TlFC97/bRs="; + fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info + }; + patches = [ ]; + }; + }; + + isWindows = stdenv.targetPlatform.uname.system == "Windows"; + isCross = stdenv.hostPlatform != stdenv.targetPlatform; in stdenv.mkDerivation { pname = "dxvk"; - inherit src version; + inherit (srcs.${dxvkVersion}) version src patches; nativeBuildInputs = [ glslang meson ninja ]; - buildInputs = [ windows.pthreads ] - ++ lib.optionals isDxvk2 [ spirv-headers vulkan-headers ]; + buildInputs = lib.optional isWindows [ windows.pthreads ] + ++ lib.optionals isDxvk2 ( + [ spirv-headers vulkan-headers ] + ++ lib.optional (!isWindows && sdl2Support) SDL2 + ++ lib.optional (!isWindows && glfwSupport) glfw + ); - patches = dxvkPatches; + postPatch = lib.optionalString isDxvk2 '' + substituteInPlace "subprojects/libdisplay-info/tool/gen-search-table.py" \ + --replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3" + ''; - preConfigure = lib.optionalString isDxvk2 '' - ln -s ${lib.getDev spirv-headers}/include include/spirv/include - ln -s ${lib.getDev vulkan-headers}/include include/vulkan/include + # Build with the Vulkan SDK in nixpkgs. + preConfigure = '' + rm -rf include/spirv/include include/vulkan/include + mkdir -p include/spirv/include include/vulkan/include ''; mesonFlags = @@ -38,9 +88,12 @@ stdenv.mkDerivation { in [ "--buildtype" "release" - "--cross-file" "build-win${arch}.txt" "--prefix" "${placeholder "out"}" - ]; + ] + ++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ] + ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; + + doCheck = isDxvk2 && !isCross; meta = { description = "A Vulkan-based translation layer for Direct3D 9/10/11"; @@ -48,6 +101,6 @@ stdenv.mkDerivation { changelog = "https://github.com/doitsujin/dxvk/releases"; maintainers = [ lib.maintainers.reckenrode ]; license = lib.licenses.zlib; - platforms = lib.platforms.windows; + platforms = lib.platforms.windows ++ lib.optionals isDxvk2 lib.platforms.linux; }; } diff --git a/pkgs/misc/dxvk/mcfgthread.patch b/pkgs/misc/dxvk/mcfgthread.patch deleted file mode 100644 index 037071630172..000000000000 --- a/pkgs/misc/dxvk/mcfgthread.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/setup_dxvk.sh b/setup_dxvk.sh -index 3e63ecf0..87c04f23 100755 ---- a/setup_dxvk.sh -+++ b/setup_dxvk.sh -@@ -133,6 +133,8 @@ - rm -v "${dstfile}" - fi - $file_cmd "${srcfile}" "${dstfile}" -+ elif [ "${4}" = "--force" ]; then -+ $file_cmd "${srcfile}" "${dstfile}" - else - echo "${dstfile}: File not found in wine prefix" >&2 - return 1 -@@ -170,12 +172,12 @@ - } - - install() { -- installFile "$win64_sys_path" "$dxvk_lib64" "$1" -+ installFile "$win64_sys_path" "$dxvk_lib64" "$1" "${2-}" - inst64_ret="$?" - - inst32_ret=-1 - if $wow64; then -- installFile "$win32_sys_path" "$dxvk_lib32" "$1" -+ installFile "$win32_sys_path" "$dxvk_lib32" "$1" "${2-}" - inst32_ret="$?" - fi - -@@ -214,3 +216,5 @@ - - $action d3d10core - $action d3d11 -+ -+basedir="" dxvk_lib32=@mcfgthreads32@/bin dxvk_lib64=@mcfgthreads64@/bin $action mcfgthread-12 --force diff --git a/pkgs/misc/dxvk/setup_dxvk.sh b/pkgs/misc/dxvk/setup_dxvk.sh new file mode 100644 index 000000000000..8fadb264fd3d --- /dev/null +++ b/pkgs/misc/dxvk/setup_dxvk.sh @@ -0,0 +1,265 @@ +#!@bash@/bin/bash -e + +set -eu -o pipefail + +dxvk32_dir=@dxvk32@/bin +dxvk64_dir=@dxvk64@/bin + +mcfgthreads32_dir=@mcfgthreads32@/bin +mcfgthreads64_dir=@mcfgthreads64@/bin + +## Defaults + +declare -A dlls=( + [d3d9]="dxvk/d3d9.dll" + [d3d10]="dxvk/d3d10.dll dxvk/d3d10_1.dll dxvk/d3d10core.dll" + [d3d11]="dxvk/d3d11.dll" + [dxgi]="dxvk/dxgi.dll" + [mcfgthreads]="mcfgthreads/mcfgthread-12.dll" +) + +declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1 [mcfgthreads]=1) + +## Command-line Parsing + +usage() { + echo "DXVK @version@" + echo "Set up Wine prefix with DXVK DLLs" + echo + echo "USAGE" + echo " $0 [install|uninstall] [OPTIONS]" + echo + echo "COMMANDS" + echo " install Copy the DXVK DLLs into the prefix" + echo " uninstall Restore the backed up Wine DLLs in the prefix" + echo + echo "OPTIONS" + echo " --with(out)-dxgi Copy DXVK DXGI DLL into prefix (default: with DXGI)" + echo " --with(out)-d3d10 Copy D3D10 DLLs into prefix (default: without D3D10)" + echo " -s, --symlink Symlink instead of copy" + echo " -f, --force Create a Wine prefix even if it does not exist" + echo " -p, --prefix Wine prefix to manage (default: \$WINEPREFIX)" + exit 1 +} + +case "$1" in + uninstall|install) + action=$1 + shift + ;; + -h|--help) + usage + ;; + *) + if [ ! -z "${1:-}" ]; then + echo "Unrecognized command: $1" + fi + usage + ;; +esac + + +do_symlink=false +do_makeprefix=false + +while [ ! -z "${1:-}" ]; do + case "$1" in + --with-dxgi) + targets[dxgi]=1 + ;; + --without-dxgi) + unset targets[dxgi] + ;; + --with-d3d10) + targets[d3d10]=1 + ;; + --without-d3d10) + unset targets[d3d10] + ;; + -s|--symlink) + do_symlink=true + ;; + --no-symlink) + do_symlink=false + ;; + -f|--force) + do_makeprefix=true + ;; + --no-force) + do_makeprefix=false + ;; + -p|--prefix) + shift + if [ ! -z "${1:-}" ]; then + WINEPREFIX=$1 + else + echo "Required PREFIX missing" + usage + fi + ;; + -h|--help) + usage + ;; + *) + echo "Unrecognized option: $1" + usage + ;; + esac + shift +done + +## Get information on the Wine environment + +export WINEPREFIX=${WINEPREFIX:-"$HOME/.wine"} + +# check wine prefix before invoking wine, so that we +# don't accidentally create one if the user screws up +if ! $do_makeprefix && [ -n "$WINEPREFIX" ] && ! [ -f "$WINEPREFIX/system.reg" ]; then + echo "$WINEPREFIX: Not a valid wine prefix." >&2 + exit 1 +fi + +export WINEDEBUG=-all +# disable mscoree and mshtml to avoid downloading +# wine gecko and mono +export WINEDLLOVERRIDES="mscoree,mshtml=" + +wine="wine" +wine64="wine64" +wineboot="wineboot" + +# $PATH is the way for user to control where wine is located (including custom Wine versions). +# Pure 64-bit Wine (non Wow64) requries skipping 32-bit steps. +# In such case, wine64 and winebooot will be present, but wine binary will be missing, +# however it can be present in other PATHs, so it shouldn't be used, to avoid versions mixing. +wine_path=$(dirname "$(command -v $wineboot)") +wow64=true +if ! [ -f "$wine_path/$wine" ]; then + wine=$wine64 + wow64=false +fi + +# resolve 32-bit and 64-bit system32 path +winever=$($wine --version | grep wine) +if [ -z "$winever" ]; then + echo "$wine: Not a wine executable. Check your $wine." >&2 + exit 1 +fi + +# ensure wine placeholder dlls are recreated +# if they are missing +$wineboot -u + +win64_sys_path=$($wine64 winepath -u 'C:\windows\system32' 2> /dev/null) +win64_sys_path="${win64_sys_path/$'\r'/}" +if $wow64; then + win32_sys_path=$($wine winepath -u 'C:\windows\system32' 2> /dev/null) + win32_sys_path="${win32_sys_path/$'\r'/}" +fi + +if [ -z "${win32_sys_path:-}" ] && [ -z "${win64_sys_path:-}" ]; then + echo 'Failed to resolve C:\windows\system32.' >&2 + exit 1 +fi + +## Utility functions + +install_file() { + $do_symlink && file_cmd="ln -sv" || file_cmd="install -m 755 -v" + + srcfile=$1 + dstfile=$2 + + if [ -f "${srcfile}.so" ]; then + srcfile="${srcfile}.so" + fi + + if ! [ -f "${srcfile}" ]; then + echo "${srcfile}: File not found. Skipping." >&2 + return 1 + fi + + if [ -n "$1" ]; then + if [ -f "${dstfile}" ] || [ -h "${dstfile}" ]; then + if ! [ -f "${dstfile}.old" ]; then + mv -v "${dstfile}" "${dstfile}.old" + else + rm -v "${dstfile}" + fi + fi + $file_cmd "${srcfile}" "${dstfile}" + else + echo "${dstfile}: File not found in wine prefix" >&2 + return 1 + fi +} + +uninstall_file() { + srcfile=$1 + dstfile=$2 + + if [ -f "${srcfile}.so" ]; then + srcfile="${srcfile}.so" + fi + + if ! [ -f "${srcfile}" ]; then + echo "${srcfile}: File not found. Skipping." >&2 + return 1 + fi + + if ! [ -f "${dstfile}" ] && ! [ -h "${dstfile}" ]; then + echo "${dstfile}: File not found. Skipping." >&2 + return 1 + fi + + if [ -f "${dstfile}.old" ]; then + rm -v "${dstfile}" + mv -v "${dstfile}.old" "${dstfile}" + return 0 + else + return 1 + fi +} + +install_override() { + dll=$(basename "$1") + $wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /d native /f >/dev/null 2>&1 + if [ $? -ne 0 ]; then + echo -e "Failed to add override for $dll" + exit 1 + fi +} + +uninstall_override() { + dll=$(basename "$1") + $wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /f > /dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "Failed to remove override for $dll" + fi +} + +## Perform the requested command + +declare -A paths + +for target in "${!targets[@]}"; do + [ ${targets[$target]} -eq 1 ] || continue + for dll in ${dlls[$target]}; do + dllname=$(basename "$dll") + basedir=$(dirname "$dll") + + if [ ! -z "${win32_sys_path:-}" ]; then + basedir32=${basedir}32_dir + paths["${!basedir32}/$dllname"]="$win32_sys_path/$dllname" + fi + if [ ! -z "${win64_sys_path:-}" ]; then + basedir64=${basedir}64_dir + paths["${!basedir64}/$dllname"]="$win64_sys_path/$dllname" + fi + done +done + +for srcpath in "${!paths[@]}"; do + ${action}_file "$srcpath" "${paths["$srcpath"]}" + ${action}_override "$(basename srcpath)" +done diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 9527c156e486..ac18998130a6 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile , python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff -, makeWrapper, t1utils +, makeWrapper, t1utils, boehmgc, rsync , texlive, tex ? texlive.combine { - inherit (texlive) scheme-small lh metafont epsf; + inherit (texlive) scheme-small lh metafont epsf fontinst; } }: stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.22.2"; + version = "2.24.0"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-3ekIVPp94QEvThMEpoYXrqmrMiky7AznaYT2DSaqI74="; + sha256 = "sha256-PO2+O5KwJWnjpvLwZ0hYlns9onjXCqPpiu9b3Nf3i2k="; }; postInstall = '' @@ -43,13 +43,18 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm python3 gettext perl fontconfig freetype pango - fontforge help2man groff t1utils + fontforge help2man groff t1utils boehmgc rsync ]; autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh"; enableParallelBuilding = true; + passthru.updateScript = { + command = [ ./update.sh ]; + supportedFeatures = [ "commit" ]; + }; + meta = with lib; { description = "Music typesetting system"; homepage = "http://lilypond.org/"; diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index a8472b66f1fa..468cd51439ec 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,11 +1,14 @@ -{ lib, fetchurl, guile, lilypond }: +{ lib, fetchurl, lilypond }: -(lilypond.override { - inherit guile; -}).overrideAttrs (oldAttrs: rec { - version = "2.23.12"; +lilypond.overrideAttrs (oldAttrs: rec { + version = "2.25.1"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-SLZ9/Jybltd8+1HANk8pTGHRb7MuZSJJDDY/S4Kwz/k="; + sha256 = "sha256-DchY+4+bWIvTZb4v9q/fAqStkbsxHhvty3eur0ZFYVs="; + }; + + passthru.updateScript = { + command = [ ./update.sh "unstable" ]; + supportedFeatures = [ "commit" ]; }; }) diff --git a/pkgs/misc/lilypond/update.sh b/pkgs/misc/lilypond/update.sh new file mode 100755 index 000000000000..e9c3f48805af --- /dev/null +++ b/pkgs/misc/lilypond/update.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused nix + +set -euo pipefail + +if [ $# -gt 0 ] && [ "$1" = "unstable" ]; then + ATTR="lilypond-unstable" + FILE="$(dirname "${BASH_SOURCE[@]}")/unstable.nix" + QUERY="VERSION_DEVEL=" +else + ATTR="lilypond" + FILE="$(dirname "${BASH_SOURCE[@]}")/default.nix" + QUERY="VERSION_STABLE=" +fi + +# update version +PREV=$(nix eval --raw -f default.nix $ATTR.version) +NEXT=$(curl -s 'https://gitlab.com/lilypond/lilypond/-/raw/master/VERSION' | grep "$QUERY" | cut -d= -f2) +sed -i "s|$PREV|$NEXT|" "$FILE" +echo "[{\"commitMessage\":\"$ATTR: $PREV -> $NEXT\"}]" + +# update hash +PREV=$(nix eval --raw -f default.nix $ATTR.src.outputHash) +NEXT=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 $(nix eval --raw -f default.nix $ATTR.src.url))) +sed -i "s|$PREV|$NEXT|" "$FILE" diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index e138a62e39aa..2bbfeda4d321 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -9,13 +9,13 @@ let in rustPlatform.buildRustPackage rec { pname = "t-rec"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "sassman"; repo = "t-rec-rs"; rev = "v${version}"; - sha256 = "sha256-tkt0XAofBhHytbA24g0+jU13aNjmgQ5RspbLTPclnrI="; + sha256 = "sha256-o1fO0N65L6Z6W6aBNhS5JqDHIc1MRQx0yECGzVSCsbo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" ''; - cargoSha256 = "sha256-bb0fwz0fI6DJWgnW0rX63qH2niCLtPeVKex7m6BhVWs="; + cargoHash = "sha256-3NExPlHNcoYVkpOzWCyd66chJpeDzQLRJUruSLAwGNw="; meta = with lib; { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index a36005872500..42d7021f3452 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -92,6 +92,16 @@ let passAsFile = [ "extraConfig" ]; + # Workaround '-idirafter' ordering bug in staging-next: + # https://github.com/NixOS/nixpkgs/pull/210004 + # where libc '-idirafter' gets added after user's idirafter and + # breaks. + # TODO(trofi): remove it in staging once fixed in cc-wrapper. + preConfigure = '' + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags) + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) + ''; + configurePhase = '' runHook preConfigure diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index 3a53916a46de..e7252ab35e63 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -2,7 +2,7 @@ , makeScopeWithSplicing, generateSplicesForMkScope , buildPackages , bsdSetupHook, makeSetupHook -, fetchgit, fetchurl, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell +, fetchgit, fetchzip, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell , zlib, expat, libmd , runCommand, writeShellScript, writeText, symlinkJoin }: @@ -75,6 +75,11 @@ in makeScopeWithSplicing in { inherit freebsdSrc; + ports = fetchzip { + url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz"; + sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E="; + }; + # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`? # See note in ../netbsd/default.nix. @@ -388,6 +393,12 @@ in makeScopeWithSplicing outputs = [ "out" "man" "test" ]; }; + sed = mkDerivation { + path = "usr.bin/sed"; + TESTSRC = "${freebsdSrc}/contrib/netbsd-tests"; + MK_TESTS = "no"; + }; + # Don't add this to nativeBuildInputs directly. Use statHook instead. stat = mkDerivation { path = "usr.bin/stat"; diff --git a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix new file mode 100644 index 000000000000..3c3dcb6d5d67 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix @@ -0,0 +1,64 @@ +{ lib, stdenv, linuxHeaders, freebsd, runCommandCC, buildPackages }: + +stdenv.mkDerivation { + pname = "evdev-proto"; + inherit (linuxHeaders) version; + + src = freebsd.ports; + + sourceRoot = "source/devel/evdev-proto"; + + useTempPrefix = true; + + nativeBuildInputs = [ freebsd.makeMinimal ]; + + ARCH = freebsd.makeMinimal.MACHINE_ARCH; + OPSYS = "FreeBSD"; + _OSRELEASE = "${lib.versions.majorMinor freebsd.makeMinimal.version}-RELEASE"; + + AWK = "awk"; + CHMOD = "chmod"; + FIND = "find"; + MKDIR = "mkdir -p"; + PKG_BIN = "${buildPackages.pkg}/bin/pkg"; + RM = "rm -f"; + SED = "${buildPackages.freebsd.sed}/bin/sed"; + SETENV = "env"; + SH = "sh"; + TOUCH = "touch"; + XARGS = "xargs"; + + ABI_FILE = runCommandCC "abifile" {} "$CC -shared -o $out"; + CLEAN_FETCH_ENV = true; + INSTALL_AS_USER = true; + NO_CHECKSUM = true; + NO_MTREE = true; + SRC_BASE = freebsd.freebsdSrc; + + preUnpack = '' + export MAKE_JOBS_NUMBER="$NIX_BUILD_CORES" + + export DISTDIR="$PWD/distfiles" + export PKG_DBDIR="$PWD/pkg" + export PREFIX="$prefix" + + mkdir -p "$DISTDIR/evdev-proto" + tar -C "$DISTDIR/evdev-proto" \ + -xf ${linuxHeaders.src} \ + --strip-components 4 \ + linux-${linuxHeaders.version}/include/uapi/linux + ''; + + makeFlags = [ "DIST_SUBDIR=evdev-proto" ]; + + postInstall = '' + mv $prefix $out + ''; + + meta = with lib; { + description = "Input event device header files for FreeBSD"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.freebsd; + license = licenses.gpl2Only; + }; +} diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 8903db9f36b7..1033927ce675 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -680,6 +680,13 @@ in makeScopeWithSplicing ## ## START LIBRARIES ## + libarch = mkDerivation { + path = "lib/libarch"; + version = "9.2"; + sha256 = "6ssenRhuSwp0Jn71ErT0PrEoCJ+cIYRztwdL4QTDZsQ="; + meta.platforms = lib.platforms.netbsd; + }; + libutil = mkDerivation { path = "lib/libutil"; version = "9.2"; @@ -809,6 +816,16 @@ in makeScopeWithSplicing meta.platforms = lib.platforms.netbsd; }; + libpci = mkDerivation { + pname = "libpci"; + path = "lib/libpci"; + version = "9.2"; + sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; + NIX_CFLAGS_COMPILE = [ "-I." ]; + meta.platforms = lib.platforms.netbsd; + extraPaths = with self; [ sys.src ]; + }; + libpthread-headers = mkDerivation { pname = "libpthread-headers"; path = "lib/libpthread"; diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index f648435eed27..72a375028453 100644 --- a/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1"; src = fetchurl { - url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; - sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp"; + url = "https://web.archive.org/web/20180408044816/https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; + hash = "sha256-Fzo5QhLd3kZHVFKhJe7xzV6bmRz5nAsG2mNLkAqVBEI="; }; patches = [ diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix index d7ac5d9fd904..839548ae8ffd 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix @@ -45,12 +45,20 @@ let cp -r ${MacOSX-SDK}${standardFrameworkPath name private} $out/Library/Frameworks + if [[ -d ${MacOSX-SDK}/usr/lib/swift/${name}.swiftmodule ]]; then + mkdir -p $out/lib/swift + cp -r -t $out/lib/swift \ + ${MacOSX-SDK}/usr/lib/swift/${name}.swiftmodule \ + ${MacOSX-SDK}/usr/lib/swift/libswift${name}.tbd + fi + # Fix and check tbd re-export references chmod u+w -R $out find $out -name '*.tbd' -type f | while read tbd; do echo "Fixing re-exports in $tbd" rewrite-tbd \ -p ${standardFrameworkPath name private}/:$out/Library/Frameworks/${name}.framework/ \ + -p /usr/lib/swift/:$out/lib/swift/ \ ${mkDepsRewrites deps} \ -r ${builtins.storeDir} \ "$tbd" @@ -163,6 +171,15 @@ in rec { # Seems to be appropriate given https://developer.apple.com/forums/thread/666686 JavaVM = super.JavaNativeFoundation; + + CoreVideo = lib.overrideDerivation super.CoreVideo (drv: { + installPhase = drv.installPhase + '' + # When used as a module, complains about a missing import for + # Darwin.C.stdint. Apparently fixed in later SDKs. + awk -i inplace '/CFBase.h/ { print "#include " } { print }' \ + $out/Library/Frameworks/CoreVideo.framework/Headers/CVBase.h + ''; + }); }; bareFrameworks = ( diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index a4f71f12821d..dfa52606c817 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -3,16 +3,7 @@ , xar, cpio, python3, pbzx }: let - MacOSX-SDK = stdenvNoCC.mkDerivation rec { - pname = "MacOSX-SDK"; - version = "11.0.0"; - - # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog - src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg"; - sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf"; - }; - + mkSusDerivation = args: stdenvNoCC.mkDerivation (args // { dontBuild = true; darwinDontCodeSign = true; @@ -24,16 +15,45 @@ let pbzx $src | cpio -idm ''; + passthru = { + inherit (args) version; + }; + }); + + MacOSX-SDK = mkSusDerivation { + pname = "MacOSX-SDK"; + version = "11.0.0"; + + # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog + src = fetchurl { + url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg"; + sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf"; + }; + installPhase = '' cd Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk mkdir $out cp -r System usr $out/ ''; + }; - passthru = { - inherit version; + CLTools_Executables = mkSusDerivation { + pname = "CLTools_Executables"; + version = "11.0.0"; + + # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog + src = fetchurl { + url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_Executables.pkg"; + sha256 = "0nvb1qx7l81l2wcl8wvgbpsg5rcn51ylhivqmlfr2hrrv3zrrpl0"; }; + + installPhase = '' + cd Library/Developer/CommandLineTools + + mkdir $out + cp -r Library usr $out/ + ''; }; callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); @@ -43,7 +63,7 @@ let # TODO: this is nice to be private. is it worth the callPackage above? # Probably, I don't think that callPackage costs much at all. - inherit MacOSX-SDK; + inherit MacOSX-SDK CLTools_Executables; Libsystem = callPackage ./libSystem.nix {}; LibsystemCross = pkgs.darwin.Libsystem; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix index dc4ab1955b50..59cbc2b1063a 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix @@ -75,7 +75,7 @@ FileProviderUI = {}; FinderSync = {}; ForceFeedback = { inherit IOKit; }; - Foundation = { inherit ApplicationServices CoreFoundation Security SystemConfiguration libobjc; }; + Foundation = { inherit ApplicationServices CoreFoundation Security SystemConfiguration Combine libobjc; }; GLKit = {}; GLUT = { inherit OpenGL; }; GSS = {}; @@ -169,7 +169,7 @@ Speech = {}; SpriteKit = {}; StoreKit = {}; - SwiftUI = {}; + SwiftUI = { inherit AppKit DeveloperToolsSupport UniformTypeIdentifiers; }; SyncServices = {}; System = {}; SystemConfiguration = { inherit Security; }; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix index 0297f8897f12..7be670425d7a 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { ]; installPhase = '' - mkdir -p $out/{include,lib} + mkdir -p $out/{include,lib/swift} for dir in $includeDirs; do from=${MacOSX-SDK}/usr/include/$dir @@ -57,6 +57,13 @@ stdenvNoCC.mkDerivation { $out/lib done + for name in os Dispatch; do + cp -dr \ + ${MacOSX-SDK}/usr/lib/swift/$name.swiftmodule \ + ${MacOSX-SDK}/usr/lib/swift/libswift$name.tbd \ + $out/lib/swift + done + for f in $csu; do from=${MacOSX-SDK}/usr/lib/$f if [ -e "$from" ]; then @@ -71,6 +78,7 @@ stdenvNoCC.mkDerivation { rewrite-tbd \ -c /usr/lib/libsystem.dylib:$out/lib/libsystem.dylib \ -p /usr/lib/system/:$out/lib/system/ \ + -p /usr/lib/swift/:$out/lib/swift/ \ -r ${builtins.storeDir} \ "$tbd" done diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix index 63ef2a1c263e..9288097ef369 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix @@ -8,14 +8,17 @@ let self = stdenvNoCC.mkDerivation { dontBuild = true; installPhase = '' - mkdir -p $out/{include,lib} + mkdir -p $out/{include,lib/swift} cp -r ${MacOSX-SDK}/usr/include/objc $out/include cp ${MacOSX-SDK}/usr/lib/libobjc* $out/lib + cp -r ${MacOSX-SDK}/usr/lib/swift/ObjectiveC.swiftmodule $out/lib/swift + cp ${MacOSX-SDK}/usr/lib/swift/libswiftObjectiveC.tbd $out/lib/swift ''; passthru = { tbdRewrites = { const."/usr/lib/libobjc.A.dylib" = "${self}/lib/libobjc.A.dylib"; + const."/usr/lib/swift/libswiftObjectiveC.dylib" = "${self}/lib/swift/libswiftObjectiveC.dylib"; }; }; }; in self diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index b413744677d2..74f1160e4306 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix @@ -5,8 +5,6 @@ appleDerivation' stdenv { srcs = lib.attrValues IOKitSrcs; sourceRoot = "."; - phases = [ "unpackPhase" "installPhase" ]; - __propagatedImpureHostDeps = [ "/System/Library/Frameworks/IOKit.framework/IOKit" "/System/Library/Frameworks/IOKit.framework/Resources" diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix index bb09adce252e..f4fe65b8066c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix @@ -1,8 +1,6 @@ { appleDerivation', stdenv, darwin-stubs }: appleDerivation' stdenv { - phases = [ "unpackPhase" "installPhase" ]; - __propagatedImpureHostDeps = [ "/System/Library/Frameworks/Security.framework/Security" "/System/Library/Frameworks/Security.framework/Resources" diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 64de728805fd..4082f5b760cf 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -1,8 +1,7 @@ { appleDerivation', stdenvNoCC }: appleDerivation' stdenvNoCC { - phases = [ "unpackPhase" "installPhase" ]; - + dontBuild = true; installPhase = '' mkdir -p $out/include cp mDNSShared/dns_sd.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix index 2fc4afa77d9f..315f0fb06219 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix @@ -1,8 +1,6 @@ { appleDerivation, darwin-stubs }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - # Not strictly necessary, since libSystem depends on it, but it's nice to be explicit so we # can easily find out what's impure. __propagatedImpureHostDeps = [ diff --git a/pkgs/os-specific/darwin/xattr/default.nix b/pkgs/os-specific/darwin/xattr/default.nix index a1e3c4914879..7fe0f84606ce 100644 --- a/pkgs/os-specific/darwin/xattr/default.nix +++ b/pkgs/os-specific/darwin/xattr/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchFromGitHub , buildPythonPackage , python , ed @@ -11,9 +11,11 @@ buildPythonPackage rec { pname = "xattr"; version = "61.60.1"; - src = fetchzip rec { - url = "https://opensource.apple.com/tarballs/python_modules/python_modules-${version}.tar.gz"; - sha256 = "19kydl7w4vpdi7zmfd5z9vjkq24jfk2cv4j0pppw69j06czhdwwi"; + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "python_modules"; + rev = "python_modules-${version}"; + hash = "sha256-kfMGPzNAJsPvvUCSzcR0kgg85U6/NFf/ie1uwg9tfqY="; }; sourceRoot = "${src.name}/Modules/xattr-0.6.4"; @@ -61,7 +63,10 @@ buildPythonPackage rec { ''; makeWrapperArgs = [ - "--prefix" "PYTHONPATH" ":" "${placeholder "python"}/${python.sitePackages}" + "--prefix" + "PYTHONPATH" + ":" + "${placeholder "python"}/${python.sitePackages}" ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 020aee04af79..303eb801478c 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -130,6 +130,10 @@ in stdenv.mkDerivation rec { mkdir $out/etc/bluetooth ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf + # https://github.com/NixOS/nixpkgs/issues/204418 + ln -s /etc/bluetooth/input.conf $out/etc/bluetooth/input.conf + ln -s /etc/bluetooth/network.conf $out/etc/bluetooth/network.conf + # Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez for files in `find tools/ -type f -perm -755`; do filename=$(basename $files) diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 5475a565b09b..71bde6220a02 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, protobuf, protobufc, asciidoc, iptables , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2 -, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd }: +, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd +, buildPackages +}: stdenv.mkDerivation rec { pname = "criu"; @@ -22,9 +24,34 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython perl ]; - buildInputs = [ protobuf asciidoc xmlto libpaper libnl libcap libnet nftables libbsd ]; - propagatedBuildInputs = [ protobufc ] ++ (with python3.pkgs; [ python python3.pkgs.protobuf ]); + depsBuildBuild = [ protobufc buildPackages.stdenv.cc ]; + nativeBuildInputs = [ + pkg-config + asciidoc + xmlto + libpaper + docbook_xsl + which + makeWrapper + docbook_xml_dtd_45 + python3 + python3.pkgs.wrapPython + perl + ]; + buildInputs = [ + protobuf + libnl + libcap + libnet + nftables + libbsd + ]; + propagatedBuildInputs = [ + protobufc + ] ++ (with python3.pkgs; [ + python + python3.pkgs.protobuf + ]); postPatch = '' substituteInPlace ./Documentation/Makefile \ @@ -34,7 +61,27 @@ stdenv.mkDerivation rec { ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; - makeFlags = [ "PREFIX=$(out)" "ASCIIDOC=${asciidoc}/bin/asciidoc" "XMLTO=${xmlto}/bin/xmlto" ]; + makeFlags = let + # criu's Makefile infrastructure expects to be passed a target architecture + # which neither matches the config-tuple's first part, nor the + # targetPlatform.linuxArch attribute. Thus we take the latter and map it + # onto the expected string: + linuxArchMapping = { + "x86_64" = "x86"; + "arm" = "arm"; + "arm64" = "aarch64"; + "powerpc" = "ppc64"; + "s390" = "s390"; + "mips" = "mips"; + }; + in [ + "PREFIX=$(out)" + "ASCIIDOC=${buildPackages.asciidoc}/bin/asciidoc" + "XMLTO=${buildPackages.xmlto}/bin/xmlto" + ] ++ (lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + "ARCH=${linuxArchMapping."${stdenv.targetPlatform.linuxArch}"}" + "CROSS_COMPILE=${stdenv.targetPlatform.config}-" + ]); outputs = [ "out" "dev" "man" ]; @@ -58,7 +105,7 @@ stdenv.mkDerivation rec { description = "Userspace checkpoint/restore for Linux"; homepage = "https://criu.org"; license = licenses.gpl2; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 457160879871..8939aef06c54 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -54,6 +54,7 @@ , libmbim , libcbor , xz +, enableFlashrom ? false }: let @@ -76,7 +77,7 @@ let # # Currently broken on Aarch64 # haveFlashrom = isx86; # Experimental - haveFlashrom = false; + haveFlashrom = isx86 && enableFlashrom; runPythonCommand = name: buildCommandPython: runCommand name { nativeBuildInputs = [ python3 ]; @@ -116,7 +117,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.9"; + version = "1.8.10"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -125,7 +126,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - hash = "sha256-cZp5GsS6WYiuuT7EJ3i9ZdM8sHXQwJO1wE5eFoK+Uoo="; + hash = "sha256-vvNUidNdhW9xeksjEVnkIR7CZ4oBQizZJRMFtZUq6Ow="; }; patches = [ @@ -332,7 +333,6 @@ let "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" "fwupd/remotes.d/vendor-directory.conf" - "fwupd/thunderbolt.conf" "fwupd/uefi_capsule.conf" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" @@ -347,6 +347,8 @@ let "fwupd/redfish.conf" ] ++ lib.optionals haveMSR [ "fwupd/msr.conf" + ] ++ lib.optionals isx86 [ + "fwupd/thunderbolt.conf" ]; # DisabledPlugins key in fwupd/daemon.conf diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 951c84eaf492..8396fd5e3d33 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,42 +1,43 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns -, libcap, libidn2 +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gettext +, libxslt +, docbook_xsl_ns +, libcap +, libidn2 , iproute2 , apparmorRulesFromClosure }: -let - version = "20211215"; - sunAsIsLicense = { - fullName = "AS-IS, SUN MICROSYSTEMS license"; - url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "iputils"; - inherit version; + version = "20221126"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1vzdch1xi2x2j8mvnsr4wwwh7kdkgf926xafw5kkb74yy1wac5qv"; + hash = "sha256-XVoQhdjBmEK8TbCpaKLjebPw7ZT8iEvyLJDTCkzezeE="; }; - outputs = ["out" "apparmor"]; + outputs = [ "out" "apparmor" ]; # We don't have the required permissions inside the build sandbox: # /build/source/build/ping/ping: socket: Operation not permitted doCheck = false; mesonFlags = [ - "-DBUILD_RARPD=true" "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" "-DINSTALL_SYSTEMD_UNITS=true" "-DSKIP_TESTS=${lib.boolToString (!doCheck)}" ] - # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): - ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; + # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): + ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] @@ -65,23 +66,19 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://github.com/iputils/iputils"; + changelog = "https://github.com/iputils/iputils/releases/tag/${version}"; description = "A set of small useful utilities for Linux networking"; - inherit (src.meta) homepage; - changelog = "https://github.com/iputils/iputils/releases/tag/s${version}"; - license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ]; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos lheckemann ]; - longDescription = '' A set of small useful utilities for Linux networking including: - arping - clockdiff - ninfod - ping - rarpd - rdisc - tracepath + - arping: send ARP REQUEST to a neighbour host + - clockdiff: measure clock difference between hosts + - ping: send ICMP ECHO_REQUEST to network hosts + - tracepath: traces path to a network host discovering MTU along this path ''; + license = with licenses; [ gpl2Plus bsd3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos lheckemann ]; }; } diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 2f48448541b3..5a5193997be0 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.17"; - hash = "sha256-cobPqWUYKMWJOJUJVGMzuNqWXfqEoaTIqz5oGkf6uuc="; + version = "2.03.18"; + hash = "sha256-n2g+KYDZXA3Ou9JcfBdwMsVhXXJnv8iF6r/OWSgPR2k="; } diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index f1b129e80407..91363969ffe6 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, coreutils , pkg-config , perl , lvm2 @@ -9,31 +10,28 @@ , systemd , liburcu , json_c -, kmod +, linuxHeaders , cmocka , nixosTests }: stdenv.mkDerivation rec { pname = "multipath-tools"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; rev = "refs/tags/${version}"; - sha256 = "sha256-pIGeZ+jB+6GqkfVN83axHIuY/BobQ+zs+tH+MkLIln0="; + sha256 = "sha256-CPvtnjzkyxKXrT8+YXaIgDA548h8X61+jCxMHKFfEyg="; }; postPatch = '' - substituteInPlace libmultipath/Makefile \ - --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h + substituteInPlace create-config.mk \ + --replace /bin/echo ${coreutils}/bin/echo - # systemd-udev-settle.service is deprecated. substituteInPlace multipathd/multipathd.service \ - --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ - --replace /sbin/multipathd "$out/bin/multipathd" \ - --replace " systemd-udev-settle.service" "" + --replace /sbin/multipathd "$out/bin/multipathd" sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", @@ -45,15 +43,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; + buildInputs = [ systemd lvm2 libaio readline liburcu json_c linuxHeaders ]; makeFlags = [ "LIB=lib" "prefix=$(out)" + "systemd_prefix=$(out)" + "kernel_incdir=${linuxHeaders}/include/" "man8dir=$(out)/share/man/man8" "man5dir=$(out)/share/man/man5" "man3dir=$(out)/share/man/man3" - "SYSTEMDPATH=lib" ]; doCheck = true; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index bd81715bdacb..1c1edc5abce0 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-pNU5isAZh9cPgaWZSSvWmSqukKV3TFGGntOKN6y1zIo="; + sha256 = "sha256-EINi0pZo0lz3sMrcY7FaTBz8DbxxrcFRszxf597Ok5o="; }; strictDeps = true; diff --git a/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix b/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix new file mode 100644 index 000000000000..4a651bf473e5 --- /dev/null +++ b/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl }: + +## Usage +# In NixOS, simply add this package to services.udev.packages: +# services.udev.packages = [ pkgs.picoprobe-udev-rules ]; + +stdenv.mkDerivation rec { + pname = "picoprobe-udev-rules"; + version = "unstable-2023-01-31"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/probe-rs/webpage/1cba61acc6ecb5ff96f74641269844ad88ad8ad5/static/files/69-probe-rs.rules"; + sha256 = "sha256-vQMPX3Amttja0u03KWGnPDAVTGM9ekJ+IBTjW+xlJS0="; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D $src $out/lib/udev/rules.d/69-probe-rs.rules + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://probe.rs/docs/getting-started/probe-setup/#udev-rules"; + description = "Picoprobe udev rules list"; + platforms = platforms.linux; + license = licenses.gpl2Only; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix index ba2d0967e45d..4a5e50d9c6ab 100644 --- a/pkgs/os-specific/linux/sgx/psw/default.nix +++ b/pkgs/os-specific/linux/sgx/psw/default.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { # NixOS module which is based on those files without relying on them. Still, it # is helpful to have properly patched versions for non-NixOS distributions. postFixup = '' - header "Fixing aesmd.service" + echo "Fixing aesmd.service" substituteInPlace $out/lib/systemd/system/aesmd.service \ --replace '@aesm_folder@' \ "$out/aesm" \ @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { --replace "/bin/kill" \ "${coreutils}/bin/kill" - header "Fixing remount-dev-exec.service" + echo "Fixing remount-dev-exec.service" substituteInPlace $out/lib/systemd/system/remount-dev-exec.service \ --replace '/bin/mount' \ "${util-linux}/bin/mount" diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index 5213dc1e4fda..053aaecbcbb7 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { }; in '' - header "Setting up IPP crypto build artifacts" + echo "Setting up IPP crypto build artifacts" pushd 'external/ippcp_internal' @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { ./linux/installer/bin/sgx_linux_x64_sdk_${version}.bin -prefix $installDir installDir=$installDir/sgxsdk - header "Move files created by installer" + echo "Move files created by installer" mkdir -p $out/bin pushd $out @@ -206,15 +206,15 @@ stdenv.mkDerivation rec { preFixup = '' - header "Strip sgxsdk prefix" + echo "Strip sgxsdk prefix" for path in "$out/share/bin/environment" "$out/bin/sgx-gdb"; do substituteInPlace $path --replace "$TMPDIR/sgxsdk" "$out" done - header "Fixing pkg-config files" + echo "Fixing pkg-config files" sed -i "s|prefix=.*|prefix=$out|g" $out/lib/pkgconfig/*.pc - header "Fixing SGX_SDK default in samples" + echo "Fixing SGX_SDK default in samples" substituteInPlace $out/share/SampleCode/LocalAttestation/buildenv.mk \ --replace '/opt/intel/sgxsdk' "$out" for file in $out/share/SampleCode/*/Makefile; do @@ -222,12 +222,12 @@ stdenv.mkDerivation rec { --replace '/opt/intel/sgxsdk' "$out" done - header "Fixing BINUTILS_DIR in buildenv.mk" + echo "Fixing BINUTILS_DIR in buildenv.mk" substituteInPlace $out/share/bin/buildenv.mk \ --replace 'BINUTILS_DIR ?= /usr/local/bin' \ 'BINUTILS_DIR ?= ${BINUTILS_DIR}' - header "Fixing GDB path in bin/sgx-gdb" + echo "Fixing GDB path in bin/sgx-gdb" substituteInPlace $out/bin/sgx-gdb --replace '/usr/local/bin/gdb' '${gdb}/bin/gdb' ''; diff --git a/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch new file mode 100644 index 000000000000..c64fdd8d34c0 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch @@ -0,0 +1,44 @@ +From 236e9281cb158be3191c500524fbc5f397a25e03 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Sun, 15 Jan 2023 20:15:55 +0800 +Subject: [PATCH] tpm2_context_init: fix driver name checking + +https://github.com/systemd/systemd/commit/542dbc623e introduced +additional checks for tpm2 driver names, namely ensuring the driver +name, when concated with "libtss2-tcti-" and ".so.0", generates a valid +filename (with no '/' inside). + +For example, if the driver is name "device", the line + fn = strjoina("libtss2-tcti-", driver, ".so.0") +would yield "libtss2-tcti-device.so.0", passing the check. And the +filename is then passed to dlopen for loading the driver. + +Our current approach for systemd to correctly locate these dynamically +loaded libraries is to patch the filenames to include their absolute +path. Thus the line mentioned above is patched into + fn = strjoina("/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-", driver, ".so.0") +yielding "/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-device.so.0", +tripping the check. + +This patch relaxes the check to also accept absolute paths, by replacing +filename_is_valid with path_is_valid. +--- + src/shared/tpm2-util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c +index ba8dfb041d..7de5d5fc77 100644 +--- a/src/shared/tpm2-util.c ++++ b/src/shared/tpm2-util.c +@@ -192,7 +192,7 @@ int tpm2_context_init(const char *device, struct tpm2_context *ret) { + fn = strjoina("libtss2-tcti-", driver, ".so.0"); + + /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */ +- if (!filename_is_valid(fn)) ++ if (!path_is_valid(fn)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "TPM2 driver name '%s' not valid, refusing.", driver); + + dl = dlopen(fn, RTLD_NOW); +-- +2.39.0 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fadb6a486c82..e871d6618c34 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -93,6 +93,7 @@ , withHwdb ? true , withImportd ? !stdenv.hostPlatform.isMusl , withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" + && stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6" # assumes hard floats && !stdenv.hostPlatform.isMips64 # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 , withLocaled ? true , withLogind ? true @@ -174,6 +175,7 @@ stdenv.mkDerivation { ./0016-pkg-config-derive-prefix-from-prefix.patch ./0017-inherit-systemd-environment-when-calling-generators.patch ./0018-core-don-t-taint-on-unmerged-usr.patch + ./0019-tpm2_context_init-fix-driver-name-checking.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -714,7 +716,7 @@ stdenv.mkDerivation { description = "A system and service manager for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; - badPlatforms = [ (plat: plat.isStatic) ]; + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 broken = stdenv.hostPlatform.isStatic; priority = 10; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 2d954d83ecf3..ba4fe8356ce7 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, openssl, pkg-config, libnl , nixosTests, wpa_supplicant_gui -, dbusSupport ? true, dbus +, dbusSupport ? !stdenv.hostPlatform.isStatic, dbus , withReadline ? true, readline -, withPcsclite ? true, pcsclite +, withPcsclite ? !stdenv.hostPlatform.isStatic, pcsclite , readOnlyModeSSIDs ? false }: @@ -73,6 +73,15 @@ stdenv.mkDerivation rec { CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y + '' + # Upstream uses conditionals based on ifdef, so opposite of =y is + # not =n, as one may expect, but undefine. + # + # This config is sourced into makefile. + + optionalString (!dbusSupport) '' + undefine CONFIG_CTRL_IFACE_DBUS + undefine CONFIG_CTRL_IFACE_DBUS_NEW + undefine CONFIG_CTRL_IFACE_DBUS_INTRO '' + (if withReadline then '' CONFIG_READLINE=y '' else '' @@ -104,13 +113,15 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man5 $out/share/man/man8 cp -v "doc/docbook/"*.5 $out/share/man/man5/ cp -v "doc/docbook/"*.8 $out/share/man/man8/ - + '' + + lib.optionalString dbusSupport '' mkdir -p $out/share/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system cp -v "dbus/"*service $out/share/dbus-1/system-services sed -e "s@/sbin/wpa_supplicant@$out&@" -i "$out/share/dbus-1/system-services/"* cp -v dbus/dbus-wpa_supplicant.conf $out/share/dbus-1/system.d cp -v "systemd/"*.service $out/etc/systemd/system - + '' + + '' rm $out/share/man/man8/wpa_priv.8 install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example ''; diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 44edf3be7a81..05808d605d26 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -11,12 +11,25 @@ let yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ ]; + esbuild' = esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.16.17"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; + # replaces esbuild's download script with a binary from nixpkgs patchEsbuild = path : version : '' mkdir -p ${path}/node_modules/esbuild/bin jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json - sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index b84632746c94..c8a4b99d58e0 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - hash = "sha256-0viXsBRCiaxBTTKXJngSov5M7toscQUOdXDTr1l0U3I="; + hash = "sha256-/KT3JZ/xYcKRynksWgsPsioCLTSxeQxr6WjRUzYXJcU="; }; - vendorHash = "sha256-SuKT+b8g6xEK15ry2IAmpS/vwDG+zJqK9nfsWpHNXuU="; + vendorHash = "sha256-8p5NFxXKaZPsW4B6NMzfi0pqfVroIahSgA0fukvB3JI="; ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"]; diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index db7d40ad35d5..1371bac15d66 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -4,17 +4,18 @@ let python = python3.override { packageOverrides = self: super: { mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.16.3"; - src = oldAttrs.src.override { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU="; + version = "0.16.10"; + src = fetchFromGitHub { + owner = "mautrix"; + repo = "python"; + rev = "v${version}"; + hash = "sha256-YQsQ7M+mHcRdGUZp+mo46AlBmKSdmlgRdGieEG0Hu9k="; }; }); }; }; - -in python.pkgs.buildPythonApplication rec { +in +python.pkgs.buildPythonApplication rec { pname = "heisenbridge"; version = "1.13.1"; @@ -30,11 +31,10 @@ in python.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with python.pkgs; [ - aiohttp irc + ruamel-yaml mautrix python-socks - pyyaml ]; nativeCheckInputs = with python.pkgs; [ diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index c1abe663ea90..bb6063fdafb4 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "dbee027ed9b568469815b319332e029964bff7fb", - "sha256": "sha256-M0m3JtA9Qx5ZpgNujeUBC/7TVES9dKLEr5pKgn8l1cM=", - "version": "unstable-2023-01-22" + "rev": "3b8e6c6040fe341fe4b9fc16cdbd3aea697dfad3", + "sha256": "sha256-gESGo8zRJtGJZrZEkW0OS/O65ZwVzpDA3jmyLCV0RpI=", + "version": "unstable-2023-01-26" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 2bd89a7c143b..ba6e1cdcc7a7 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2732"; + version = "0.20.2782"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-h9vQ4OFXt3Fb7+2QSsXJh/uqy9glRFAZfZ8fdBqqna/59PV8GtItYWSJi7FhGVeFMX+WMQnsxG0/8Hq1z7akMA=="; + hash = "sha512-qBstaZfBts2EfYVt+iU9QqIEVRfPIqt122NAMlS42yoV7iLqeXfK989Wm6FoYtTvvgtNpVJ9rLPNMSSH3AX3TQ=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index 47aca84a80b2..e1db293f6499 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.160.0"; + version = "0.161.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-maNOiC+hFv/mniU1spZVZrUJETT5sgdi1OmbYR2smFk="; + sha256 = "sha256-TZ/TxX9OgDGx8zD2mI8cTDPZSqBjkYN3Uy+W9MXbJOI="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 60c073e3a828..2a3586f29e2a 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "libreddit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Q/Vl126EMRSNdStpZqFEkA0Kjzu6BeyBhokTQrrQXE="; + hash = "sha256-kiiZxS5ttUZ1FdF/N9sO6GO13Wmij8DwsNa8p+ZTk0k="; }; - cargoSha256 = "sha256-TA0Rsya3vx6N/iAWpRmB7Byz7AIR0sdfk3kJ8wgvWHY="; + cargoSha256 = "sha256-0XBJ1tlVO2+iK9O2CDVZxDwFXW8T23j2lSbqpnW3fis="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index b4e4e87fb7dc..11920c3e8b68 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -11,6 +11,8 @@ buildGoModule rec { sha256 = "sha256-VqVrAmbKTfDhcvgayEE1wUeFBSTGczBrntIJQ5/uWzM="; }; + subPackages = [ "." ]; + vendorSha256 = null; meta = with lib; { diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index db1f7c6d1f25..74389663455f 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -1,17 +1,19 @@ -{ fetchFromGitHub, fetchpatch +{ fetchFromGitHub +, fetchpatch , lib , python3 -, protobuf3_20 -, enableE2be ? true, enableMetrics ? true, enableSqlite ? true +, enableE2be ? true +, enableMetrics ? true +, enableSqlite ? true }: python3.pkgs.buildPythonApplication rec { pname = "mautrix-googlechat"; - version = "0.4.0"; + version = "unstable-2023-01-25"; src = fetchFromGitHub { owner = "mautrix"; repo = "googlechat"; - rev = "v${version}"; - sha256 = "sha256-UVWYT0HTOUEkBG0n6KNhCSSO/2PAF1rIvCaw478z+q0="; + rev = "e2eb528745466468f059c506c22e500e0cd832aa"; + sha256 = "sha256-FNlEHzuy89RuFUwZPmVA+4AmpQHGD+18BguGC6qBdBM="; }; patches = [ @@ -24,13 +26,6 @@ }) ]; - doCheck = false; - - postPatch = '' - sed -i requirements.txt \ - -e 's/asyncpg>=.*/asyncpg/' - ''; - baseConfigPath = "share/mautrix-googlechat/example-config.yaml"; postInstall = '' rm $out/example-config.yaml @@ -43,8 +38,12 @@ pycryptodome unpaddedbase64 ]; - metrics = [ prometheus-client ]; - sqlite = [ aiosqlite ]; + metrics = [ + prometheus-client + ]; + sqlite = [ + aiosqlite + ]; }; propagatedBuildInputs = with python3.pkgs; [ @@ -54,14 +53,14 @@ ruamel-yaml CommonMark python-magic - (protobuf.override { - protobuf = protobuf3_20; - }) + protobuf3 mautrix ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics ++ lib.optionals enableSqlite passthru.optional-dependencies.sqlite; + doCheck = false; + meta = with lib; { homepage = "https://github.com/mautrix/googlechat"; description = "A Matrix-Google Chat puppeting bridge"; diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 7aada1e2eed5..8ff6f1d36694 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -11,6 +11,20 @@ python3.pkgs.buildPythonPackage rec { sha256 = "sha256-UbetU1n9zD/mVFaJc9FECDq/Zell1TI/aYPsGXGB8Js="; }; + postPatch = '' + # the version mangling in mautrix_signal/get_version.py interacts badly with pythonRelaxDepsHook + substituteInPlace setup.py \ + --replace 'version=version' 'version="${version}"' + ''; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "mautrix" + ]; + propagatedBuildInputs = with python3.pkgs; [ CommonMark aiohttp @@ -31,12 +45,6 @@ python3.pkgs.buildPythonPackage rec { doCheck = false; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "asyncpg>=0.20,<0.26" "asyncpg>=0.20" \ - --replace "mautrix>=0.16.0,<0.17" "mautrix>=0.16.0" - ''; - postInstall = '' mkdir -p $out/bin diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 468df32bbddd..2284a677b656 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -9,28 +9,31 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.27.0a1"; + version = "1.27.0a7"; pname = "tulir-telethon"; src = super.fetchPypi { inherit pname version; - sha256 = "sha256-tABAY4UlTyMK1ZafIFawegjBAtcnq3HMNbE1L6WaT3E="; + sha256 = "sha256-w4WILvLvJBKf3Nlj0omTCDDD4z+b0XFlCplQ/IHwIPs="; }; doCheck = false; }); }; }; -in python.pkgs.buildPythonPackage rec { +in +python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.12.2"; + version = "unstable-2023-01-28"; disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; - rev = "v${version}"; - sha256 = "sha256-htCk0VLr6GfXbpYWF/2bmpko7gSVlkH6HwDjOMhW8is="; + rev = "f12abbe03846fd5897d58572ab24b70a58b337d2"; + sha256 = "sha256-5ZZ85FOmTO26q2zhAIsF7mTlN4BLNLW2dQF+0culkUM="; }; + format = "setuptools"; + patches = [ ./0001-Re-add-entrypoint.patch ]; propagatedBuildInputs = with python.pkgs; ([ @@ -43,19 +46,24 @@ in python.pkgs.buildPythonPackage rec { tulir-telethon asyncpg Mako - # optional + # speedups cryptg - cchardet aiodns brotli + # qr_login pillow qrcode + # formattednumbers phonenumbers + # metrics prometheus-client + # sqlite aiosqlite ] ++ lib.optionals withHQthumbnails [ + # hq_thumbnails moviepy ] ++ lib.optionals withE2BE [ + # e2be python-olm pycryptodome unpaddedbase64 diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 8e657e1edc0f..5e24e5e9a8eb 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.41"; + version = "2.0.42"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-NhxzpNtRzLE9bVWIGSHwnok7RjqRp8Uan9uCvdigAyk="; + sha256 = "sha256-2ywaQubE/DZCTIX6a3vh1VH+/lfoe9gRzkqih8ULU8Q="; }; - vendorSha256 = "sha256-906gMXI6zEIIcXvT/ZqAM+5F0GVHbipUtdrPO6+32KQ="; + vendorSha256 = "sha256-KtYFjNqUIYgAwIkEhQwg5OdjIluyENeZ6Qo5TGKzA/s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index afe28b690f79..44d86af8957d 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.45.0"; + version = "1.46.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-5KiqVrhb/yEaxgLJ3SB/WHNOfCbPzfJcgdPZ2kuNFEY="; + sha256 = "sha256-5OZ4DuGIVMw0Yvd4JC+dbX01RAUAZHmROzl+7Pd6+tc="; }; - vendorSha256 = "sha256-SBag82QLLPeGowt10edaAnUWI36i71Ps0pdixiAXVB8="; + vendorHash = "sha256-p6C/j1591cmPtIvBH1022YRkfBo07KQ8fqUwJ5YIUn8="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 8f0be0901e05..488d3e22e654 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zfs_exporter"; - version = "2.2.5"; + version = "2.2.7"; src = fetchFromGitHub { owner = "pdf"; repo = pname; rev = "v" + version; - hash = "sha256-FY3P2wmNWyr7mImc1PJs1G2Ae8rZvDzq0kRZfiRTzyc="; + hash = "sha256-bc9bmGrRGhm58JzrVLLJBUc1zaGXqz2fqx+ZphidFbc="; }; - vendorSha256 = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c="; + vendorHash = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c="; postInstall = '' install -Dm444 -t $out/share/doc/${pname} *.md diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index e4f558c790b2..e6e7130e3fdb 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, runCommand +{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand , cacert, moreutils, jq, git, pkg-config, yarn, python3 , esbuild, nodejs-16_x-openssl_1_1, libsecret, xorg, ripgrep , AppKit, Cocoa, Security, cctools }: @@ -17,12 +17,25 @@ let aarch64-darwin = "darwin-arm64"; }.${system} or (throw "Unsupported system ${system}"); + esbuild' = esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.16.17"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; + # replaces esbuild's download script with a binary from nixpkgs patchEsbuild = path : version : '' mkdir -p ${path}/node_modules/esbuild/bin jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json - sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 71b1bf567847..357da5292821 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M55IylFGAKy9TEIyLSHGbf9FjU5OjvoHjwYkiS31Zpk="; + sha256 = "sha256-Ptp01SnVqQ+qFxX4Qsoyw9bkw+inm9gMSRqtmAcFlVE="; }; - vendorHash = "sha256-D8nFoTggxYNj7ZSY1rvA4YSJHbB7wwpPSu1g+S3c1C0="; + vendorHash = "sha256-8NBudXcU3cjSbo6qpGZVLtbrLedzwijwrbiTgC+OMcU="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 84b63d5984e3..e2a265c0f5ef 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchzip }: let - version = "22.3.5"; + version = "22.3.11"; platform = if stdenv.isLinux then "linux" else "darwin"; arch = if stdenv.isAarch64 then "arm" else "amd"; sha256s = { - darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g="; - darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4="; - linux.amd = "sha256-wsUuSCstYucjMpFsqssPGEhm3zCrAdE9Mldtkypbthg="; - linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8="; + darwin.amd = "sha256-kwAKxFg7BSNInvsQvFqgtpq8EEwSnmDeDyaF5b8L8SQ="; + darwin.arm = "sha256-kH5Ii672SeAIiRcWuAO3oVJVSBWp+r78RmTiR3BaDbg="; + linux.amd = "sha256-EKgkRKBrM4+X2YGoP2LpWRHL+fdHu44LYwCZ+O+c5ZY="; + linux.arm = "sha256-9b4oerRXjUVUYoswJWtnMBJSQDoCKClf673VjDQFUAw="; }; in stdenv.mkDerivation rec { pname = "redpanda"; diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix index 0940d1a0ece3..e59b9d73d5a8 100644 --- a/pkgs/servers/simple-http-server/default.nix +++ b/pkgs/servers/simple-http-server/default.nix @@ -1,21 +1,30 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9wssSegekRBUXxpru5WGGu6BLX6BFEgV0QliNJToRFg="; + sha256 = "sha256-b+z3rio+kg1Z0B4pqhTlCTtzXgAeCAhinSa9dkIwcaY="; }; - cargoSha256 = "sha256-P8Zr5KTjXD0qHkf6QfyfN39PjokpZUfywhzVjIO5rE8="; + cargoSha256 = "sha256-teBqgQloI/13F7K/+EBKFcHWqcK1wJrNUu5LO8nwQbo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix new file mode 100644 index 000000000000..c5e536363fda --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, libkrb5, openssl, postgresql }: + +stdenv.mkDerivation rec { + pname = "pgaudit"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "pgaudit"; + repo = "pgaudit"; + rev = version; + hash = "sha256-8pShPr4HJaJQPjW1iPJIpj3CutTx8Tgr+rOqoXtgCcw="; + }; + + buildInputs = [ libkrb5 openssl postgresql ]; + + makeFlags = [ "USE_PGXS=1" ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + meta = with lib; { + description = "Open Source PostgreSQL Audit Logging"; + homepage = "https://github.com/pgaudit/pgaudit"; + maintainers = with maintainers; [ idontgetoutmuch ]; + platforms = postgresql.meta.platforms; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 77137d4447b2..8eb0cb7f42f8 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; rev = "v${version}"; - sha256 = "sha256-I+MIQjZNsKHLsiCtvip73fA2LYPR7PVFgTBNtn+CtFE="; + hash = "sha256-bOckX7zvHhgJDDhoAm+VZVIeVIf2hG/3oWZWuTtnZPo="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 4c5b00609918..14078659aeac 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.2.6"; + version = "2.3.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-8HFyIzJ1iF3K2vTlibFallvkMKjFTJ2DO64fORToD8E="; + hash = "sha256-zl7AF+1hj6UFnf9sKO40ZTzm7edKguUYFqaT5/qf8Ic="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 80065bde4ba1..2bf9db061a91 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -24,6 +24,8 @@ self: super: { pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; + pgaudit = super.callPackage ./ext/pgaudit.nix { }; + pgroonga = super.callPackage ./ext/pgroonga.nix { }; pgvector = super.callPackage ./ext/pgvector.nix { }; diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix index ab059b518e74..86da469e3468 100644 --- a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeymarker"; inherit version; vendorSha256 = "sha256-ZuDobjC/nizZ7G0o/zVTQmDfDjcdBhfPcmkhgwFc7VU="; - src = fetchurl { - url = "https://github.com/honeycombio/honeymarker/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeymarker"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix b/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix index c7fde50e15d0..60e6a537e42e 100644 --- a/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix +++ b/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix @@ -1,6 +1,6 @@ generic: { v0_2_1 = generic { version = "0.2.1"; - sha256 = "0gp427bsc1y7k6j1sqgl8r3kng5b0qhmqd4bpfb9139ivmp2sykk"; + sha256 = "sha256-tiwX94CRvXnUYpiux94XhOj2abn1Uc+wjcDOmw79ab4="; }; } diff --git a/pkgs/servers/tracing/honeycomb/honeytail/default.nix b/pkgs/servers/tracing/honeycomb/honeytail/default.nix index cbe901f2859a..b5c21ed1d94a 100644 --- a/pkgs/servers/tracing/honeycomb/honeytail/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeytail/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeytail"; inherit version; vendorSha256 = "sha256-LtiiLGLjhbfT49A6Fw5CbSbnmTHMxtcUssr+ayCVrvY="; - src = fetchurl { - url = "https://github.com/honeycombio/honeytail/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeytail"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/pkgs/servers/tracing/honeycomb/honeytail/versions.nix b/pkgs/servers/tracing/honeycomb/honeytail/versions.nix index 370d645ab626..295cc7c6353e 100644 --- a/pkgs/servers/tracing/honeycomb/honeytail/versions.nix +++ b/pkgs/servers/tracing/honeycomb/honeytail/versions.nix @@ -1,6 +1,6 @@ generic: { v1_6_0 = generic { version = "1.6.0"; - sha256 = "039svpvqjck7s3rq86s29xgcyxl1wr0zj90s3jsyp058zk1dgwdy"; + sha256 = "sha256-S0hIgNNzF1eNe+XJs+PT7EUIl5oJCXu+B/zQago4sf8="; }; } diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix index 839b8ec053f7..e1009c35a882 100644 --- a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeyvent"; inherit version; vendorSha256 = null; - src = fetchurl { - url = "https://github.com/honeycombio/honeyvent/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeyvent"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix b/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix index 831de6c93372..1bf2443aa183 100644 --- a/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix +++ b/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix @@ -1,6 +1,6 @@ generic: { v1_1_0 = generic { version = "1.1.0"; - sha256 = "0ar2m25ngdd1wk7d70j2781wbrvhjhf9cj9qvp24jjrhqng6hvn7"; + sha256 = "sha256-yFQEOshjaH6fRCQ7IZChANI9guZlTXk35p1NzQvxUdI="; }; } diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index 2bd4cf324823..8d2f4f42afb3 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; - version = "2.10.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "levito"; repo = "tt-rss-feedly-theme"; rev = "v${version}"; - sha256 = "sha256-a8IZZbTlVU8Cu1F/HwEnsUW3eRqaTnKuJ166WJIw9/A="; + sha256 = "sha256-sHKht4EXKIibk+McMR+fKv7eZFJsGgZWhfxlLssA/Sw="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index 0712a06863e5..4ddb8995b622 100644 --- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -18,6 +18,7 @@ in discourse-oauth2-basic = callPackage ./discourse-oauth2-basic {}; discourse-openid-connect = callPackage ./discourse-openid-connect {}; discourse-prometheus = callPackage ./discourse-prometheus {}; + discourse-reactions = callPackage ./discourse-reactions {}; discourse-saved-searches = callPackage ./discourse-saved-searches {}; discourse-solved = callPackage ./discourse-solved {}; discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix new file mode 100644 index 000000000000..ac48f83ae90b --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix @@ -0,0 +1,17 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-reactions"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-reactions"; + rev = "3afaabc8e430dfe655be4efbbcb20ab7f0c7c8d3"; + sha256 = "sha256-CdrInrPFDpvYW7j0epIeAFUoPGTbmMOGdm2DpkIQBbs="; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-reactions"; + maintainers = with maintainers; [ bbenno ]; + license = licenses.mit; + description = "Allows users to react to a post from a choice of emojis, rather than only the like heart"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index aa0ddbd60ede..2c5c8f4b44a5 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -294,8 +294,9 @@ def update_plugins(): {'name': 'discourse-ldap-auth', 'owner': 'jonmbake'}, {'name': 'discourse-math'}, {'name': 'discourse-migratepassword', 'owner': 'discoursehosting'}, - {'name': 'discourse-prometheus'}, {'name': 'discourse-openid-connect'}, + {'name': 'discourse-prometheus'}, + {'name': 'discourse-reactions'}, {'name': 'discourse-saved-searches'}, {'name': 'discourse-solved'}, {'name': 'discourse-spoiler-alert'}, diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index 5d138132377e..90d238f32329 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "shiori"; - version = "1.5.3"; + version = "1.5.4"; - vendorSha256 = "sha256-vyBb8jNpXgpiktbn2lphL2wAeKmvjJLxV8ZrHoUSNYY="; + vendorHash = "sha256-8aiaG2ry/XXsosbrLBmwnjbwIhbKMdM6WHae07MG7WI="; doCheck = false; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "go-shiori"; repo = pname; rev = "v${version}"; - sha256 = "sha256-razBb/flqwyFG4SPWhSapDO1sB5DYzyjYGx8ABFg/I8="; + sha256 = "sha256-QZTYhRz65VLs3Ytv0k8ptfeQ/36M2VBXFaD9zhQXDh8="; }; passthru.tests = { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 53ec9e9865ef..0907d814171f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1180,11 +1180,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { pname = "libXpm"; - version = "3.5.13"; + version = "3.5.15"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2"; - sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; + url = "mirror://xorg/individual/lib/libXpm-3.5.15.tar.xz"; + sha256 = "1hfivygzrzpq81vg9z2l46pd5nrzm326k6z3cfw6syiibin91fv0"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6de759498b21..b0530977f7e2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -3,7 +3,8 @@ lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, automake, autoconf, libiconv, libtool, intltool, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, - libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, + libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd, + ncompress, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt, ApplicationServices, Carbon, Cocoa, Xplugin, @@ -313,6 +314,7 @@ self: super: libXpm = super.libXpm.overrideAttrs (attrs: { outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; + XPM_PATH_COMPRESS = lib.makeBinPath [ ncompress ]; }); libXpresent = super.libXpresent.overrideAttrs (attrs: { @@ -328,7 +330,13 @@ self: super: }); libpciaccess = super.libpciaccess.overrideAttrs (attrs: { - meta = attrs.meta // { platforms = lib.platforms.linux; }; + buildInputs = lib.optionals stdenv.hostPlatform.isNetBSD (with netbsd; [ libarch libpci ]); + + meta = attrs.meta // { + # https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/blob/master/configure.ac#L108-114 + platforms = lib.fold (os: ps: ps ++ lib.platforms.${os}) [] + [ "cygwin" "freebsd" "linux" "netbsd" "openbsd" "illumos" ]; + }; }); setxkbmap = super.setxkbmap.overrideAttrs (attrs: { diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 07f98eef9f1a..9a82416d3050 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -193,7 +193,7 @@ mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2 -mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2 +mirror://xorg/individual/lib/libXpm-3.5.15.tar.xz mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index ece3722cfcd1..4fb615d37015 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, bash }: stdenv.mkDerivation rec { - version = "2023-01-17"; + version = "2023-01-26"; pname = "oh-my-zsh"; - rev = "61dd3682e69aa990a8a3589c5c61ea2e1edf8312"; + rev = "e55e3f0f56ab4df21eb33e19569c295e7e5e71a4"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "5ixM/cQdhr/ycXoL2G1Mvc77zxN3Di75W2Hhst8HvZ0="; + sha256 = "gN5jjhbRxSBJiXs1DsUeMHCCsv9qSOxC4guHmjJdW7U="; }; strictDeps = true; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 85bd8d2087f6..42d19a0fad4b 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -100,6 +100,7 @@ rec { + lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc"; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (pkgs.buildPackages.makeSetupHook { + name = "darwin-portable-libSystem-hook"; substitutions = { libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; }; diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 5e549e48287c..2cc44b319ffa 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -71,7 +71,7 @@ in rec { cp ${gawk}/bin/gawk $out/bin cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin - cp ${gzip}/bin/gzip $out/bin + cp ${gzip}/bin/.gzip-wrapped $out/bin/gzip cp ${bzip2_.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 94998bbfa0fe..751e19d1681a 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -271,7 +271,7 @@ let sourceProvenance = listOf lib.types.attrs; maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix priority = int; - platforms = listOf (oneOf [ str (attrsOf anything) (functionTo bool) ]); # see lib.meta.platformMatch + platforms = listOf (either str (attrsOf anything)); # see lib.meta.platformMatch hydraPlatforms = listOf str; broken = bool; unfree = bool; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index b07420bb4185..b1b982ecdffc 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,4 +1,5 @@ # shellcheck shell=bash +# shellcheck disable=1090,2154,2123,2034,2178,2048,2068,1091 __nixpkgs_setup_set_original=$- set -eu set -o pipefail @@ -32,7 +33,7 @@ if [ -n "$__structuredAttrs" ]; then export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json" export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh" else - : ${outputs:=out} + : "${outputs:=out}" fi getAllOutputNames() { @@ -125,11 +126,6 @@ _eval() { ###################################################################### # Logging. -# Obsolete. -stopNest() { true; } -header() { echo "$1"; } -closeNest() { true; } - # Prints a command such that all word splits are unambiguous. We need # to split the command in three parts because the middle format string # will be, and must be, repeated for each argument. The first argument @@ -210,8 +206,8 @@ addToSearchPath() { # syntax when they switch to setting __structuredAttrs = true. prependToVar() { local -n nameref="$1" + local useArray type - useArray= if [ -n "$__structuredAttrs" ]; then useArray=true else @@ -243,8 +239,8 @@ prependToVar() { # Same as above appendToVar() { local -n nameref="$1" + local useArray type - useArray= if [ -n "$__structuredAttrs" ]; then useArray=true else @@ -398,7 +394,7 @@ fi # implementation uses zip archive and zip does not support dates going back to # 1970. export SOURCE_DATE_EPOCH -: ${SOURCE_DATE_EPOCH:=315532800} +: "${SOURCE_DATE_EPOCH:=315532800}" # Wildcard expansions that don't match should expand to an empty list. @@ -448,7 +444,6 @@ runHook addInputsHook # Package accumulators -# shellcheck disable=SC2034 declare -a pkgsBuildBuild pkgsBuildHost pkgsBuildTarget declare -a pkgsHostHost pkgsHostTarget declare -a pkgsTargetTarget @@ -473,7 +468,6 @@ declare -a pkgTargetHookVars=(envTargetTargetHook) declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) # those variables are declared here, since where and if they are used varies -# shellcheck disable=SC2034 declare -a preFixupHooks fixupOutputHooks preConfigureHooks postFixupHooks postUnpackHooks unpackCmdHooks # Add env hooks for all sorts of deps with the specified host offset. @@ -521,7 +515,7 @@ findInputs() { local -r targetOffset="$3" # Sanity check - (( hostOffset <= targetOffset )) || exit -1 + (( hostOffset <= targetOffset )) || exit 1 local varVar="${pkgAccumVarVars[hostOffset + 1]}" local varRef="$varVar[$((targetOffset - hostOffset))]" @@ -610,12 +604,12 @@ findInputs() { # in each list must be store paths, and therefore space-free. # Make sure all are at least defined as empty -: ${depsBuildBuild=} ${depsBuildBuildPropagated=} -: ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=} -: ${depsBuildTarget=} ${depsBuildTargetPropagated=} -: ${depsHostHost=} ${depsHostHostPropagated=} -: ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=} -: ${depsTargetTarget=} ${depsTargetTargetPropagated=} +: "${depsBuildBuild=}" "${depsBuildBuildPropagated=}" +: "${nativeBuildInputs=}" "${propagatedNativeBuildInputs=}" "${defaultNativeBuildInputs=}" +: "${depsBuildTarget=}" "${depsBuildTargetPropagated=}" +: "${depsHostHost=}" "${depsHostHostPropagated=}" +: "${buildInputs=}" "${propagatedBuildInputs=}" "${defaultBuildInputs=}" +: "${depsTargetTarget=}" "${depsTargetTargetPropagated=}" for pkg in ${depsBuildBuild[@]} ${depsBuildBuildPropagated[@]}; do findInputs "$pkg" -1 -1 @@ -650,7 +644,7 @@ activatePackage() { local -r targetOffset="$3" # Sanity check - (( hostOffset <= targetOffset )) || exit -1 + (( hostOffset <= targetOffset )) || exit 1 if [ -f "$pkg" ]; then source "$pkg" @@ -798,10 +792,6 @@ unset _HOST_PATH unset _XDG_DATA_DIRS -# Make GNU Make produce nested output. -export NIX_INDENT_MAKE=1 - - # Normalize the NIX_BUILD_CORES variable. The value might be 0, which # means that we're supposed to try and auto-detect the number of # available CPU cores at run-time. @@ -888,7 +878,7 @@ substituteStream() { # fail loudly if provided with a binary (containing null bytes) consumeEntire() { # read returns non-0 on EOF, so we want read to fail - if IFS='' read -r -d '' $1 ; then + if IFS='' read -r -d '' "$1" ; then echo "consumeEntire(): ERROR: Input null bytes, won't process" >&2 return 1 fi @@ -1033,7 +1023,7 @@ _defaultUnpack() { unpackFile() { curSrc="$1" - header "unpacking source archive $curSrc" 3 + echo "unpacking source archive $curSrc" if ! runOneHook unpackCmd "$curSrc"; then echo "do not know how to unpack source archive $curSrc" exit 1 @@ -1079,7 +1069,7 @@ unpackPhase() { # Find the source directory. # set to empty if unset - : ${sourceRoot=} + : "${sourceRoot=}" if [ -n "${setSourceRoot:-}" ]; then runOneHook setSourceRoot @@ -1130,7 +1120,7 @@ patchPhase() { fi for i in "${patchesArray[@]}"; do - header "applying patch $i" 3 + echo "applying patch $i" local uncompress=cat case "$i" in *.gz) @@ -1183,7 +1173,7 @@ configurePhase() { runHook preConfigure # set to empty if unset - : ${configureScript=} + : "${configureScript=}" if [[ -z "$configureScript" && -x ./configure ]]; then configureScript=./configure @@ -1253,7 +1243,7 @@ buildPhase() { runHook preBuild if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then - echo "no Makefile, doing nothing" + echo "no Makefile or custom buildPhase, doing nothing" else foundMakefile=1 @@ -1323,6 +1313,15 @@ checkPhase() { installPhase() { runHook preInstall + # Dont reuse 'foundMakefile' set in buildPhase, a makefile may have been created in buildPhase + if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then + echo "no Makefile or custom installPhase, doing nothing" + runHook postInstall + return + else + foundMakefile=1 + fi + if [ -n "$prefix" ]; then mkdir -p "$prefix" fi @@ -1436,7 +1435,7 @@ installCheckPhase() { echo "no Makefile or custom installCheckPhase, doing nothing" #TODO(@oxij): should flagsArray influence make -n? elif [[ -z "${installCheckTarget:-}" ]] \ - && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then + && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" >/dev/null 2>&1; then echo "no installcheck target in ${makefile:-Makefile}, doing nothing" else # Old bash empty array hack @@ -1485,15 +1484,15 @@ distPhase() { showPhaseHeader() { local phase="$1" case "$phase" in - unpackPhase) header "unpacking sources";; - patchPhase) header "patching sources";; - configurePhase) header "configuring";; - buildPhase) header "building";; - checkPhase) header "running tests";; - installPhase) header "installing";; - fixupPhase) header "post-installation fixup";; - installCheckPhase) header "running install tests";; - *) header "$phase";; + unpackPhase) echo "unpacking sources";; + patchPhase) echo "patching sources";; + configurePhase) echo "configuring";; + buildPhase) echo "building";; + checkPhase) echo "running tests";; + installPhase) echo "installing";; + fixupPhase) echo "post-installation fixup";; + installCheckPhase) echo "running install tests";; + *) echo "$phase";; esac } @@ -1503,19 +1502,23 @@ showPhaseFooter() { local startTime="$2" local endTime="$3" local delta=$(( endTime - startTime )) - (( $delta < 30 )) && return + (( delta < 30 )) && return local H=$((delta/3600)) local M=$((delta%3600/60)) local S=$((delta%60)) echo -n "$phase completed in " - (( $H > 0 )) && echo -n "$H hours " - (( $M > 0 )) && echo -n "$M minutes " + (( H > 0 )) && echo -n "$H hours " + (( M > 0 )) && echo -n "$M minutes " echo "$S seconds" } genericBuild() { + # variable used by our gzip wrapper to add -n. + # gzip is in common-path.nix and is added to nix-shell but we only want to change its behaviour in nix builds. do not move to a setupHook in gzip. + export GZIP_NO_TIMESTAMPS=1 + if [ -f "${buildCommandPath:-}" ]; then source "$buildCommandPath" return @@ -1548,7 +1551,7 @@ genericBuild() { if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi if [[ -n $NIX_LOG_FD ]]; then - echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&$NIX_LOG_FD + echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD" fi showPhaseHeader "$curPhase" diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh index f394869ea915..5b5677eef136 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh @@ -17,6 +17,15 @@ else LD_BINARY=$out/lib/ld-*so.? fi +# path to version-specific libraries, like libstdc++.so +LIBSTDCXX_SO_DIR=$(echo $out/lib/gcc/*/*) + +# Move version-specific libraries out to avoid library mix when we +# upgrade gcc. +# TODO(trofi): update bootstrap tarball script and tarballs to put them +# into expected location directly. +LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/mv $out/lib/libstdc++.* $LIBSTDCXX_SO_DIR/ + # On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs. So # use a copy of patchelf. LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/cp $out/bin/patchelf . @@ -25,8 +34,8 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do if [ -L "$i" ]; then continue; fi if [ -z "${i##*/liblto*}" ]; then continue; fi echo patching "$i" - LD_LIBRARY_PATH=$out/lib $LD_BINARY \ - ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i" + LD_LIBRARY_PATH=$out/lib:$LIBSTDCXX_SO_DIR $LD_BINARY \ + ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib:$LIBSTDCXX_SO_DIR --force-rpath "$i" done for i in $out/lib/librt-*.so $out/lib/libpcre*; do diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 870fb04c3883..5c7dfcceec64 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -296,7 +296,7 @@ in overrides = self: super: { inherit (prevStage) - ccWrapperStdenv + ccWrapperStdenv gettext gcc-unwrapped coreutils gnugrep perl gnum4 bison; dejagnu = super.dejagnu.overrideAttrs (a: { doCheck = false; } ); @@ -332,7 +332,8 @@ in # and that can fail to load. Therefore we upgrade `ld` to use newer libc; # apparently the interpreter needs to match libc, too. bintools = self.stdenvNoCC.mkDerivation { - inherit (prevStage.bintools.bintools) name; + pname = prevStage.bintools.bintools.pname + "-patchelfed-ld"; + inherit (prevStage.bintools.bintools) version; enableParallelBuilding = true; dontUnpack = true; dontBuild = true; @@ -369,7 +370,7 @@ in overrides = self: super: rec { inherit (prevStage) ccWrapperStdenv - binutils coreutils gnugrep + binutils coreutils gnugrep gettext perl patchelf linuxHeaders gnum4 bison libidn2 libunistring; ${localSystem.libc} = getLibc prevStage; gcc-unwrapped = diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index e98ba0c08595..3aa7f6a3df53 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -115,7 +115,7 @@ in with pkgs; rec { cp ${gawk.out}/bin/gawk $out/bin cp -d ${gawk.out}/bin/awk $out/bin cp ${tarMinimal.out}/bin/tar $out/bin - cp ${gzip.out}/bin/gzip $out/bin + cp ${gzip.out}/bin/.gzip-wrapped $out/bin/gzip cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake.out}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin @@ -272,16 +272,17 @@ in with pkgs; rec { gcc --version '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - ldlinux=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext /* only basename */ (builtins.baseNameOf binutils.dynamicLinker)}) - export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}" - export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" - export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" + rtld=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext /* only basename */ (builtins.baseNameOf binutils.dynamicLinker)}) + libc_includes=${bootstrapTools}/include-glibc '' + lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - ldmusl=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) - export CPP="cpp -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools}" - export CC="gcc -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib" - export CXX="g++ -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib" + rtld=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) + libc_includes=${bootstrapTools}/include-libc '' + '' + # path to version-specific libraries, like libstdc++.so + cxx_libs=$(echo ${bootstrapTools}/lib/gcc/*/*) + export CPP="cpp -idirafter $libc_includes -B${bootstrapTools}" + export CC="gcc -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs" + export CXX="g++ -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs" echo '#include ' >> foo.c echo '#include ' >> foo.c diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 818001018b3a..39039c5950e4 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -51,6 +51,8 @@ with pkgs; php = recurseIntoAttrs (callPackages ./php {}); + pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }); + rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index 5ff18298f217..bad6eb7ba7aa 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -4,7 +4,8 @@ { stdenv , pkgs , lib -, +, runCommand +, testers }: let @@ -99,6 +100,25 @@ in # tests for hooks in `stdenv.defaultNativeBuildInputs` hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; }); + outputs-no-out = runCommand "outputs-no-out-assert" { + result = testers.testBuildFailure (stdenv.mkDerivation { + NIX_DEBUG = 1; + name = "outputs-no-out"; + outputs = ["foo"]; + buildPhase = ":"; + installPhase = '' + touch $foo + ''; + }); + + # Assumption: the first output* variable to be configured is + # _overrideFirst outputDev "dev" "out" + expectedMsg = "_assignFirst: could not find a non-empty variable to assign to outputDev. The following variables were all unset or empty: dev out."; + } '' + grep -F "$expectedMsg" $result/testBuildFailure.log >/dev/null + touch $out + ''; + test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; }; # Test compatibility with derivations using `env` as a regular variable. diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 2c39f4fce994..6eb84855247d 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -25,14 +25,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.18"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.19"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-WE0fBw6rBMDK+BHmZT1OXr4nu3G8y0AmdimSRi2RaPs="; + hash = "sha256-0Z4jTN9+bsurCYqJcYqG0r0ed3gWG9PDgT5J/+stiPE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 61753bb8330b..e3b2ae74ca4b 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.126.0"; + version = "0.127.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-ul02G6FULaSFMtQfmqrSRSAgAxx5/cpG6qeDrGB2m5g="; + sha256 = "sha256-WCkVCND3c8HYLi0UrgF3zoEykIs1/D7HgeblZETvU4M="; }; - vendorHash = "sha256-Z6elKuSGvXPjMk8upqJ2Z0I5Cu3s3LeGUkQFcUKheH0="; + vendorHash = "sha256-FBKwWApiIs0y0IZqJOJwzdBq1ihaPv8mqqSTO42ggi0="; doCheck = false; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index efdfae8268a9..99eedf999119 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JVxlfwCA+EetV4QYB6uEKe1yWt3sCvMPZwyIr6Td7Bw="; + sha256 = "sha256-PTUATmnpJGeY0Ushf7sAapsZ51VC2IdnKMzYJX5+h9A="; }; - cargoSha256 = "sha256-uUxwQIQTzQkKgR4F4sf4J1G2LaXiGbIvA6VM55zLK2E="; + cargoHash = "sha256-jxGdozSEIop2jBL4lK3ZcEuuR7P8qDoQD/Lrl4yaBN0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 30e61e00522f..e7d13b20b60a 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.68.1"; + version = "0.69.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iOJnSeVRAjmJblaipmk05J9BvAkYgyS1OA8b3xDykXc="; + hash = "sha256-nwS5Oar8ck9StNJtbnZoRv3/v/fYKq/RXVl7CPWBfGY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index e7f22ad0ff96..f61bc9df66d5 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -51,6 +51,15 @@ stdenv.mkDerivation rec { ]; sha256 = "1h00djdvgjhwfb60wl4qrxbyfsbbnn1qw6l2hkldnif4m8f8r1zj"; }) + (fetchurl { + urls = [ + # original link (will be dead eventually): + "https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch" + + "https://web.archive.org/web/20230106200319/https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch" + ]; + sha256 = "sha256-on79jElQ+z2ULWAq14RpluAqr9d6itHiZwDkKubBzTc="; + }) ] ++ lib.optional enableNLS (fetchurl { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/unzip/files/unzip-6.0-natspec.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 8862ad8030bf..3a3223728a7a 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -2,14 +2,14 @@ coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "0.5.4.19"; + version = "0.5.4.20"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = version; - sha256 = "sha256-YCfjOGbjjv4ntNDK3E49hYCVYDhMsRBJ7zsHt8hqQ7Y="; + sha256 = "sha256-OzcfIFYaWez2B1lmAYvhm+knuYbyMu2ohs+kGEVG7K0="; }; nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ]; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 3e6bed334c29..d943e43b76b9 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -65,7 +65,6 @@ python.pkgs.buildPythonApplication rec { "mecab-python3" "numba" "numpy" - "umap-learn" "unidic-lite" ]; in '' @@ -74,6 +73,8 @@ python.pkgs.buildPythonApplication rec { ''-e 's/${package}.*[<>=]+.*/${package}/g' \'' ) relaxedConstraints)} requirements.txt + # only used for notebooks and visualization + sed -r -i -e '/umap-learn/d' requirements.txt ''; nativeBuildInputs = with python.pkgs; [ @@ -108,7 +109,6 @@ python.pkgs.buildPythonApplication rec { torchaudio-bin tqdm trainer - umap-learn unidic-lite webrtcvad ]; diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/tools/backup/pgbackrest/default.nix index e6bdca7c92d8..d8ab7956ade7 100644 --- a/pkgs/tools/backup/pgbackrest/default.nix +++ b/pkgs/tools/backup/pgbackrest/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.43"; + version = "2.44"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-JZHE68d8fzqr0kI35TxoVB3Frt/v22xkZexfzhkqzBU="; + sha256 = "sha256-N56HUW1JZNvaqzU01xaZ8BsFA2KW4z8ixulPngYCIY0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 44683fa3884c..71756025196c 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-qWVmsW16eQM7d+HoHR2qE7GpcC5HK7TIhhx6J2glKpA="; + hash = "sha256-KdPslVJHH+xdUuFfmLZumP2lHzkDrrAvpDaj38SuP8o="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-zhLFMvp97mQclaLwH4Hl8jFNMmoYrf8AtVv49RDq7lM="; + vendorHash = "sha256-oetaCiXWEBUEf382l4sjO0SCPxkoh+bMTgIf/qJTQms="; subPackages = [ "cmd/restic" ]; diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index ef94eee2429f..03bd62924048 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -159,16 +159,6 @@ let ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link" done ''; - - # since 7b9fd5d1c9802131ca0a01ff08a3ff64379d2df4 - # autopatchelf misses to add $out/lib to rpath; - # we have to call autopatchelf manually as it would - # run too late and overwrite our rpath otherwise - dontAutoPatchelf = true; - postFixup = '' - autoPatchelf $out - patchelf --add-rpath $out/lib $out/lib/* - ''; }; binPath = lib.makeBinPath ([ acl gnugrep procps ] diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 771188a98cd9..24f81d99da3c 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl +, makeWrapper , xz -, writeText }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ xz.bin ]; + nativeBuildInputs = [ xz.bin makeWrapper ]; makeFlags = [ "SHELL=/bin/sh" @@ -40,12 +40,13 @@ stdenv.mkDerivation rec { preFixup = '' sed -i '1{;/#!\/bin\/sh/aPATH="'$out'/bin:$PATH" }' $out/bin/* - ''; - - # set GZIP env variable to "-n" to stop gzip from adding timestamps + '' + # run gzip with "-n" when $GZIP_NO_TIMESTAMPS (set by stdenv's setup.sh) is set to stop gzip from adding timestamps # to archive headers: https://github.com/NixOS/nixpkgs/issues/86348 - setupHook = writeText "setup-hook" '' - export GZIP="-n" + # if changing so that there's no longer a .gzip-wrapped then update copy in make-bootstrap-tools.nix + + '' + wrapProgram $out/bin/gzip \ + --add-flags "\''${GZIP_NO_TIMESTAMPS:+-n}" ''; meta = { diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 7fa7b4e35c85..b41b3c843da6 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, texinfo }: +{ lib, stdenv, fetchurl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { version = "1.23"; outputs = [ "out" "man" "info" ]; - nativeBuildInputs = [ texinfo ]; - src = fetchurl { url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; sha256 = "sha256-R5LAR93xXvKdVbqOaKGiHgy3aS2H7N9yBEGYZFgvKA0="; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 59f1901bd9fd..d49cc314b4a8 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xz"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; - sha256 = "eV6gSUxm1QmwUt3DbcY71jTln/Kg85wWo7VkTdAdh+Y="; + sha256 = "3Rcqy1OGemgBL5TBc4lAGy8nShqlro+Ey/uLfjg+qNM="; }; strictDeps = true; diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix index 877d95c5b3d9..cb3cbe5d7f28 100644 --- a/pkgs/tools/filesystems/hfsprogs/default.nix +++ b/pkgs/tools/filesystems/hfsprogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, libbsd }: +{ lib, stdenv, fetchurl, fetchFromGitHub, openssl, libbsd }: stdenv.mkDerivation rec { version = "332.25"; @@ -8,9 +8,12 @@ stdenv.mkDerivation rec { url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/hfsprogs_${version}-11.debian.tar.gz"; sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; }) - (fetchurl { - url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz"; - sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6"; + (fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "diskdev_cmds"; + rev = "diskdev_cmds-${version}"; + hash = "sha256-cycPGPx2Gbjn4FKGKuQKJkh+dWGbJfy6C+LTz8rrs0A="; + name = sourceRoot; }) ]; diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 9181dff70d34..6da75887d598 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-TDA1T36iY3xRFX0mBYazKeyzoDD7RPWRxQfUF7Rv5vA="; + sha256 = "sha256-FgVXl986PPaX/6TX7MaXPd+NJ3M94fNGa1hFWUDRP8w="; }; - cargoHash = "sha256-rBZ9cYk5Gzs8hy8fRgO8I0zaBncl8CwQoX5I0qzHBYE="; + cargoHash = "sha256-uWKSO2odvBeFUcZPGcsEki0PdNVtbVv5g3Dnkxgw2Io="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/tools/games/scarab/default.nix index 039e46f71944..56e94807fec1 100644 --- a/pkgs/tools/games/scarab/default.nix +++ b/pkgs/tools/games/scarab/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "scarab"; - version = "1.19.0.0"; + version = "1.20.0.0"; src = fetchFromGitHub { owner = "fifty-six"; repo = pname; rev = "v${version}"; - sha256 = "10pmzy7nhcam0686kpn64cgar59shzzy5k7j3vrgmnm27zgkr22v"; + sha256 = "sha256-VfXIxir4SaELuF2QpqbVzTvlkYxwERa0ddGEn1OAh04="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/tools/graphics/wgpu-utils/default.nix b/pkgs/tools/graphics/wgpu-utils/default.nix index 460d45c1eac2..745640bfa228 100644 --- a/pkgs/tools/graphics/wgpu-utils/default.nix +++ b/pkgs/tools/graphics/wgpu-utils/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wgpu-utils"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "gfx-rs"; repo = "wgpu"; rev = "v${version}"; - hash = "sha256-jHjV2A949m/KyAkkdaP00d5j+V96jRQah4LKs8LcYQk="; + hash = "sha256-Yfq85stS1FWahrwv+8hEFSAGr2eZHJ+/cuNYfIFRi3c="; }; - cargoHash = "sha256-XbEgcPLL3UZ4zdV90AEFI8RlkZAMuLXznlkBcAG/0l8="; + cargoHash = "sha256-R8x3QfVWyEyz7o9Jzh+XgQKYF8HZMAPwbq847j2LfqY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index d7da86688616..bed377663328 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -1,17 +1,18 @@ -{ fetchFromGitHub -, lib +{ lib +, fetchFromGitHub , stdenv , python3Packages }: + python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; rev = "refs/tags/release/${version}"; - sha256 = "sha256-4mbu3Z48jZQqRft4vkz/x4a7kAOiTrQfnyQpXl3MJn0="; + hash = "sha256-K5y5C+K/fMhgOcSsCMaIgY6ce9UUPszoyumsfNHKjBo="; }; patches = [ @@ -45,6 +46,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://www.pgbarman.org/"; description = "Backup and Recovery Manager for PostgreSQL"; + changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS"; maintainers = with maintainers; [ freezeboy ]; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/tools/misc/completely/Gemfile b/pkgs/tools/misc/completely/Gemfile new file mode 100644 index 000000000000..bfae92920327 --- /dev/null +++ b/pkgs/tools/misc/completely/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'completely' diff --git a/pkgs/tools/misc/completely/Gemfile.lock b/pkgs/tools/misc/completely/Gemfile.lock new file mode 100644 index 000000000000..656c96cbc40c --- /dev/null +++ b/pkgs/tools/misc/completely/Gemfile.lock @@ -0,0 +1,20 @@ +GEM + remote: https://rubygems.org/ + specs: + colsole (0.8.2) + completely (0.5.2) + colsole (~> 0.6) + mister_bin (~> 0.7.2) + docopt (0.6.1) + mister_bin (0.7.3) + colsole (~> 0.7) + docopt (~> 0.6) + +PLATFORMS + ruby + +DEPENDENCIES + completely + +BUNDLED WITH + 2.4.5 diff --git a/pkgs/tools/misc/completely/default.nix b/pkgs/tools/misc/completely/default.nix new file mode 100644 index 000000000000..7e0129f6d1b3 --- /dev/null +++ b/pkgs/tools/misc/completely/default.nix @@ -0,0 +1,21 @@ +{ lib +, bundlerApp +, bundlerUpdateScript +}: + +bundlerApp { + pname = "completely"; + + gemdir = ./.; + exes = [ "completely" ]; + + passthru.updateScript = bundlerUpdateScript "completely"; + + meta = with lib; { + description = "Generate bash completion scripts using a simple configuration file"; + homepage = "https://github.com/DannyBen/completely"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/tools/misc/completely/gemset.nix b/pkgs/tools/misc/completely/gemset.nix new file mode 100644 index 000000000000..a078a113f6d4 --- /dev/null +++ b/pkgs/tools/misc/completely/gemset.nix @@ -0,0 +1,44 @@ +{ + colsole = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l29sxy4p9jbvcihckxfsyqx98b8xwzd3hjqvdh1zxw8nv5walnp"; + type = "gem"; + }; + version = "0.8.2"; + }; + completely = { + dependencies = ["colsole" "mister_bin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w7cmmsp9m42c8w4j03kr98zy7x7yszw3qsm3ww600dmc0d0xd2b"; + type = "gem"; + }; + version = "0.5.2"; + }; + docopt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rvlfbb7kzyagncm4zdpcjwrh682zamgf5rcf5qmj0bd6znkgy3k"; + type = "gem"; + }; + version = "0.6.1"; + }; + mister_bin = { + dependencies = ["colsole" "docopt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f51zs9wjpslhdadp8yfx4ij0jj1ya92cbzqlfd2wfr19wdr2jgd"; + type = "gem"; + }; + version = "0.7.3"; + }; +} diff --git a/pkgs/tools/misc/copier/default.nix b/pkgs/tools/misc/copier/default.nix new file mode 100644 index 000000000000..55d1ea6693e7 --- /dev/null +++ b/pkgs/tools/misc/copier/default.nix @@ -0,0 +1,51 @@ +{ lib, git, python3, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "copier"; + version = "7.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "copier-org"; + repo = "copier"; + rev = "v${version}"; + sha256 = "sha256-8lTvyyKfAkvnUvw3e+r9C/49QASR8Zeokm509jxGK2g="; + }; + + POETRY_DYNAMIC_VERSIONING_BYPASS = version; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + python3.pkgs.poetry-dynamic-versioning + ]; + + propagatedBuildInputs = with python3.pkgs; [ + colorama + dunamai + iteration-utilities + jinja2 + jinja2-ansible-filters + mkdocs-material + mkdocs-mermaid2-plugin + mkdocstrings + packaging + pathspec + plumbum + pydantic + pygments + pyyaml + pyyaml-include + questionary + ]; + + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ git ] }" + ]; + + meta = with lib; { + description = "Library and command-line utility for rendering projects templates"; + homepage = "https://copier.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 7bf751652d4e..898f7aefabfe 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , autoreconfHook , pkg-config , glib @@ -15,11 +15,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.3.2"; + version = "1.4.1"; - src = fetchurl { - url = "http://www.ddcutil.com/tarballs/${pname}-${version}.tar.gz"; - sha256 = "sha256-vZI7OquGjZ0koArdOWKkfFtfRzCvtXm8lGFCUklloEI="; + src = fetchFromGitHub { + owner = "rockowitz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-y3mubdInYa4gpxhdw2JcRhnhd12O7jNq/oF3qoP82LU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index ad7704d5d409..cb53f4517377 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.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kA+7kAFAAZngbub2gHoiqEcSkcbxv0DPqbAT3MDBHtI="; + sha256 = "sha256-JVvkASYNp6GSCEIWfZwZ1rtOkUCutccOWCkt47rmgyE="; }; - vendorSha256 = "sha256-v3ZF2WDp4EmHA8RnP39o21cy9+n4cKkKZ0gSowv4nvk="; + vendorSha256 = "sha256-jFItDgmjjKbmTpOn32V1K3AmYyYCrc5RqMAH/X+VWTM="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index 3137c820eeac..b6883e570802 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -4,7 +4,10 @@ let efiSystemsBuild = { i686-linux.target = "i386"; x86_64-linux.target = "x86_64"; + armv7l-linux.target = "arm"; aarch64-linux.target = "aarch64"; + riscv32-linux.target = "riscv32"; + riscv64-linux.target = "riscv64"; }; in ( diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index c3a0c5aa906d..65c88eac4e88 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -48,6 +48,16 @@ stdenv.mkDerivation rec { substituteInPlace src/util/genfsimg --replace " syslinux " " true " ''; # calling syslinux on a FAT image isn't going to work + # Workaround '-idirafter' ordering bug in staging-next: + # https://github.com/NixOS/nixpkgs/pull/210004 + # where libc '-idirafter' gets added after user's idirafter and + # breaks. + # TODO(trofi): remove it in staging once fixed in cc-wrapper. + preConfigure = '' + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags) + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) + ''; + # not possible due to assembler code hardeningDisable = [ "pic" "stackprotector" ]; diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index 7a8a6aa8a848..3b11dfcb64fd 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.32.0"; - vendorSha256 = "sha256-nL+2Yc4gI2+SoxoaGlazecsrcVkVh6Ig9sqITSOa5e0="; + version = "2.34.0"; + vendorHash = "sha256-Z0ifACsdSIYevsvRD5KACFSRlvrL1jIJbrzjDFeLbEQ="; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "v${version}"; - sha256 = "sha256-EyDX4OrBAzc5eYR660SrGIG61TRlWnnV/GAtXy7DfEI="; + sha256 = "sha256-SDZzbUh3wbDfzkE/5GgFstDuMYLiM8+MXRZ79jYGoaQ="; }; postInstall = '' diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index ece081830328..1e310fb4c1e0 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-KJkqzvsm0IMaqeKnIbLGeOSJrsLvW+z7lCg6NbuU13g="; + hash = "sha256-v+/pT8HnLoeeYe33v4xUoR5YWD/jHgEG/Q11Trw9X2s="; }; postPatch = '' @@ -35,14 +35,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero rapidjson ] + buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_RAPIDJSON=ON" "-DEXTERNAL_FMT=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index f2eafc38472d..aeb978ec3163 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-9jNRXAP+qNihqr30/dSHqzDkyh+GauafMQBkBit5gmc="; + sha256 = "sha256-6pt8WjfSt458FIK/cCzEOM9mFruFY6jBnkXoRWIhOr0="; }; vendorHash = "sha256-zUwp7RqaKtxbTzEOhcmGG/+tqtBKs7cm6+sFNCKET08="; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 850bdb83c898..e3969d01eec3 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"; }; + patches = [ + # pass through NIX_* environment variables to scons. + ./scons-nix-env.patch + ]; + nativeBuildInputs = [ pkg-config sphinx @@ -56,9 +61,6 @@ stdenv.mkDerivation rec { ]; prePatch = '' - export CFLAGS="$NIX_CFLAGS_COMPILE" - export LDFLAGS="''${NIX_LDFLAGS//-rpath /-Wl,-rpath=}" - # remove sources of nondeterminism substituteInPlace lib/cmdline.c \ --replace "__DATE__" "\"Jan 1 1970\"" \ @@ -67,6 +69,7 @@ stdenv.mkDerivation rec { --replace "gzip -c " "gzip -cn " ''; + # Otherwise tries to access /usr. prefixKey = "--prefix="; sconsFlags = lib.optionals (!withGui) [ "--without-gui" ]; diff --git a/pkgs/tools/misc/rmlint/scons-nix-env.patch b/pkgs/tools/misc/rmlint/scons-nix-env.patch new file mode 100644 index 000000000000..10ed5698be3a --- /dev/null +++ b/pkgs/tools/misc/rmlint/scons-nix-env.patch @@ -0,0 +1,19 @@ +scons does not use os environment by default: + https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html + +nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables +to be passed through like NIX_CFLAGS_COMPILE_BEFORE. +--- a/SConstruct ++++ b/SConstruct +@@ -559,10 +559,7 @@ options = dict( + SHLINKCOMSTR=link_shared_library_message, + LINKCOMSTR=link_program_message, + PREFIX=GetOption('prefix'), +- ENV = dict([ (key, os.environ[key]) +- for key in os.environ +- if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH'] +- ]) ++ ENV = os.environ, + ) + + if ARGUMENTS.get('VERBOSE') == "1": diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 44029fb5d4ef..aaaa297a5598 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "10.2.4"; + version = "10.3.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-b1nWTQ+m4b6XzDTR36ubf5nTdUuWK94F2P4Q3tUvHAw="; + hash = "sha256-BKrErM1d90o+yJ/R0vVgXDBwPgQSP3Qj26x4JmB7SXw="; }; - cargoHash = "sha256-7GSkFh0Fefl9VlCdPdVZ9IsyN0IKUob5c43v84PtrcI="; + cargoHash = "sha256-jm97lfWHTtd3tE+Yql9CIss78B+bW9nUQAhs5anDb6c="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/twspace-crawler/default.nix b/pkgs/tools/misc/twspace-crawler/default.nix new file mode 100644 index 000000000000..eead04e0138c --- /dev/null +++ b/pkgs/tools/misc/twspace-crawler/default.nix @@ -0,0 +1,23 @@ +{ lib, buildNpmPackage, fetchFromGitHub }: + +buildNpmPackage rec { + pname = "twspace-crawler"; + version = "1.11.13"; + + src = fetchFromGitHub { + owner = "HitomaruKonpaku"; + repo = "twspace-crawler"; + rev = "v${version}"; + hash = "sha256-MGFVIQDb++oVbTQubl7CNYwT/ofTNFQfFiveXcNgQpA="; + }; + + npmDepsHash = "sha256-zKy/DngBwnfUqG6JfCULoDIrg1V16hX0Q4zNz45z888="; + + meta = with lib; { + description = "Script to monitor & download Twitter Spaces 24/7"; + homepage = "https://github.com/HitomaruKonpaku/twspace-crawler"; + changelog = "https://github.com/HitomaruKonpaku/twspace-crawler/raw/v${version}/CHANGELOG.md"; + license = licenses.isc; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index fa17625d592c..1ac2e3124337 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.16"; + version = "0.0.17"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "sha256-03Y7966xB+3iJ1LSZPiuXMR7krhb6Wiri455ycA50SU="; + sha256 = "sha256-r4IpmwZaRKzesvq7jAjCvfvZVmfcvwj23zMH3VnlC4I="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-97yyOZCw4bJMpbH2ubyNtAJa7EwJY0AnPWMiUUzIM0M="; + hash = "sha256-ZbGLBjjAsdEhWK3/RS+yRI70xqV+5fzg76Y2Lip1m9A="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix new file mode 100644 index 000000000000..c04c98e05315 --- /dev/null +++ b/pkgs/tools/misc/wakapi/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wakapi"; + version = "2.6.1"; + + src = fetchFromGitHub { + owner = "muety"; + repo = pname; + rev = version; + sha256 = "1bhd96la2ipwna9lic50pd5klcc3xj9yqd5rd1cgzznbm4ylpjqb"; + }; + + vendorHash = "sha256-fkSXaP9hHCCyO8mFB5CKPExifuNjTvDnXupjCVllG9I"; + + # Not a go module required by the project, contains development utilities + excludedPackages = [ "scripts" ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + homepage = "https://wakapi.dev/"; + changelog = "https://github.com/muety/wakapi/releases/tag/${version}"; + description = "A minimalist self-hosted WakaTime-compatible backend for coding statistics"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index bc43d77bbfba..71f31c720d02 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; + # Workaround '-idirafter' ordering bug in staging-next: + # https://github.com/NixOS/nixpkgs/pull/210004 + # where libc '-idirafter' gets added after user's idirafter and + # breaks. + # TODO(trofi): remove it in staging once fixed in cc-wrapper. + preConfigure = '' + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) + ''; + buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ]; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 846c966d00c4..87808b4a2233 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,38 +1,67 @@ -{ lib, stdenv, fetchurl, jdk11, runtimeShell, unzip, chromium }: - -stdenv.mkDerivation rec { - pname = "burpsuite"; - version = "2021.12"; +{ lib, fetchurl, jdk, buildFHSUserEnv, unzip, makeDesktopItem }: +let + version = "2022.12.7"; src = fetchurl { name = "burpsuite.jar"; urls = [ - "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" - "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" + "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" ]; - sha256 = "sha256-BLX/SgHctXciOZoA6Eh4zuDJoxNSZgvoj2Teg1fV80g="; + sha256 = "2e354c2aadc58267bc282dde462d20b3aca7108077eb141d49f89a16172763cf"; }; - dontUnpack = true; - dontBuild = true; - installPhase = '' - runHook preInstall + name = "burpsuite-${version}"; + description = "An integrated platform for performing security testing of web applications"; + desktopItem = makeDesktopItem rec { + name = "burpsuite"; + exec = name; + icon = name; + desktopName = "Burp Suite Community Edition"; + comment = description; + categories = [ "Development" "Security" "System" ]; + }; - mkdir -p $out/bin - echo '#!${runtimeShell} - eval "$(${unzip}/bin/unzip -p ${src} chromium.properties)" - mkdir -p "$HOME/.BurpSuite/burpbrowser/$linux64" - ln -sf "${chromium}/bin/chromium" "$HOME/.BurpSuite/burpbrowser/$linux64/chrome" - exec ${jdk11}/bin/java -jar ${src} "$@"' > $out/bin/burpsuite - chmod +x $out/bin/burpsuite +in +buildFHSUserEnv { + inherit name; - runHook postInstall + runScript = "${jdk}/bin/java -jar ${src}"; + + targetPkgs = pkgs: with pkgs; [ + alsa-lib + at-spi2-core + cairo + cups + dbus + expat + glib + gtk3 + libdrm + libudev0-shim + libxkbcommon + mesa.drivers + nspr + nss + pango + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + ]; + + extraInstallCommands = '' + mv "$out/bin/${name}" "$out/bin/burpsuite" # name includes the version number + mkdir -p "$out/share/pixmaps" + ${lib.getBin unzip}/bin/unzip -p ${src} resources/Media/icon64community.png > "$out/share/pixmaps/burpsuite.png" + cp -r ${desktopItem}/share/applications $out/share ''; - preferLocalBuild = true; - meta = with lib; { - description = "An integrated platform for performing security testing of web applications"; + inherit description; longDescription = '' Burp Suite is an integrated platform for performing security testing of web applications. Its various tools work seamlessly together to support the entire testing process, from @@ -43,8 +72,8 @@ stdenv.mkDerivation rec { downloadPage = "https://portswigger.net/burp/freedownload"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - platforms = jdk11.meta.platforms; - hydraPlatforms = []; + platforms = jdk.meta.platforms; + hydraPlatforms = [ ]; maintainers = with maintainers; [ bennofs ]; }; } diff --git a/pkgs/tools/networking/connman/connman/default.nix b/pkgs/tools/networking/connman/connman/default.nix index bfe609f85268..da1a6107e463 100644 --- a/pkgs/tools/networking/connman/connman/default.nix +++ b/pkgs/tools/networking/connman/connman/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv +{ lib +, nixosTests +, stdenv , fetchurl , fetchpatch , pkg-config @@ -170,6 +172,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.connman = nixosTests.connman; + meta = with lib; { description = "A daemon for managing internet connections"; homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/"; diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index 6558d72ecd93..5b00de2fda85 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -1,22 +1,19 @@ -{ stdenv, lib, fetchFromGitHub -, cmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect +{ stdenv, lib, fetchurl +, cmake, qtwebsockets, qtwebengine, qtkeychain, wrapQtAppsHook, openconnect }: stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; - version = "1.4.8"; + version = "1.4.9"; - src = fetchFromGitHub { - owner = "yuezk"; - repo = "GlobalProtect-openconnect"; - fetchSubmodules = true; - rev = "v${version}"; - sha256 = "sha256-PQAlGeHVayImKalCNv2SwPcxD0ts4BVSqeo1hKYmnMA="; + src = fetchurl { + url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; + hash = "sha256-vhvVKESLbqHx3XumxbIWOXIreDkW3yONDMXMHxhjsvk="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ openconnect qtwebsockets qtwebengine ]; + buildInputs = [ openconnect qtwebsockets qtwebengine qtkeychain ]; patchPhase = '' substituteInPlace GPService/gpservice.h \ diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix index 0c12652586be..f36ee2d3e206 100644 --- a/pkgs/tools/networking/gost/default.nix +++ b/pkgs/tools/networking/gost/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gost"; - version = "2.11.1"; + version = "2.11.5"; src = fetchFromGitHub { owner = "ginuerzh"; repo = "gost"; rev = "v${version}"; - sha256 = "1mxgjvx99bz34f132827bqk56zgvh5rw3h2xmc524wvx59k9zj2a"; + sha256 = "sha256-UBjrWeBw9+qKQ/+1T1W/3e0vrigp540URIyM2d9iCE8="; }; - vendorSha256 = "1cgb957ipkiix3x0x84c77a1i8l679q3kqykm1lhb4f19x61dqjh"; + vendorHash = "sha256-lA4uW0cc0XqU9pjVEMapFLb3eD20Lea9PbkgL3sjJns="; postPatch = '' substituteInPlace http2_test.go \ diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 8c09f1e430f6..9d2286e2271f 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.8.13"; + version = "1.8.14"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-uXrJOBF3X8UF1ktTfAoYgzc0QBLvyzzGQVJVfs8tjng="; + hash = "sha256-m6if0Br9WRPR8POwOM0Iwido3UR/V0BlkuaLcWsf/c0="; }; postPatch = '' diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix index 555fd43035e6..146a2fc6ea50 100644 --- a/pkgs/tools/networking/openconnect/common.nix +++ b/pkgs/tools/networking/openconnect/common.nix @@ -15,6 +15,8 @@ , zlib , vpnc-scripts , PCSC +, useDefaultExternalBrowser ? true +, xdg-utils , autoreconfHook }: @@ -32,7 +34,8 @@ stdenv.mkDerivation rec { buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ] ++ lib.optional stdenv.isDarwin PCSC - ++ lib.optional stdenv.isLinux p11-kit; + ++ lib.optional stdenv.isLinux p11-kit + ++ lib.optional (stdenv.isLinux && useDefaultExternalBrowser) xdg-utils; nativeBuildInputs = [ pkg-config autoreconfHook ]; meta = with lib; { diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index e0e0b6078f73..1ea893948dc5 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -26,6 +26,3 @@ in rec { useOpenSSL = true; }; } - - - diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index 09cca7d2eef2..0764c274084a 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "pritunl-client"; - version = "1.3.3373.6"; + version = "1.3.3420.31"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-Ttg6SNDcNIQlbNnKQY32hmsrgLhzHkeQfwlmCHe0bI0="; + sha256 = "sha256-FKLYpn2HeAVGN9OjLowv2BJRLZKReqXLPFvbin/jaBo="; }; modRoot = "cli"; - vendorSha256 = "sha256-fI2RIzvfbqBgchsvY8hsiecXYItM2XX9h8oiP3zmfTA="; + vendorHash = "sha256-fI2RIzvfbqBgchsvY8hsiecXYItM2XX9h8oiP3zmfTA="; postInstall = '' mv $out/bin/cli $out/bin/pritunl-client diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 96a71c1aba46..690cf3d97013 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; - hash = "sha256-3LyV14kdn5EMZuTtyfHy/eTeou7Bjjr591rtRKAvE0E="; + hash = "sha256-7kCFzszhJYTmAPPYFKKPqCLfqs7B+UyEv9Z/ilVxpfQ="; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/nix/info/info.sh b/pkgs/tools/nix/info/info.sh index c309e8be1649..6ec827350469 100755 --- a/pkgs/tools/nix/info/info.sh +++ b/pkgs/tools/nix/info/info.sh @@ -70,7 +70,7 @@ nixev() { } desc_system() { - nixev '(import {}).stdenv.hostPlatform.system' + nixev 'builtins.currentSystem' } desc_host_os() { @@ -98,7 +98,7 @@ desc_multi_user() { } desc_nixpkgs_path() { - nixev '' + nixev '' 2>/dev/null || echo "not found" } channel_facts() { diff --git a/pkgs/tools/nix/nixos-render-docs/default.nix b/pkgs/tools/nix/nixos-render-docs/default.nix new file mode 100644 index 000000000000..55bbbd9ffa56 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, python3 +, python3Minimal +}: + +let + # python3Minimal can't be overridden with packages on Darwin, due to a missing framework. + # Instead of modifying stdenv, we take the easy way out, since most people on Darwin will + # just be hacking on the Nixpkgs manual (which also uses make-options-doc). + python = ((if stdenv.isDarwin then python3 else python3Minimal).override { + self = python; + includeSiteCustomize = true; + }); + + # TODO add our own small test suite, maybe add tests for these deps to channels? + markdown-it-py-no-tests = python.pkgs.markdown-it-py.override { + disableTests = true; + }; + mdit-py-plugins-no-tests = python.pkgs.mdit-py-plugins.override { + markdown-it-py = markdown-it-py-no-tests; + disableTests = true; + }; +in + +python.pkgs.buildPythonApplication { + pname = "nixos-render-docs"; + version = "0.0"; + format = "pyproject"; + + src = lib.cleanSourceWith { + filter = name: type: + lib.cleanSourceFilter name type + && ! (type == "directory" + && builtins.elem + (baseNameOf name) + [ + ".pytest_cache" + ".mypy_cache" + "__pycache__" + ]); + src = ./src; + }; + + nativeBuildInputs = [ + python.pkgs.setuptools + python.pkgs.pytestCheckHook + ]; + + propagatedBuildInputs = [ + markdown-it-py-no-tests + mdit-py-plugins-no-tests + python.pkgs.frozendict + ]; + + pytestFlagsArray = [ "-vvrP" "tests/" ]; + + meta = with lib; { + description = "Renderer for NixOS manual and option docs"; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py new file mode 100644 index 000000000000..5af13267b14d --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py @@ -0,0 +1,24 @@ +import argparse +import os +import sys +from typing import Any, Dict + +from .md import Converter +from . import manual +from . import options + +def main() -> None: + parser = argparse.ArgumentParser(description='render nixos manual bits') + + commands = parser.add_subparsers(dest='command', required=True) + + options.build_cli(commands.add_parser('options')) + manual.build_cli(commands.add_parser('manual')) + + args = parser.parse_args() + if args.command == 'options': + options.run_cli(args) + elif args.command == 'manual': + manual.run_cli(args) + else: + raise RuntimeError('command not hooked up', args) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py new file mode 100644 index 000000000000..bad36e57a2f3 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py @@ -0,0 +1,254 @@ +from collections.abc import Mapping, MutableMapping, Sequence +from frozendict import frozendict # type: ignore[attr-defined] +from typing import Any, cast, Optional, NamedTuple + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict +from xml.sax.saxutils import escape, quoteattr + +from .md import Renderer + +_xml_id_translate_table = { + ord('*'): ord('_'), + ord('<'): ord('_'), + ord(' '): ord('_'), + ord('>'): ord('_'), + ord('['): ord('_'), + ord(']'): ord('_'), + ord(':'): ord('_'), + ord('"'): ord('_'), +} +def make_xml_id(s: str) -> str: + return s.translate(_xml_id_translate_table) + +class Deflist: + has_dd = False + +class Heading(NamedTuple): + container_tag: str + level: int + +class DocBookRenderer(Renderer): + __output__ = "docbook" + _link_tags: list[str] + _deflists: list[Deflist] + _headings: list[Heading] + + def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): + super().__init__(manpage_urls, parser) + self._link_tags = [] + self._deflists = [] + self._headings = [] + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + result = super().render(tokens, options, env) + result += self._close_headings(None, env) + return result + def renderInline(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # HACK to support docbook links and xrefs. link handling is only necessary because the docbook + # manpage stylesheet converts - in urls to a mathematical minus, which may be somewhat incorrect. + for i, token in enumerate(tokens): + if token.type != 'link_open': + continue + token.tag = 'link' + # turn [](#foo) into xrefs + if token.attrs['href'][0:1] == '#' and tokens[i + 1].type == 'link_close': # type: ignore[index] + token.tag = "xref" + # turn into links without contents + if tokens[i + 1].type == 'text' and tokens[i + 1].content == token.attrs['href']: + tokens[i + 1].content = '' + + return super().renderInline(tokens, options, env) + + def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return escape(token.content) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # should check options.breaks() and emit hard break if so + return "\n" + def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"{escape(token.content)}" + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"{escape(token.content)}" + def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._link_tags.append(token.tag) + href = cast(str, token.attrs['href']) + (attr, start) = ('linkend', 1) if href[0] == '#' else ('xlink:href', 0) + return f"<{token.tag} {attr}={quoteattr(href[start:])}>" + def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"" + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + # HACK open and close para for docbook change size. remove soon. + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + spacing = ' spacing="compact"' if token.attrs.get('compact', False) else '' + return f"\n" + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + info = f" language={quoteattr(token.info)}" if token.info != "" else "" + return f"{escape(token.content)}" + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "
" + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "
" + def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + # markdown-it emits tokens based on the html syntax tree, but docbook is + # slightly different. html has
{
{
}}
, + # docbook has {} + # we have to reject multiple definitions for the same term for time being. + def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._deflists.append(Deflist()) + return "" + def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._deflists.pop() + return "" + def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._deflists[-1].has_dd = False + return "" + def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + if self._deflists[-1].has_dd: + raise Exception("multiple definitions per term not supported") + self._deflists[-1].has_dd = True + return "" + def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + if token.meta['name'] == 'command': + return f"{escape(token.content)}" + if token.meta['name'] == 'file': + return f"{escape(token.content)}" + if token.meta['name'] == 'var': + return f"{escape(token.content)}" + if token.meta['name'] == 'env': + return f"{escape(token.content)}" + if token.meta['name'] == 'option': + return f"" + if token.meta['name'] == 'manpage': + [page, section] = [ s.strip() for s in token.content.rsplit('(', 1) ] + section = section[:-1] + man = f"{page}({section})" + title = f"{escape(page)}" + vol = f"{escape(section)}" + ref = f"{title}{vol}" + if man in self._manpage_urls: + return f"{ref}" + else: + return ref + raise NotImplementedError("md node not supported yet", token) + def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f'' + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + start = f' startingnumber="{token.attrs["start"]}"' if 'start' in token.attrs else "" + spacing = ' spacing="compact"' if token.attrs.get('compact', False) else '' + return f"" + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"" + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + hlevel = int(token.tag[1:]) + result = self._close_headings(hlevel, env) + (tag, attrs) = self._heading_tag(token, tokens, i, options, env) + self._headings.append(Heading(tag, hlevel)) + attrs_str = "".join([ f" {k}={quoteattr(v)}" for k, v in attrs.items() ]) + return result + f'<{tag}{attrs_str}>\n' + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return '' + + def _close_headings(self, level: Optional[int], env: MutableMapping[str, Any]) -> str: + # we rely on markdown-it producing h{1..6} tags in token.tag for this to work + result = [] + while len(self._headings): + if level is None or self._headings[-1].level >= level: + result.append(f"") + self._headings.pop() + else: + break + return "\n".join(result) + + def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> tuple[str, dict[str, str]]: + attrs = {} + if id := token.attrs.get('id'): + attrs['xml:id'] = cast(str, id) + return ("section", attrs) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py new file mode 100644 index 000000000000..361bc0877893 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py @@ -0,0 +1,143 @@ +import argparse +import json + +from abc import abstractmethod +from collections.abc import MutableMapping, Sequence +from typing import Any, cast, NamedTuple, Optional, Union +from xml.sax.saxutils import escape, quoteattr +from markdown_it.token import Token +from markdown_it.utils import OptionsDict + +from .docbook import DocBookRenderer +from .md import Converter + +class RenderedSection: + id: Optional[str] + chapters: list[str] + + def __init__(self, id: Optional[str]) -> None: + self.id = id + self.chapters = [] + +class BaseConverter(Converter): + _sections: list[RenderedSection] + + def __init__(self, manpage_urls: dict[str, str]): + super().__init__(manpage_urls) + self._sections = [] + + def add_section(self, id: Optional[str], chapters: list[str]) -> None: + self._sections.append(RenderedSection(id)) + for content in chapters: + self._md.renderer._title_seen = False # type: ignore[attr-defined] + self._sections[-1].chapters.append(self._render(content)) + + @abstractmethod + def finalize(self) -> str: raise NotImplementedError() + +class ManualDocBookRenderer(DocBookRenderer): + # needed to check correctness of chapters. + # we may want to use front matter instead of this kind of heuristic. + _title_seen = False + + def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> tuple[str, dict[str, str]]: + (tag, attrs) = super()._heading_tag(token, tokens, i, options, env) + if self._title_seen: + if token.tag == 'h1': + raise RuntimeError("only one title heading allowed", token) + return (tag, attrs) + self._title_seen = True + return ("chapter", attrs | { + 'xmlns': "http://docbook.org/ns/docbook", + 'xmlns:xlink': "http://www.w3.org/1999/xlink", + }) + + # TODO minimize docbook diffs with existing conversions. remove soon. + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return super().paragraph_open(token, tokens, i, options, env) + "\n " + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + super().paragraph_close(token, tokens, i, options, env) + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"\n{escape(token.content)}" + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + info = f" language={quoteattr(token.info)}" if token.info != "" else "" + return f"\n{escape(token.content)}" + +class DocBookConverter(BaseConverter): + __renderer__ = ManualDocBookRenderer + + def finalize(self) -> str: + result = [] + + for section in self._sections: + id = "id=" + quoteattr(section.id) if section.id is not None else "" + result.append(f'
') + result += section.chapters + result.append(f'
') + + return "\n".join(result) + + + +class Section: + id: Optional[str] = None + chapters: list[str] + + def __init__(self) -> None: + self.chapters = [] + +class SectionAction(argparse.Action): + def __call__(self, parser: argparse.ArgumentParser, ns: argparse.Namespace, + values: Union[str, Sequence[Any], None], opt_str: Optional[str] = None) -> None: + sections = getattr(ns, self.dest) + if sections is None: sections = [] + sections.append(Section()) + setattr(ns, self.dest, sections) + +class SectionIDAction(argparse.Action): + def __call__(self, parser: argparse.ArgumentParser, ns: argparse.Namespace, + values: Union[str, Sequence[Any], None], opt_str: Optional[str] = None) -> None: + sections = getattr(ns, self.dest) + if sections is None: raise argparse.ArgumentError(self, "no active section") + sections[-1].id = cast(str, values) + +class ChaptersAction(argparse.Action): + def __call__(self, parser: argparse.ArgumentParser, ns: argparse.Namespace, + values: Union[str, Sequence[Any], None], opt_str: Optional[str] = None) -> None: + sections = getattr(ns, self.dest) + if sections is None: raise argparse.ArgumentError(self, "no active section") + sections[-1].chapters.extend(cast(Sequence[str], values)) + +def _build_cli_db(p: argparse.ArgumentParser) -> None: + p.add_argument('--manpage-urls', required=True) + p.add_argument("outfile") + p.add_argument("--section", dest="contents", action=SectionAction, nargs=0) + p.add_argument("--section-id", dest="contents", action=SectionIDAction) + p.add_argument("--chapters", dest="contents", action=ChaptersAction, nargs='+') + +def _run_cli_db(args: argparse.Namespace) -> None: + with open(args.manpage_urls, 'r') as manpage_urls: + md = DocBookConverter(json.load(manpage_urls)) + for section in args.contents: + chapters = [] + for p in section.chapters: + with open(p, 'r') as f: + chapters.append(f.read()) + md.add_section(section.id, chapters) + with open(args.outfile, 'w') as f: + f.write(md.finalize()) + +def build_cli(p: argparse.ArgumentParser) -> None: + formats = p.add_subparsers(dest='format', required=True) + _build_cli_db(formats.add_parser('docbook')) + +def run_cli(args: argparse.Namespace) -> None: + if args.format == 'docbook': + _run_cli_db(args) + else: + raise RuntimeError('format not hooked up', args) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py new file mode 100644 index 000000000000..c08675870f6a --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py @@ -0,0 +1,385 @@ +from abc import ABC +from collections.abc import Mapping, MutableMapping, Sequence +from frozendict import frozendict # type: ignore[attr-defined] +from typing import Any, Callable, Optional + +import re + +from .types import RenderFn + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict +from mdit_py_plugins.container import container_plugin # type: ignore[attr-defined] +from mdit_py_plugins.deflist import deflist_plugin # type: ignore[attr-defined] +from mdit_py_plugins.myst_role import myst_role_plugin # type: ignore[attr-defined] + +_md_escape_table = { + ord('*'): '\\*', + ord('<'): '\\<', + ord('['): '\\[', + ord('`'): '\\`', + ord('.'): '\\.', + ord('#'): '\\#', + ord('&'): '\\&', + ord('\\'): '\\\\', +} +def md_escape(s: str) -> str: + return s.translate(_md_escape_table) + +class Renderer(markdown_it.renderer.RendererProtocol): + _admonitions: dict[str, tuple[RenderFn, RenderFn]] + _admonition_stack: list[str] + + def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): + self._manpage_urls = manpage_urls + self.rules = { + 'text': self.text, + 'paragraph_open': self.paragraph_open, + 'paragraph_close': self.paragraph_close, + 'hardbreak': self.hardbreak, + 'softbreak': self.softbreak, + 'code_inline': self.code_inline, + 'code_block': self.code_block, + 'link_open': self.link_open, + 'link_close': self.link_close, + 'list_item_open': self.list_item_open, + 'list_item_close': self.list_item_close, + 'bullet_list_open': self.bullet_list_open, + 'bullet_list_close': self.bullet_list_close, + 'em_open': self.em_open, + 'em_close': self.em_close, + 'strong_open': self.strong_open, + 'strong_close': self.strong_close, + 'fence': self.fence, + 'blockquote_open': self.blockquote_open, + 'blockquote_close': self.blockquote_close, + 'dl_open': self.dl_open, + 'dl_close': self.dl_close, + 'dt_open': self.dt_open, + 'dt_close': self.dt_close, + 'dd_open': self.dd_open, + 'dd_close': self.dd_close, + 'myst_role': self.myst_role, + "container_admonition_open": self.admonition_open, + "container_admonition_close": self.admonition_close, + "inline_anchor": self.inline_anchor, + "heading_open": self.heading_open, + "heading_close": self.heading_close, + "ordered_list_open": self.ordered_list_open, + "ordered_list_close": self.ordered_list_close, + } + + self._admonitions = { + "{.note}": (self.note_open, self.note_close), + "{.caution}": (self.caution_open,self.caution_close), + "{.tip}": (self.tip_open, self.tip_close), + "{.important}": (self.important_open, self.important_close), + "{.warning}": (self.warning_open, self.warning_close), + } + self._admonition_stack = [] + + def admonition_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + tag = token.info.strip() + self._admonition_stack.append(tag) + return self._admonitions[tag][0](token, tokens, i, options, env) + def admonition_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonitions[self._admonition_stack.pop()][1](token, tokens, i, options, env) + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + def do_one(i: int, token: Token) -> str: + if token.type == "inline": + assert token.children is not None + return self.renderInline(token.children, options, env) + elif token.type in self.rules: + return self.rules[token.type](tokens[i], tokens, i, options, env) + else: + raise NotImplementedError("md token not supported yet", token) + return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) + def renderInline(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + def do_one(i: int, token: Token) -> str: + if token.type in self.rules: + return self.rules[token.type](tokens[i], tokens, i, options, env) + else: + raise NotImplementedError("md token not supported yet", token) + return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) + + def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + +def _is_escaped(src: str, pos: int) -> bool: + found = 0 + while pos >= 0 and src[pos] == '\\': + found += 1 + pos -= 1 + return found % 2 == 1 + +_INLINE_ANCHOR_PATTERN = re.compile(r"\{\s*#([\w-]+)\s*\}") + +def _inline_anchor_plugin(md: markdown_it.MarkdownIt) -> None: + def inline_anchor(state: markdown_it.rules_inline.StateInline, silent: bool) -> bool: + if state.src[state.pos] != '[': + return False + if _is_escaped(state.src, state.pos - 1): + return False + + # treat the inline span like a link label for simplicity. + label_begin = state.pos + 1 + label_end = markdown_it.helpers.parseLinkLabel(state, state.pos) + input_end = state.posMax + if label_end < 0: + return False + + # match id + match = _INLINE_ANCHOR_PATTERN.match(state.src[label_end + 1 : ]) + if not match: + return False + + if not silent: + token = state.push("inline_anchor", "", 0) # type: ignore[no-untyped-call] + token.attrs['id'] = match[1] + + state.pos = label_begin + state.posMax = label_end + state.md.inline.tokenize(state) + + state.pos = label_end + match.end() + 1 + state.posMax = input_end + return True + + md.inline.ruler.before("link", "inline_anchor", inline_anchor) + +def _inline_comment_plugin(md: markdown_it.MarkdownIt) -> None: + def inline_comment(state: markdown_it.rules_inline.StateInline, silent: bool) -> bool: + if state.src[state.pos : state.pos + 4] != '': # --> + state.pos = i + 3 + return True + + return False + + md.inline.ruler.after("autolink", "inline_comment", inline_comment) + +def _block_comment_plugin(md: markdown_it.MarkdownIt) -> None: + def block_comment(state: markdown_it.rules_block.StateBlock, startLine: int, endLine: int, + silent: bool) -> bool: + pos = state.bMarks[startLine] + state.tShift[startLine] + posMax = state.eMarks[startLine] + + if state.src[pos : pos + 4] != '': + state.line = nextLine + 1 + return True + + nextLine += 1 + + return False + + md.block.ruler.after("code", "block_comment", block_comment) + +_HEADER_ID_RE = re.compile(r"\s*\{\s*\#([\w-]+)\s*\}\s*$") + +class Converter(ABC): + __renderer__: Callable[[Mapping[str, str], markdown_it.MarkdownIt], Renderer] + + def __init__(self, manpage_urls: Mapping[str, str]): + self._manpage_urls = frozendict(manpage_urls) + + self._md = markdown_it.MarkdownIt( + "commonmark", + { + 'maxNesting': 100, # default is 20 + 'html': False, # not useful since we target many formats + 'typographer': True, # required for smartquotes + }, + renderer_cls=lambda parser: self.__renderer__(self._manpage_urls, parser) + ) + self._md.use( + container_plugin, + name="admonition", + validate=lambda name, *args: ( + name.strip() in self._md.renderer._admonitions # type: ignore[attr-defined] + ) + ) + self._md.use(deflist_plugin) + self._md.use(myst_role_plugin) + self._md.use(_inline_anchor_plugin) + self._md.use(_inline_comment_plugin) + self._md.use(_block_comment_plugin) + self._md.enable(["smartquotes", "replacements"]) + + def _post_parse(self, tokens: list[Token]) -> list[Token]: + for i in range(0, len(tokens)): + # parse header IDs. this is purposely simple and doesn't support + # classes or other inds of attributes. + if tokens[i].type == 'heading_open': + children = tokens[i + 1].children + assert children is not None + if len(children) == 0 or children[-1].type != 'text': + continue + if m := _HEADER_ID_RE.search(children[-1].content): + tokens[i].attrs['id'] = m[1] + children[-1].content = children[-1].content[:-len(m[0])].rstrip() + + # markdown-it signifies wide lists by setting the wrapper paragraphs + # of each item to hidden. this is not useful for our stylesheets, which + # signify this with a special css class on list elements instead. + wide_stack = [] + for i in range(0, len(tokens)): + if tokens[i].type in [ 'bullet_list_open', 'ordered_list_open' ]: + wide_stack.append([i, True]) + elif tokens[i].type in [ 'bullet_list_close', 'ordered_list_close' ]: + (idx, compact) = wide_stack.pop() + tokens[idx].attrs['compact'] = compact + elif len(wide_stack) > 0 and tokens[i].type == 'paragraph_open' and not tokens[i].hidden: + wide_stack[-1][1] = False + + return tokens + + def _parse(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> list[Token]: + tokens = self._md.parse(src, env if env is not None else {}) + return self._post_parse(tokens) + + def _render(self, src: str) -> str: + env: dict[str, Any] = {} + tokens = self._parse(src, env) + return self._md.renderer.render(tokens, self._md.options, env) # type: ignore[no-any-return] diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py new file mode 100644 index 000000000000..3667c7bbcdeb --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py @@ -0,0 +1,284 @@ +import argparse +import json + +from abc import abstractmethod +from collections.abc import MutableMapping, Sequence +from markdown_it.utils import OptionsDict +from markdown_it.token import Token +from typing import Any, Optional +from xml.sax.saxutils import escape, quoteattr + +from .docbook import DocBookRenderer, make_xml_id +from .md import Converter, md_escape +from .types import OptionLoc, Option, RenderedOption + +def option_is(option: Option, key: str, typ: str) -> Optional[dict[str, str]]: + if key not in option: + return None + if type(option[key]) != dict: + return None + if option[key].get('_type') != typ: # type: ignore[union-attr] + return None + return option[key] # type: ignore[return-value] + +class BaseConverter(Converter): + _options: dict[str, RenderedOption] + + def __init__(self, manpage_urls: dict[str, str], + revision: str, + document_type: str, + varlist_id: str, + id_prefix: str, + markdown_by_default: bool): + super().__init__(manpage_urls) + self._options = {} + self._revision = revision + self._document_type = document_type + self._varlist_id = varlist_id + self._id_prefix = id_prefix + self._markdown_by_default = markdown_by_default + + def _format_decl_def_loc(self, loc: OptionLoc) -> tuple[Optional[str], str]: + # locations can be either plain strings (specific to nixpkgs), or attrsets + # { name = "foo/bar.nix"; url = "https://github.com/....."; } + if isinstance(loc, str): + # Hyperlink the filename either to the NixOS github + # repository (if it’s a module and we have a revision number), + # or to the local filesystem. + if not loc.startswith('/'): + if self._revision == 'local': + href = f"https://github.com/NixOS/nixpkgs/blob/master/{loc}" + else: + href = f"https://github.com/NixOS/nixpkgs/blob/{self._revision}/{loc}" + else: + href = f"file://{loc}" + # Print the filename and make it user-friendly by replacing the + # /nix/store/ prefix by the default location of nixos + # sources. + if not loc.startswith('/'): + name = f"" + elif 'nixops' in loc and '/nix/' in loc: + name = f"" + else: + name = loc + return (href, name) + else: + return (loc['url'] if 'url' in loc else None, loc['name']) + + @abstractmethod + def _decl_def_header(self, header: str) -> list[str]: raise NotImplementedError() + + @abstractmethod + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: raise NotImplementedError() + + @abstractmethod + def _decl_def_footer(self) -> list[str]: raise NotImplementedError() + + def _render_decl_def(self, header: str, locs: list[OptionLoc]) -> list[str]: + result = [] + result += self._decl_def_header(header) + for loc in locs: + href, name = self._format_decl_def_loc(loc) + result += self._decl_def_entry(href, name) + result += self._decl_def_footer() + return result + + def _render_code(self, option: Option, key: str) -> list[str]: + if lit := option_is(option, key, 'literalMD'): + return [ self._render(f"*{key.capitalize()}:*\n{lit['text']}") ] + elif lit := option_is(option, key, 'literalExpression'): + code = lit['text'] + # for multi-line code blocks we only have to count ` runs at the beginning + # of a line, but this is much easier. + multiline = '\n' in code + longest, current = (0, 0) + for c in code: + current = current + 1 if c == '`' else 0 + longest = max(current, longest) + # inline literals need a space to separate ticks from content, code blocks + # need newlines. inline literals need one extra tick, code blocks need three. + ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ') + code = f"{ticks}{sep}{code}{sep}{ticks}" + return [ self._render(f"*{key.capitalize()}:*\n{code}") ] + elif key in option: + raise Exception(f"{key} has unrecognized type", option[key]) + else: + return [] + + def _render_description(self, desc: str | dict[str, str]) -> list[str]: + if isinstance(desc, str) and self._markdown_by_default: + return [ self._render(desc) ] + elif isinstance(desc, dict) and desc.get('_type') == 'mdDoc': + return [ self._render(desc['text']) ] + else: + raise Exception("description has unrecognized type", desc) + + @abstractmethod + def _related_packages_header(self) -> list[str]: raise NotImplementedError() + + def _convert_one(self, option: dict[str, Any]) -> list[str]: + result = [] + + if desc := option.get('description'): + result += self._render_description(desc) + if typ := option.get('type'): + ro = " *(read only)*" if option.get('readOnly', False) else "" + result.append(self._render(f"*Type:* {md_escape(typ)}{ro}")) + + result += self._render_code(option, 'default') + result += self._render_code(option, 'example') + + if related := option.get('relatedPackages'): + result += self._related_packages_header() + result.append(self._render(related)) + if decl := option.get('declarations'): + result += self._render_decl_def("Declared by", decl) + if defs := option.get('definitions'): + result += self._render_decl_def("Defined by", defs) + + return result + + def add_options(self, options: dict[str, Any]) -> None: + for (name, option) in options.items(): + try: + self._options[name] = RenderedOption(option['loc'], self._convert_one(option)) + except Exception as e: + raise Exception(f"Failed to render option {name}") from e + + @abstractmethod + def finalize(self) -> str: raise NotImplementedError() + +class OptionsDocBookRenderer(DocBookRenderer): + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in options doc", token) + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in options doc", token) + + # TODO keep optionsDocBook diff small. remove soon if rendering is still good. + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + token.attrs['compact'] = False + return super().ordered_list_open(token, tokens, i, options, env) + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + token.attrs['compact'] = False + return super().bullet_list_open(token, tokens, i, options, env) + +class DocBookConverter(BaseConverter): + __renderer__ = OptionsDocBookRenderer + + def _render_code(self, option: dict[str, Any], key: str) -> list[str]: + if lit := option_is(option, key, 'literalDocBook'): + return [ f"{key.capitalize()}: {lit['text']}" ] + else: + return super()._render_code(option, key) + + def _render_description(self, desc: str | dict[str, Any]) -> list[str]: + if isinstance(desc, str) and not self._markdown_by_default: + return [ f"{desc}" ] + else: + return super()._render_description(desc) + + def _related_packages_header(self) -> list[str]: + return [ + "", + " Related packages:", + "", + ] + + def _decl_def_header(self, header: str) -> list[str]: + return [ + f"{header}:", + "" + ] + + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: + if href is not None: + href = " xlink:href=" + quoteattr(href) + return [ + f"", + escape(name), + "" + ] + + def _decl_def_footer(self) -> list[str]: + return [ "" ] + + def finalize(self) -> str: + keys = list(self._options.keys()) + keys.sort(key=lambda opt: [ (0 if p.startswith("enable") else 1 if p.startswith("package") else 2, p) + for p in self._options[opt].loc ]) + + result = [] + + result.append('') + if self._document_type == 'appendix': + result += [ + '', + ' Configuration Options', + ] + result += [ + f'', + ] + + for name in keys: + id = make_xml_id(self._id_prefix + name) + result += [ + "", + # NOTE adding extra spaces here introduces spaces into xref link expansions + (f"" + + f""), + "" + ] + result += self._options[name].lines + result += [ + "", + "" + ] + + result.append("") + if self._document_type == 'appendix': + result.append("") + + return "\n".join(result) + +def _build_cli_db(p: argparse.ArgumentParser) -> None: + p.add_argument('--manpage-urls', required=True) + p.add_argument('--revision', required=True) + p.add_argument('--document-type', required=True) + p.add_argument('--varlist-id', required=True) + p.add_argument('--id-prefix', required=True) + p.add_argument('--markdown-by-default', default=False, action='store_true') + p.add_argument("infile") + p.add_argument("outfile") + +def _run_cli_db(args: argparse.Namespace) -> None: + with open(args.manpage_urls, 'r') as manpage_urls: + md = DocBookConverter( + json.load(manpage_urls), + revision = args.revision, + document_type = args.document_type, + varlist_id = args.varlist_id, + id_prefix = args.id_prefix, + markdown_by_default = args.markdown_by_default) + + with open(args.infile, 'r') as f: + md.add_options(json.load(f)) + with open(args.outfile, 'w') as f: + f.write(md.finalize()) + +def build_cli(p: argparse.ArgumentParser) -> None: + formats = p.add_subparsers(dest='format', required=True) + _build_cli_db(formats.add_parser('docbook')) + +def run_cli(args: argparse.Namespace) -> None: + if args.format == 'docbook': + _run_cli_db(args) + else: + raise RuntimeError('format not hooked up', args) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py new file mode 100644 index 000000000000..7814b3a4854b --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py @@ -0,0 +1,13 @@ +from collections.abc import Sequence, MutableMapping +from typing import Any, Callable, Optional, Tuple, NamedTuple + +from markdown_it.token import Token +from markdown_it.utils import OptionsDict + +OptionLoc = str | dict[str, str] +Option = dict[str, str | dict[str, str] | list[OptionLoc]] + +RenderedOption = NamedTuple('RenderedOption', [('loc', list[str]), + ('lines', list[str])]) + +RenderFn = Callable[[Token, Sequence[Token], int, OptionsDict, MutableMapping[str, Any]], str] diff --git a/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml b/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml new file mode 100644 index 000000000000..d66643ef8421 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml @@ -0,0 +1,15 @@ +[project] +name = "nixos-render-docs" +version = "0.0" +description = "Renderer for NixOS manual and option docs" +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", +] + +[project.scripts] +nixos-render-docs = "nixos_render_docs:main" + +[build-system] +requires = ["setuptools"] diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py new file mode 100644 index 000000000000..0b73cdc8e7c7 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py @@ -0,0 +1,102 @@ +import nixos_render_docs + +from markdown_it.token import Token + +class Converter(nixos_render_docs.md.Converter): + # actual renderer doesn't matter, we're just parsing. + __renderer__ = nixos_render_docs.docbook.DocBookRenderer + +def test_heading_id_absent() -> None: + c = Converter({}) + assert c._parse("# foo") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo', markup='', info='', meta={}, block=False, hidden=False) + ], + content='foo', markup='', info='', meta={}, block=True, hidden=False), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_present() -> None: + c = Converter({}) + assert c._parse("# foo {#foo}\n## bar { #bar}\n### bal { #bal} ") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={'id': 'foo'}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#foo}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='heading_open', tag='h2', nesting=1, attrs={'id': 'bar'}, map=[1, 2], level=0, + children=None, content='', markup='##', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=1, + content='bar { #bar}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='bar', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h2', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='##', info='', meta={}, block=True, hidden=False), + Token(type='heading_open', tag='h3', nesting=1, attrs={'id': 'bal'}, map=[2, 3], level=0, + children=None, content='', markup='###', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[2, 3], level=1, + content='bal { #bal}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='bal', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h3', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='###', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_incomplete() -> None: + c = Converter({}) + assert c._parse("# foo {#}") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo {#}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_double() -> None: + c = Converter({}) + assert c._parse("# foo {#a} {#b}") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={'id': 'b'}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#a} {#b}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo {#a}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_suffixed() -> None: + c = Converter({}) + assert c._parse("# foo {#a} s") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#a} s', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo {#a} s', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py new file mode 100644 index 000000000000..0f5d28407367 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py @@ -0,0 +1,182 @@ +import nixos_render_docs +import pytest + +from markdown_it.token import Token + +class Converter(nixos_render_docs.md.Converter): + # actual renderer doesn't matter, we're just parsing. + __renderer__ = nixos_render_docs.docbook.DocBookRenderer + +@pytest.mark.parametrize("ordered", [True, False]) +def test_list_wide(ordered: bool) -> None: + t, tag, m, e1, e2, i1, i2 = ( + ("ordered", "ol", ".", "1.", "2.", "1", "2") if ordered else ("bullet", "ul", "-", "-", "-", "", "") + ) + c = Converter({}) + assert c._parse(f"{e1} a\n\n{e2} b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': False}, map=[0, 3], level=0, + children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 2], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=3, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[2, 3], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[2, 3], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[2, 3], level=3, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] + +@pytest.mark.parametrize("ordered", [True, False]) +def test_list_narrow(ordered: bool) -> None: + t, tag, m, e1, e2, i1, i2 = ( + ("ordered", "ol", ".", "1.", "2.", "1", "2") if ordered else ("bullet", "ul", "-", "-", "-", "", "") + ) + c = Converter({}) + assert c._parse(f"{e1} a\n{e2} b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': True}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=3, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[1, 2], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=3, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] + assert c._parse(f"{e1} - a\n{e2} b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': True}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={'compact': True}, map=[0, 1], level=2, + children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=5, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_close', tag='ul', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[1, 2], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=3, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] + assert c._parse(f"{e1} - a\n{e2} - b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': True}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={'compact': True}, map=[0, 1], level=2, + children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=5, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_close', tag='ul', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={'compact': True}, map=[1, 2], level=2, + children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[1, 2], level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=5, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_close', tag='ul', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py new file mode 100644 index 000000000000..5a02fabde0fb --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py @@ -0,0 +1,14 @@ +import nixos_render_docs + +from markdown_it.token import Token +import pytest + +def test_option_headings() -> None: + c = nixos_render_docs.options.DocBookConverter({}, 'local', 'none', 'vars', 'opt-', False) + with pytest.raises(RuntimeError) as exc: + c._render("# foo") + assert exc.value.args[0] == 'md token not supported in options doc' + assert exc.value.args[1] == Token( + type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False + ) diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py new file mode 100644 index 000000000000..4efcb9bdfc73 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py @@ -0,0 +1,279 @@ +import nixos_render_docs + +from markdown_it.token import Token + +class Converter(nixos_render_docs.md.Converter): + # actual renderer doesn't matter, we're just parsing. + __renderer__ = nixos_render_docs.docbook.DocBookRenderer + +def test_inline_anchor_simple() -> None: + c = Converter({}) + assert c._parse("[]{#test}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[]{#test}', + markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'test'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_anchor_formatted() -> None: + c = Converter({}) + assert c._parse("a[b c `d` ***e***]{#test}f") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a[b c `d` ***e***]{#test}f', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, + children=None, content='a', markup='', info='', meta={}, block=False, hidden=False), + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'test'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b c ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='code_inline', tag='code', nesting=0, attrs={}, map=None, level=0, + children=None, content='d', markup='`', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_open', tag='em', nesting=1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='strong_open', tag='strong', nesting=1, attrs={}, map=None, level=1, + children=None, content='', markup='**', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=2, children=None, + content='e', markup='', info='', meta={}, block=False, hidden=False), + Token(type='strong_close', tag='strong', nesting=-1, attrs={}, map=None, level=1, + children=None, content='', markup='**', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_close', tag='em', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='f', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_anchor_in_heading() -> None: + c = Converter({}) + # inline anchors in headers are allowed, but header attributes should be preferred + assert c._parse("# foo []{#bar} baz") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo []{#bar} baz', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'bar'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' baz', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_anchor_on_links() -> None: + c = Converter({}) + assert c._parse("[ [a](#bar) ]{#foo}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[ [a](#bar) ]{#foo}', + markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'foo'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='link_open', tag='a', nesting=1, attrs={'href': '#bar'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False), + Token(type='link_close', tag='a', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_anchor_nested() -> None: + # inline anchors may contain more anchors (even though this is a bit pointless) + c = Converter({}) + assert c._parse("[ [a]{#bar} ]{#foo}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='[ [a]{#bar} ]{#foo}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'foo'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'bar'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a ', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_anchor_escaping() -> None: + c = Converter({}) + assert c._parse("\\[a]{#bar}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='[a]{#bar}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("\\\\[a]{#bar}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='\\\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='\\', markup='', info='', meta={}, block=False, hidden=False), + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'bar'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("\\\\\\[a]{#bar}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='\\[a]{#bar}', markup='', info='', meta={}, block=False, hidden=False) + ], + content='\\\\\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_basic() -> None: + c = Converter({}) + assert c._parse("a b") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("a") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_does_not_nest_in_code() -> None: + c = Converter({}) + assert c._parse("`ac`") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='`ac`', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='code_inline', tag='code', nesting=0, attrs={}, map=None, level=0, children=None, + content='ac', markup='`', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_does_not_nest_elsewhere() -> None: + c = Converter({}) + assert c._parse("*ac*") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='*ac*', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='em_open', tag='em', nesting=1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='ac', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_close', tag='em', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_can_be_escaped() -> None: + c = Converter({}) + assert c._parse("a\\c") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a\\c', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='ac', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("a\\\\c") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a\\c', markup='', info='', meta={}, block=False, hidden=False) + ], + content='a\\\\c', markup='', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("a\\\\\\c") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a\\c', markup='', info='', meta={}, block=False, hidden=False) + ], + content='a\\\\\\c', markup='', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_block_comment() -> None: + c = Converter({}) + assert c._parse("") == [] + assert c._parse("") == [] + assert c._parse("") == [] + assert c._parse("") == [] + assert c._parse("") == [] diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 1df83b44ca62..55b949aad4ef 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , fetchpatch +, bzip2 , cli11 , cmake , curl @@ -15,6 +16,7 @@ , spdlog , termcolor , tl-expected +, fmt_9 }: let @@ -34,28 +36,34 @@ 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" - ]; + # Use as header-only library. + # + # Spdlog 1.11 requires fmt version 8 while micromamba requires + # version 9. spdlog may use its bundled version of fmt, + # though. Micromamba is not calling spdlog functions with + # fmt-types in their signature. I.e. we get away with removing + # fmt_8 from spdlog's propagated dependencies and using fmt_9 for + # micromamba itself. + dontBuild = true; + cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DSPDLOG_FMT_EXTERNAL=OFF" ]; + propagatedBuildInputs = []; }); in stdenv.mkDerivation rec { pname = "micromamba"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - sha256 = "sha256-t1DfLwBGW6MfazuFludn6/fdYWFaMnkhXva6bvus694="; + sha256 = "sha256-KGlH5i/lI6c1Jj1ttAOrip8BKECaea5D202TJMcFDmM="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ + bzip2 cli11 nlohmann_json curl @@ -68,6 +76,7 @@ stdenv.mkDerivation rec { ghc_filesystem python3 tl-expected + fmt_9 ]; cmakeFlags = [ diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 51d70f15dfcb..cfc23ff619dc 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 = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-HSgW9qKXIWu+nzlWjR7HoIrjO1yn48a0U/E76VwrpQ0="; + hash = "sha256-8nFseSTAIGJdB4P/K/cXAehvdrSLcTTBZLQNs/ZC+I8="; }; buildInputs = [ boost diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix index 3c44dbdbe144..0796a0914f1f 100644 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ b/pkgs/tools/package-management/nix/nix-perl.nix @@ -40,6 +40,4 @@ stdenv.mkDerivation { ]; preConfigure = "export NIX_STATE_DIR=$TMPDIR"; - - preBuild = "unset NIX_INDENT_MAKE"; } diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix new file mode 100644 index 000000000000..a2bac43e5924 --- /dev/null +++ b/pkgs/tools/package-management/pkg/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, m4, pkg-config, tcl +, bzip2, libarchive, libbsd, lzma, openssl, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pkg"; + version = "1.19.0"; + + src = fetchFromGitHub { + owner = "freebsd"; + repo = "pkg"; + rev = finalAttrs.version; + sha256 = "W66g8kVvaPJSyOZcgyDcUBrWQQ5YDkRqofSWfIsjd+k="; + }; + + setOutputFlags = false; + separateDebugInfo = true; + + nativeBuildInputs = [ m4 pkg-config tcl ]; + buildInputs = [ bzip2 libarchive lzma openssl zlib ] + ++ lib.optional stdenv.isLinux libbsd; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/etc + ''; + + meta = with lib; { + homepage = "https://github.com/freebsd/pkg"; + description = "Package management tool for FreeBSD"; + maintainers = with maintainers; [ qyliss ]; + platforms = with platforms; darwin ++ freebsd ++ linux ++ netbsd ++ openbsd; + license = licenses.bsd2; + }; +}) diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix index 200cd96c238b..b00aede15818 100644 --- a/pkgs/tools/security/brutespray/default.nix +++ b/pkgs/tools/security/brutespray/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "brutespray"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-hlFp2ZQnoydxF2NBCjSKtmNzMj9V14AKrNYKMF/8m70="; + sha256 = "sha256-O9HOsj0R6oHI7jjG4FBqbrSAQSVomgeD7tyPDNCNmIo="; }; postPatch = '' diff --git a/pkgs/tools/security/kestrel/default.nix b/pkgs/tools/security/kestrel/default.nix index 16f3a4f52a4e..69622b71e0e1 100644 --- a/pkgs/tools/security/kestrel/default.nix +++ b/pkgs/tools/security/kestrel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kestrel"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "finfet"; repo = pname; rev = "v${version}"; - hash = "sha256-aJKqx/PY7BanzE5AtqmKxvkULgXXqueGnDniLd9tHOg="; + hash = "sha256-kEM81HIfWETVrUiqXu1+3az+Stg3GdjHE7FaxXJgNYk="; }; - cargoHash = "sha256-UnXaDdQzoYP1N2FnLjOQgiJKnCyCojXKKxVlWYZT0DE="; + cargoHash = "sha256-xv35oFawFLVXZS3Eum6RCo8LcVvHftfv+UvJYYmIDx4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index bae83462872b..fa07080d2dfa 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -4,34 +4,27 @@ , autoreconfHook }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "secp256k1"; - version = "unstable-2022-02-06"; + version = "0.2.0"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; - rev = "5dcc6f8dbdb1850570919fc9942d22f728dbc0af"; - sha256 = "x9qG2S6tBSRseWaFIN9N2fRpY1vkv8idT3d3rfJnmaU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wYJIMCoo6ryeQN4ZnvEkJ5/332+AkaOwgplDuQQC5MU="; }; nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-benchmark=no" - "--enable-exhaustive-tests=no" - "--enable-experimental" - "--enable-module-ecdh" "--enable-module-recovery" - "--enable-module-schnorrsig" - "--enable-tests=yes" ]; doCheck = true; - checkPhase = "./tests"; - meta = with lib; { description = "Optimized C library for EC operations on curve secp256k1"; longDescription = '' diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix index 084d8638c9a1..620d38f37709 100644 --- a/pkgs/tools/security/tlsx/default.nix +++ b/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-5roEaWdvjMYoQJqfMxRKryb9frDnpoJOYTG5g2MSIy0="; + hash = "sha256-9Cs5lkt7lAgCl/q2Xc8W5A8/frKER/d3mS1KH9jAy68="; }; - vendorHash = "sha256-g7v7n8xwYOuE4ojOEjgNmbyytPuwbxQx1R6fXHpVrYU="; + vendorHash = "sha256-eQnrSE45UGRbJ7zO6TdBh6UKooUEnhVxg4cdgoFu5eM="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/tracee/default.nix b/pkgs/tools/security/tracee/default.nix index bb4b558fc685..6600faeed963 100644 --- a/pkgs/tools/security/tracee/default.nix +++ b/pkgs/tools/security/tracee/default.nix @@ -19,15 +19,15 @@ let in buildGoModule rec { pname = "tracee"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w/x7KhopkADKvpDc5TE5Kf34pRY6HP3kX1Lqujnl0b8="; + sha256 = "sha256-TSzvuPE4to6aN52fmcwC6mVBOWUFQSyWHDgNs8emPq4="; }; - vendorSha256 = "sha256-5RXNRNoMydFcemNGgyfqcUPtfMVgMYdiyWo/sZi8GQw="; + vendorSha256 = "sha256-HGJ7Gtug+nSg+mAQH4jcNkeikWQW10cgAIoAqeAf9r4="; patches = [ ./use-our-libbpf.patch @@ -64,11 +64,10 @@ buildGoModule rec { mkdir -p $out/{bin,share/tracee} - cp ./dist/tracee-ebpf $out/bin - cp ./dist/tracee-rules $out/bin + mv ./dist/tracee-{ebpf,rules} $out/bin/ - cp -r ./dist/rules $out/share/tracee/ - cp -r ./cmd/tracee-rules/templates $out/share/tracee/ + mv ./dist/rules $out/share/tracee/ + mv ./cmd/tracee-rules/templates $out/share/tracee/ runHook postInstall ''; @@ -105,7 +104,12 @@ buildGoModule rec { is delivered as a Docker image that monitors the OS and detects suspicious behavior based on a pre-defined set of behavioral patterns. ''; - license = licenses.asl20; + license = with licenses; [ + # general license + asl20 + # pkg/ebpf/c/* + gpl2Plus + ]; maintainers = with maintainers; [ jk ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch b/pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch deleted file mode 100644 index 88a3e4972507..000000000000 --- a/pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go -index afbc5330..13745c70 100644 ---- a/tests/integration/integration_test.go -+++ b/tests/integration/integration_test.go -@@ -246,8 +246,8 @@ func Test_EventFilters(t *testing.T) { - eventFunc: checkExecve, - }, - { -- name: "trace only execve events that starts with /usr/bin", -- filterArgs: []string{"event=execve", "execve.pathname=/usr/bin*"}, -+ name: "trace only execve events that starts with /run", -+ filterArgs: []string{"event=execve", "execve.pathname=/run*"}, - eventFunc: checkExecve, - }, - { diff --git a/pkgs/tools/system/pdisk/default.nix b/pkgs/tools/system/pdisk/default.nix index 87fc683063c7..e0a78b6b9409 100644 --- a/pkgs/tools/system/pdisk/default.nix +++ b/pkgs/tools/system/pdisk/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchzip +, fetchFromGitHub , fetchpatch , installShellFiles , libbsd @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { pname = "pdisk"; version = "0.9"; - src = fetchzip { - url = "https://opensource.apple.com/tarballs/pdisk/pdisk-${lib.versions.minor version}.tar.gz"; - sha256 = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs="; + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = pname; + rev = "${pname}-${lib.versions.minor version}"; + hash = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs="; }; patches = [ diff --git a/pkgs/tools/system/wslu/default.nix b/pkgs/tools/system/wslu/default.nix index f765da194c0e..6337e479bb31 100644 --- a/pkgs/tools/system/wslu/default.nix +++ b/pkgs/tools/system/wslu/default.nix @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc="; }; + patches = [ + ./fallback-conf-nix-store.diff + ]; + + postPatch = '' + substituteInPlace src/wslu-header \ + --subst-var out + ''; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" diff --git a/pkgs/tools/system/wslu/fallback-conf-nix-store.diff b/pkgs/tools/system/wslu/fallback-conf-nix-store.diff new file mode 100644 index 000000000000..6315e78d7de4 --- /dev/null +++ b/pkgs/tools/system/wslu/fallback-conf-nix-store.diff @@ -0,0 +1,22 @@ +diff --git a/src/wslu-header b/src/wslu-header +index 5f33925..159c6af 100644 +--- a/src/wslu-header ++++ b/src/wslu-header +@@ -169,11 +169,17 @@ if [ -f "$HOME/.config/wslu/conf" ]; then + debug_echo "$HOME/.config/wslu/conf found, sourcing" + source "$HOME/.config/wslu/conf" + fi ++ + if [ -f "$HOME/.wslurc" ]; then + debug_echo "$HOME/.wslurc found, sourcing" + source "$HOME/.wslurc" + fi + ++if [ -f "@out@/share/wslu/conf" ]; then ++ debug_echo "@out@/share/wslu/conf found, sourcing" ++ source "@out@/share/wslu/conf" ++fi ++ + # functions + + function help { diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index a85e91b1a0c1..c376411e6f7f 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -16,7 +16,7 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "gawk" + lib.optionalString interactive "-interactive"; version = "5.2.1"; @@ -31,13 +31,19 @@ stdenv.mkDerivation (rec { ./darwin-no-pma.patch ]; + # PIE is incompatible with the "persistent malloc" ("pma") feature. + # While build system attempts to pass -no-pie to gcc. nixpkgs' `ld` + # wrapped still passes `-pie` flag to linker and breaks linkage. + # Let's disable "pie" until `ld` is fixed to do the right thing. + hardeningDisable = [ "pie" ]; + # When we do build separate interactive version, it makes sense to always include man. outputs = [ "out" "info" ] ++ lib.optional (!interactive) "man"; - nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales - # no-pma fix - ++ [ autoreconfHook ]; + # no-pma fix + nativeBuildInputs = [ autoreconfHook ] + ++ lib.optional (doCheck && stdenv.isLinux) glibcLocales; buildInputs = lib.optional withSigsegv libsigsegv ++ lib.optional interactive readline @@ -83,8 +89,4 @@ stdenv.mkDerivation (rec { platforms = platforms.unix ++ platforms.windows; maintainers = [ ]; }; -} // lib.optionalAttrs stdenv.hostPlatform.isMusl { - # PIE is incompatible with the "persistent malloc" ("pma") feature. - # FIXME: make unconditional in staging (added to avoid rebuilds in staging-next) - hardeningDisable = [ "pie" ]; -}) +} diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index ea0ecf58a96d..1e17cda75d5f 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "igrep"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - sha256 = "sha256-pXgmbSmOLeAtI7pP0X9go4KnlLv4RChBQNCPYeG4Q84="; + sha256 = "sha256-g6DY3+HwBNQ+jxByXyTJK5CjAaC48FpmsDf1qGGO/Lk="; }; - cargoHash = "sha256-n1AVD6PuZFdZbTuGxNHvR6ngoVmSAixabcJl6nIcyP0="; + cargoHash = "sha256-7cSUIwWyWPxFDuRWplidbI93zbBV84T7e4Q//Uwj6N4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/tools/text/mdbook-open-on-gh/default.nix index ea7fd3a22e70..cba1e97591ef 100644 --- a/pkgs/tools/text/mdbook-open-on-gh/default.nix +++ b/pkgs/tools/text/mdbook-open-on-gh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-open-on-gh"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - hash = "sha256-omQTyJ7XKRBjX8jyWLONajAYnwr93nElrwDLdvs2MxM="; + hash = "sha256-uXfvE34yRrTUjh/HTMvOeZVxX4Drt6sxziaazg0CR3I="; }; - cargoHash = "sha256-57KcqALWbiGtp6HWSN42gZ0St38oHu3inZ0TT77j7go="; + cargoHash = "sha256-ol06ErggVLw2ThpXq9NRWEr7ymDSEBN4ae5zUmHKa7k="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index c2d9238bdd69..a0eb1f75a35d 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -5,17 +5,18 @@ stdenv.mkDerivation rec { version = "2.36"; src = fetchurl { - url = "https://pauillac.inria.fr/~maranget/hevea/distri/hevea-${version}.tar.gz"; + url = "https://hevea.inria.fr/distri/hevea-${version}.tar.gz"; sha256 = "sha256-XWdZ13AqKVx2oSwbKhoWdUqw7B/+1z/J0LE4tB5yBkg="; }; - buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; + nativeBuildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "A quite complete and fast LATEX to HTML translator"; - homepage = "http://pauillac.inria.fr/~maranget/hevea/"; + homepage = "https://hevea.inria.fr/"; + changelog = "https://github.com/maranget/hevea/raw/v${version}/CHANGES"; license = licenses.qpl; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix index e6cd6de9e679..3c3b736bf2c6 100644 --- a/pkgs/tools/typesetting/soupault/default.nix +++ b/pkgs/tools/typesetting/soupault/default.nix @@ -5,24 +5,31 @@ , testers }: -ocamlPackages.buildDunePackage rec { +let pname = "soupault"; - version = "4.3.1"; - minimalOCamlVersion = "4.08"; + version = "4.4.0"; +in +ocamlPackages.buildDunePackage { + inherit pname version; + + minimalOCamlVersion = "4.13"; + + duneVersion = "3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "PataphysicalSociety"; repo = pname; rev = version; - sha256 = "sha256-P8PGSJ7TOlnMoTcE5ZXqc7pJe4l+zRhBh0A/2iIJLQI="; + sha256 = "sha256-M4gaPxBxQ1Bk2C3BwvobYHyaWKIZgQ6buZ6S5wBlvPg="; }; buildInputs = with ocamlPackages; [ base64 camomile containers + digestif ezjsonm fileutils fmt diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 25841ae92b49..e58b8f342d05 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -16,7 +16,6 @@ let self = localPython; packageOverrides = self: super: { cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; - future = changeVersion super.future.overridePythonAttrs "0.16.0" "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf"; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { @@ -48,10 +47,11 @@ with localPython.pkgs; buildPythonApplication rec { preConfigure = '' substituteInPlace setup.py \ --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \ - --replace "requests>=2.20.1,<=2.26" "requests==2.28.1" \ + --replace "requests>=2.20.1,<=2.26" "requests<3" \ --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<2" \ --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \ --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \ + --replace "future>=0.16.0,<0.17.0" "future" \ --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.2.0" ''; diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 57c0d51d4070..dbe8fcda724f 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.30.0"; + version = "0.30.1"; subPackages = [ "govc" ]; @@ -10,10 +10,10 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-BMkty2H42fAILw/zRiAWE5cOX9WCZIs0503QODLHqxo="; + sha256 = "sha256-hG+yaaSmABosCIkVPLzv0J5VnoPaYqCMpDingQ1apEs="; }; - vendorSha256 = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k="; + vendorHash = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k="; ldflags = [ "-s" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f05bd2f8b993..d6dd82b8bda1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -217,6 +217,8 @@ mapAliases ({ clang11Stdenv = lowPrio llvmPackages_11.stdenv; clang12Stdenv = lowPrio llvmPackages_12.stdenv; clang13Stdenv = lowPrio llvmPackages_13.stdenv; + clang14Stdenv = lowPrio llvmPackages_14.stdenv; + clang15Stdenv = lowPrio llvmPackages_15.stdenv; clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 clasp = clingo; # added 2022-12-22 @@ -978,6 +980,7 @@ mapAliases ({ mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 + mps-youtube = throw "'mps-youtube' has been removed as it's unmaintained and stopped working. Use 'yewtube', a maintained fork"; # Added 2022-12-29 mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 multimc = throw "multimc was removed from nixpkgs; use prismlauncher instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 522d94c60319..63ceceae9158 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -112,6 +112,12 @@ with pkgs; tests = callPackages ../test {}; + defaultPkgConfigPackages = + # We don't want nix-env -q to enter this, because all of these are aliases. + dontRecurseIntoAttrs ( + import ./pkg-config/defaultPkgConfigPackages.nix pkgs + ); + ### Nixpkgs maintainer tools nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; @@ -159,9 +165,10 @@ with pkgs; autoreconfHook = callPackage ( { makeSetupHook, autoconf, automake, gettext, libtool }: - makeSetupHook - { deps = [ autoconf automake gettext libtool ]; } - ../build-support/setup-hooks/autoreconf.sh + makeSetupHook { + name = "autoreconf-hook"; + deps = [ autoconf automake gettext libtool ]; + } ../build-support/setup-hooks/autoreconf.sh ) { }; autoreconfHook264 = autoreconfHook.override { @@ -203,8 +210,9 @@ with pkgs; substitutions = { canonicalize_jar = canonicalize-jar; }; } ../build-support/setup-hooks/canonicalize-jars.sh; - ensureNewerSourcesHook = { year }: makeSetupHook {} - (writeScript "ensure-newer-sources-hook.sh" '' + ensureNewerSourcesHook = { year }: makeSetupHook { + name = "ensure-newer-sources-hook"; + } (writeScript "ensure-newer-sources-hook.sh" '' postUnpackHooks+=(_ensureNewerSources) _ensureNewerSources() { '${findutils}/bin/find' "$sourceRoot" \ @@ -337,9 +345,10 @@ with pkgs; # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; - updateAutotoolsGnuConfigScriptsHook = makeSetupHook - { substitutions = { gnu_config = gnu-config;}; } - ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; + updateAutotoolsGnuConfigScriptsHook = makeSetupHook { + name = "update-autotools-gnu-config-scripts-hook"; + substitutions = { gnu_config = gnu-config; }; + } ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; gogUnpackHook = makeSetupHook { name = "gog-unpack-hook"; @@ -615,7 +624,9 @@ with pkgs; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; - dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; + dieHook = makeSetupHook { + name = "die-hook"; + } ../build-support/setup-hooks/die.sh; archiver = callPackage ../applications/misc/archiver { }; @@ -964,11 +975,15 @@ with pkgs; madonctl = callPackage ../applications/misc/madonctl { }; - copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; + copyDesktopItems = makeSetupHook { + name = "copy-desktop-items-hook"; + } ../build-support/setup-hooks/copy-desktop-items.sh; makeDesktopItem = callPackage ../build-support/make-desktopitem { }; - copyPkgconfigItems = makeSetupHook { } ../build-support/setup-hooks/copy-pkgconfig-items.sh; + copyPkgconfigItems = makeSetupHook { + name = "copy-pkg-config-items-hook"; + } ../build-support/setup-hooks/copy-pkgconfig-items.sh; makePkgconfigItem = callPackage ../build-support/make-pkgconfigitem { }; @@ -985,17 +1000,17 @@ with pkgs; makeWrapper = makeShellWrapper; - makeShellWrapper = makeSetupHook - { deps = [ dieHook ]; - substitutions = { - # targetPackages.runtimeShell only exists when pkgs == targetPackages (when targetPackages is not __raw) - shell = if targetPackages ? runtimeShell then targetPackages.runtimeShell else throw "makeWrapper/makeShellWrapper must be in nativeBuildInputs"; - }; - passthru = { - tests = tests.makeWrapper; - }; - } - ../build-support/setup-hooks/make-wrapper.sh; + makeShellWrapper = makeSetupHook { + name = "make-shell-wrapper-hook"; + deps = [ dieHook ]; + substitutions = { + # targetPackages.runtimeShell only exists when pkgs == targetPackages (when targetPackages is not __raw) + shell = if targetPackages ? runtimeShell then targetPackages.runtimeShell else throw "makeWrapper/makeShellWrapper must be in nativeBuildInputs"; + }; + passthru = { + tests = tests.makeWrapper; + }; + } ../build-support/setup-hooks/make-wrapper.sh; makeBinaryWrapper = callPackage ../build-support/setup-hooks/make-binary-wrapper { }; @@ -1036,9 +1051,10 @@ with pkgs; setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; - shortenPerlShebang = makeSetupHook - { deps = [ dieHook ]; } - ../build-support/setup-hooks/shorten-perl-shebang.sh; + shortenPerlShebang = makeSetupHook { + name = "shorten-perl-shebang-hook"; + deps = [ dieHook ]; + } ../build-support/setup-hooks/shorten-perl-shebang.sh; singularity-tools = callPackage ../build-support/singularity-tools { }; @@ -1075,7 +1091,9 @@ with pkgs; inherit (lib.systems) platforms; - setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh; + setJavaClassPath = makeSetupHook { + name = "set-java-classpath-hook"; + } ../build-support/setup-hooks/set-java-classpath.sh; fixDarwinDylibNames = makeSetupHook { name = "fix-darwin-dylib-names-hook"; @@ -1086,23 +1104,31 @@ with pkgs; writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { }; desktopToDarwinBundle = makeSetupHook { + name = "desktop-to-darwin-bundle-hook"; deps = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; - keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; + keepBuildTree = makeSetupHook { + name = "keep-build-tree-hook"; + } ../build-support/setup-hooks/keep-build-tree.sh; - enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; + enableGCOVInstrumentation = makeSetupHook { + name = "enable-gcov-instrumentation-hook"; + } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; - makeGCOVReport = makeSetupHook - { deps = [ lcov enableGCOVInstrumentation ]; } - ../build-support/setup-hooks/make-coverage-analysis-report.sh; + makeGCOVReport = makeSetupHook { + name = "make-gcov-report-hook"; + deps = [ lcov enableGCOVInstrumentation ]; + } ../build-support/setup-hooks/make-coverage-analysis-report.sh; makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; # intended to be used like nix-build -E 'with import {}; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; - findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; + findXMLCatalogs = makeSetupHook { + name = "find-xml-catalogs-hook"; + } ../build-support/setup-hooks/find-xml-catalogs.sh; wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { makeWrapper = makeBinaryWrapper; @@ -1112,11 +1138,17 @@ with pkgs; wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; - separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; + separateDebugInfo = makeSetupHook { + name = "separate-debug-info-hook"; + } ../build-support/setup-hooks/separate-debug-info.sh; - setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh; + setupDebugInfoDirs = makeSetupHook { + name = "setup-debug-info-dirs-hook"; + } ../build-support/setup-hooks/setup-debug-info-dirs.sh; - useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh; + useOldCXXAbi = makeSetupHook { + name = "use-old-cxx-abi-hook"; + } ../build-support/setup-hooks/use-old-cxx-abi.sh; iconConvTools = callPackage ../build-support/icon-conv-tools {}; @@ -1375,6 +1407,8 @@ with pkgs; dwarfs = callPackage ../tools/filesystems/dwarfs { }; + copier = callPackage ../tools/misc/copier { }; + gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; }; @@ -2491,9 +2525,7 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; - logseq = callPackage ../applications/misc/logseq { - electron = electron_20; - }; + logseq = callPackage ../applications/misc/logseq { }; natls = callPackage ../tools/misc/natls { }; @@ -3285,6 +3317,8 @@ with pkgs; itch = callPackage ../games/itch {}; + itchiodl = callPackage ../games/itchiodl { }; + itd = callPackage ../applications/misc/itd { }; kord = callPackage ../applications/misc/kord { }; @@ -3758,7 +3792,9 @@ with pkgs; brutespray = callPackage ../tools/security/brutespray { }; breakpointHook = assert stdenv.buildPlatform.isLinux; - makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; + makeSetupHook { + name = "breakpoint-hook"; + } ../build-support/setup-hooks/breakpoint-hook.sh; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -5306,6 +5342,8 @@ with pkgs; pika = callPackage ../applications/graphics/pika { }; + pkg = callPackage ../tools/package-management/pkg { }; + playerctl = callPackage ../tools/audio/playerctl { }; pn = callPackage ../tools/text/pn { }; @@ -6597,6 +6635,8 @@ with pkgs; drone-runner-docker = callPackage ../development/tools/continuous-integration/drone-runner-docker { }; + drone-runner-ssh = callPackage ../development/tools/continuous-integration/drone-runner-ssh { }; + dropbear = callPackage ../tools/networking/dropbear { }; dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; @@ -12690,6 +12730,8 @@ with pkgs; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twspace-crawler = callPackage ../tools/misc/twspace-crawler { }; + twspace-dl = callPackage ../tools/misc/twspace-dl { }; twtxt = python3Packages.callPackage ../applications/networking/twtxt { }; @@ -12967,6 +13009,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; + wakapi = callPackage ../tools/misc/wakapi { }; + wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; weather = callPackage ../applications/misc/weather { }; @@ -15649,7 +15693,7 @@ with pkgs; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; cargo-lock = callPackage ../development/tools/rust/cargo-lock { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; cargo-pgx = callPackage ../development/tools/rust/cargo-pgx { inherit (darwin.apple_sdk.frameworks) Security; @@ -15902,8 +15946,6 @@ with pkgs; spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; - spirv-llvm-translator_14 = callPackage ../development/compilers/spirv-llvm-translator { llvm = llvm_14; }; - sqldeveloper = callPackage ../development/tools/database/sqldeveloper { jdk = oraclejdk; }; @@ -15930,7 +15972,10 @@ with pkgs; svdtools = callPackage ../development/embedded/svdtools { }; - swift = callPackage ../development/compilers/swift { }; + swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { }); + inherit (swiftPackages) swift swiftpm sourcekit-lsp; + + swiftpm2nix = callPackage ../development/tools/swiftpm2nix { }; swiProlog = callPackage ../development/compilers/swi-prolog { openssl = openssl_1_1; @@ -18017,6 +18062,8 @@ with pkgs; litestream = callPackage ../development/tools/database/litestream {}; + ls-lint = callPackage ../development/tools/ls-lint { }; + lsof = callPackage ../development/tools/misc/lsof { }; ltrace = callPackage ../development/tools/misc/ltrace { }; @@ -18718,11 +18765,13 @@ with pkgs; xcodebuild6 = xcodebuild.override { stdenv = llvmPackages_6.stdenv; }; xcbuild = xcodebuild; xcbuildHook = makeSetupHook { + name = "xcbuild-hook"; deps = [ xcbuild ]; } ../development/tools/xcbuild/setup-hook.sh ; # xcbuild with llvm 6 xcbuild6Hook = makeSetupHook { + name = "xcbuild6-hook"; deps = [ xcodebuild6 ]; } ../development/tools/xcbuild/setup-hook.sh ; @@ -21451,6 +21500,8 @@ with pkgs; libopusenc = callPackage ../development/libraries/libopusenc { }; + liboqs = callPackage ../development/libraries/liboqs { }; + libosinfo = callPackage ../development/libraries/libosinfo { }; libosip = callPackage ../development/libraries/osip {}; @@ -21989,6 +22040,7 @@ with pkgs; memorymapping = callPackage ../development/libraries/memorymapping { }; memorymappingHook = makeSetupHook { + name = "memorymapping-hook"; deps = [ memorymapping ]; } ../development/libraries/memorymapping/setup-hook.sh; @@ -21996,6 +22048,7 @@ with pkgs; memstream = callPackage ../development/libraries/memstream { }; memstreamHook = makeSetupHook { + name = "memstream-hook"; deps = [ memstream ]; } ../development/libraries/memstream/setup-hook.sh; @@ -22019,7 +22072,7 @@ with pkgs; libGLU = mesa_glu; mesa = callPackage ../development/libraries/mesa { - llvmPackages = llvmPackages_latest; + llvmPackages = llvmPackages_15; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; inherit (darwin.apple_sdk_11_0.libs) Xplugin; @@ -22674,9 +22727,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; - qmake48Hook = makeSetupHook - { substitutions = { qt4 = qt48; }; } - ../development/libraries/qt-4.x/4.8/qmake-hook.sh; + qmake48Hook = makeSetupHook { + name = "qmake4.8-hook"; + substitutions = { qt4 = qt48; }; + } ../development/libraries/qt-4.x/4.8/qmake-hook.sh; qmake4Hook = qmake48Hook; @@ -24211,6 +24265,8 @@ with pkgs; diod = callPackage ../servers/diod { lua = lua5_1; }; + directx-headers = callPackage ../development/libraries/directx-headers {}; + directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {}; dkimproxy = callPackage ../servers/mail/dkimproxy { }; @@ -25583,6 +25639,8 @@ with pkgs; erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; + evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { }; + fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; @@ -26299,6 +26357,8 @@ with pkgs; perf-tools = callPackage ../os-specific/linux/perf-tools { }; + picoprobe-udev-rules = callPackage ../os-specific/linux/picoprobe-udev-rules { }; + pipes = callPackage ../misc/screensavers/pipes { }; pipes-rs = callPackage ../misc/screensavers/pipes-rs { }; @@ -28408,6 +28468,8 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; + cavalier = callPackage ../applications/audio/cavalier { }; + cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -28524,6 +28586,8 @@ with pkgs; complete-alias = callPackage ../tools/misc/complete-alias { }; + completely = callPackage ../tools/misc/completely { }; + confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; copyq = qt6Packages.callPackage ../applications/misc/copyq { }; @@ -29004,6 +29068,8 @@ with pkgs; go-motion = callPackage ../development/tools/go-motion { }; + go-musicfox = callPackage ../applications/audio/go-musicfox { }; + gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; greenfoot = callPackage ../applications/editors/greenfoot { @@ -29375,6 +29441,8 @@ with pkgs; w_scan = callPackage ../applications/video/w_scan { }; + w_scan2 = callPackage ../applications/video/w_scan2 { }; + wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; @@ -31282,8 +31350,6 @@ with pkgs; mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; - mps-youtube = callPackage ../applications/misc/mps-youtube { }; - mplayer = callPackage ../applications/video/mplayer ({ libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); @@ -32816,6 +32882,8 @@ with pkgs; spotify = callPackage ../applications/audio/spotify { }; + spotify-player = callPackage ../applications/audio/spotify-player { }; + spotifywm = callPackage ../applications/audio/spotifywm { }; psst = callPackage ../applications/audio/psst { }; @@ -33416,7 +33484,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/office/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { }; @@ -34092,6 +34160,8 @@ with pkgs; yelp-tools = callPackage ../development/misc/yelp-tools { }; + yewtube = callPackage ../applications/misc/yewtube { }; + yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; yoshimi = callPackage ../applications/audio/yoshimi { }; @@ -37266,6 +37336,8 @@ with pkgs; dump = callPackage ../tools/backup/dump { }; dxvk = callPackage ../misc/dxvk { }; + dxvk_1 = callPackage ../misc/dxvk/dxvk.nix { dxvkVersion = "1.10"; }; + dxvk_2 = callPackage ../misc/dxvk/dxvk.nix { dxvkVersion = "2.1"; }; ecdsatool = callPackage ../tools/security/ecdsatool { }; @@ -37485,7 +37557,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security SystemConfiguration; }; - lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; + lilypond = callPackage ../misc/lilypond { }; lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; @@ -37649,6 +37721,8 @@ with pkgs; nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { }; + nixos-render-docs = callPackage ../tools/nix/nixos-render-docs { }; + nixdoc = callPackage ../tools/nix/nixdoc {}; dnadd = callPackage ../tools/nix/dnadd { }; @@ -38617,9 +38691,7 @@ with pkgs; simplehttp2server = callPackage ../servers/simplehttp2server { }; - simple-http-server = callPackage ../servers/simple-http-server { - inherit (darwin.apple_sdk.frameworks) Security; - }; + simple-http-server = callPackage ../servers/simple-http-server { }; diceware = with python3Packages; toPythonApplication diceware; @@ -38835,6 +38907,8 @@ with pkgs; xmcp = callPackage ../tools/X11/xmcp { }; + yesplaymusic = callPackage ../applications/audio/yesplaymusic { }; + ymuse = callPackage ../applications/audio/ymuse { }; zk = callPackage ../applications/office/zk {}; @@ -38855,7 +38929,7 @@ with pkgs; mictray = callPackage ../tools/audio/mictray { }; - swift-corelibs-libdispatch = callPackage ../development/libraries/swift-corelibs-libdispatch { }; + swift-corelibs-libdispatch = swiftPackages.Dispatch; swaysettings = callPackage ../applications/misc/swaysettings { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index cb32a46ca25d..cf00c3da93cf 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -120,6 +120,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { rewrite-tbd = callPackage ../os-specific/darwin/rewrite-tbd { }; checkReexportsHook = pkgs.makeSetupHook { + name = "darwin-check-reexports-hook"; deps = [ pkgs.darwin.print-reexports ]; } ../os-specific/darwin/print-reexports/setup-hook.sh; @@ -140,6 +141,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { signingUtils = callPackage ../os-specific/darwin/signing-utils { }; autoSignDarwinBinariesHook = pkgs.makeSetupHook { + name = "auto-sign-darwin-binaries-hook"; deps = [ self.signingUtils ]; } ../os-specific/darwin/signing-utils/auto-sign-hook.sh; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 6858e37fabeb..dbe96bd096f8 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -47,10 +47,10 @@ pkgs.releaseTools.sourceTarball { opts=(--option build-users-group "") nix-store --init - header "checking eval-release.nix" + echo "checking eval-release.nix" nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null - header "checking find-tarballs.nix" + echo "checking find-tarballs.nix" nix-instantiate --readonly-mode --eval --strict --show-trace --json \ ./maintainers/scripts/find-tarballs.nix \ --arg expr 'import ./maintainers/scripts/all-tarballs.nix' > $TMPDIR/tarballs.json @@ -61,7 +61,7 @@ pkgs.releaseTools.sourceTarball { exit 1 fi - header "generating packages.json" + echo "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp nix-env -f . -I nixpkgs=$src -qa --meta --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index e2b81b20c5b0..ab9dac4b380c 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -32,7 +32,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } # Check that all-packages.nix evaluates on a number of platforms without any warnings. for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do - header "checking Nixpkgs on $platform" + echo "checking Nixpkgs on $platform" # To get a call trace; see https://nixos.org/manual/nixpkgs/stable/#function-library-lib.trivial.warn # Relies on impure eval diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 03bd642550f1..301495961e33 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1477,7 +1477,9 @@ let trie = callPackage ../development/ocaml-modules/trie { }; - tsdl = callPackage ../development/ocaml-modules/tsdl { }; + tsdl = callPackage ../development/ocaml-modules/tsdl { + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback; + }; tsdl-image = callPackage ../development/ocaml-modules/tsdl-image { }; diff --git a/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix b/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix new file mode 100644 index 000000000000..b3cf3cdca2fc --- /dev/null +++ b/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix @@ -0,0 +1,45 @@ +/* A set of aliases to be used in generated expressions. + + In case of ambiguity, this will pick a sensible default. + + This was initially based on cabal2nix's mapping. + + It'd be nice to generate this mapping, based on a set of derivations. + It can not be fully automated, so it should be a expression or tool + that makes suggestions about which pkg-config module names can be added. + */ +pkgs: + +let + inherit (pkgs) lib; + inherit (lib) + all + flip + mapAttrs + mapAttrsToList + getAttrFromPath + importJSON + ; + + data = importJSON ./pkg-config-data.json; + inherit (data) modules; + + platform = pkgs.stdenv.hostPlatform; + + isSupported = moduleData: + moduleData?supportedWhenPlatformAttrsEqual -> + all (x: x) ( + mapAttrsToList + (k: v: platform?${k} && platform.${k} == v) + moduleData.supportedWhenPlatformAttrsEqual + ); + + modulePkgs = flip mapAttrs modules (_moduleName: moduleData: + if moduleData?attrPath && isSupported moduleData then + getAttrFromPath moduleData.attrPath pkgs + else + null + ); + +in + modulePkgs diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json new file mode 100644 index 000000000000..61ed9098b919 --- /dev/null +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -0,0 +1,964 @@ +{ + "version": { + "major": 0, + "minor": 1 + }, + "modules": { + "IL": { + "attrPath": [ + "libdevil" + ] + }, + "ImageMagick": { + "attrPath": [ + "imagemagick" + ] + }, + "MagickWand": { + "attrPath": [ + "imagemagick" + ] + }, + "Qt5Concurrent": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Core": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5DBus": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Gui": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Network": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5OpenGL": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5OpenGLExtensions": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5PrintSupport": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Qml": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QmlModels": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5Quick": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QuickTest": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QuickWidgets": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5Sql": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Test": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Widgets": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Xml": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "SoapySDR": { + "attrPath": [ + "soapysdr" + ] + }, + "alsa": { + "attrPath": [ + "alsa-lib" + ] + }, + "alsa-topology": { + "attrPath": [ + "alsa-lib" + ] + }, + "appindicator-0.1": { + "attrPath": [ + "libappindicator-gtk2" + ] + }, + "appindicator3-0.1": { + "attrPath": [ + "libappindicator-gtk3" + ] + }, + "bzip2": { + "attrPath": [ + "bzip2" + ] + }, + "cairo-gobject": { + "attrPath": [ + "cairo" + ] + }, + "cairo-pdf": { + "attrPath": [ + "cairo" + ] + }, + "cairo-ps": { + "attrPath": [ + "cairo" + ] + }, + "cairo-svg": { + "attrPath": [ + "cairo" + ] + }, + "dbusmenu-glib-0.4": { + "attrPath": [ + "libdbusmenu" + ] + }, + "dbusmenu-gtk3-0.4": { + "attrPath": [ + "libdbusmenu-gtk3" + ] + }, + "egl": { + "attrPath": [ + "libGL" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "fftw3": { + "attrPath": [ + "fftw" + ] + }, + "fftw3f": { + "attrPath": [ + "fftwFloat" + ] + }, + "form": { + "attrPath": [ + "ncurses" + ] + }, + "formw": { + "attrPath": [ + "ncurses" + ] + }, + "freealut": { + "attrPath": [ + "freealut" + ] + }, + "freetype2": { + "attrPath": [ + "freetype" + ] + }, + "gdk-2.0": { + "attrPath": [ + "gtk2" + ] + }, + "gdk-3.0": { + "attrPath": [ + "gtk3" + ] + }, + "gdk-pixbuf-2.0": { + "attrPath": [ + "gdk-pixbuf" + ] + }, + "gdk-x11-2.0": { + "attrPath": [ + "gtk2-x11" + ] + }, + "gdk-x11-3.0": { + "attrPath": [ + "gtk3-x11" + ] + }, + "geos": { + "attrPath": [ + "geos" + ] + }, + "gio-2.0": { + "attrPath": [ + "glib" + ] + }, + "gl": { + "attrPath": [ + "libGL" + ] + }, + "glew": { + "attrPath": [ + "glew" + ] + }, + "glu": { + "attrPath": [ + "libGLU" + ] + }, + "glut": { + "attrPath": [ + "freeglut" + ] + }, + "gnome-keyring-1": { + "attrPath": [ + "libgnome-keyring" + ] + }, + "gnome-vfs-2.0": { + "attrPath": [ + "gnome2", + "gnome_vfs" + ] + }, + "gnome-vfs-module-2.0": { + "attrPath": [ + "gnome2", + "gnome_vfs" + ] + }, + "gobject-2.0": { + "attrPath": [ + "glib" + ] + }, + "gobject-introspection-1.0": { + "attrPath": [ + "gobject-introspection" + ] + }, + "gstreamer-audio-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-base-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-controller-1.0": { + "attrPath": [ + "gst_all_1", + "gstreamer" + ] + }, + "gstreamer-net-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-video-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gthread-2.0": { + "attrPath": [ + "glib" + ] + }, + "gtk+-2.0": { + "attrPath": [ + "gtk2" + ] + }, + "gtk+-3.0": { + "attrPath": [ + "gtk3" + ] + }, + "gtk+-x11-2.0": { + "attrPath": [ + "gtk2-x11" + ] + }, + "gtksourceview-3.0": { + "attrPath": [ + "gtksourceview3" + ] + }, + "hidapi": { + "attrPath": [ + "hidapi" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": true + } + }, + "hidapi-hidraw": { + "attrPath": [ + "hidapi" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "hidapi-libusb": { + "attrPath": [ + "hidapi" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "icu-i18n": { + "attrPath": [ + "icu" + ] + }, + "icu-io": { + "attrPath": [ + "icu" + ] + }, + "icu-uc": { + "attrPath": [ + "icu" + ] + }, + "imlib2": { + "attrPath": [ + "imlib2" + ] + }, + "jack": { + "attrPath": [ + "libjack2" + ] + }, + "javascriptcoregtk-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "lapack": { + "attrPath": [ + "liblapack" + ] + }, + "libR": { + "attrPath": [ + "R" + ] + }, + "libavutil": { + "attrPath": [ + "ffmpeg" + ] + }, + "libb2": { + "attrPath": [ + "libb2" + ] + }, + "libbrotlidec": { + "attrPath": [ + "brotli" + ] + }, + "libbrotlienc": { + "attrPath": [ + "brotli" + ] + }, + "libcrypto": { + "attrPath": [ + "openssl" + ] + }, + "libecpg": { + "attrPath": [ + "postgresql" + ] + }, + "libecpg_compat": { + "attrPath": [ + "postgresql" + ] + }, + "libgsasl": { + "attrPath": [ + "gsasl" + ] + }, + "libidn": { + "attrPath": [ + "libidn" + ] + }, + "libjpeg": { + "attrPath": [ + "libjpeg" + ] + }, + "liblzma": { + "attrPath": [ + "xz" + ] + }, + "libmagic": { + "attrPath": [ + "file" + ] + }, + "libmnl": { + "attrPath": [ + "libmnl" + ] + }, + "libnotify": { + "attrPath": [ + "libnotify" + ] + }, + "libpcap": { + "attrPath": [ + "libpcap" + ] + }, + "libpcre": { + "attrPath": [ + "pcre" + ] + }, + "libpcre2-16": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-32": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-8": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-posix": { + "attrPath": [ + "pcre2" + ] + }, + "libpgtypes": { + "attrPath": [ + "postgresql" + ] + }, + "libpng": { + "attrPath": [ + "libpng" + ] + }, + "libpq": { + "attrPath": [ + "postgresql" + ] + }, + "libpulse": { + "attrPath": [ + "libpulseaudio" + ] + }, + "libpulse-mainloop-glib": { + "attrPath": [ + "libpulseaudio" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "libpulse-simple": { + "attrPath": [ + "libpulseaudio" + ] + }, + "libqrencode": { + "attrPath": [ + "qrencode" + ] + }, + "librtlsdr": { + "attrPath": [ + "rtl-sdr" + ] + }, + "libsass": { + "attrPath": [ + "libsass" + ] + }, + "libsctp": { + "attrPath": [ + "lksctp-tools" + ] + }, + "libsecp256k1": { + "attrPath": [ + "secp256k1" + ] + }, + "libsodium": { + "attrPath": [ + "libsodium" + ] + }, + "libsoup-gnome-2.4": { + "attrPath": [ + "libsoup" + ] + }, + "libssh2": { + "attrPath": [ + "libssh2" + ] + }, + "libssl": { + "attrPath": [ + "openssl" + ] + }, + "libstatgrab": { + "attrPath": [ + "libstatgrab" + ] + }, + "libsystemd": { + "attrPath": [ + "systemd" + ] + }, + "libturbojpeg": { + "attrPath": [ + "libjpeg" + ] + }, + "libudev": { + "attrPath": [ + "systemd" + ] + }, + "libxml-2.0": { + "attrPath": [ + "libxml2" + ] + }, + "libzip": { + "attrPath": [ + "libzip" + ] + }, + "libzmq": { + "attrPath": [ + "zeromq" + ] + }, + "menu": { + "attrPath": [ + "ncurses" + ] + }, + "menuw": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses++": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses++w": { + "attrPath": [ + "ncurses" + ] + }, + "ncursesw": { + "attrPath": [ + "ncurses" + ] + }, + "netsnmp": { + "attrPath": [ + "net_snmp" + ] + }, + "nix-cmd": { + "attrPath": [ + "nix" + ] + }, + "nix-expr": { + "attrPath": [ + "nix" + ] + }, + "nix-main": { + "attrPath": [ + "nix" + ] + }, + "nix-store": { + "attrPath": [ + "nix" + ] + }, + "odbc": { + "attrPath": [ + "unixODBC" + ] + }, + "ompi": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-c": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-cxx": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-f77": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-f90": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-fort": { + "attrPath": [ + "openmpi" + ] + }, + "openblas": { + "attrPath": [ + "openblasCompat" + ] + }, + "openssl": { + "attrPath": [ + "openssl" + ] + }, + "orte": { + "attrPath": [ + "openmpi" + ] + }, + "panel": { + "attrPath": [ + "ncurses" + ] + }, + "panelw": { + "attrPath": [ + "ncurses" + ] + }, + "pangocairo": { + "attrPath": [ + "pango" + ] + }, + "poppler-glib": { + "attrPath": [ + "poppler_gi" + ] + }, + "python": { + "attrPath": [ + "python3" + ] + }, + "ruby-2.7": { + "attrPath": [ + "ruby_2_7" + ] + }, + "ruby-3.0": { + "attrPath": [ + "ruby_3_0" + ] + }, + "ruby-3.1": { + "attrPath": [ + "ruby_3_1" + ] + }, + "sdl2": { + "attrPath": [ + "SDL2" + ] + }, + "sndfile": { + "attrPath": [ + "libsndfile" + ] + }, + "sqlite3": { + "attrPath": [ + "sqlite" + ] + }, + "taglib": { + "attrPath": [ + "taglib" + ] + }, + "taglib_c": { + "attrPath": [ + "taglib" + ] + }, + "tdjson": { + "attrPath": [ + "tdlib" + ] + }, + "tensorflow": { + "attrPath": [ + "libtensorflow" + ] + }, + "uuid": { + "attrPath": [ + "libossp_uuid" + ] + }, + "vte-2.91": { + "attrPath": [ + "vte" + ] + }, + "wayland-client": { + "attrPath": [ + "wayland" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "wayland-cursor": { + "attrPath": [ + "wayland" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "wayland-scanner": { + "attrPath": [ + "wayland" + ] + }, + "wayland-server": { + "attrPath": [ + "wayland" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "webkit2gtk-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "webkit2gtk-web-extension-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "x11": { + "attrPath": [ + "xorg", + "libX11" + ] + }, + "xau": { + "attrPath": [ + "xorg", + "libXau" + ] + }, + "xcursor": { + "attrPath": [ + "xorg", + "libXcursor" + ] + }, + "xerces-c": { + "attrPath": [ + "xercesc" + ] + }, + "xext": { + "attrPath": [ + "xorg", + "libXext" + ] + }, + "xft": { + "attrPath": [ + "xorg", + "libXft" + ] + }, + "xi": { + "attrPath": [ + "xorg", + "libXi" + ] + }, + "xinerama": { + "attrPath": [ + "xorg", + "libXinerama" + ] + }, + "xkbcommon": { + "attrPath": [ + "libxkbcommon" + ] + }, + "xpm": { + "attrPath": [ + "xorg", + "libXpm" + ] + }, + "xrandr": { + "attrPath": [ + "xorg", + "libXrandr" + ] + }, + "xrender": { + "attrPath": [ + "xorg", + "libXrender" + ] + }, + "xscrnsaver": { + "attrPath": [ + "xorg", + "libXScrnSaver" + ] + }, + "xtst": { + "attrPath": [ + "xorg", + "libXtst" + ] + }, + "xxf86vm": { + "attrPath": [ + "xorg", + "libXxf86vm" + ] + }, + "yaml-0.1": { + "attrPath": [ + "libyaml" + ] + }, + "zlib": { + "attrPath": [ + "zlib" + ] + } + } +} diff --git a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix new file mode 100644 index 000000000000..1e53a02ec8a9 --- /dev/null +++ b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix @@ -0,0 +1,45 @@ +# cd nixpkgs +# nix-build -A tests.pkg-config.defaultPkgConfigPackages +{ lib, pkg-config, defaultPkgConfigPackages, runCommand, testers }: +let + inherit (lib.strings) escapeNixIdentifier; + + allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) defaultPkgConfigPackages; + + # nix-build rejects attribute names with periods + # This will build those regardless. + tests-combined = runCommand "pkg-config-checks" { + allTests = lib.attrValues allTests; + } '' + touch $out + ''; + + makePkgConfigTestMaybe = moduleName: pkg: + if ! lib.isDerivation pkg + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` is not defined to be a derivation. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config-packages.nix` in Nixpkgs." + + else if ! pkg?meta.unsupported + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` does not have a `meta.unsupported` attribute. This can't be right. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config-packages.nix` in Nixpkgs." + + else if pkg.meta.unsupported + then + # We return `null` instead of doing a `filterAttrs`, because with + # `filterAttrs` the evaluator would not be able to return the attribute + # set without first evaluating all of the attribute _values_. This would + # be rather expensive, and severly slow down the use case of getting a + # single test, which we want to do in `passthru.tests`, or interactively. + null + + else if ! pkg?meta.broken + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` does not have a `meta.broken` attribute. This can't be right. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config.packages.nix` in Nixpkgs." + + else if pkg.meta.broken + then null + + else testers.hasPkgConfigModule { inherit moduleName; package = pkg; }; + +in + allTests // { inherit tests-combined; } diff --git a/pkgs/top-level/pkg-config/tests.nix b/pkgs/top-level/pkg-config/tests.nix new file mode 100644 index 000000000000..bcc8e7b4ee3e --- /dev/null +++ b/pkgs/top-level/pkg-config/tests.nix @@ -0,0 +1,21 @@ +# cd nixpkgs +# nix-build -A tests.pkg-config +{ lib, stdenv, ... }: + +let + # defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform + # in order to filter out the unsupported packages without throwing any errors + # tryEval would be too fragile, masking different problems as if they're + # unsupported platform problems. + allPkgs = import ../default.nix { + system = stdenv.hostPlatform.system; + localSystem = stdenv.hostPlatform.system; + config = { + allowUnsupportedSystem = true; + }; + overlays = []; + }; +in +lib.recurseIntoAttrs { + defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4ad9b845adc8..783dd4da82a1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04 + dictpath = pathable; # added 2023-01-28 diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 djangorestframework-jwt = drf-jwt; # added 2021-07-20 @@ -129,6 +130,7 @@ mapAliases ({ nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 + pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70ed35ad088d..be3ea429793e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2389,8 +2389,6 @@ self: super: with self; { dictionaries = callPackage ../development/python-modules/dictionaries { }; - dictpath = callPackage ../development/python-modules/dictpath { }; - dicttoxml = callPackage ../development/python-modules/dicttoxml { }; dicttoxml2 = callPackage ../development/python-modules/dicttoxml2 { }; @@ -4767,6 +4765,8 @@ self: super: with self; { itemloaders = callPackage ../development/python-modules/itemloaders { }; + iteration-utilities = callPackage ../development/python-modules/iteration-utilities { }; + iterm2 = callPackage ../development/python-modules/iterm2 { }; itsdangerous = callPackage ../development/python-modules/itsdangerous { }; @@ -4859,6 +4859,8 @@ self: super: with self; { jinja2 = callPackage ../development/python-modules/jinja2 { }; + jinja2-ansible-filters = callPackage ../development/python-modules/jinja2-ansible-filters { }; + jinja2-git = callPackage ../development/python-modules/jinja2-git { }; jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; @@ -5924,6 +5926,8 @@ self: super: with self; { mkdocstrings-python = callPackage ../development/python-modules/mkdocstrings-python { }; + mkdocs-mermaid2-plugin = callPackage ../development/python-modules/mkdocs-mermaid2-plugin { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; ml-collections = callPackage ../development/python-modules/ml-collections { }; @@ -6651,6 +6655,8 @@ self: super: with self; { openrouteservice = callPackage ../development/python-modules/openrouteservice { }; + opensearch-py = callPackage ../development/python-modules/opensearch-py { }; + opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; opensfm = callPackage ../development/python-modules/opensfm { }; @@ -6779,8 +6785,6 @@ self: super: with self; { packvers = callPackage ../development/python-modules/packvers { }; - pafy = callPackage ../development/python-modules/pafy { }; - pagelabels = callPackage ../development/python-modules/pagelabels { }; paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; @@ -9659,6 +9663,8 @@ self: super: with self; { pyyaml-env-tag = callPackage ../development/python-modules/pyyaml-env-tag { }; + pyyaml-include = callPackage ../development/python-modules/pyyaml-include { }; + pyzerproc = callPackage ../development/python-modules/pyzerproc { }; pyzmq = callPackage ../development/python-modules/pyzmq { }; @@ -9878,6 +9884,8 @@ self: super: with self; { remi = callPackage ../development/python-modules/remi { }; + remote-pdb = callPackage ../development/python-modules/remote-pdb { }; + renault-api = callPackage ../development/python-modules/renault-api { }; rencode = callPackage ../development/python-modules/rencode { }; @@ -10186,6 +10194,8 @@ self: super: with self; { safe = callPackage ../development/python-modules/safe { }; + safe-pysha3 = callPackage ../development/python-modules/safe-pysha3 { }; + safeio = callPackage ../development/python-modules/safeio { }; safety = callPackage ../development/python-modules/safety { }; @@ -10757,6 +10767,8 @@ self: super: with self; { sphinx-book-theme = callPackage ../development/python-modules/sphinx-book-theme { }; + sphinx-codeautolink = callPackage ../development/python-modules/sphinx-codeautolink { }; + sphinx-comments = callPackage ../development/python-modules/sphinx-comments { }; sphinx-design = callPackage ../development/python-modules/sphinx-design { }; @@ -10765,14 +10777,22 @@ self: super: with self; { sphinx-fortran = callPackage ../development/python-modules/sphinx-fortran { }; + sphinx-hoverxref = callPackage ../development/python-modules/sphinx-hoverxref { }; + sphinx-jupyterbook-latex = callPackage ../development/python-modules/sphinx-jupyterbook-latex { }; sphinx-multitoc-numbering = callPackage ../development/python-modules/sphinx-multitoc-numbering { }; + sphinx-notfound-page = callPackage ../development/python-modules/sphinx-notfound-page { }; + sphinx-pytest = callPackage ../development/python-modules/sphinx-pytest { }; + sphinx-prompt = callPackage ../development/python-modules/sphinx-prompt { }; + sphinx-thebe = callPackage ../development/python-modules/sphinx-thebe { }; + sphinx-tabs = callPackage ../development/python-modules/sphinx-tabs { }; + sphinx-togglebutton = callPackage ../development/python-modules/sphinx-togglebutton { }; sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { }; @@ -10841,6 +10861,8 @@ self: super: with self; { sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; + sphinx-jquery = callPackage ../development/python-modules/sphinx-jquery { }; + sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { }; sphinx-autodoc-typehints = callPackage ../development/python-modules/sphinx-autodoc-typehints { }; @@ -10873,6 +10895,8 @@ self: super: with self; { sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; + sphinx-version-warning = callPackage ../development/python-modules/sphinx-version-warning { }; + sphinxext-opengraph = callPackage ../development/python-modules/sphinxext-opengraph { }; spidev = callPackage ../development/python-modules/spidev { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index b8719294f98d..f15349da64fa 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -34,6 +34,8 @@ let nix = nativePlatforms; nixUnstable = nativePlatforms; mesa = nativePlatforms; + rustc = nativePlatforms; + cargo = nativePlatforms; }; gnuCommon = lib.recursiveUpdate common {